X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fbindings.c;h=0c274a486ef99f3816a20569f4782c585d7f9125;hb=1854b5cebef22ace9e9e4dd191f609818df9ce08;hp=e738038d7ab8e066df6b516a242c6eff3d3e73a3;hpb=99d1a3bd6dc5c7ed1499b30bfc2b4c66ffaf858a;p=ldk-java

diff --git a/ts/bindings.c b/ts/bindings.c
index e738038d..0c274a48 100644
--- a/ts/bindings.c
+++ b/ts/bindings.c
@@ -22,6 +22,7 @@ void free(void *ptr);
 #define DO_ASSERT(a) (void)(a)
 #define CHECK(a)
 #define CHECK_ACCESS(p)
+#define CHECK_INNER_FIELD_ACCESS_OR_NULL(v)
 
 // We assume that CVec_u8Z and u8slice are the same size and layout (and thus pointers to the two can be mixed)
 _Static_assert(sizeof(LDKCVec_u8Z) == sizeof(LDKu8slice), "Vec<u8> and [u8] need to have been mapped identically");
@@ -84,6 +85,20 @@ static inline int32_t LDKAccessError_to_js(LDKAccessError val) {
 		default: abort();
 	}
 }
+static inline LDKCOption_NoneZ LDKCOption_NoneZ_from_js(int32_t ord) {
+	switch (ord) {
+		case 0: return LDKCOption_NoneZ_Some;
+		case 1: return LDKCOption_NoneZ_None;
+	}
+	abort();
+}
+static inline int32_t LDKCOption_NoneZ_to_js(LDKCOption_NoneZ val) {
+	switch (val) {
+		case LDKCOption_NoneZ_Some: return 0;
+		case LDKCOption_NoneZ_None: return 1;
+		default: abort();
+	}
+}
 static inline LDKChannelMonitorUpdateErr LDKChannelMonitorUpdateErr_from_js(int32_t ord) {
 	switch (ord) {
 		case 0: return LDKChannelMonitorUpdateErr_TemporaryFailure;
@@ -120,6 +135,7 @@ static inline LDKCreationError LDKCreationError_from_js(int32_t ord) {
 		case 1: return LDKCreationError_RouteTooLong;
 		case 2: return LDKCreationError_TimestampOutOfBounds;
 		case 3: return LDKCreationError_ExpiryTimeOutOfBounds;
+		case 4: return LDKCreationError_InvalidAmount;
 	}
 	abort();
 }
@@ -129,6 +145,7 @@ static inline int32_t LDKCreationError_to_js(LDKCreationError val) {
 		case LDKCreationError_RouteTooLong: return 1;
 		case LDKCreationError_TimestampOutOfBounds: return 2;
 		case LDKCreationError_ExpiryTimeOutOfBounds: return 3;
+		case LDKCreationError_InvalidAmount: return 4;
 		default: abort();
 	}
 }
@@ -200,21 +217,23 @@ static inline int32_t LDKIOError_to_js(LDKIOError val) {
 }
 static inline LDKLevel LDKLevel_from_js(int32_t ord) {
 	switch (ord) {
-		case 0: return LDKLevel_Trace;
-		case 1: return LDKLevel_Debug;
-		case 2: return LDKLevel_Info;
-		case 3: return LDKLevel_Warn;
-		case 4: return LDKLevel_Error;
+		case 0: return LDKLevel_Gossip;
+		case 1: return LDKLevel_Trace;
+		case 2: return LDKLevel_Debug;
+		case 3: return LDKLevel_Info;
+		case 4: return LDKLevel_Warn;
+		case 5: return LDKLevel_Error;
 	}
 	abort();
 }
 static inline int32_t LDKLevel_to_js(LDKLevel val) {
 	switch (val) {
-		case LDKLevel_Trace: return 0;
-		case LDKLevel_Debug: return 1;
-		case LDKLevel_Info: return 2;
-		case LDKLevel_Warn: return 3;
-		case LDKLevel_Error: return 4;
+		case LDKLevel_Gossip: return 0;
+		case LDKLevel_Trace: return 1;
+		case LDKLevel_Debug: return 2;
+		case LDKLevel_Info: return 3;
+		case LDKLevel_Warn: return 4;
+		case LDKLevel_Error: return 5;
 		default: abort();
 	}
 }
@@ -312,20 +331,6 @@ static inline int32_t LDKSiPrefix_to_js(LDKSiPrefix val) {
 		default: abort();
 	}
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_u8Z_new(int8_tArray elems) {
-	LDKCVec_u8Z *ret = MALLOC(sizeof(LDKCVec_u8Z), "LDKCVec_u8Z");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(uint8_t) * ret->datalen, "LDKCVec_u8Z Data");
-		int8_t *java_elems = (int8_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			ret->data[i] = java_elems[i];
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_u8Z CVec_u8Z_clone(const LDKCVec_u8Z *orig) {
 	LDKCVec_u8Z ret = { .data = MALLOC(sizeof(int8_t) * orig->datalen, "LDKCVec_u8Z clone bytes"), .datalen = orig->datalen };
 	memcpy(ret.data, orig->data, sizeof(int8_t) * ret.datalen);
@@ -346,9 +351,6 @@ uint64_t TxOut_get_value (struct LDKTxOut* thing) {	return thing->value;}int64_t
 	return ret_val;
 }
 
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_SecretKeyErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_SecretKeyErrorZ*)arg)->result_ok;
-}
 int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_SecretKeyErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_SecretKeyErrorZ *val = (LDKCResult_SecretKeyErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -362,9 +364,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_SecretKeyErrorZ_g
 	uint32_t err_conv = LDKSecp256k1Error_to_js((*val->contents.err));
 	return err_conv;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_PublicKeyErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_PublicKeyErrorZ*)arg)->result_ok;
-}
 int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_PublicKeyErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_PublicKeyErrorZ *val = (LDKCResult_PublicKeyErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -378,9 +377,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PublicKeyErrorZ_g
 	uint32_t err_conv = LDKSecp256k1Error_to_js((*val->contents.err));
 	return err_conv;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_TxCreationKeysDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_TxCreationKeysDecodeErrorZ *val = (LDKCResult_TxCreationKeysDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -388,6 +384,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysDec
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -398,12 +395,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysDec
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ChannelPublicKeysDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ChannelPublicKeysDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelPublicKeysDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ChannelPublicKeysDecodeErrorZ *val = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -411,6 +406,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelPublicKeys
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -421,12 +417,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelPublicKeys
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_TxCreationKeysErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_TxCreationKeysErrorZ *val = (LDKCResult_TxCreationKeysErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -434,6 +428,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_TxCreationKeysErr
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -455,9 +450,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCOption_u32Z_ref_from_ptr(
 		default: abort();
 	}
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_HTLCOutputInCommitmentDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *val = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -465,6 +457,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_HTLCOutputInCommi
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -475,12 +468,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_HTLCOutputInCommi
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *val = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -488,6 +479,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_CounterpartyChann
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -498,12 +490,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_CounterpartyChann
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ChannelTransactionParametersDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ChannelTransactionParametersDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelTransactionParametersDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ *val = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -511,6 +501,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelTransactio
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -521,12 +512,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelTransactio
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_HolderCommitmentTransactionDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ *val = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -534,6 +523,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_HolderCommitmentT
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -544,12 +534,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_HolderCommitmentT
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_BuiltCommitmentTransactionDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *val = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -557,6 +545,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_BuiltCommitmentTr
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -567,12 +556,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_BuiltCommitmentTr
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_TrustedClosingTransactionNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_TrustedClosingTransactionNoneZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_TrustedClosingTransactionNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_TrustedClosingTransactionNoneZ *val = (LDKCResult_TrustedClosingTransactionNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -580,6 +567,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_TrustedClosingTra
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -588,9 +576,6 @@ void  __attribute__((visibility("default"))) TS_LDKCResult_TrustedClosingTransac
 	CHECK(!val->result_ok);
 	return *val->contents.err;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_CommitmentTransactionDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_CommitmentTransactionDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_CommitmentTransactionDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_CommitmentTransactionDecodeErrorZ *val = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -598,6 +583,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_CommitmentTransac
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -608,12 +594,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_CommitmentTransac
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_TrustedCommitmentTransactionNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_TrustedCommitmentTransactionNoneZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_TrustedCommitmentTransactionNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_TrustedCommitmentTransactionNoneZ *val = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -621,6 +605,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_TrustedCommitment
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -629,9 +614,6 @@ void  __attribute__((visibility("default"))) TS_LDKCResult_TrustedCommitmentTran
 	CHECK(!val->result_ok);
 	return *val->contents.err;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_CVec_SignatureZNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_CVec_SignatureZNoneZ*)arg)->result_ok;
-}
 ptrArray  __attribute__((visibility("default"))) TS_LDKCResult_CVec_SignatureZNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_CVec_SignatureZNoneZ *val = (LDKCResult_CVec_SignatureZNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -652,9 +634,6 @@ void  __attribute__((visibility("default"))) TS_LDKCResult_CVec_SignatureZNoneZ_
 	CHECK(!val->result_ok);
 	return *val->contents.err;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownScriptDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ShutdownScriptDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownScriptDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ShutdownScriptDecodeErrorZ *val = (LDKCResult_ShutdownScriptDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -662,6 +641,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownScriptDec
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -672,12 +652,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownScriptDec
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownScriptInvalidShutdownScriptZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(uint32_t arg) {
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ *val = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -685,6 +663,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownScriptInv
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -695,12 +674,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownScriptInv
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NoneErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NoneErrorZ*)arg)->result_ok;
-}
 void  __attribute__((visibility("default"))) TS_LDKCResult_NoneErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NoneErrorZ *val = (LDKCResult_NoneErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -712,9 +689,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NoneErrorZ_get_er
 	uint32_t err_conv = LDKIOError_to_js((*val->contents.err));
 	return err_conv;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_RouteHopDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_RouteHopDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteHopDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_RouteHopDecodeErrorZ *val = (LDKCResult_RouteHopDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -722,6 +696,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteHopDecodeErr
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -732,28 +707,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteHopDecodeErr
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_RouteHopZ_new(uint32_tArray elems) {
-	LDKCVec_RouteHopZ *ret = MALLOC(sizeof(LDKCVec_RouteHopZ), "LDKCVec_RouteHopZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKRouteHop) * ret->datalen, "LDKCVec_RouteHopZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKRouteHop arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = RouteHop_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_RouteHopZ CVec_RouteHopZ_clone(const LDKCVec_RouteHopZ *orig) {
 	LDKCVec_RouteHopZ ret = { .data = MALLOC(sizeof(LDKRouteHop) * orig->datalen, "LDKCVec_RouteHopZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -768,9 +725,6 @@ static inline LDKCVec_CVec_RouteHopZZ CVec_CVec_RouteHopZZ_clone(const LDKCVec_C
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_RouteDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_RouteDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_RouteDecodeErrorZ *val = (LDKCResult_RouteDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -778,6 +732,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteDecodeErrorZ
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -788,12 +743,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteDecodeErrorZ
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_RouteParametersDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_RouteParametersDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteParametersDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_RouteParametersDecodeErrorZ *val = (LDKCResult_RouteParametersDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -801,6 +754,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteParametersDe
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -811,28 +765,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteParametersDe
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_RouteHintZ_new(uint32_tArray elems) {
-	LDKCVec_RouteHintZ *ret = MALLOC(sizeof(LDKCVec_RouteHintZ), "LDKCVec_RouteHintZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKRouteHint) * ret->datalen, "LDKCVec_RouteHintZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKRouteHint arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = RouteHint_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_RouteHintZ CVec_RouteHintZ_clone(const LDKCVec_RouteHintZ *orig) {
 	LDKCVec_RouteHintZ ret = { .data = MALLOC(sizeof(LDKRouteHint) * orig->datalen, "LDKCVec_RouteHintZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -852,9 +788,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCOption_u64Z_ref_from_ptr(
 		default: abort();
 	}
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_PayeeDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_PayeeDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PayeeDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_PayeeDecodeErrorZ *val = (LDKCResult_PayeeDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -862,6 +795,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PayeeDecodeErrorZ
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -872,28 +806,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PayeeDecodeErrorZ
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_RouteHintHopZ_new(uint32_tArray elems) {
-	LDKCVec_RouteHintHopZ *ret = MALLOC(sizeof(LDKCVec_RouteHintHopZ), "LDKCVec_RouteHintHopZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKRouteHintHop) * ret->datalen, "LDKCVec_RouteHintHopZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKRouteHintHop arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = RouteHintHop_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_RouteHintHopZ CVec_RouteHintHopZ_clone(const LDKCVec_RouteHintHopZ *orig) {
 	LDKCVec_RouteHintHopZ ret = { .data = MALLOC(sizeof(LDKRouteHintHop) * orig->datalen, "LDKCVec_RouteHintHopZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -901,9 +817,6 @@ static inline LDKCVec_RouteHintHopZ CVec_RouteHintHopZ_clone(const LDKCVec_Route
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_RouteHintDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_RouteHintDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteHintDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_RouteHintDecodeErrorZ *val = (LDKCResult_RouteHintDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -911,6 +824,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteHintDecodeEr
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -921,12 +835,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteHintDecodeEr
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_RouteHintHopDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_RouteHintHopDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteHintHopDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_RouteHintHopDecodeErrorZ *val = (LDKCResult_RouteHintHopDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -934,6 +846,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteHintHopDecod
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -944,28 +857,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteHintHopDecod
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_ChannelDetailsZ_new(uint32_tArray elems) {
-	LDKCVec_ChannelDetailsZ *ret = MALLOC(sizeof(LDKCVec_ChannelDetailsZ), "LDKCVec_ChannelDetailsZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKChannelDetails) * ret->datalen, "LDKCVec_ChannelDetailsZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKChannelDetails arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = ChannelDetails_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_ChannelDetailsZ CVec_ChannelDetailsZ_clone(const LDKCVec_ChannelDetailsZ *orig) {
 	LDKCVec_ChannelDetailsZ ret = { .data = MALLOC(sizeof(LDKChannelDetails) * orig->datalen, "LDKCVec_ChannelDetailsZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -973,9 +868,6 @@ static inline LDKCVec_ChannelDetailsZ CVec_ChannelDetailsZ_clone(const LDKCVec_C
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_RouteLightningErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_RouteLightningErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteLightningErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_RouteLightningErrorZ *val = (LDKCResult_RouteLightningErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -983,6 +875,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteLightningErr
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -993,12 +886,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RouteLightningErr
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_TxOutAccessErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_TxOutAccessErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_TxOutAccessErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_TxOutAccessErrorZ *val = (LDKCResult_TxOutAccessErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -1032,25 +923,6 @@ int8_tArray  __attribute__((visibility("default"))) TS_C2Tuple_usizeTransactionZ
 	return ret_arr;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_usizeTransactionZZ_new(uint32_tArray elems) {
-	LDKCVec_C2Tuple_usizeTransactionZZ *ret = MALLOC(sizeof(LDKCVec_C2Tuple_usizeTransactionZZ), "LDKCVec_C2Tuple_usizeTransactionZZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ) * ret->datalen, "LDKCVec_C2Tuple_usizeTransactionZZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKC2Tuple_usizeTransactionZ arr_elem_conv = *(LDKC2Tuple_usizeTransactionZ*)(arr_elem_ptr);
-			arr_elem_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_C2Tuple_usizeTransactionZZ CVec_C2Tuple_usizeTransactionZZ_clone(const LDKCVec_C2Tuple_usizeTransactionZZ *orig) {
 	LDKCVec_C2Tuple_usizeTransactionZZ ret = { .data = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ) * orig->datalen, "LDKCVec_C2Tuple_usizeTransactionZZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -1065,9 +937,6 @@ static inline LDKCVec_TxidZ CVec_ThirtyTwoBytesZ_clone(const LDKCVec_TxidZ *orig
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NoneChannelMonitorUpdateErrZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NoneChannelMonitorUpdateErrZ*)arg)->result_ok;
-}
 void  __attribute__((visibility("default"))) TS_LDKCResult_NoneChannelMonitorUpdateErrZ_get_ok(uint32_t arg) {
 	LDKCResult_NoneChannelMonitorUpdateErrZ *val = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -1087,6 +956,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMonitorEvent_ref_from_ptr(
 			uint64_t htlc_event_ref = 0;
 			CHECK((((uint64_t)htlc_event_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&htlc_event_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_event_var);
 			htlc_event_ref = (uint64_t)htlc_event_var.inner & ~1;
 			return 0 /* LDKMonitorEvent - HTLCEvent */; (void) htlc_event_ref;
 		}
@@ -1095,6 +965,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMonitorEvent_ref_from_ptr(
 			uint64_t commitment_tx_confirmed_ref = 0;
 			CHECK((((uint64_t)commitment_tx_confirmed_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&commitment_tx_confirmed_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_confirmed_var);
 			commitment_tx_confirmed_ref = (uint64_t)commitment_tx_confirmed_var.inner & ~1;
 			return 0 /* LDKMonitorEvent - CommitmentTxConfirmed */; (void) commitment_tx_confirmed_ref;
 		}
@@ -1103,6 +974,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMonitorEvent_ref_from_ptr(
 			uint64_t funding_txo_ref = 0;
 			CHECK((((uint64_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var);
 			funding_txo_ref = (uint64_t)funding_txo_var.inner & ~1;
 			return 0 /* LDKMonitorEvent - UpdateCompleted */; (void) funding_txo_ref; (void) obj->update_completed.monitor_update_id;
 		}
@@ -1111,31 +983,13 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMonitorEvent_ref_from_ptr(
 			uint64_t update_failed_ref = 0;
 			CHECK((((uint64_t)update_failed_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&update_failed_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(update_failed_var);
 			update_failed_ref = (uint64_t)update_failed_var.inner & ~1;
 			return 0 /* LDKMonitorEvent - UpdateFailed */; (void) update_failed_ref;
 		}
 		default: abort();
 	}
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_MonitorEventZ_new(uint32_tArray elems) {
-	LDKCVec_MonitorEventZ *ret = MALLOC(sizeof(LDKCVec_MonitorEventZ), "LDKCVec_MonitorEventZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKMonitorEvent) * ret->datalen, "LDKCVec_MonitorEventZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKMonitorEvent arr_elem_conv = *(LDKMonitorEvent*)(arr_elem_ptr);
-			arr_elem_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_MonitorEventZ CVec_MonitorEventZ_clone(const LDKCVec_MonitorEventZ *orig) {
 	LDKCVec_MonitorEventZ ret = { .data = MALLOC(sizeof(LDKMonitorEvent) * orig->datalen, "LDKCVec_MonitorEventZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -1158,6 +1012,70 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCOption_C2Tuple_usizeTrans
 		default: abort();
 	}
 }
+uint32_t __attribute__((visibility("default"))) TS_LDKClosureReason_ref_from_ptr(uint32_t ptr) {
+	LDKClosureReason *obj = (LDKClosureReason*)(ptr & ~1);
+	switch(obj->tag) {
+		case 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 0 /* LDKClosureReason - CounterpartyForceClosed */; (void) peer_msg_conv;
+		}
+		case LDKClosureReason_HolderForceClosed: {
+			return 0 /* LDKClosureReason - HolderForceClosed */;
+		}
+		case LDKClosureReason_CooperativeClosure: {
+			return 0 /* LDKClosureReason - CooperativeClosure */;
+		}
+		case LDKClosureReason_CommitmentTxConfirmed: {
+			return 0 /* LDKClosureReason - CommitmentTxConfirmed */;
+		}
+		case LDKClosureReason_FundingTimedOut: {
+			return 0 /* LDKClosureReason - FundingTimedOut */;
+		}
+		case LDKClosureReason_ProcessingError: {
+			LDKStr err_str = obj->processing_error.err;
+			jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len);
+			return 0 /* LDKClosureReason - ProcessingError */; (void) err_conv;
+		}
+		case LDKClosureReason_DisconnectedPeer: {
+			return 0 /* LDKClosureReason - DisconnectedPeer */;
+		}
+		case LDKClosureReason_OutdatedChannelManager: {
+			return 0 /* LDKClosureReason - OutdatedChannelManager */;
+		}
+		default: abort();
+	}
+}
+uint32_t __attribute__((visibility("default"))) TS_LDKCOption_ClosureReasonZ_ref_from_ptr(uint32_t ptr) {
+	LDKCOption_ClosureReasonZ *obj = (LDKCOption_ClosureReasonZ*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKCOption_ClosureReasonZ_Some: {
+			uint64_t some_ref = ((uint64_t)&obj->some) | 1;
+			return 0 /* LDKCOption_ClosureReasonZ - Some */; (void) some_ref;
+		}
+		case LDKCOption_ClosureReasonZ_None: {
+			return 0 /* LDKCOption_ClosureReasonZ - None */;
+		}
+		default: abort();
+	}
+}
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_COption_ClosureReasonZDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_COption_ClosureReasonZDecodeErrorZ *val = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(arg & ~1);
+	CHECK(val->result_ok);
+	uint64_t res_ref = ((uint64_t)&(*val->contents.result)) | 1;
+	return res_ref;
+}
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_COption_ClosureReasonZDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_COption_ClosureReasonZDecodeErrorZ *val = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(arg & ~1);
+	CHECK(!val->result_ok);
+	LDKDecodeError err_var = (*val->contents.err);
+	uint64_t err_ref = 0;
+	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
+	err_ref = (uint64_t)err_var.inner & ~1;
+	return err_ref;
+}
 uint32_t __attribute__((visibility("default"))) TS_LDKNetworkUpdate_ref_from_ptr(uint32_t ptr) {
 	LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1);
 	switch(obj->tag) {
@@ -1166,6 +1084,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKNetworkUpdate_ref_from_ptr
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKNetworkUpdate - ChannelUpdateMessage */; (void) msg_ref;
 		}
@@ -1201,6 +1120,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKSpendableOutputDescriptor_
 			uint64_t outpoint_ref = 0;
 			CHECK((((uint64_t)outpoint_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&outpoint_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_var);
 			outpoint_ref = (uint64_t)outpoint_var.inner & ~1;
 			uint64_t output_ref = ((uint64_t)&obj->static_output.output) | 1;
 			return 0 /* LDKSpendableOutputDescriptor - StaticOutput */; (void) outpoint_ref; (void) (uint64_t)output_ref;
@@ -1210,6 +1130,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKSpendableOutputDescriptor_
 			uint64_t delayed_payment_output_ref = 0;
 			CHECK((((uint64_t)delayed_payment_output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&delayed_payment_output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(delayed_payment_output_var);
 			delayed_payment_output_ref = (uint64_t)delayed_payment_output_var.inner & ~1;
 			return 0 /* LDKSpendableOutputDescriptor - DelayedPaymentOutput */; (void) delayed_payment_output_ref;
 		}
@@ -1218,31 +1139,13 @@ uint32_t __attribute__((visibility("default"))) TS_LDKSpendableOutputDescriptor_
 			uint64_t static_payment_output_ref = 0;
 			CHECK((((uint64_t)static_payment_output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&static_payment_output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(static_payment_output_var);
 			static_payment_output_ref = (uint64_t)static_payment_output_var.inner & ~1;
 			return 0 /* LDKSpendableOutputDescriptor - StaticPaymentOutput */; (void) static_payment_output_ref;
 		}
 		default: abort();
 	}
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_SpendableOutputDescriptorZ_new(uint32_tArray elems) {
-	LDKCVec_SpendableOutputDescriptorZ *ret = MALLOC(sizeof(LDKCVec_SpendableOutputDescriptorZ), "LDKCVec_SpendableOutputDescriptorZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKSpendableOutputDescriptor) * ret->datalen, "LDKCVec_SpendableOutputDescriptorZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKSpendableOutputDescriptor arr_elem_conv = *(LDKSpendableOutputDescriptor*)(arr_elem_ptr);
-			arr_elem_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_SpendableOutputDescriptorZ CVec_SpendableOutputDescriptorZ_clone(const LDKCVec_SpendableOutputDescriptorZ *orig) {
 	LDKCVec_SpendableOutputDescriptorZ ret = { .data = MALLOC(sizeof(LDKSpendableOutputDescriptor) * orig->datalen, "LDKCVec_SpendableOutputDescriptorZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -1250,6 +1153,176 @@ static inline LDKCVec_SpendableOutputDescriptorZ CVec_SpendableOutputDescriptorZ
 	}
 	return ret;
 }
+uint32_t __attribute__((visibility("default"))) TS_LDKPaymentPurpose_ref_from_ptr(uint32_t ptr) {
+	LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKPaymentPurpose_InvoicePayment: {
+			int8_tArray payment_preimage_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_preimage_arr + 4), obj->invoice_payment.payment_preimage.data, 32);
+			int8_tArray payment_secret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_secret_arr + 4), obj->invoice_payment.payment_secret.data, 32);
+			return 0 /* LDKPaymentPurpose - InvoicePayment */; (void) payment_preimage_arr; (void) payment_secret_arr;
+		}
+		case LDKPaymentPurpose_SpontaneousPayment: {
+			int8_tArray spontaneous_payment_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(spontaneous_payment_arr + 4), obj->spontaneous_payment.data, 32);
+			return 0 /* LDKPaymentPurpose - SpontaneousPayment */; (void) spontaneous_payment_arr;
+		}
+		default: abort();
+	}
+}
+uint32_t __attribute__((visibility("default"))) TS_LDKEvent_ref_from_ptr(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKEvent_FundingGenerationReady: {
+			int8_tArray temporary_channel_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(temporary_channel_id_arr + 4), obj->funding_generation_ready.temporary_channel_id.data, 32);
+			LDKCVec_u8Z output_script_var = obj->funding_generation_ready.output_script;
+			int8_tArray output_script_arr = init_arr(output_script_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(output_script_arr + 4), output_script_var.data, output_script_var.datalen);
+			return 0 /* LDKEvent - FundingGenerationReady */; (void) temporary_channel_id_arr; (void) obj->funding_generation_ready.channel_value_satoshis; (void) output_script_arr; (void) obj->funding_generation_ready.user_channel_id;
+		}
+		case LDKEvent_PaymentReceived: {
+			int8_tArray payment_hash_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_hash_arr + 4), obj->payment_received.payment_hash.data, 32);
+			uint64_t purpose_ref = ((uint64_t)&obj->payment_received.purpose) | 1;
+			return 0 /* LDKEvent - PaymentReceived */; (void) payment_hash_arr; (void) obj->payment_received.amt; (void) purpose_ref;
+		}
+		case LDKEvent_PaymentSent: {
+			int8_tArray payment_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_id_arr + 4), obj->payment_sent.payment_id.data, 32);
+			int8_tArray payment_preimage_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_preimage_arr + 4), obj->payment_sent.payment_preimage.data, 32);
+			int8_tArray payment_hash_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_hash_arr + 4), obj->payment_sent.payment_hash.data, 32);
+			uint64_t fee_paid_msat_ref = ((uint64_t)&obj->payment_sent.fee_paid_msat) | 1;
+			return 0 /* LDKEvent - PaymentSent */; (void) payment_id_arr; (void) payment_preimage_arr; (void) payment_hash_arr; (void) fee_paid_msat_ref;
+		}
+		case LDKEvent_PaymentPathFailed: {
+			int8_tArray payment_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_id_arr + 4), obj->payment_path_failed.payment_id.data, 32);
+			int8_tArray payment_hash_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_hash_arr + 4), obj->payment_path_failed.payment_hash.data, 32);
+			uint64_t network_update_ref = ((uint64_t)&obj->payment_path_failed.network_update) | 1;
+			LDKCVec_RouteHopZ path_var = obj->payment_path_failed.path;
+			uint32_tArray path_arr = NULL;
+			path_arr = init_arr(path_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
+			uint32_t *path_arr_ptr = (uint32_t*)(path_arr + 4);
+			for (size_t k = 0; k < path_var.datalen; k++) {
+				LDKRouteHop path_conv_10_var = path_var.data[k];
+				uint64_t path_conv_10_ref = 0;
+				CHECK((((uint64_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+				CHECK((((uint64_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+				CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
+				path_conv_10_ref = (uint64_t)path_conv_10_var.inner & ~1;
+				path_arr_ptr[k] = path_conv_10_ref;
+			}
+			
+			uint64_t short_channel_id_ref = ((uint64_t)&obj->payment_path_failed.short_channel_id) | 1;
+			LDKRouteParameters retry_var = obj->payment_path_failed.retry;
+			uint64_t retry_ref = 0;
+			if ((uint64_t)retry_var.inner > 4096) {
+				CHECK((((uint64_t)retry_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+				CHECK((((uint64_t)&retry_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(retry_var);
+				retry_ref = (uint64_t)retry_var.inner & ~1;
+			}
+			return 0 /* LDKEvent - PaymentPathFailed */; (void) payment_id_arr; (void) payment_hash_arr; (void) obj->payment_path_failed.rejected_by_dest; (void) network_update_ref; (void) obj->payment_path_failed.all_paths_failed; (void) path_arr; (void) short_channel_id_ref; (void) retry_ref;
+		}
+		case LDKEvent_PaymentFailed: {
+			int8_tArray payment_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_id_arr + 4), obj->payment_failed.payment_id.data, 32);
+			int8_tArray payment_hash_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_hash_arr + 4), obj->payment_failed.payment_hash.data, 32);
+			return 0 /* LDKEvent - PaymentFailed */; (void) payment_id_arr; (void) payment_hash_arr;
+		}
+		case LDKEvent_PendingHTLCsForwardable: {
+			return 0 /* LDKEvent - PendingHTLCsForwardable */; (void) obj->pending_htl_cs_forwardable.time_forwardable;
+		}
+		case LDKEvent_SpendableOutputs: {
+			LDKCVec_SpendableOutputDescriptorZ outputs_var = obj->spendable_outputs.outputs;
+			uint32_tArray outputs_arr = NULL;
+			outputs_arr = init_arr(outputs_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
+			uint32_t *outputs_arr_ptr = (uint32_t*)(outputs_arr + 4);
+			for (size_t b = 0; b < outputs_var.datalen; b++) {
+				uint64_t outputs_conv_27_ref = ((uint64_t)&outputs_var.data[b]) | 1;
+				outputs_arr_ptr[b] = outputs_conv_27_ref;
+			}
+			
+			return 0 /* LDKEvent - SpendableOutputs */; (void) outputs_arr;
+		}
+		case LDKEvent_PaymentForwarded: {
+			uint64_t fee_earned_msat_ref = ((uint64_t)&obj->payment_forwarded.fee_earned_msat) | 1;
+			return 0 /* LDKEvent - PaymentForwarded */; (void) fee_earned_msat_ref; (void) obj->payment_forwarded.claim_from_onchain_tx;
+		}
+		case LDKEvent_ChannelClosed: {
+			int8_tArray channel_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(channel_id_arr + 4), obj->channel_closed.channel_id.data, 32);
+			uint64_t reason_ref = ((uint64_t)&obj->channel_closed.reason) | 1;
+			return 0 /* LDKEvent - ChannelClosed */; (void) channel_id_arr; (void) obj->channel_closed.user_channel_id; (void) reason_ref;
+		}
+		case LDKEvent_DiscardFunding: {
+			int8_tArray channel_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(channel_id_arr + 4), obj->discard_funding.channel_id.data, 32);
+			LDKTransaction transaction_var = obj->discard_funding.transaction;
+			int8_tArray transaction_arr = init_arr(transaction_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(transaction_arr + 4), transaction_var.data, transaction_var.datalen);
+			return 0 /* LDKEvent - DiscardFunding */; (void) channel_id_arr; (void) transaction_arr;
+		}
+		case LDKEvent_PaymentPathSuccessful: {
+			int8_tArray payment_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_id_arr + 4), obj->payment_path_successful.payment_id.data, 32);
+			int8_tArray payment_hash_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(payment_hash_arr + 4), obj->payment_path_successful.payment_hash.data, 32);
+			LDKCVec_RouteHopZ path_var = obj->payment_path_successful.path;
+			uint32_tArray path_arr = NULL;
+			path_arr = init_arr(path_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
+			uint32_t *path_arr_ptr = (uint32_t*)(path_arr + 4);
+			for (size_t k = 0; k < path_var.datalen; k++) {
+				LDKRouteHop path_conv_10_var = path_var.data[k];
+				uint64_t path_conv_10_ref = 0;
+				CHECK((((uint64_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+				CHECK((((uint64_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+				CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
+				path_conv_10_ref = (uint64_t)path_conv_10_var.inner & ~1;
+				path_arr_ptr[k] = path_conv_10_ref;
+			}
+			
+			return 0 /* LDKEvent - PaymentPathSuccessful */; (void) payment_id_arr; (void) payment_hash_arr; (void) path_arr;
+		}
+		default: abort();
+	}
+}
+uint32_t __attribute__((visibility("default"))) TS_LDKCOption_EventZ_ref_from_ptr(uint32_t ptr) {
+	LDKCOption_EventZ *obj = (LDKCOption_EventZ*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKCOption_EventZ_Some: {
+			uint64_t some_ref = ((uint64_t)&obj->some) | 1;
+			return 0 /* LDKCOption_EventZ - Some */; (void) some_ref;
+		}
+		case LDKCOption_EventZ_None: {
+			return 0 /* LDKCOption_EventZ - None */;
+		}
+		default: abort();
+	}
+}
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_COption_EventZDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_COption_EventZDecodeErrorZ *val = (LDKCResult_COption_EventZDecodeErrorZ*)(arg & ~1);
+	CHECK(val->result_ok);
+	uint64_t res_ref = ((uint64_t)&(*val->contents.result)) | 1;
+	return res_ref;
+}
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_COption_EventZDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_COption_EventZDecodeErrorZ *val = (LDKCResult_COption_EventZDecodeErrorZ*)(arg & ~1);
+	CHECK(!val->result_ok);
+	LDKDecodeError err_var = (*val->contents.err);
+	uint64_t err_ref = 0;
+	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
+	err_ref = (uint64_t)err_var.inner & ~1;
+	return err_ref;
+}
 uint32_t __attribute__((visibility("default"))) TS_LDKErrorAction_ref_from_ptr(uint32_t ptr) {
 	LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1);
 	switch(obj->tag) {
@@ -1259,6 +1332,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKErrorAction_ref_from_ptr(u
 			if ((uint64_t)msg_var.inner > 4096) {
 				CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 				CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 				msg_ref = (uint64_t)msg_var.inner & ~1;
 			}
 			return 0 /* LDKErrorAction - DisconnectPeer */; (void) msg_ref;
@@ -1270,11 +1344,15 @@ uint32_t __attribute__((visibility("default"))) TS_LDKErrorAction_ref_from_ptr(u
 			uint32_t ignore_and_log_conv = LDKLevel_to_js(obj->ignore_and_log);
 			return 0 /* LDKErrorAction - IgnoreAndLog */; (void) ignore_and_log_conv;
 		}
+		case LDKErrorAction_IgnoreDuplicateGossip: {
+			return 0 /* LDKErrorAction - IgnoreDuplicateGossip */;
+		}
 		case LDKErrorAction_SendErrorMessage: {
 			LDKErrorMessage msg_var = obj->send_error_message.msg;
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKErrorAction - SendErrorMessage */; (void) msg_ref;
 		}
@@ -1291,6 +1369,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendAcceptChannel */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1301,6 +1380,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendOpenChannel */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1311,6 +1391,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendFundingCreated */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1321,6 +1402,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendFundingSigned */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1331,6 +1413,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendFundingLocked */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1341,6 +1424,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendAnnouncementSignatures */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1351,6 +1435,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t updates_ref = 0;
 			CHECK((((uint64_t)updates_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&updates_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_var);
 			updates_ref = (uint64_t)updates_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - UpdateHTLCs */; (void) node_id_arr; (void) updates_ref;
 		}
@@ -1361,6 +1446,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendRevokeAndACK */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1371,6 +1457,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendClosingSigned */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1381,6 +1468,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendShutdown */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1391,6 +1479,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendChannelReestablish */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1399,11 +1488,13 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			LDKChannelUpdate update_msg_var = obj->broadcast_channel_announcement.update_msg;
 			uint64_t update_msg_ref = 0;
 			CHECK((((uint64_t)update_msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&update_msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(update_msg_var);
 			update_msg_ref = (uint64_t)update_msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - BroadcastChannelAnnouncement */; (void) msg_ref; (void) update_msg_ref;
 		}
@@ -1412,6 +1503,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - BroadcastNodeAnnouncement */; (void) msg_ref;
 		}
@@ -1420,6 +1512,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - BroadcastChannelUpdate */; (void) msg_ref;
 		}
@@ -1430,6 +1523,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendChannelUpdate */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1446,6 +1540,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendChannelRangeQuery */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1456,6 +1551,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendShortIdsQuery */; (void) node_id_arr; (void) msg_ref;
 		}
@@ -1466,31 +1562,13 @@ uint32_t __attribute__((visibility("default"))) TS_LDKMessageSendEvent_ref_from_
 			uint64_t msg_ref = 0;
 			CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uint64_t)msg_var.inner & ~1;
 			return 0 /* LDKMessageSendEvent - SendReplyChannelRange */; (void) node_id_arr; (void) msg_ref;
 		}
 		default: abort();
 	}
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_MessageSendEventZ_new(uint32_tArray elems) {
-	LDKCVec_MessageSendEventZ *ret = MALLOC(sizeof(LDKCVec_MessageSendEventZ), "LDKCVec_MessageSendEventZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKMessageSendEvent) * ret->datalen, "LDKCVec_MessageSendEventZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKMessageSendEvent arr_elem_conv = *(LDKMessageSendEvent*)(arr_elem_ptr);
-			arr_elem_conv = MessageSendEvent_clone((LDKMessageSendEvent*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_MessageSendEventZ CVec_MessageSendEventZ_clone(const LDKCVec_MessageSendEventZ *orig) {
 	LDKCVec_MessageSendEventZ ret = { .data = MALLOC(sizeof(LDKMessageSendEvent) * orig->datalen, "LDKCVec_MessageSendEventZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -1498,54 +1576,71 @@ static inline LDKCVec_MessageSendEventZ CVec_MessageSendEventZ_clone(const LDKCV
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_InitFeaturesDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_InitFeaturesDecodeErrorZ*)arg)->result_ok;
-}
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InitFeaturesDecodeErrorZ_get_ok(uint32_t arg) {
-	LDKCResult_InitFeaturesDecodeErrorZ *val = (LDKCResult_InitFeaturesDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ScoringParametersDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_ScoringParametersDecodeErrorZ *val = (LDKCResult_ScoringParametersDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
-	LDKInitFeatures res_var = (*val->contents.result);
+	LDKScoringParameters res_var = (*val->contents.result);
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InitFeaturesDecodeErrorZ_get_err(uint32_t arg) {
-	LDKCResult_InitFeaturesDecodeErrorZ *val = (LDKCResult_InitFeaturesDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ScoringParametersDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_ScoringParametersDecodeErrorZ *val = (LDKCResult_ScoringParametersDecodeErrorZ*)(arg & ~1);
 	CHECK(!val->result_ok);
 	LDKDecodeError err_var = (*val->contents.err);
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NodeFeaturesDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NodeFeaturesDecodeErrorZ*)arg)->result_ok;
-}
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeFeaturesDecodeErrorZ_get_ok(uint32_t arg) {
-	LDKCResult_NodeFeaturesDecodeErrorZ *val = (LDKCResult_NodeFeaturesDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ScorerDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_ScorerDecodeErrorZ *val = (LDKCResult_ScorerDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
-	LDKNodeFeatures res_var = (*val->contents.result);
+	LDKScorer res_var = (*val->contents.result);
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeFeaturesDecodeErrorZ_get_err(uint32_t arg) {
-	LDKCResult_NodeFeaturesDecodeErrorZ *val = (LDKCResult_NodeFeaturesDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ScorerDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_ScorerDecodeErrorZ *val = (LDKCResult_ScorerDecodeErrorZ*)(arg & ~1);
 	CHECK(!val->result_ok);
 	LDKDecodeError err_var = (*val->contents.err);
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ChannelFeaturesDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ChannelFeaturesDecodeErrorZ*)arg)->result_ok;
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InitFeaturesDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_InitFeaturesDecodeErrorZ *val = (LDKCResult_InitFeaturesDecodeErrorZ*)(arg & ~1);
+	CHECK(val->result_ok);
+	LDKInitFeatures res_var = (*val->contents.result);
+	uint64_t res_ref = 0;
+	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
+	res_ref = (uint64_t)res_var.inner & ~1;
+	return res_ref;
+}
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InitFeaturesDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_InitFeaturesDecodeErrorZ *val = (LDKCResult_InitFeaturesDecodeErrorZ*)(arg & ~1);
+	CHECK(!val->result_ok);
+	LDKDecodeError err_var = (*val->contents.err);
+	uint64_t err_ref = 0;
+	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
+	err_ref = (uint64_t)err_var.inner & ~1;
+	return err_ref;
 }
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelFeaturesDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ChannelFeaturesDecodeErrorZ *val = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(arg & ~1);
@@ -1554,6 +1649,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelFeaturesDe
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -1564,81 +1660,76 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelFeaturesDe
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceFeaturesDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_InvoiceFeaturesDecodeErrorZ*)arg)->result_ok;
-}
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceFeaturesDecodeErrorZ_get_ok(uint32_t arg) {
-	LDKCResult_InvoiceFeaturesDecodeErrorZ *val = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeFeaturesDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_NodeFeaturesDecodeErrorZ *val = (LDKCResult_NodeFeaturesDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
-	LDKInvoiceFeatures res_var = (*val->contents.result);
+	LDKNodeFeatures res_var = (*val->contents.result);
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceFeaturesDecodeErrorZ_get_err(uint32_t arg) {
-	LDKCResult_InvoiceFeaturesDecodeErrorZ *val = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeFeaturesDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_NodeFeaturesDecodeErrorZ *val = (LDKCResult_NodeFeaturesDecodeErrorZ*)(arg & ~1);
 	CHECK(!val->result_ok);
 	LDKDecodeError err_var = (*val->contents.err);
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ScoringParametersDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ScoringParametersDecodeErrorZ*)arg)->result_ok;
-}
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ScoringParametersDecodeErrorZ_get_ok(uint32_t arg) {
-	LDKCResult_ScoringParametersDecodeErrorZ *val = (LDKCResult_ScoringParametersDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceFeaturesDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_InvoiceFeaturesDecodeErrorZ *val = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
-	LDKScoringParameters res_var = (*val->contents.result);
+	LDKInvoiceFeatures res_var = (*val->contents.result);
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ScoringParametersDecodeErrorZ_get_err(uint32_t arg) {
-	LDKCResult_ScoringParametersDecodeErrorZ *val = (LDKCResult_ScoringParametersDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceFeaturesDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_InvoiceFeaturesDecodeErrorZ *val = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(arg & ~1);
 	CHECK(!val->result_ok);
 	LDKDecodeError err_var = (*val->contents.err);
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ScorerDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ScorerDecodeErrorZ*)arg)->result_ok;
-}
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ScorerDecodeErrorZ_get_ok(uint32_t arg) {
-	LDKCResult_ScorerDecodeErrorZ *val = (LDKCResult_ScorerDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ *val = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
-	LDKScorer res_var = (*val->contents.result);
+	LDKChannelTypeFeatures res_var = (*val->contents.result);
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ScorerDecodeErrorZ_get_err(uint32_t arg) {
-	LDKCResult_ScorerDecodeErrorZ *val = (LDKCResult_ScorerDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelTypeFeaturesDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ *val = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(arg & ~1);
 	CHECK(!val->result_ok);
 	LDKDecodeError err_var = (*val->contents.err);
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *val = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -1646,6 +1737,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_DelayedPaymentOut
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -1656,12 +1748,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_DelayedPaymentOut
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *val = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -1669,6 +1759,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_StaticPaymentOutp
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -1679,12 +1770,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_StaticPaymentOutp
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_SpendableOutputDescriptorDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_SpendableOutputDescriptorDecodeErrorZ *val = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -1698,12 +1787,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_SpendableOutputDe
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NoneNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NoneNoneZ*)arg)->result_ok;
-}
 void  __attribute__((visibility("default"))) TS_LDKCResult_NoneNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_NoneNoneZ *val = (LDKCResult_NoneNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -1743,9 +1830,6 @@ ptrArray  __attribute__((visibility("default"))) TS_C2Tuple_SignatureCVec_Signat
 	return ret_arr;
 }
 
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *val = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -1759,9 +1843,6 @@ void  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_SignatureCVec
 	CHECK(!val->result_ok);
 	return *val->contents.err;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_SignatureNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_SignatureNoneZ*)arg)->result_ok;
-}
 int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_SignatureNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_SignatureNoneZ *val = (LDKCResult_SignatureNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -1832,6 +1913,7 @@ LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* th
 	holder_tx_var = HolderCommitmentTransaction_clone(holder_tx);
 	CHECK((((uint64_t)holder_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&holder_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(holder_tx_var);
 	holder_tx_ref = (uint64_t)holder_tx_var.inner;
 	if (holder_tx_var.is_owned) {
 		holder_tx_ref |= 1;
@@ -1840,7 +1922,7 @@ LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* th
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr);
-	ret_conv = CResult_NoneNoneZ_clone((LDKCResult_NoneNoneZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKThirtyTwoBytes channel_keys_id_LDKBaseSign_jcall(const void* this_arg) {
@@ -1858,6 +1940,7 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_L
 	commitment_tx_var = CommitmentTransaction_clone(commitment_tx);
 	CHECK((((uint64_t)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_var);
 	commitment_tx_ref = (uint64_t)commitment_tx_var.inner;
 	if (commitment_tx_var.is_owned) {
 		commitment_tx_ref |= 1;
@@ -1866,7 +1949,7 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_L
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr);
-	ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const void* this_arg, uint64_t idx, const uint8_t (* secret)[32]) {
@@ -1877,7 +1960,7 @@ LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const vo
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr);
-	ret_conv = CResult_NoneNoneZ_clone((LDKCResult_NoneNoneZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htlcs_LDKBaseSign_jcall(const void* this_arg, const LDKHolderCommitmentTransaction * commitment_tx) {
@@ -1887,6 +1970,7 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htl
 	commitment_tx_var = HolderCommitmentTransaction_clone(commitment_tx);
 	CHECK((((uint64_t)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_var);
 	commitment_tx_ref = (uint64_t)commitment_tx_var.inner;
 	if (commitment_tx_var.is_owned) {
 		commitment_tx_ref |= 1;
@@ -1895,7 +1979,7 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htl
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr);
-	ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone((LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)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]) {
@@ -1910,7 +1994,7 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_output_LDKBaseSign_jcall(const vo
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr);
-	ret_conv = CResult_SignatureNoneZ_clone((LDKCResult_SignatureNoneZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)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) {
@@ -1926,6 +2010,7 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_htlc_LDKBaseSign_jcall(const void
 	htlc_var = HTLCOutputInCommitment_clone(htlc);
 	CHECK((((uint64_t)htlc_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&htlc_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_var);
 	htlc_ref = (uint64_t)htlc_var.inner;
 	if (htlc_var.is_owned) {
 		htlc_ref |= 1;
@@ -1934,7 +2019,7 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_htlc_LDKBaseSign_jcall(const void
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr);
-	ret_conv = CResult_SignatureNoneZ_clone((LDKCResult_SignatureNoneZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)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) {
@@ -1950,6 +2035,7 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_LDKBaseSign_jcall(c
 	htlc_var = HTLCOutputInCommitment_clone(htlc);
 	CHECK((((uint64_t)htlc_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&htlc_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_var);
 	htlc_ref = (uint64_t)htlc_var.inner;
 	if (htlc_var.is_owned) {
 		htlc_ref |= 1;
@@ -1958,7 +2044,7 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_LDKBaseSign_jcall(c
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr);
-	ret_conv = CResult_SignatureNoneZ_clone((LDKCResult_SignatureNoneZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_SignatureNoneZ sign_closing_transaction_LDKBaseSign_jcall(const void* this_arg, const LDKClosingTransaction * closing_tx) {
@@ -1968,6 +2054,7 @@ LDKCResult_SignatureNoneZ sign_closing_transaction_LDKBaseSign_jcall(const void*
 	closing_tx_var = ClosingTransaction_clone(closing_tx);
 	CHECK((((uint64_t)closing_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&closing_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(closing_tx_var);
 	closing_tx_ref = (uint64_t)closing_tx_var.inner;
 	if (closing_tx_var.is_owned) {
 		closing_tx_ref |= 1;
@@ -1976,7 +2063,7 @@ LDKCResult_SignatureNoneZ sign_closing_transaction_LDKBaseSign_jcall(const void*
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr);
-	ret_conv = CResult_SignatureNoneZ_clone((LDKCResult_SignatureNoneZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_SignatureNoneZ sign_channel_announcement_LDKBaseSign_jcall(const void* this_arg, const LDKUnsignedChannelAnnouncement * msg) {
@@ -1986,6 +2073,7 @@ LDKCResult_SignatureNoneZ sign_channel_announcement_LDKBaseSign_jcall(const void
 	msg_var = UnsignedChannelAnnouncement_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -1994,7 +2082,7 @@ LDKCResult_SignatureNoneZ sign_channel_announcement_LDKBaseSign_jcall(const void
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr);
-	ret_conv = CResult_SignatureNoneZ_clone((LDKCResult_SignatureNoneZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 void ready_channel_LDKBaseSign_jcall(void* this_arg, const LDKChannelTransactionParameters * channel_parameters) {
@@ -2004,6 +2092,7 @@ void ready_channel_LDKBaseSign_jcall(void* this_arg, const LDKChannelTransaction
 	channel_parameters_var = ChannelTransactionParameters_clone(channel_parameters);
 	CHECK((((uint64_t)channel_parameters_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&channel_parameters_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_var);
 	channel_parameters_ref = (uint64_t)channel_parameters_var.inner;
 	if (channel_parameters_var.is_owned) {
 		channel_parameters_ref |= 1;
@@ -2022,7 +2111,7 @@ static inline LDKBaseSign LDKBaseSign_init (/*TODO: JS Object Reference */void*
 	LDKChannelPublicKeys pubkeys_conv;
 	pubkeys_conv.inner = (void*)(pubkeys & (~1));
 	pubkeys_conv.is_owned = (pubkeys & 1) || (pubkeys == 0);
-	pubkeys_conv = ChannelPublicKeys_clone(&pubkeys_conv);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(pubkeys_conv);
 
 	LDKBaseSign ret = {
 		.this_arg = (void*) calls,
@@ -2075,6 +2164,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BaseSign_validate_holder_com
 	LDKHolderCommitmentTransaction holder_tx_conv;
 	holder_tx_conv.inner = (void*)(holder_tx & (~1));
 	holder_tx_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(holder_tx_conv);
 	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
 	*ret_conv = (this_arg_conv->validate_holder_commitment)(this_arg_conv->this_arg, &holder_tx_conv);
 	return (uint64_t)ret_conv;
@@ -2096,6 +2186,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BaseSign_sign_counterparty_c
 	LDKCommitmentTransaction commitment_tx_conv;
 	commitment_tx_conv.inner = (void*)(commitment_tx & (~1));
 	commitment_tx_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv);
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
 	*ret_conv = (this_arg_conv->sign_counterparty_commitment)(this_arg_conv->this_arg, &commitment_tx_conv);
 	return (uint64_t)ret_conv;
@@ -2121,6 +2212,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BaseSign_sign_holder_commitm
 	LDKHolderCommitmentTransaction commitment_tx_conv;
 	commitment_tx_conv.inner = (void*)(commitment_tx & (~1));
 	commitment_tx_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv);
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
 	*ret_conv = (this_arg_conv->sign_holder_commitment_and_htlcs)(this_arg_conv->this_arg, &commitment_tx_conv);
 	return (uint64_t)ret_conv;
@@ -2160,6 +2252,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BaseSign_sign_justice_revoke
 	LDKHTLCOutputInCommitment htlc_conv;
 	htlc_conv.inner = (void*)(htlc & (~1));
 	htlc_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv);
 	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
 	*ret_conv = (this_arg_conv->sign_justice_revoked_htlc)(this_arg_conv->this_arg, justice_tx_ref, input, amount, per_commitment_key_ref, &htlc_conv);
 	return (uint64_t)ret_conv;
@@ -2180,6 +2273,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BaseSign_sign_counterparty_h
 	LDKHTLCOutputInCommitment htlc_conv;
 	htlc_conv.inner = (void*)(htlc & (~1));
 	htlc_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv);
 	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
 	*ret_conv = (this_arg_conv->sign_counterparty_htlc_transaction)(this_arg_conv->this_arg, htlc_tx_ref, input, amount, per_commitment_point_ref, &htlc_conv);
 	return (uint64_t)ret_conv;
@@ -2192,6 +2286,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BaseSign_sign_closing_transa
 	LDKClosingTransaction closing_tx_conv;
 	closing_tx_conv.inner = (void*)(closing_tx & (~1));
 	closing_tx_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(closing_tx_conv);
 	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
 	*ret_conv = (this_arg_conv->sign_closing_transaction)(this_arg_conv->this_arg, &closing_tx_conv);
 	return (uint64_t)ret_conv;
@@ -2204,6 +2299,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BaseSign_sign_channel_announ
 	LDKUnsignedChannelAnnouncement msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
 	*ret_conv = (this_arg_conv->sign_channel_announcement)(this_arg_conv->this_arg, &msg_conv);
 	return (uint64_t)ret_conv;
@@ -2216,6 +2312,7 @@ void  __attribute__((visibility("default"))) TS_BaseSign_ready_channel(uint32_t
 	LDKChannelTransactionParameters channel_parameters_conv;
 	channel_parameters_conv.inner = (void*)(channel_parameters & (~1));
 	channel_parameters_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv);
 	(this_arg_conv->ready_channel)(this_arg_conv->this_arg, &channel_parameters_conv);
 }
 
@@ -2232,6 +2329,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BaseSign_get_pubkeys(uint32_
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -2273,7 +2371,7 @@ static inline LDKSign LDKSign_init (/*TODO: JS Object Reference */void* o, /*TOD
 	LDKChannelPublicKeys pubkeys_conv;
 	pubkeys_conv.inner = (void*)(pubkeys & (~1));
 	pubkeys_conv.is_owned = (pubkeys & 1) || (pubkeys == 0);
-	pubkeys_conv = ChannelPublicKeys_clone(&pubkeys_conv);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(pubkeys_conv);
 
 	LDKSign ret = {
 		.this_arg = (void*) calls,
@@ -2301,9 +2399,6 @@ int8_tArray  __attribute__((visibility("default"))) TS_Sign_write(uint32_t this_
 	return ret_arr;
 }
 
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_SignDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_SignDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_SignDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_SignDecodeErrorZ *val = (LDKCResult_SignDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2318,12 +2413,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_SignDecodeErrorZ_
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_RecoverableSignatureNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_RecoverableSignatureNoneZ*)arg)->result_ok;
-}
 int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_RecoverableSignatureNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_RecoverableSignatureNoneZ *val = (LDKCResult_RecoverableSignatureNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2343,9 +2436,6 @@ static inline LDKCVec_CVec_u8ZZ CVec_CVec_u8ZZ_clone(const LDKCVec_CVec_u8ZZ *or
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_CVec_CVec_u8ZZNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_CVec_CVec_u8ZZNoneZ*)arg)->result_ok;
-}
 ptrArray  __attribute__((visibility("default"))) TS_LDKCResult_CVec_CVec_u8ZZNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_CVec_CVec_u8ZZNoneZ *val = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2367,9 +2457,6 @@ void  __attribute__((visibility("default"))) TS_LDKCResult_CVec_CVec_u8ZZNoneZ_g
 	CHECK(!val->result_ok);
 	return *val->contents.err;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_InMemorySignerDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_InMemorySignerDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InMemorySignerDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_InMemorySignerDecodeErrorZ *val = (LDKCResult_InMemorySignerDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2377,6 +2464,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InMemorySignerDec
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -2387,28 +2475,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InMemorySignerDec
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_TxOutZ_new(uint32_tArray elems) {
-	LDKCVec_TxOutZ *ret = MALLOC(sizeof(LDKCVec_TxOutZ), "LDKCVec_TxOutZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKTxOut) * ret->datalen, "LDKCVec_TxOutZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKTxOut arr_elem_conv = *(LDKTxOut*)(arr_elem_ptr);
-			arr_elem_conv = TxOut_clone((LDKTxOut*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_TxOutZ CVec_TxOutZ_clone(const LDKCVec_TxOutZ *orig) {
 	LDKCVec_TxOutZ ret = { .data = MALLOC(sizeof(LDKTxOut) * orig->datalen, "LDKCVec_TxOutZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -2416,9 +2486,6 @@ static inline LDKCVec_TxOutZ CVec_TxOutZ_clone(const LDKCVec_TxOutZ *orig) {
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_TransactionNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_TransactionNoneZ*)arg)->result_ok;
-}
 int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_TransactionNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_TransactionNoneZ *val = (LDKCResult_TransactionNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2451,6 +2518,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMoni
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -2458,25 +2526,6 @@ uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMoni
 	return ret_ref;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_BlockHashChannelMonitorZZ_new(uint32_tArray elems) {
-	LDKCVec_C2Tuple_BlockHashChannelMonitorZZ *ret = MALLOC(sizeof(LDKCVec_C2Tuple_BlockHashChannelMonitorZZ), "LDKCVec_C2Tuple_BlockHashChannelMonitorZZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ) * ret->datalen, "LDKCVec_C2Tuple_BlockHashChannelMonitorZZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKC2Tuple_BlockHashChannelMonitorZ arr_elem_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(arr_elem_ptr);
-			arr_elem_conv = C2Tuple_BlockHashChannelMonitorZ_clone((LDKC2Tuple_BlockHashChannelMonitorZ*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_C2Tuple_BlockHashChannelMonitorZZ CVec_C2Tuple_BlockHashChannelMonitorZZ_clone(const LDKCVec_C2Tuple_BlockHashChannelMonitorZZ *orig) {
 	LDKCVec_C2Tuple_BlockHashChannelMonitorZZ ret = { .data = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ) * orig->datalen, "LDKCVec_C2Tuple_BlockHashChannelMonitorZZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -2484,9 +2533,6 @@ static inline LDKCVec_C2Tuple_BlockHashChannelMonitorZZ CVec_C2Tuple_BlockHashCh
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ*)arg)->result_ok;
-}
 uint32_tArray  __attribute__((visibility("default"))) TS_LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ *val = (LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2552,15 +2598,13 @@ uint32_t __attribute__((visibility("default"))) TS_LDKAPIError_ref_from_ptr(uint
 			uint64_t script_ref = 0;
 			CHECK((((uint64_t)script_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&script_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(script_var);
 			script_ref = (uint64_t)script_var.inner & ~1;
 			return 0 /* LDKAPIError - IncompatibleShutdownScript */; (void) script_ref;
 		}
 		default: abort();
 	}
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NoneAPIErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NoneAPIErrorZ*)arg)->result_ok;
-}
 void  __attribute__((visibility("default"))) TS_LDKCResult_NoneAPIErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NoneAPIErrorZ *val = (LDKCResult_NoneAPIErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2572,25 +2616,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NoneAPIErrorZ_get
 	uint64_t err_ref = ((uint64_t)&(*val->contents.err)) | 1;
 	return err_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_CResult_NoneAPIErrorZZ_new(uint32_tArray elems) {
-	LDKCVec_CResult_NoneAPIErrorZZ *ret = MALLOC(sizeof(LDKCVec_CResult_NoneAPIErrorZZ), "LDKCVec_CResult_NoneAPIErrorZZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ) * ret->datalen, "LDKCVec_CResult_NoneAPIErrorZZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKCResult_NoneAPIErrorZ arr_elem_conv = *(LDKCResult_NoneAPIErrorZ*)(arr_elem_ptr);
-			arr_elem_conv = CResult_NoneAPIErrorZ_clone((LDKCResult_NoneAPIErrorZ*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_CResult_NoneAPIErrorZZ CVec_CResult_NoneAPIErrorZZ_clone(const LDKCVec_CResult_NoneAPIErrorZZ *orig) {
 	LDKCVec_CResult_NoneAPIErrorZZ ret = { .data = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ) * orig->datalen, "LDKCVec_CResult_NoneAPIErrorZZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -2598,25 +2623,6 @@ static inline LDKCVec_CResult_NoneAPIErrorZZ CVec_CResult_NoneAPIErrorZZ_clone(c
 	}
 	return ret;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_APIErrorZ_new(uint32_tArray elems) {
-	LDKCVec_APIErrorZ *ret = MALLOC(sizeof(LDKCVec_APIErrorZ), "LDKCVec_APIErrorZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKAPIError) * ret->datalen, "LDKCVec_APIErrorZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKAPIError arr_elem_conv = *(LDKAPIError*)(arr_elem_ptr);
-			arr_elem_conv = APIError_clone((LDKAPIError*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_APIErrorZ CVec_APIErrorZ_clone(const LDKCVec_APIErrorZ *orig) {
 	LDKCVec_APIErrorZ ret = { .data = MALLOC(sizeof(LDKAPIError) * orig->datalen, "LDKCVec_APIErrorZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -2624,9 +2630,6 @@ static inline LDKCVec_APIErrorZ CVec_APIErrorZ_clone(const LDKCVec_APIErrorZ *or
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult__u832APIErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult__u832APIErrorZ*)arg)->result_ok;
-}
 int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult__u832APIErrorZ_get_ok(uint32_t arg) {
 	LDKCResult__u832APIErrorZ *val = (LDKCResult__u832APIErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2690,6 +2693,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKPaymentSendFailure_ref_fro
 			if ((uint64_t)failed_paths_retry_var.inner > 4096) {
 				CHECK((((uint64_t)failed_paths_retry_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 				CHECK((((uint64_t)&failed_paths_retry_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(failed_paths_retry_var);
 				failed_paths_retry_ref = (uint64_t)failed_paths_retry_var.inner & ~1;
 			}
 			int8_tArray payment_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
@@ -2699,9 +2703,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKPaymentSendFailure_ref_fro
 		default: abort();
 	}
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_PaymentIdPaymentSendFailureZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_PaymentIdPaymentSendFailureZ*)arg)->result_ok;
-}
 int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_PaymentIdPaymentSendFailureZ_get_ok(uint32_t arg) {
 	LDKCResult_PaymentIdPaymentSendFailureZ *val = (LDKCResult_PaymentIdPaymentSendFailureZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2715,9 +2716,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PaymentIdPaymentS
 	uint64_t err_ref = ((uint64_t)&(*val->contents.err)) | 1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NonePaymentSendFailureZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NonePaymentSendFailureZ*)arg)->result_ok;
-}
 void  __attribute__((visibility("default"))) TS_LDKCResult_NonePaymentSendFailureZ_get_ok(uint32_t arg) {
 	LDKCResult_NonePaymentSendFailureZ *val = (LDKCResult_NonePaymentSendFailureZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2749,9 +2747,6 @@ int8_tArray  __attribute__((visibility("default"))) TS_C2Tuple_PaymentHashPaymen
 	return ret_arr;
 }
 
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(uint32_t arg) {
 	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *val = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -2780,9 +2775,9 @@ uint32_t __attribute__((visibility("default"))) TS_LDKNetAddress_ref_from_ptr(ui
 			return 0 /* LDKNetAddress - IPv6 */; (void) addr_arr; (void) obj->i_pv6.port;
 		}
 		case LDKNetAddress_OnionV2: {
-			int8_tArray addr_arr = init_arr(10, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(addr_arr + 4), obj->onion_v2.addr.data, 10);
-			return 0 /* LDKNetAddress - OnionV2 */; (void) addr_arr; (void) obj->onion_v2.port;
+			int8_tArray onion_v2_arr = init_arr(12, sizeof(uint8_t), "Native int8_tArray Bytes");
+			memcpy((uint8_t*)(onion_v2_arr + 4), obj->onion_v2.data, 12);
+			return 0 /* LDKNetAddress - OnionV2 */; (void) onion_v2_arr;
 		}
 		case LDKNetAddress_OnionV3: {
 			int8_tArray ed25519_pubkey_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
@@ -2792,25 +2787,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKNetAddress_ref_from_ptr(ui
 		default: abort();
 	}
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_NetAddressZ_new(uint32_tArray elems) {
-	LDKCVec_NetAddressZ *ret = MALLOC(sizeof(LDKCVec_NetAddressZ), "LDKCVec_NetAddressZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKNetAddress) * ret->datalen, "LDKCVec_NetAddressZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKNetAddress arr_elem_conv = *(LDKNetAddress*)(arr_elem_ptr);
-			arr_elem_conv = NetAddress_clone((LDKNetAddress*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_NetAddressZ CVec_NetAddressZ_clone(const LDKCVec_NetAddressZ *orig) {
 	LDKCVec_NetAddressZ ret = { .data = MALLOC(sizeof(LDKNetAddress) * orig->datalen, "LDKCVec_NetAddressZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -2838,8 +2814,44 @@ int8_tArray  __attribute__((visibility("default"))) TS_C2Tuple_PaymentHashPaymen
 	return ret_arr;
 }
 
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_PaymentSecretAPIErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_PaymentSecretAPIErrorZ*)arg)->result_ok;
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(uint32_t arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *val = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(arg & ~1);
+	CHECK(val->result_ok);
+	LDKC2Tuple_PaymentHashPaymentSecretZ* res_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
+	*res_conv = (*val->contents.result);
+	*res_conv = C2Tuple_PaymentHashPaymentSecretZ_clone(res_conv);
+	return ((uint64_t)res_conv);
+}
+void  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(uint32_t arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *val = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(arg & ~1);
+	CHECK(!val->result_ok);
+	return *val->contents.err;
+}
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *val = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(arg & ~1);
+	CHECK(val->result_ok);
+	LDKC2Tuple_PaymentHashPaymentSecretZ* res_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
+	*res_conv = (*val->contents.result);
+	*res_conv = C2Tuple_PaymentHashPaymentSecretZ_clone(res_conv);
+	return ((uint64_t)res_conv);
+}
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(uint32_t arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *val = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(arg & ~1);
+	CHECK(!val->result_ok);
+	uint64_t err_ref = ((uint64_t)&(*val->contents.err)) | 1;
+	return err_ref;
+}
+int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_PaymentSecretNoneZ_get_ok(uint32_t arg) {
+	LDKCResult_PaymentSecretNoneZ *val = (LDKCResult_PaymentSecretNoneZ*)(arg & ~1);
+	CHECK(val->result_ok);
+	int8_tArray res_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+	memcpy((uint8_t*)(res_arr + 4), (*val->contents.result).data, 32);
+	return res_arr;
+}
+void  __attribute__((visibility("default"))) TS_LDKCResult_PaymentSecretNoneZ_get_err(uint32_t arg) {
+	LDKCResult_PaymentSecretNoneZ *val = (LDKCResult_PaymentSecretNoneZ*)(arg & ~1);
+	CHECK(!val->result_ok);
+	return *val->contents.err;
 }
 int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_PaymentSecretAPIErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_PaymentSecretAPIErrorZ *val = (LDKCResult_PaymentSecretAPIErrorZ*)(arg & ~1);
@@ -2854,24 +2866,18 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PaymentSecretAPIE
 	uint64_t err_ref = ((uint64_t)&(*val->contents.err)) | 1;
 	return err_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_ChannelMonitorZ_new(uint32_tArray elems) {
-	LDKCVec_ChannelMonitorZ *ret = MALLOC(sizeof(LDKCVec_ChannelMonitorZ), "LDKCVec_ChannelMonitorZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKChannelMonitor) * ret->datalen, "LDKCVec_ChannelMonitorZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKChannelMonitor arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = ChannelMonitor_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
+int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_PaymentPreimageAPIErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_PaymentPreimageAPIErrorZ *val = (LDKCResult_PaymentPreimageAPIErrorZ*)(arg & ~1);
+	CHECK(val->result_ok);
+	int8_tArray res_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+	memcpy((uint8_t*)(res_arr + 4), (*val->contents.result).data, 32);
+	return res_arr;
+}
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PaymentPreimageAPIErrorZ_get_err(uint32_t arg) {
+	LDKCResult_PaymentPreimageAPIErrorZ *val = (LDKCResult_PaymentPreimageAPIErrorZ*)(arg & ~1);
+	CHECK(!val->result_ok);
+	uint64_t err_ref = ((uint64_t)&(*val->contents.err)) | 1;
+	return err_ref;
 }
 static inline LDKCVec_ChannelMonitorZ CVec_ChannelMonitorZ_clone(const LDKCVec_ChannelMonitorZ *orig) {
 	LDKCVec_ChannelMonitorZ ret = { .data = MALLOC(sizeof(LDKChannelMonitor) * orig->datalen, "LDKCVec_ChannelMonitorZ clone bytes"), .datalen = orig->datalen };
@@ -2901,6 +2907,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_LDKWatch_jcall(const void*
 	uint64_t funding_txo_ref = 0;
 	CHECK((((uint64_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var);
 	funding_txo_ref = (uint64_t)funding_txo_var.inner;
 	if (funding_txo_var.is_owned) {
 		funding_txo_ref |= 1;
@@ -2909,6 +2916,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_LDKWatch_jcall(const void*
 	uint64_t monitor_ref = 0;
 	CHECK((((uint64_t)monitor_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&monitor_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(monitor_var);
 	monitor_ref = (uint64_t)monitor_var.inner;
 	if (monitor_var.is_owned) {
 		monitor_ref |= 1;
@@ -2917,7 +2925,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_LDKWatch_jcall(const void*
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr);
-	ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone((LDKCResult_NoneChannelMonitorUpdateErrZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_LDKWatch_jcall(const void* this_arg, LDKOutPoint funding_txo, LDKChannelMonitorUpdate update) {
@@ -2926,6 +2934,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_LDKWatch_jcall(const void
 	uint64_t funding_txo_ref = 0;
 	CHECK((((uint64_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var);
 	funding_txo_ref = (uint64_t)funding_txo_var.inner;
 	if (funding_txo_var.is_owned) {
 		funding_txo_ref |= 1;
@@ -2934,6 +2943,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_LDKWatch_jcall(const void
 	uint64_t update_ref = 0;
 	CHECK((((uint64_t)update_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&update_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(update_var);
 	update_ref = (uint64_t)update_var.inner;
 	if (update_var.is_owned) {
 		update_ref |= 1;
@@ -2942,7 +2952,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_LDKWatch_jcall(const void
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr);
-	ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone((LDKCResult_NoneChannelMonitorUpdateErrZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCVec_MonitorEventZ release_pending_monitor_events_LDKWatch_jcall(const void* this_arg) {
@@ -2960,7 +2970,7 @@ LDKCVec_MonitorEventZ release_pending_monitor_events_LDKWatch_jcall(const void*
 		void* ret_conv_14_ptr = (void*)(((uint64_t)ret_conv_14) & ~1);
 		CHECK_ACCESS(ret_conv_14_ptr);
 		LDKMonitorEvent ret_conv_14_conv = *(LDKMonitorEvent*)(ret_conv_14_ptr);
-		ret_conv_14_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uint64_t)ret_conv_14) & ~1));
+		FREE((void*)ret_conv_14);
 		ret_constr.data[o] = ret_conv_14_conv;
 	}
 	return ret_constr;
@@ -2995,10 +3005,12 @@ uint32_t  __attribute__((visibility("default"))) TS_Watch_watch_channel(uint32_t
 	LDKOutPoint funding_txo_conv;
 	funding_txo_conv.inner = (void*)(funding_txo & (~1));
 	funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0);
+	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);
+	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);
@@ -3012,10 +3024,12 @@ uint32_t  __attribute__((visibility("default"))) TS_Watch_update_channel(uint32_
 	LDKOutPoint funding_txo_conv;
 	funding_txo_conv.inner = (void*)(funding_txo & (~1));
 	funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0);
+	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);
+	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);
@@ -3102,6 +3116,7 @@ typedef struct LDKKeysInterface_JCalls {
 	uint32_t get_secure_random_bytes_meth;
 	uint32_t read_chan_signer_meth;
 	uint32_t sign_invoice_meth;
+	uint32_t get_inbound_payment_key_material_meth;
 } LDKKeysInterface_JCalls;
 static void LDKKeysInterface_JCalls_free(void* this_arg) {
 	LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg;
@@ -3113,6 +3128,7 @@ static void LDKKeysInterface_JCalls_free(void* this_arg) {
 		js_free(j_calls->get_secure_random_bytes_meth);
 		js_free(j_calls->read_chan_signer_meth);
 		js_free(j_calls->sign_invoice_meth);
+		js_free(j_calls->get_inbound_payment_key_material_meth);
 		FREE(j_calls);
 	}
 }
@@ -3139,7 +3155,7 @@ LDKShutdownScript get_shutdown_scriptpubkey_LDKKeysInterface_jcall(const void* t
 	LDKShutdownScript ret_conv;
 	ret_conv.inner = (void*)(ret & (~1));
 	ret_conv.is_owned = (ret & 1) || (ret == 0);
-	ret_conv = ShutdownScript_clone(&ret_conv);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv);
 	return ret_conv;
 }
 LDKSign get_channel_signer_LDKKeysInterface_jcall(const void* this_arg, bool inbound, uint64_t channel_value_satoshis) {
@@ -3148,7 +3164,7 @@ LDKSign get_channel_signer_LDKKeysInterface_jcall(const void* this_arg, bool inb
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKSign ret_conv = *(LDKSign*)(ret_ptr);
-	ret_conv = Sign_clone(&ret_conv);
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKThirtyTwoBytes get_secure_random_bytes_LDKKeysInterface_jcall(const void* this_arg) {
@@ -3168,7 +3184,7 @@ LDKCResult_SignDecodeErrorZ read_chan_signer_LDKKeysInterface_jcall(const void*
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignDecodeErrorZ ret_conv = *(LDKCResult_SignDecodeErrorZ*)(ret_ptr);
-	ret_conv = CResult_SignDecodeErrorZ_clone((LDKCResult_SignDecodeErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const void* this_arg, LDKCVec_u8Z invoice_preimage) {
@@ -3181,9 +3197,17 @@ LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const v
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_RecoverableSignatureNoneZ ret_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(ret_ptr);
-	ret_conv = CResult_RecoverableSignatureNoneZ_clone((LDKCResult_RecoverableSignatureNoneZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
+LDKThirtyTwoBytes get_inbound_payment_key_material_LDKKeysInterface_jcall(const void* this_arg) {
+	LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg;
+	int8_tArray ret = js_invoke_function_0(j_calls->get_inbound_payment_key_material_meth);
+	LDKThirtyTwoBytes ret_ref;
+	CHECK(*((uint32_t*)ret) == 32);
+	memcpy(ret_ref.data, (uint8_t*)(ret + 4), 32);
+	return ret_ref;
+}
 static void LDKKeysInterface_JCalls_cloned(LDKKeysInterface* new_obj) {
 	LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) new_obj->this_arg;
 	atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);
@@ -3202,6 +3226,7 @@ static inline LDKKeysInterface LDKKeysInterface_init (/*TODO: JS Object Referenc
 		.get_secure_random_bytes = get_secure_random_bytes_LDKKeysInterface_jcall,
 		.read_chan_signer = read_chan_signer_LDKKeysInterface_jcall,
 		.sign_invoice = sign_invoice_LDKKeysInterface_jcall,
+		.get_inbound_payment_key_material = get_inbound_payment_key_material_LDKKeysInterface_jcall,
 		.free = LDKKeysInterface_JCalls_free,
 	};
 	return ret;
@@ -3239,6 +3264,7 @@ uint32_t  __attribute__((visibility("default"))) TS_KeysInterface_get_shutdown_s
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -3289,6 +3315,15 @@ uint32_t  __attribute__((visibility("default"))) TS_KeysInterface_sign_invoice(u
 	return (uint64_t)ret_conv;
 }
 
+int8_tArray  __attribute__((visibility("default"))) TS_KeysInterface_get_inbound_payment_key_material(uint32_t this_arg) {
+	void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr;
+	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+	memcpy((uint8_t*)(ret_arr + 4), (this_arg_conv->get_inbound_payment_key_material)(this_arg_conv->this_arg).data, 32);
+	return ret_arr;
+}
+
 typedef struct LDKFeeEstimator_JCalls {
 	atomic_size_t refcnt;
 	uint32_t get_est_sat_per_1000_weight_meth;
@@ -3346,11 +3381,19 @@ static void LDKLogger_JCalls_free(void* this_arg) {
 		FREE(j_calls);
 	}
 }
-void log_LDKLogger_jcall(const void* this_arg, const char* record) {
+void log_LDKLogger_jcall(const void* this_arg, const LDKRecord * record) {
 	LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) this_arg;
-	const char* record_str = record;
-	jstring record_conv = str_ref_to_ts(record_str, strlen(record_str));
-	js_invoke_function_1(j_calls->log_meth, record_conv);
+	LDKRecord record_var = *record;
+	uint64_t record_ref = 0;
+	record_var = Record_clone(record);
+	CHECK((((uint64_t)record_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&record_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(record_var);
+	record_ref = (uint64_t)record_var.inner;
+	if (record_var.is_owned) {
+		record_ref |= 1;
+	}
+	js_invoke_function_1(j_calls->log_meth, record_ref);
 }
 static void LDKLogger_JCalls_cloned(LDKLogger* new_obj) {
 	LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) new_obj->this_arg;
@@ -3392,13 +3435,11 @@ uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMana
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner & ~1;
 	return ret_ref;
 }
 
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ *val = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3413,12 +3454,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHash
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ChannelConfigDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ChannelConfigDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelConfigDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ChannelConfigDecodeErrorZ *val = (LDKCResult_ChannelConfigDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3426,6 +3465,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelConfigDeco
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3436,12 +3476,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelConfigDeco
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_OutPointDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_OutPointDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_OutPointDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_OutPointDecodeErrorZ *val = (LDKCResult_OutPointDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3449,6 +3487,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_OutPointDecodeErr
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3459,6 +3498,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_OutPointDecodeErr
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
@@ -3563,9 +3603,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCOption_TypeZ_ref_from_ptr
 		default: abort();
 	}
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_COption_TypeZDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_COption_TypeZDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_COption_TypeZDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_COption_TypeZDecodeErrorZ *val = (LDKCResult_COption_TypeZDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3579,6 +3616,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_COption_TypeZDeco
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
@@ -3595,6 +3633,7 @@ uint32_t __attribute__((visibility("default"))) TS_LDKPaymentError_ref_from_ptr(
 			uint64_t routing_ref = 0;
 			CHECK((((uint64_t)routing_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&routing_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(routing_var);
 			routing_ref = (uint64_t)routing_var.inner & ~1;
 			return 0 /* LDKPaymentError - Routing */; (void) routing_ref;
 		}
@@ -3605,9 +3644,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKPaymentError_ref_from_ptr(
 		default: abort();
 	}
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_PaymentIdPaymentErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_PaymentIdPaymentErrorZ*)arg)->result_ok;
-}
 int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_PaymentIdPaymentErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_PaymentIdPaymentErrorZ *val = (LDKCResult_PaymentIdPaymentErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3621,9 +3657,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PaymentIdPaymentE
 	uint64_t err_ref = ((uint64_t)&(*val->contents.err)) | 1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_SiPrefixNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_SiPrefixNoneZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_SiPrefixNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_SiPrefixNoneZ *val = (LDKCResult_SiPrefixNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3635,9 +3668,6 @@ void  __attribute__((visibility("default"))) TS_LDKCResult_SiPrefixNoneZ_get_err
 	CHECK(!val->result_ok);
 	return *val->contents.err;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_InvoiceNoneZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_InvoiceNoneZ *val = (LDKCResult_InvoiceNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3645,6 +3675,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceNoneZ_get_
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3653,9 +3684,6 @@ void  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceNoneZ_get_err(
 	CHECK(!val->result_ok);
 	return *val->contents.err;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_SignedRawInvoiceNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_SignedRawInvoiceNoneZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_SignedRawInvoiceNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_SignedRawInvoiceNoneZ *val = (LDKCResult_SignedRawInvoiceNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3663,6 +3691,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_SignedRawInvoiceN
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3680,6 +3709,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_RawInvoice_u832Invoi
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -3706,6 +3736,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_RawInvoice_u832Invoi
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -3713,9 +3744,6 @@ uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_RawInvoice_u832Invoi
 	return ret_ref;
 }
 
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_PayeePubKeyErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_PayeePubKeyErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PayeePubKeyErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_PayeePubKeyErrorZ *val = (LDKCResult_PayeePubKeyErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3723,6 +3751,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PayeePubKeyErrorZ
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3732,25 +3761,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PayeePubKeyErrorZ
 	uint32_t err_conv = LDKSecp256k1Error_to_js((*val->contents.err));
 	return err_conv;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_PrivateRouteZ_new(uint32_tArray elems) {
-	LDKCVec_PrivateRouteZ *ret = MALLOC(sizeof(LDKCVec_PrivateRouteZ), "LDKCVec_PrivateRouteZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKPrivateRoute) * ret->datalen, "LDKCVec_PrivateRouteZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKPrivateRoute arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = PrivateRoute_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_PrivateRouteZ CVec_PrivateRouteZ_clone(const LDKCVec_PrivateRouteZ *orig) {
 	LDKCVec_PrivateRouteZ ret = { .data = MALLOC(sizeof(LDKPrivateRoute) * orig->datalen, "LDKCVec_PrivateRouteZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -3758,9 +3768,6 @@ static inline LDKCVec_PrivateRouteZ CVec_PrivateRouteZ_clone(const LDKCVec_Priva
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_PositiveTimestampCreationErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_PositiveTimestampCreationErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PositiveTimestampCreationErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_PositiveTimestampCreationErrorZ *val = (LDKCResult_PositiveTimestampCreationErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3768,6 +3775,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PositiveTimestamp
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3777,9 +3785,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PositiveTimestamp
 	uint32_t err_conv = LDKCreationError_to_js((*val->contents.err));
 	return err_conv;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NoneSemanticErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NoneSemanticErrorZ*)arg)->result_ok;
-}
 void  __attribute__((visibility("default"))) TS_LDKCResult_NoneSemanticErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NoneSemanticErrorZ *val = (LDKCResult_NoneSemanticErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3791,9 +3796,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NoneSemanticError
 	uint32_t err_conv = LDKSemanticError_to_js((*val->contents.err));
 	return err_conv;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceSemanticErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_InvoiceSemanticErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceSemanticErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_InvoiceSemanticErrorZ *val = (LDKCResult_InvoiceSemanticErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3801,6 +3803,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceSemanticEr
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3810,9 +3813,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceSemanticEr
 	uint32_t err_conv = LDKSemanticError_to_js((*val->contents.err));
 	return err_conv;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_DescriptionCreationErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_DescriptionCreationErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_DescriptionCreationErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_DescriptionCreationErrorZ *val = (LDKCResult_DescriptionCreationErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3820,6 +3820,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_DescriptionCreati
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3829,9 +3830,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_DescriptionCreati
 	uint32_t err_conv = LDKCreationError_to_js((*val->contents.err));
 	return err_conv;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ExpiryTimeCreationErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ExpiryTimeCreationErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ExpiryTimeCreationErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ExpiryTimeCreationErrorZ *val = (LDKCResult_ExpiryTimeCreationErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3839,6 +3837,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ExpiryTimeCreatio
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3848,9 +3847,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ExpiryTimeCreatio
 	uint32_t err_conv = LDKCreationError_to_js((*val->contents.err));
 	return err_conv;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_PrivateRouteCreationErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_PrivateRouteCreationErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PrivateRouteCreationErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_PrivateRouteCreationErrorZ *val = (LDKCResult_PrivateRouteCreationErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3858,6 +3854,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PrivateRouteCreat
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3867,9 +3864,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PrivateRouteCreat
 	uint32_t err_conv = LDKCreationError_to_js((*val->contents.err));
 	return err_conv;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_StringErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_StringErrorZ*)arg)->result_ok;
-}
 jstring  __attribute__((visibility("default"))) TS_LDKCResult_StringErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_StringErrorZ *val = (LDKCResult_StringErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3883,9 +3877,6 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_StringErrorZ_get_
 	uint32_t err_conv = LDKSecp256k1Error_to_js((*val->contents.err));
 	return err_conv;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ChannelMonitorUpdateDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ChannelMonitorUpdateDecodeErrorZ *val = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -3893,6 +3884,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelMonitorUpd
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -3903,47 +3895,59 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelMonitorUpd
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_HTLCUpdateDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_HTLCUpdateDecodeErrorZ*)arg)->result_ok;
+uint32_t __attribute__((visibility("default"))) TS_LDKCOption_MonitorEventZ_ref_from_ptr(uint32_t ptr) {
+	LDKCOption_MonitorEventZ *obj = (LDKCOption_MonitorEventZ*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKCOption_MonitorEventZ_Some: {
+			uint64_t some_ref = ((uint64_t)&obj->some) | 1;
+			return 0 /* LDKCOption_MonitorEventZ - Some */; (void) some_ref;
+		}
+		case LDKCOption_MonitorEventZ_None: {
+			return 0 /* LDKCOption_MonitorEventZ - None */;
+		}
+		default: abort();
+	}
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_HTLCUpdateDecodeErrorZ_get_ok(uint32_t arg) {
-	LDKCResult_HTLCUpdateDecodeErrorZ *val = (LDKCResult_HTLCUpdateDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_COption_MonitorEventZDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_COption_MonitorEventZDecodeErrorZ *val = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
-	LDKHTLCUpdate res_var = (*val->contents.result);
-	uint64_t res_ref = 0;
-	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	res_ref = (uint64_t)res_var.inner & ~1;
+	uint64_t res_ref = ((uint64_t)&(*val->contents.result)) | 1;
 	return res_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_HTLCUpdateDecodeErrorZ_get_err(uint32_t arg) {
-	LDKCResult_HTLCUpdateDecodeErrorZ *val = (LDKCResult_HTLCUpdateDecodeErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_COption_MonitorEventZDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_COption_MonitorEventZDecodeErrorZ *val = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(arg & ~1);
 	CHECK(!val->result_ok);
 	LDKDecodeError err_var = (*val->contents.err);
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NoneMonitorUpdateErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NoneMonitorUpdateErrorZ*)arg)->result_ok;
-}
-void  __attribute__((visibility("default"))) TS_LDKCResult_NoneMonitorUpdateErrorZ_get_ok(uint32_t arg) {
-	LDKCResult_NoneMonitorUpdateErrorZ *val = (LDKCResult_NoneMonitorUpdateErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_HTLCUpdateDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_HTLCUpdateDecodeErrorZ *val = (LDKCResult_HTLCUpdateDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
-	return *val->contents.result;
+	LDKHTLCUpdate res_var = (*val->contents.result);
+	uint64_t res_ref = 0;
+	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
+	res_ref = (uint64_t)res_var.inner & ~1;
+	return res_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NoneMonitorUpdateErrorZ_get_err(uint32_t arg) {
-	LDKCResult_NoneMonitorUpdateErrorZ *val = (LDKCResult_NoneMonitorUpdateErrorZ*)(arg & ~1);
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_HTLCUpdateDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_HTLCUpdateDecodeErrorZ *val = (LDKCResult_HTLCUpdateDecodeErrorZ*)(arg & ~1);
 	CHECK(!val->result_ok);
-	LDKMonitorUpdateError err_var = (*val->contents.err);
+	LDKDecodeError err_var = (*val->contents.err);
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
@@ -3956,6 +3960,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_OutPointScriptZ_get_
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -3996,25 +4001,6 @@ int8_tArray  __attribute__((visibility("default"))) TS_C2Tuple_u32ScriptZ_get_b(
 	return ret_arr;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_u32ScriptZZ_new(uint32_tArray elems) {
-	LDKCVec_C2Tuple_u32ScriptZZ *ret = MALLOC(sizeof(LDKCVec_C2Tuple_u32ScriptZZ), "LDKCVec_C2Tuple_u32ScriptZZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ) * ret->datalen, "LDKCVec_C2Tuple_u32ScriptZZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKC2Tuple_u32ScriptZ arr_elem_conv = *(LDKC2Tuple_u32ScriptZ*)(arr_elem_ptr);
-			arr_elem_conv = C2Tuple_u32ScriptZ_clone((LDKC2Tuple_u32ScriptZ*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_C2Tuple_u32ScriptZZ CVec_C2Tuple_u32ScriptZZ_clone(const LDKCVec_C2Tuple_u32ScriptZZ *orig) {
 	LDKCVec_C2Tuple_u32ScriptZZ ret = { .data = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ) * orig->datalen, "LDKCVec_C2Tuple_u32ScriptZZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -4051,25 +4037,6 @@ uint32_tArray  __attribute__((visibility("default"))) TS_C2Tuple_TxidCVec_C2Tupl
 	return ret_arr;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_new(uint32_tArray elems) {
-	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ *ret = MALLOC(sizeof(LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ), "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ) * ret->datalen, "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ arr_elem_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(arr_elem_ptr);
-			arr_elem_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone((LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_clone(const LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ *orig) {
 	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ ret = { .data = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ) * orig->datalen, "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -4077,175 +4044,15 @@ static inline LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ CVec_C2Tuple_TxidCV
 	}
 	return ret;
 }
-uint32_t __attribute__((visibility("default"))) TS_LDKPaymentPurpose_ref_from_ptr(uint32_t ptr) {
-	LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1);
-	switch(obj->tag) {
-		case LDKPaymentPurpose_InvoicePayment: {
-			int8_tArray payment_preimage_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(payment_preimage_arr + 4), obj->invoice_payment.payment_preimage.data, 32);
-			int8_tArray payment_secret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(payment_secret_arr + 4), obj->invoice_payment.payment_secret.data, 32);
-			return 0 /* LDKPaymentPurpose - InvoicePayment */; (void) payment_preimage_arr; (void) payment_secret_arr; (void) obj->invoice_payment.user_payment_id;
-		}
-		case LDKPaymentPurpose_SpontaneousPayment: {
-			int8_tArray spontaneous_payment_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(spontaneous_payment_arr + 4), obj->spontaneous_payment.data, 32);
-			return 0 /* LDKPaymentPurpose - SpontaneousPayment */; (void) spontaneous_payment_arr;
-		}
-		default: abort();
+static inline LDKCVec_EventZ CVec_EventZ_clone(const LDKCVec_EventZ *orig) {
+	LDKCVec_EventZ ret = { .data = MALLOC(sizeof(LDKEvent) * orig->datalen, "LDKCVec_EventZ clone bytes"), .datalen = orig->datalen };
+	for (size_t i = 0; i < ret.datalen; i++) {
+		ret.data[i] = Event_clone(&orig->data[i]);
 	}
+	return ret;
 }
-uint32_t __attribute__((visibility("default"))) TS_LDKClosureReason_ref_from_ptr(uint32_t ptr) {
-	LDKClosureReason *obj = (LDKClosureReason*)(ptr & ~1);
-	switch(obj->tag) {
-		case 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 0 /* LDKClosureReason - CounterpartyForceClosed */; (void) peer_msg_conv;
-		}
-		case LDKClosureReason_HolderForceClosed: {
-			return 0 /* LDKClosureReason - HolderForceClosed */;
-		}
-		case LDKClosureReason_CooperativeClosure: {
-			return 0 /* LDKClosureReason - CooperativeClosure */;
-		}
-		case LDKClosureReason_CommitmentTxConfirmed: {
-			return 0 /* LDKClosureReason - CommitmentTxConfirmed */;
-		}
-		case LDKClosureReason_ProcessingError: {
-			LDKStr err_str = obj->processing_error.err;
-			jstring err_conv = str_ref_to_ts(err_str.chars, err_str.len);
-			return 0 /* LDKClosureReason - ProcessingError */; (void) err_conv;
-		}
-		case LDKClosureReason_DisconnectedPeer: {
-			return 0 /* LDKClosureReason - DisconnectedPeer */;
-		}
-		case LDKClosureReason_OutdatedChannelManager: {
-			return 0 /* LDKClosureReason - OutdatedChannelManager */;
-		}
-		default: abort();
-	}
-}
-uint32_t __attribute__((visibility("default"))) TS_LDKEvent_ref_from_ptr(uint32_t ptr) {
-	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
-	switch(obj->tag) {
-		case LDKEvent_FundingGenerationReady: {
-			int8_tArray temporary_channel_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(temporary_channel_id_arr + 4), obj->funding_generation_ready.temporary_channel_id.data, 32);
-			LDKCVec_u8Z output_script_var = obj->funding_generation_ready.output_script;
-			int8_tArray output_script_arr = init_arr(output_script_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(output_script_arr + 4), output_script_var.data, output_script_var.datalen);
-			return 0 /* LDKEvent - FundingGenerationReady */; (void) temporary_channel_id_arr; (void) obj->funding_generation_ready.channel_value_satoshis; (void) output_script_arr; (void) obj->funding_generation_ready.user_channel_id;
-		}
-		case LDKEvent_PaymentReceived: {
-			int8_tArray payment_hash_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(payment_hash_arr + 4), obj->payment_received.payment_hash.data, 32);
-			uint64_t purpose_ref = ((uint64_t)&obj->payment_received.purpose) | 1;
-			return 0 /* LDKEvent - PaymentReceived */; (void) payment_hash_arr; (void) obj->payment_received.amt; (void) purpose_ref;
-		}
-		case LDKEvent_PaymentSent: {
-			int8_tArray payment_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(payment_id_arr + 4), obj->payment_sent.payment_id.data, 32);
-			int8_tArray payment_preimage_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(payment_preimage_arr + 4), obj->payment_sent.payment_preimage.data, 32);
-			int8_tArray payment_hash_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(payment_hash_arr + 4), obj->payment_sent.payment_hash.data, 32);
-			uint64_t fee_paid_msat_ref = ((uint64_t)&obj->payment_sent.fee_paid_msat) | 1;
-			return 0 /* LDKEvent - PaymentSent */; (void) payment_id_arr; (void) payment_preimage_arr; (void) payment_hash_arr; (void) fee_paid_msat_ref;
-		}
-		case LDKEvent_PaymentPathFailed: {
-			int8_tArray payment_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(payment_id_arr + 4), obj->payment_path_failed.payment_id.data, 32);
-			int8_tArray payment_hash_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(payment_hash_arr + 4), obj->payment_path_failed.payment_hash.data, 32);
-			uint64_t network_update_ref = ((uint64_t)&obj->payment_path_failed.network_update) | 1;
-			LDKCVec_RouteHopZ path_var = obj->payment_path_failed.path;
-			uint32_tArray path_arr = NULL;
-			path_arr = init_arr(path_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
-			uint32_t *path_arr_ptr = (uint32_t*)(path_arr + 4);
-			for (size_t k = 0; k < path_var.datalen; k++) {
-				LDKRouteHop path_conv_10_var = path_var.data[k];
-				uint64_t path_conv_10_ref = 0;
-				CHECK((((uint64_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-				CHECK((((uint64_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-				path_conv_10_ref = (uint64_t)path_conv_10_var.inner & ~1;
-				path_arr_ptr[k] = path_conv_10_ref;
-			}
-			
-			uint64_t short_channel_id_ref = ((uint64_t)&obj->payment_path_failed.short_channel_id) | 1;
-			LDKRouteParameters retry_var = obj->payment_path_failed.retry;
-			uint64_t retry_ref = 0;
-			if ((uint64_t)retry_var.inner > 4096) {
-				CHECK((((uint64_t)retry_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-				CHECK((((uint64_t)&retry_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-				retry_ref = (uint64_t)retry_var.inner & ~1;
-			}
-			return 0 /* LDKEvent - PaymentPathFailed */; (void) payment_id_arr; (void) payment_hash_arr; (void) obj->payment_path_failed.rejected_by_dest; (void) network_update_ref; (void) obj->payment_path_failed.all_paths_failed; (void) path_arr; (void) short_channel_id_ref; (void) retry_ref;
-		}
-		case LDKEvent_PendingHTLCsForwardable: {
-			return 0 /* LDKEvent - PendingHTLCsForwardable */; (void) obj->pending_htl_cs_forwardable.time_forwardable;
-		}
-		case LDKEvent_SpendableOutputs: {
-			LDKCVec_SpendableOutputDescriptorZ outputs_var = obj->spendable_outputs.outputs;
-			uint32_tArray outputs_arr = NULL;
-			outputs_arr = init_arr(outputs_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
-			uint32_t *outputs_arr_ptr = (uint32_t*)(outputs_arr + 4);
-			for (size_t b = 0; b < outputs_var.datalen; b++) {
-				uint64_t outputs_conv_27_ref = ((uint64_t)&outputs_var.data[b]) | 1;
-				outputs_arr_ptr[b] = outputs_conv_27_ref;
-			}
-			
-			return 0 /* LDKEvent - SpendableOutputs */; (void) outputs_arr;
-		}
-		case LDKEvent_PaymentForwarded: {
-			uint64_t fee_earned_msat_ref = ((uint64_t)&obj->payment_forwarded.fee_earned_msat) | 1;
-			return 0 /* LDKEvent - PaymentForwarded */; (void) fee_earned_msat_ref; (void) obj->payment_forwarded.claim_from_onchain_tx;
-		}
-		case LDKEvent_ChannelClosed: {
-			int8_tArray channel_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(channel_id_arr + 4), obj->channel_closed.channel_id.data, 32);
-			uint64_t reason_ref = ((uint64_t)&obj->channel_closed.reason) | 1;
-			return 0 /* LDKEvent - ChannelClosed */; (void) channel_id_arr; (void) obj->channel_closed.user_channel_id; (void) reason_ref;
-		}
-		case LDKEvent_DiscardFunding: {
-			int8_tArray channel_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(channel_id_arr + 4), obj->discard_funding.channel_id.data, 32);
-			LDKTransaction transaction_var = obj->discard_funding.transaction;
-			int8_tArray transaction_arr = init_arr(transaction_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
-			memcpy((uint8_t*)(transaction_arr + 4), transaction_var.data, transaction_var.datalen);
-			return 0 /* LDKEvent - DiscardFunding */; (void) channel_id_arr; (void) transaction_arr;
-		}
-		default: abort();
-	}
-}
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_EventZ_new(uint32_tArray elems) {
-	LDKCVec_EventZ *ret = MALLOC(sizeof(LDKCVec_EventZ), "LDKCVec_EventZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKEvent) * ret->datalen, "LDKCVec_EventZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKEvent arr_elem_conv = *(LDKEvent*)(arr_elem_ptr);
-			arr_elem_conv = Event_clone((LDKEvent*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
-static inline LDKCVec_EventZ CVec_EventZ_clone(const LDKCVec_EventZ *orig) {
-	LDKCVec_EventZ ret = { .data = MALLOC(sizeof(LDKEvent) * orig->datalen, "LDKCVec_EventZ clone bytes"), .datalen = orig->datalen };
-	for (size_t i = 0; i < ret.datalen; i++) {
-		ret.data[i] = Event_clone(&orig->data[i]);
-	}
-	return ret;
-}
-static inline uint32_t C2Tuple_u32TxOutZ_get_a(LDKC2Tuple_u32TxOutZ *NONNULL_PTR tuple){
-	return tuple->a;
+static inline uint32_t C2Tuple_u32TxOutZ_get_a(LDKC2Tuple_u32TxOutZ *NONNULL_PTR tuple){
+	return tuple->a;
 }
 int32_t  __attribute__((visibility("default"))) TS_C2Tuple_u32TxOutZ_get_a(uint32_t tuple) {
 	LDKC2Tuple_u32TxOutZ* tuple_conv = (LDKC2Tuple_u32TxOutZ*)(tuple & ~1);
@@ -4263,25 +4070,6 @@ uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_u32TxOutZ_get_b(uint
 	return (uint64_t)ret_ref;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_u32TxOutZZ_new(uint32_tArray elems) {
-	LDKCVec_C2Tuple_u32TxOutZZ *ret = MALLOC(sizeof(LDKCVec_C2Tuple_u32TxOutZZ), "LDKCVec_C2Tuple_u32TxOutZZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ) * ret->datalen, "LDKCVec_C2Tuple_u32TxOutZZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKC2Tuple_u32TxOutZ arr_elem_conv = *(LDKC2Tuple_u32TxOutZ*)(arr_elem_ptr);
-			arr_elem_conv = C2Tuple_u32TxOutZ_clone((LDKC2Tuple_u32TxOutZ*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_C2Tuple_u32TxOutZZ CVec_C2Tuple_u32TxOutZZ_clone(const LDKCVec_C2Tuple_u32TxOutZZ *orig) {
 	LDKCVec_C2Tuple_u32TxOutZZ ret = { .data = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ) * orig->datalen, "LDKCVec_C2Tuple_u32TxOutZZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -4318,25 +4106,6 @@ uint32_tArray  __attribute__((visibility("default"))) TS_C2Tuple_TxidCVec_C2Tupl
 	return ret_arr;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_new(uint32_tArray elems) {
-	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ *ret = MALLOC(sizeof(LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ), "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ) * ret->datalen, "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ arr_elem_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(arr_elem_ptr);
-			arr_elem_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone((LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_clone(const LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ *orig) {
 	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret = { .data = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ) * orig->datalen, "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -4362,25 +4131,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKBalance_ref_from_ptr(uint3
 		default: abort();
 	}
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_BalanceZ_new(uint32_tArray elems) {
-	LDKCVec_BalanceZ *ret = MALLOC(sizeof(LDKCVec_BalanceZ), "LDKCVec_BalanceZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKBalance) * ret->datalen, "LDKCVec_BalanceZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKBalance arr_elem_conv = *(LDKBalance*)(arr_elem_ptr);
-			arr_elem_conv = Balance_clone((LDKBalance*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_BalanceZ CVec_BalanceZ_clone(const LDKCVec_BalanceZ *orig) {
 	LDKCVec_BalanceZ ret = { .data = MALLOC(sizeof(LDKBalance) * orig->datalen, "LDKCVec_BalanceZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -4388,9 +4138,6 @@ static inline LDKCVec_BalanceZ CVec_BalanceZ_clone(const LDKCVec_BalanceZ *orig)
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *val = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4406,12 +4153,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_C2Tuple_BlockHash
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NoneLightningErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NoneLightningErrorZ*)arg)->result_ok;
-}
 void  __attribute__((visibility("default"))) TS_LDKCResult_NoneLightningErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NoneLightningErrorZ *val = (LDKCResult_NoneLightningErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4424,6 +4169,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NoneLightningErro
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
@@ -4447,25 +4193,6 @@ uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_PublicKeyTypeZ_get_b
 	return (uint64_t)ret_ret;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_C2Tuple_PublicKeyTypeZZ_new(uint32_tArray elems) {
-	LDKCVec_C2Tuple_PublicKeyTypeZZ *ret = MALLOC(sizeof(LDKCVec_C2Tuple_PublicKeyTypeZZ), "LDKCVec_C2Tuple_PublicKeyTypeZZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ) * ret->datalen, "LDKCVec_C2Tuple_PublicKeyTypeZZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKC2Tuple_PublicKeyTypeZ arr_elem_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(arr_elem_ptr);
-			arr_elem_conv = C2Tuple_PublicKeyTypeZ_clone((LDKC2Tuple_PublicKeyTypeZ*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_C2Tuple_PublicKeyTypeZZ CVec_C2Tuple_PublicKeyTypeZZ_clone(const LDKCVec_C2Tuple_PublicKeyTypeZZ *orig) {
 	LDKCVec_C2Tuple_PublicKeyTypeZZ ret = { .data = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ) * orig->datalen, "LDKCVec_C2Tuple_PublicKeyTypeZZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -4473,9 +4200,6 @@ static inline LDKCVec_C2Tuple_PublicKeyTypeZZ CVec_C2Tuple_PublicKeyTypeZZ_clone
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_boolLightningErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_boolLightningErrorZ*)arg)->result_ok;
-}
 jboolean  __attribute__((visibility("default"))) TS_LDKCResult_boolLightningErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_boolLightningErrorZ *val = (LDKCResult_boolLightningErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4488,6 +4212,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_boolLightningErro
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
@@ -4500,6 +4225,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_ChannelAnnouncementC
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -4516,6 +4242,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_ChannelAnnouncementC
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -4532,6 +4259,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_ChannelAnnouncementC
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -4539,25 +4267,6 @@ uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_ChannelAnnouncementC
 	return ret_ref;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_new(uint32_tArray elems) {
-	LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ *ret = MALLOC(sizeof(LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ), "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ) * ret->datalen, "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			void* arr_elem_ptr = (void*)(((uint64_t)arr_elem) & ~1);
-			CHECK_ACCESS(arr_elem_ptr);
-			LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ arr_elem_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(arr_elem_ptr);
-			arr_elem_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone((LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(((uint64_t)arr_elem) & ~1));
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_clone(const LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ *orig) {
 	LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret = { .data = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ) * orig->datalen, "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -4565,25 +4274,6 @@ static inline LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ CV
 	}
 	return ret;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_NodeAnnouncementZ_new(uint32_tArray elems) {
-	LDKCVec_NodeAnnouncementZ *ret = MALLOC(sizeof(LDKCVec_NodeAnnouncementZ), "LDKCVec_NodeAnnouncementZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKNodeAnnouncement) * ret->datalen, "LDKCVec_NodeAnnouncementZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKNodeAnnouncement arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = NodeAnnouncement_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_NodeAnnouncementZ CVec_NodeAnnouncementZ_clone(const LDKCVec_NodeAnnouncementZ *orig) {
 	LDKCVec_NodeAnnouncementZ ret = { .data = MALLOC(sizeof(LDKNodeAnnouncement) * orig->datalen, "LDKCVec_NodeAnnouncementZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -4591,9 +4281,6 @@ static inline LDKCVec_NodeAnnouncementZ CVec_NodeAnnouncementZ_clone(const LDKCV
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_CVec_u8ZPeerHandleErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_CVec_u8ZPeerHandleErrorZ*)arg)->result_ok;
-}
 int8_tArray  __attribute__((visibility("default"))) TS_LDKCResult_CVec_u8ZPeerHandleErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_CVec_u8ZPeerHandleErrorZ *val = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4609,12 +4296,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_CVec_u8ZPeerHandl
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NonePeerHandleErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NonePeerHandleErrorZ*)arg)->result_ok;
-}
 void  __attribute__((visibility("default"))) TS_LDKCResult_NonePeerHandleErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NonePeerHandleErrorZ *val = (LDKCResult_NonePeerHandleErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4627,12 +4312,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NonePeerHandleErr
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_boolPeerHandleErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_boolPeerHandleErrorZ*)arg)->result_ok;
-}
 jboolean  __attribute__((visibility("default"))) TS_LDKCResult_boolPeerHandleErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_boolPeerHandleErrorZ *val = (LDKCResult_boolPeerHandleErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4645,12 +4328,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_boolPeerHandleErr
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NodeIdDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NodeIdDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeIdDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NodeIdDecodeErrorZ *val = (LDKCResult_NodeIdDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4658,6 +4339,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeIdDecodeError
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -4668,6 +4350,24 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeIdDecodeError
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
+	err_ref = (uint64_t)err_var.inner & ~1;
+	return err_ref;
+}
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(uint32_t arg) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ *val = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(arg & ~1);
+	CHECK(val->result_ok);
+	uint64_t res_ref = ((uint64_t)&(*val->contents.result)) | 1;
+	return res_ref;
+}
+uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_COption_NetworkUpdateZDecodeErrorZ_get_err(uint32_t arg) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ *val = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(arg & ~1);
+	CHECK(!val->result_ok);
+	LDKDecodeError err_var = (*val->contents.err);
+	uint64_t err_ref = 0;
+	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
@@ -4690,7 +4390,7 @@ LDKCResult_TxOutAccessErrorZ get_utxo_LDKAccess_jcall(const void* this_arg, cons
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_TxOutAccessErrorZ ret_conv = *(LDKCResult_TxOutAccessErrorZ*)(ret_ptr);
-	ret_conv = CResult_TxOutAccessErrorZ_clone((LDKCResult_TxOutAccessErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 static void LDKAccess_JCalls_cloned(LDKAccess* new_obj) {
@@ -4742,9 +4442,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCOption_AccessZ_ref_from_p
 		default: abort();
 	}
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_DirectionalChannelInfoDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_DirectionalChannelInfoDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_DirectionalChannelInfoDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_DirectionalChannelInfoDecodeErrorZ *val = (LDKCResult_DirectionalChannelInfoDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4752,6 +4449,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_DirectionalChanne
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -4762,12 +4460,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_DirectionalChanne
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ChannelInfoDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ChannelInfoDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelInfoDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ChannelInfoDecodeErrorZ *val = (LDKCResult_ChannelInfoDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4775,6 +4471,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelInfoDecode
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -4785,12 +4482,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelInfoDecode
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_RoutingFeesDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_RoutingFeesDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RoutingFeesDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_RoutingFeesDecodeErrorZ *val = (LDKCResult_RoutingFeesDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4798,6 +4493,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RoutingFeesDecode
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -4808,12 +4504,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RoutingFeesDecode
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementInfoDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NodeAnnouncementInfoDecodeErrorZ *val = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4821,6 +4515,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementI
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -4831,31 +4526,15 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementI
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_u64Z_new(int64_tArray elems) {
-	LDKCVec_u64Z *ret = MALLOC(sizeof(LDKCVec_u64Z), "LDKCVec_u64Z");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(uint64_t) * ret->datalen, "LDKCVec_u64Z Data");
-		int64_t *java_elems = (int64_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			ret->data[i] = java_elems[i];
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_u64Z CVec_u64Z_clone(const LDKCVec_u64Z *orig) {
 	LDKCVec_u64Z ret = { .data = MALLOC(sizeof(int64_t) * orig->datalen, "LDKCVec_u64Z clone bytes"), .datalen = orig->datalen };
 	memcpy(ret.data, orig->data, sizeof(int64_t) * ret.datalen);
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NodeInfoDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NodeInfoDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeInfoDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NodeInfoDecodeErrorZ *val = (LDKCResult_NodeInfoDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4863,6 +4542,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeInfoDecodeErr
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -4873,12 +4553,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeInfoDecodeErr
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NetworkGraphDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NetworkGraphDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NetworkGraphDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NetworkGraphDecodeErrorZ *val = (LDKCResult_NetworkGraphDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4886,6 +4564,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NetworkGraphDecod
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -4896,6 +4575,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NetworkGraphDecod
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
@@ -4920,9 +4600,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCOption_CVec_NetAddressZZ_
 		default: abort();
 	}
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NetAddressDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NetAddressDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NetAddressDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NetAddressDecodeErrorZ *val = (LDKCResult_NetAddressDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -4936,28 +4613,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NetAddressDecodeE
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_UpdateAddHTLCZ_new(uint32_tArray elems) {
-	LDKCVec_UpdateAddHTLCZ *ret = MALLOC(sizeof(LDKCVec_UpdateAddHTLCZ), "LDKCVec_UpdateAddHTLCZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKUpdateAddHTLC) * ret->datalen, "LDKCVec_UpdateAddHTLCZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKUpdateAddHTLC arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = UpdateAddHTLC_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_UpdateAddHTLCZ CVec_UpdateAddHTLCZ_clone(const LDKCVec_UpdateAddHTLCZ *orig) {
 	LDKCVec_UpdateAddHTLCZ ret = { .data = MALLOC(sizeof(LDKUpdateAddHTLC) * orig->datalen, "LDKCVec_UpdateAddHTLCZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -4965,25 +4624,6 @@ static inline LDKCVec_UpdateAddHTLCZ CVec_UpdateAddHTLCZ_clone(const LDKCVec_Upd
 	}
 	return ret;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_UpdateFulfillHTLCZ_new(uint32_tArray elems) {
-	LDKCVec_UpdateFulfillHTLCZ *ret = MALLOC(sizeof(LDKCVec_UpdateFulfillHTLCZ), "LDKCVec_UpdateFulfillHTLCZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKUpdateFulfillHTLC) * ret->datalen, "LDKCVec_UpdateFulfillHTLCZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKUpdateFulfillHTLC arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = UpdateFulfillHTLC_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_UpdateFulfillHTLCZ CVec_UpdateFulfillHTLCZ_clone(const LDKCVec_UpdateFulfillHTLCZ *orig) {
 	LDKCVec_UpdateFulfillHTLCZ ret = { .data = MALLOC(sizeof(LDKUpdateFulfillHTLC) * orig->datalen, "LDKCVec_UpdateFulfillHTLCZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -4991,25 +4631,6 @@ static inline LDKCVec_UpdateFulfillHTLCZ CVec_UpdateFulfillHTLCZ_clone(const LDK
 	}
 	return ret;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_UpdateFailHTLCZ_new(uint32_tArray elems) {
-	LDKCVec_UpdateFailHTLCZ *ret = MALLOC(sizeof(LDKCVec_UpdateFailHTLCZ), "LDKCVec_UpdateFailHTLCZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKUpdateFailHTLC) * ret->datalen, "LDKCVec_UpdateFailHTLCZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKUpdateFailHTLC arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = UpdateFailHTLC_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_UpdateFailHTLCZ CVec_UpdateFailHTLCZ_clone(const LDKCVec_UpdateFailHTLCZ *orig) {
 	LDKCVec_UpdateFailHTLCZ ret = { .data = MALLOC(sizeof(LDKUpdateFailHTLC) * orig->datalen, "LDKCVec_UpdateFailHTLCZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -5017,25 +4638,6 @@ static inline LDKCVec_UpdateFailHTLCZ CVec_UpdateFailHTLCZ_clone(const LDKCVec_U
 	}
 	return ret;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_UpdateFailMalformedHTLCZ_new(uint32_tArray elems) {
-	LDKCVec_UpdateFailMalformedHTLCZ *ret = MALLOC(sizeof(LDKCVec_UpdateFailMalformedHTLCZ), "LDKCVec_UpdateFailMalformedHTLCZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKUpdateFailMalformedHTLC) * ret->datalen, "LDKCVec_UpdateFailMalformedHTLCZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKUpdateFailMalformedHTLC arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = UpdateFailMalformedHTLC_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_UpdateFailMalformedHTLCZ CVec_UpdateFailMalformedHTLCZ_clone(const LDKCVec_UpdateFailMalformedHTLCZ *orig) {
 	LDKCVec_UpdateFailMalformedHTLCZ ret = { .data = MALLOC(sizeof(LDKUpdateFailMalformedHTLC) * orig->datalen, "LDKCVec_UpdateFailMalformedHTLCZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -5043,9 +4645,6 @@ static inline LDKCVec_UpdateFailMalformedHTLCZ CVec_UpdateFailMalformedHTLCZ_clo
 	}
 	return ret;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_AcceptChannelDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_AcceptChannelDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_AcceptChannelDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_AcceptChannelDecodeErrorZ *val = (LDKCResult_AcceptChannelDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5053,6 +4652,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_AcceptChannelDeco
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5063,12 +4663,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_AcceptChannelDeco
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_AnnouncementSignaturesDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_AnnouncementSignaturesDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_AnnouncementSignaturesDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ *val = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5076,6 +4674,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_AnnouncementSigna
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5086,12 +4685,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_AnnouncementSigna
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ChannelReestablishDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ChannelReestablishDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelReestablishDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ChannelReestablishDecodeErrorZ *val = (LDKCResult_ChannelReestablishDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5099,6 +4696,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelReestablis
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5109,12 +4707,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelReestablis
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ClosingSignedDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ClosingSignedDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ClosingSignedDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ClosingSignedDecodeErrorZ *val = (LDKCResult_ClosingSignedDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5122,6 +4718,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ClosingSignedDeco
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5132,12 +4729,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ClosingSignedDeco
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ClosingSignedFeeRangeDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *val = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5145,6 +4740,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ClosingSignedFeeR
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5155,12 +4751,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ClosingSignedFeeR
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_CommitmentSignedDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_CommitmentSignedDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_CommitmentSignedDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_CommitmentSignedDecodeErrorZ *val = (LDKCResult_CommitmentSignedDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5168,6 +4762,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_CommitmentSignedD
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5178,12 +4773,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_CommitmentSignedD
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_FundingCreatedDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_FundingCreatedDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_FundingCreatedDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_FundingCreatedDecodeErrorZ *val = (LDKCResult_FundingCreatedDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5191,6 +4784,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_FundingCreatedDec
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5201,12 +4795,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_FundingCreatedDec
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_FundingSignedDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_FundingSignedDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_FundingSignedDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_FundingSignedDecodeErrorZ *val = (LDKCResult_FundingSignedDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5214,6 +4806,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_FundingSignedDeco
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5224,12 +4817,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_FundingSignedDeco
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_FundingLockedDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_FundingLockedDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_FundingLockedDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_FundingLockedDecodeErrorZ *val = (LDKCResult_FundingLockedDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5237,6 +4828,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_FundingLockedDeco
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5247,12 +4839,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_FundingLockedDeco
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_InitDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_InitDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InitDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_InitDecodeErrorZ *val = (LDKCResult_InitDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5260,6 +4850,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InitDecodeErrorZ_
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5270,12 +4861,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InitDecodeErrorZ_
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_OpenChannelDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_OpenChannelDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_OpenChannelDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_OpenChannelDecodeErrorZ *val = (LDKCResult_OpenChannelDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5283,6 +4872,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_OpenChannelDecode
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5293,12 +4883,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_OpenChannelDecode
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_RevokeAndACKDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_RevokeAndACKDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RevokeAndACKDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_RevokeAndACKDecodeErrorZ *val = (LDKCResult_RevokeAndACKDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5306,6 +4894,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RevokeAndACKDecod
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5316,12 +4905,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_RevokeAndACKDecod
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ShutdownDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ShutdownDecodeErrorZ *val = (LDKCResult_ShutdownDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5329,6 +4916,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownDecodeErr
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5339,12 +4927,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ShutdownDecodeErr
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFailHTLCDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_UpdateFailHTLCDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFailHTLCDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_UpdateFailHTLCDecodeErrorZ *val = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5352,6 +4938,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFailHTLCDec
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5362,12 +4949,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFailHTLCDec
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *val = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5375,6 +4960,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFailMalform
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5385,12 +4971,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFailMalform
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFeeDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_UpdateFeeDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFeeDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_UpdateFeeDecodeErrorZ *val = (LDKCResult_UpdateFeeDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5398,6 +4982,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFeeDecodeEr
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5408,12 +4993,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFeeDecodeEr
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFulfillHTLCDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ *val = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5421,6 +5004,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFulfillHTLC
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5431,12 +5015,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateFulfillHTLC
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_UpdateAddHTLCDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_UpdateAddHTLCDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateAddHTLCDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_UpdateAddHTLCDecodeErrorZ *val = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5444,6 +5026,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateAddHTLCDeco
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5454,12 +5037,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UpdateAddHTLCDeco
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_PingDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_PingDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PingDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_PingDecodeErrorZ *val = (LDKCResult_PingDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5467,6 +5048,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PingDecodeErrorZ_
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5477,12 +5059,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PingDecodeErrorZ_
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_PongDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_PongDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PongDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_PongDecodeErrorZ *val = (LDKCResult_PongDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5490,6 +5070,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PongDecodeErrorZ_
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5500,12 +5081,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_PongDecodeErrorZ_
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *val = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5513,6 +5092,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelAn
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5523,12 +5103,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelAn
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ChannelAnnouncementDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ChannelAnnouncementDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelAnnouncementDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ChannelAnnouncementDecodeErrorZ *val = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5536,6 +5114,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelAnnounceme
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5546,12 +5125,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelAnnounceme
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelUpdateDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ *val = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5559,6 +5136,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelUp
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5569,12 +5147,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedChannelUp
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ChannelUpdateDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ChannelUpdateDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelUpdateDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ChannelUpdateDecodeErrorZ *val = (LDKCResult_ChannelUpdateDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5582,6 +5158,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelUpdateDeco
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5592,12 +5169,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ChannelUpdateDeco
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ErrorMessageDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ErrorMessageDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ErrorMessageDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ErrorMessageDecodeErrorZ *val = (LDKCResult_ErrorMessageDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5605,6 +5180,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ErrorMessageDecod
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5615,12 +5191,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ErrorMessageDecod
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *val = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5628,6 +5202,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedNodeAnnou
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5638,12 +5213,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_UnsignedNodeAnnou
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_NodeAnnouncementDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_NodeAnnouncementDecodeErrorZ *val = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5651,6 +5224,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementD
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5661,12 +5235,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_NodeAnnouncementD
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_QueryShortChannelIdsDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_QueryShortChannelIdsDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_QueryShortChannelIdsDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ *val = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5674,6 +5246,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_QueryShortChannel
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5684,12 +5257,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_QueryShortChannel
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *val = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5697,6 +5268,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ReplyShortChannel
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5707,12 +5279,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ReplyShortChannel
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_QueryChannelRangeDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_QueryChannelRangeDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_QueryChannelRangeDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_QueryChannelRangeDecodeErrorZ *val = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5720,6 +5290,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_QueryChannelRange
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5730,12 +5301,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_QueryChannelRange
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_ReplyChannelRangeDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_ReplyChannelRangeDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ReplyChannelRangeDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_ReplyChannelRangeDecodeErrorZ *val = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5743,6 +5312,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ReplyChannelRange
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5753,12 +5323,10 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_ReplyChannelRange
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_GossipTimestampFilterDecodeErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_GossipTimestampFilterDecodeErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_GossipTimestampFilterDecodeErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_GossipTimestampFilterDecodeErrorZ *val = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5766,6 +5334,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_GossipTimestampFi
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5776,6 +5345,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_GossipTimestampFi
 	uint64_t err_ref = 0;
 	CHECK((((uint64_t)err_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&err_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(err_var);
 	err_ref = (uint64_t)err_var.inner & ~1;
 	return err_ref;
 }
@@ -5792,9 +5362,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKSignOrCreationError_ref_fr
 		default: abort();
 	}
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceSignOrCreationErrorZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_InvoiceSignOrCreationErrorZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceSignOrCreationErrorZ_get_ok(uint32_t arg) {
 	LDKCResult_InvoiceSignOrCreationErrorZ *val = (LDKCResult_InvoiceSignOrCreationErrorZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5802,6 +5369,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_InvoiceSignOrCrea
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5839,6 +5407,7 @@ LDKCOption_C2Tuple_usizeTransactionZZ register_output_LDKFilter_jcall(const void
 	uint64_t output_ref = 0;
 	CHECK((((uint64_t)output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(output_var);
 	output_ref = (uint64_t)output_var.inner;
 	if (output_var.is_owned) {
 		output_ref |= 1;
@@ -5847,7 +5416,7 @@ LDKCOption_C2Tuple_usizeTransactionZZ register_output_LDKFilter_jcall(const void
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCOption_C2Tuple_usizeTransactionZZ ret_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(ret_ptr);
-	ret_conv = COption_C2Tuple_usizeTransactionZZ_clone((LDKCOption_C2Tuple_usizeTransactionZZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 static void LDKFilter_JCalls_cloned(LDKFilter* new_obj) {
@@ -5893,6 +5462,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Filter_register_output(uint3
 	LDKWatchedOutput output_conv;
 	output_conv.inner = (void*)(output & (~1));
 	output_conv.is_owned = (output & 1) || (output == 0);
+	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);
@@ -5915,9 +5485,6 @@ uint32_t __attribute__((visibility("default"))) TS_LDKCOption_FilterZ_ref_from_p
 		default: abort();
 	}
 }
-jboolean  __attribute__((visibility("default"))) TS_LDKCResult_LockedChannelMonitorNoneZ_result_ok(uint32_t arg) {
-	return ((LDKCResult_LockedChannelMonitorNoneZ*)arg)->result_ok;
-}
 uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_LockedChannelMonitorNoneZ_get_ok(uint32_t arg) {
 	LDKCResult_LockedChannelMonitorNoneZ *val = (LDKCResult_LockedChannelMonitorNoneZ*)(arg & ~1);
 	CHECK(val->result_ok);
@@ -5925,6 +5492,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LDKCResult_LockedChannelMoni
 	uint64_t res_ref = 0;
 	CHECK((((uint64_t)res_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&res_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(res_var);
 	res_ref = (uint64_t)res_var.inner & ~1;
 	return res_ref;
 }
@@ -5933,25 +5501,6 @@ void  __attribute__((visibility("default"))) TS_LDKCResult_LockedChannelMonitorN
 	CHECK(!val->result_ok);
 	return *val->contents.err;
 }
-uint32_t  __attribute__((visibility("default"))) TS_LDKCVec_OutPointZ_new(uint32_tArray elems) {
-	LDKCVec_OutPointZ *ret = MALLOC(sizeof(LDKCVec_OutPointZ), "LDKCVec_OutPointZ");
-	ret->datalen = *((uint32_t*)elems);
-	if (ret->datalen == 0) {
-		ret->data = NULL;
-	} else {
-		ret->data = MALLOC(sizeof(LDKOutPoint) * ret->datalen, "LDKCVec_OutPointZ Data");
-		uint32_t *java_elems = (uint32_t*)(elems + 4);
-		for (size_t i = 0; i < ret->datalen; i++) {
-			uint32_t arr_elem = java_elems[i];
-			LDKOutPoint arr_elem_conv;
-			arr_elem_conv.inner = (void*)(arr_elem & (~1));
-			arr_elem_conv.is_owned = (arr_elem & 1) || (arr_elem == 0);
-			arr_elem_conv = OutPoint_clone(&arr_elem_conv);
-			ret->data[i] = arr_elem_conv;
-		}
-	}
-	return (uint64_t)ret;
-}
 static inline LDKCVec_OutPointZ CVec_OutPointZ_clone(const LDKCVec_OutPointZ *orig) {
 	LDKCVec_OutPointZ ret = { .data = MALLOC(sizeof(LDKOutPoint) * orig->datalen, "LDKCVec_OutPointZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
@@ -5985,7 +5534,7 @@ LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_LDKMessageSendEventsP
 		void* ret_conv_18_ptr = (void*)(((uint64_t)ret_conv_18) & ~1);
 		CHECK_ACCESS(ret_conv_18_ptr);
 		LDKMessageSendEvent ret_conv_18_conv = *(LDKMessageSendEvent*)(ret_conv_18_ptr);
-		ret_conv_18_conv = MessageSendEvent_clone((LDKMessageSendEvent*)(((uint64_t)ret_conv_18) & ~1));
+		FREE((void*)ret_conv_18);
 		ret_constr.data[s] = ret_conv_18_conv;
 	}
 	return ret_constr;
@@ -6367,6 +5916,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(con
 	uint64_t channel_id_ref = 0;
 	CHECK((((uint64_t)channel_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&channel_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_var);
 	channel_id_ref = (uint64_t)channel_id_var.inner;
 	if (channel_id_var.is_owned) {
 		channel_id_ref |= 1;
@@ -6376,6 +5926,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(con
 	data_var = ChannelMonitor_clone(data);
 	CHECK((((uint64_t)data_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&data_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(data_var);
 	data_ref = (uint64_t)data_var.inner;
 	if (data_var.is_owned) {
 		data_ref |= 1;
@@ -6384,6 +5935,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(con
 	uint64_t update_id_ref = 0;
 	CHECK((((uint64_t)update_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&update_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_var);
 	update_id_ref = (uint64_t)update_id_var.inner;
 	if (update_id_var.is_owned) {
 		update_id_ref |= 1;
@@ -6392,7 +5944,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(con
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr);
-	ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone((LDKCResult_NoneChannelMonitorUpdateErrZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)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) {
@@ -6401,6 +5953,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcal
 	uint64_t channel_id_ref = 0;
 	CHECK((((uint64_t)channel_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&channel_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_var);
 	channel_id_ref = (uint64_t)channel_id_var.inner;
 	if (channel_id_var.is_owned) {
 		channel_id_ref |= 1;
@@ -6411,6 +5964,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcal
 		update_var = ChannelMonitorUpdate_clone(update);
 		CHECK((((uint64_t)update_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&update_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(update_var);
 		update_ref = (uint64_t)update_var.inner;
 		if (update_var.is_owned) {
 			update_ref |= 1;
@@ -6421,6 +5975,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcal
 	data_var = ChannelMonitor_clone(data);
 	CHECK((((uint64_t)data_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&data_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(data_var);
 	data_ref = (uint64_t)data_var.inner;
 	if (data_var.is_owned) {
 		data_ref |= 1;
@@ -6429,6 +5984,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcal
 	uint64_t update_id_ref = 0;
 	CHECK((((uint64_t)update_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&update_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_var);
 	update_id_ref = (uint64_t)update_id_var.inner;
 	if (update_id_var.is_owned) {
 		update_id_ref |= 1;
@@ -6437,7 +5993,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcal
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr);
-	ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone((LDKCResult_NoneChannelMonitorUpdateErrZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 static void LDKPersist_JCalls_cloned(LDKPersist* new_obj) {
@@ -6469,13 +6025,16 @@ uint32_t  __attribute__((visibility("default"))) TS_Persist_persist_new_channel(
 	LDKOutPoint channel_id_conv;
 	channel_id_conv.inner = (void*)(channel_id & (~1));
 	channel_id_conv.is_owned = (channel_id & 1) || (channel_id == 0);
+	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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(data_conv);
 	LDKMonitorUpdateId update_id_conv;
 	update_id_conv.inner = (void*)(update_id & (~1));
 	update_id_conv.is_owned = (update_id & 1) || (update_id == 0);
+	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);
@@ -6489,16 +6048,20 @@ uint32_t  __attribute__((visibility("default"))) TS_Persist_update_persisted_cha
 	LDKOutPoint channel_id_conv;
 	channel_id_conv.inner = (void*)(channel_id & (~1));
 	channel_id_conv.is_owned = (channel_id & 1) || (channel_id == 0);
+	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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(update_conv);
 	LDKChannelMonitor data_conv;
 	data_conv.inner = (void*)(data & (~1));
 	data_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(data_conv);
 	LDKMonitorUpdateId update_id_conv;
 	update_id_conv.inner = (void*)(update_id & (~1));
 	update_id_conv.is_owned = (update_id & 1) || (update_id == 0);
+	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);
@@ -6563,6 +6126,7 @@ void handle_open_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LD
 	uint64_t their_features_ref = 0;
 	CHECK((((uint64_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var);
 	their_features_ref = (uint64_t)their_features_var.inner;
 	if (their_features_var.is_owned) {
 		their_features_ref |= 1;
@@ -6572,6 +6136,7 @@ void handle_open_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LD
 	msg_var = OpenChannel_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6586,6 +6151,7 @@ void handle_accept_channel_LDKChannelMessageHandler_jcall(const void* this_arg,
 	uint64_t their_features_ref = 0;
 	CHECK((((uint64_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var);
 	their_features_ref = (uint64_t)their_features_var.inner;
 	if (their_features_var.is_owned) {
 		their_features_ref |= 1;
@@ -6595,6 +6161,7 @@ void handle_accept_channel_LDKChannelMessageHandler_jcall(const void* this_arg,
 	msg_var = AcceptChannel_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6610,6 +6177,7 @@ void handle_funding_created_LDKChannelMessageHandler_jcall(const void* this_arg,
 	msg_var = FundingCreated_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6625,6 +6193,7 @@ void handle_funding_signed_LDKChannelMessageHandler_jcall(const void* this_arg,
 	msg_var = FundingSigned_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6640,6 +6209,7 @@ void handle_funding_locked_LDKChannelMessageHandler_jcall(const void* this_arg,
 	msg_var = FundingLocked_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6655,6 +6225,7 @@ void handle_shutdown_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPub
 	their_features_var = InitFeatures_clone(their_features);
 	CHECK((((uint64_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var);
 	their_features_ref = (uint64_t)their_features_var.inner;
 	if (their_features_var.is_owned) {
 		their_features_ref |= 1;
@@ -6664,6 +6235,7 @@ void handle_shutdown_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPub
 	msg_var = Shutdown_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6679,6 +6251,7 @@ void handle_closing_signed_LDKChannelMessageHandler_jcall(const void* this_arg,
 	msg_var = ClosingSigned_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6694,6 +6267,7 @@ void handle_update_add_htlc_LDKChannelMessageHandler_jcall(const void* this_arg,
 	msg_var = UpdateAddHTLC_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6709,6 +6283,7 @@ void handle_update_fulfill_htlc_LDKChannelMessageHandler_jcall(const void* this_
 	msg_var = UpdateFulfillHTLC_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6724,6 +6299,7 @@ void handle_update_fail_htlc_LDKChannelMessageHandler_jcall(const void* this_arg
 	msg_var = UpdateFailHTLC_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6739,6 +6315,7 @@ void handle_update_fail_malformed_htlc_LDKChannelMessageHandler_jcall(const void
 	msg_var = UpdateFailMalformedHTLC_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6754,6 +6331,7 @@ void handle_commitment_signed_LDKChannelMessageHandler_jcall(const void* this_ar
 	msg_var = CommitmentSigned_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6769,6 +6347,7 @@ void handle_revoke_and_ack_LDKChannelMessageHandler_jcall(const void* this_arg,
 	msg_var = RevokeAndACK_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6784,6 +6363,7 @@ void handle_update_fee_LDKChannelMessageHandler_jcall(const void* this_arg, LDKP
 	msg_var = UpdateFee_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6799,6 +6379,7 @@ void handle_announcement_signatures_LDKChannelMessageHandler_jcall(const void* t
 	msg_var = AnnouncementSignatures_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6820,6 +6401,7 @@ void peer_connected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPubl
 	msg_var = Init_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6835,6 +6417,7 @@ void handle_channel_reestablish_LDKChannelMessageHandler_jcall(const void* this_
 	msg_var = ChannelReestablish_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6850,6 +6433,7 @@ void handle_channel_update_LDKChannelMessageHandler_jcall(const void* this_arg,
 	msg_var = ChannelUpdate_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6865,6 +6449,7 @@ void handle_error_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublic
 	msg_var = ErrorMessage_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -6924,10 +6509,12 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_ope
 	LDKInitFeatures their_features_conv;
 	their_features_conv.inner = (void*)(their_features & (~1));
 	their_features_conv.is_owned = (their_features & 1) || (their_features == 0);
+	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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_open_channel)(this_arg_conv->this_arg, their_node_id_ref, their_features_conv, &msg_conv);
 }
 
@@ -6941,10 +6528,12 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_acc
 	LDKInitFeatures their_features_conv;
 	their_features_conv.inner = (void*)(their_features & (~1));
 	their_features_conv.is_owned = (their_features & 1) || (their_features == 0);
+	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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_accept_channel)(this_arg_conv->this_arg, their_node_id_ref, their_features_conv, &msg_conv);
 }
 
@@ -6958,6 +6547,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_fun
 	LDKFundingCreated msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_funding_created)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -6971,6 +6561,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_fun
 	LDKFundingSigned msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_funding_signed)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -6984,6 +6575,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_fun
 	LDKFundingLocked msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_funding_locked)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -6997,9 +6589,11 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_shu
 	LDKInitFeatures their_features_conv;
 	their_features_conv.inner = (void*)(their_features & (~1));
 	their_features_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_conv);
 	LDKShutdown msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_shutdown)(this_arg_conv->this_arg, their_node_id_ref, &their_features_conv, &msg_conv);
 }
 
@@ -7013,6 +6607,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_clo
 	LDKClosingSigned msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_closing_signed)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7026,6 +6621,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_upd
 	LDKUpdateAddHTLC msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_update_add_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7039,6 +6635,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_upd
 	LDKUpdateFulfillHTLC msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_update_fulfill_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7052,6 +6649,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_upd
 	LDKUpdateFailHTLC msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_update_fail_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7065,6 +6663,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_upd
 	LDKUpdateFailMalformedHTLC msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_update_fail_malformed_htlc)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7078,6 +6677,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_com
 	LDKCommitmentSigned msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_commitment_signed)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7091,6 +6691,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_rev
 	LDKRevokeAndACK msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_revoke_and_ack)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7104,6 +6705,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_upd
 	LDKUpdateFee msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_update_fee)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7117,6 +6719,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_ann
 	LDKAnnouncementSignatures msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_announcement_signatures)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7140,6 +6743,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_peer_conne
 	LDKInit msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->peer_connected)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7153,6 +6757,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_cha
 	LDKChannelReestablish msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_channel_reestablish)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7166,6 +6771,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_cha
 	LDKChannelUpdate msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_channel_update)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7179,6 +6785,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMessageHandler_handle_err
 	LDKErrorMessage msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	(this_arg_conv->handle_error)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
@@ -7219,6 +6826,7 @@ LDKCResult_boolLightningErrorZ handle_node_announcement_LDKRoutingMessageHandler
 	msg_var = NodeAnnouncement_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -7227,7 +6835,7 @@ LDKCResult_boolLightningErrorZ handle_node_announcement_LDKRoutingMessageHandler
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr);
-	ret_conv = CResult_boolLightningErrorZ_clone((LDKCResult_boolLightningErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_boolLightningErrorZ handle_channel_announcement_LDKRoutingMessageHandler_jcall(const void* this_arg, const LDKChannelAnnouncement * msg) {
@@ -7237,6 +6845,7 @@ LDKCResult_boolLightningErrorZ handle_channel_announcement_LDKRoutingMessageHand
 	msg_var = ChannelAnnouncement_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -7245,7 +6854,7 @@ LDKCResult_boolLightningErrorZ handle_channel_announcement_LDKRoutingMessageHand
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr);
-	ret_conv = CResult_boolLightningErrorZ_clone((LDKCResult_boolLightningErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_boolLightningErrorZ handle_channel_update_LDKRoutingMessageHandler_jcall(const void* this_arg, const LDKChannelUpdate * msg) {
@@ -7255,6 +6864,7 @@ LDKCResult_boolLightningErrorZ handle_channel_update_LDKRoutingMessageHandler_jc
 	msg_var = ChannelUpdate_clone(msg);
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -7263,7 +6873,7 @@ LDKCResult_boolLightningErrorZ handle_channel_update_LDKRoutingMessageHandler_jc
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr);
-	ret_conv = CResult_boolLightningErrorZ_clone((LDKCResult_boolLightningErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)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) {
@@ -7281,7 +6891,7 @@ LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel
 		void* ret_conv_59_ptr = (void*)(((uint64_t)ret_conv_59) & ~1);
 		CHECK_ACCESS(ret_conv_59_ptr);
 		LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ ret_conv_59_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(ret_conv_59_ptr);
-		ret_conv_59_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone((LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(((uint64_t)ret_conv_59) & ~1));
+		FREE((void*)ret_conv_59);
 		ret_constr.data[h] = ret_conv_59_conv;
 	}
 	return ret_constr;
@@ -7303,7 +6913,7 @@ LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_j
 		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 = NodeAnnouncement_clone(&ret_conv_18_conv);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_18_conv);
 		ret_constr.data[s] = ret_conv_18_conv;
 	}
 	return ret_constr;
@@ -7317,6 +6927,7 @@ void sync_routing_table_LDKRoutingMessageHandler_jcall(const void* this_arg, LDK
 	init_var = Init_clone(init);
 	CHECK((((uint64_t)init_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&init_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(init_var);
 	init_ref = (uint64_t)init_var.inner;
 	if (init_var.is_owned) {
 		init_ref |= 1;
@@ -7331,6 +6942,7 @@ LDKCResult_NoneLightningErrorZ handle_reply_channel_range_LDKRoutingMessageHandl
 	uint64_t msg_ref = 0;
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -7339,7 +6951,7 @@ LDKCResult_NoneLightningErrorZ handle_reply_channel_range_LDKRoutingMessageHandl
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr);
-	ret_conv = CResult_NoneLightningErrorZ_clone((LDKCResult_NoneLightningErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKReplyShortChannelIdsEnd msg) {
@@ -7350,6 +6962,7 @@ LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMess
 	uint64_t msg_ref = 0;
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -7358,7 +6971,7 @@ LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMess
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr);
-	ret_conv = CResult_NoneLightningErrorZ_clone((LDKCResult_NoneLightningErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKQueryChannelRange msg) {
@@ -7369,6 +6982,7 @@ LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandl
 	uint64_t msg_ref = 0;
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -7377,7 +6991,7 @@ LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandl
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr);
-	ret_conv = CResult_NoneLightningErrorZ_clone((LDKCResult_NoneLightningErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKQueryShortChannelIds msg) {
@@ -7388,6 +7002,7 @@ LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageH
 	uint64_t msg_ref = 0;
 	CHECK((((uint64_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 	msg_ref = (uint64_t)msg_var.inner;
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
@@ -7396,7 +7011,7 @@ LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageH
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr);
-	ret_conv = CResult_NoneLightningErrorZ_clone((LDKCResult_NoneLightningErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 static void LDKRoutingMessageHandler_JCalls_cloned(LDKRoutingMessageHandler* new_obj) {
@@ -7439,6 +7054,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle
 	LDKNodeAnnouncement msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_node_announcement)(this_arg_conv->this_arg, &msg_conv);
 	return (uint64_t)ret_conv;
@@ -7451,6 +7067,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle
 	LDKChannelAnnouncement msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_channel_announcement)(this_arg_conv->this_arg, &msg_conv);
 	return (uint64_t)ret_conv;
@@ -7463,6 +7080,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle
 	LDKChannelUpdate msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_channel_update)(this_arg_conv->this_arg, &msg_conv);
 	return (uint64_t)ret_conv;
@@ -7502,6 +7120,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_RoutingMessageHandler_g
 		uint64_t ret_conv_18_ref = 0;
 		CHECK((((uint64_t)ret_conv_18_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_18_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_18_var);
 		ret_conv_18_ref = (uint64_t)ret_conv_18_var.inner;
 		if (ret_conv_18_var.is_owned) {
 			ret_conv_18_ref |= 1;
@@ -7523,6 +7142,7 @@ void  __attribute__((visibility("default"))) TS_RoutingMessageHandler_sync_routi
 	LDKInit init_conv;
 	init_conv.inner = (void*)(init & (~1));
 	init_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(init_conv);
 	(this_arg_conv->sync_routing_table)(this_arg_conv->this_arg, their_node_id_ref, &init_conv);
 }
 
@@ -7536,6 +7156,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle
 	LDKReplyChannelRange msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -7552,6 +7173,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle
 	LDKReplyShortChannelIdsEnd msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -7568,6 +7190,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle
 	LDKQueryChannelRange msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -7584,6 +7207,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RoutingMessageHandler_handle
 	LDKQueryShortChannelIds msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -7610,7 +7234,7 @@ LDKCResult_COption_TypeZDecodeErrorZ read_LDKCustomMessageReader_jcall(const voi
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_COption_TypeZDecodeErrorZ ret_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(ret_ptr);
-	ret_conv = CResult_COption_TypeZDecodeErrorZ_clone((LDKCResult_COption_TypeZDecodeErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 static void LDKCustomMessageReader_JCalls_cloned(LDKCustomMessageReader* new_obj) {
@@ -7670,7 +7294,7 @@ LDKCResult_NoneLightningErrorZ handle_custom_message_LDKCustomMessageHandler_jca
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr);
-	ret_conv = CResult_NoneLightningErrorZ_clone((LDKCResult_NoneLightningErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCVec_C2Tuple_PublicKeyTypeZZ get_and_clear_pending_msg_LDKCustomMessageHandler_jcall(const void* this_arg) {
@@ -7688,7 +7312,7 @@ LDKCVec_C2Tuple_PublicKeyTypeZZ get_and_clear_pending_msg_LDKCustomMessageHandle
 		void* ret_conv_25_ptr = (void*)(((uint64_t)ret_conv_25) & ~1);
 		CHECK_ACCESS(ret_conv_25_ptr);
 		LDKC2Tuple_PublicKeyTypeZ ret_conv_25_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(ret_conv_25_ptr);
-		ret_conv_25_conv = C2Tuple_PublicKeyTypeZ_clone((LDKC2Tuple_PublicKeyTypeZ*)(((uint64_t)ret_conv_25) & ~1));
+		FREE((void*)ret_conv_25);
 		ret_constr.data[z] = ret_conv_25_conv;
 	}
 	return ret_constr;
@@ -7844,6 +7468,7 @@ typedef struct LDKScore_JCalls {
 	atomic_size_t refcnt;
 	uint32_t channel_penalty_msat_meth;
 	uint32_t payment_path_failed_meth;
+	uint32_t payment_path_successful_meth;
 	uint32_t write_meth;
 } LDKScore_JCalls;
 static void LDKScore_JCalls_free(void* this_arg) {
@@ -7851,17 +7476,22 @@ static void LDKScore_JCalls_free(void* this_arg) {
 	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
 		js_free(j_calls->channel_penalty_msat_meth);
 		js_free(j_calls->payment_path_failed_meth);
+		js_free(j_calls->payment_path_successful_meth);
 		js_free(j_calls->write_meth);
 		FREE(j_calls);
 	}
 }
-uint64_t channel_penalty_msat_LDKScore_jcall(const void* this_arg, uint64_t short_channel_id, const LDKNodeId * source, const LDKNodeId * target) {
+uint64_t channel_penalty_msat_LDKScore_jcall(const void* this_arg, uint64_t short_channel_id, uint64_t send_amt_msat, LDKCOption_u64Z channel_capacity_msat, const LDKNodeId * source, const LDKNodeId * target) {
 	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg;
+	LDKCOption_u64Z *channel_capacity_msat_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
+	*channel_capacity_msat_copy = channel_capacity_msat;
+	uint64_t channel_capacity_msat_ref = (uint64_t)channel_capacity_msat_copy;
 	LDKNodeId source_var = *source;
 	uint64_t source_ref = 0;
 	source_var = NodeId_clone(source);
 	CHECK((((uint64_t)source_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&source_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(source_var);
 	source_ref = (uint64_t)source_var.inner;
 	if (source_var.is_owned) {
 		source_ref |= 1;
@@ -7871,11 +7501,12 @@ uint64_t channel_penalty_msat_LDKScore_jcall(const void* this_arg, uint64_t shor
 	target_var = NodeId_clone(target);
 	CHECK((((uint64_t)target_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&target_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(target_var);
 	target_ref = (uint64_t)target_var.inner;
 	if (target_var.is_owned) {
 		target_ref |= 1;
 	}
-	return js_invoke_function_3(j_calls->channel_penalty_msat_meth, short_channel_id, source_ref, target_ref);
+	return js_invoke_function_5(j_calls->channel_penalty_msat_meth, short_channel_id, send_amt_msat, channel_capacity_msat_ref, source_ref, target_ref);
 }
 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;
@@ -7888,6 +7519,7 @@ void payment_path_failed_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path,
 		uint64_t path_conv_10_ref = 0;
 		CHECK((((uint64_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
 		path_conv_10_ref = (uint64_t)path_conv_10_var.inner;
 		if (path_conv_10_var.is_owned) {
 			path_conv_10_ref |= 1;
@@ -7898,6 +7530,28 @@ void payment_path_failed_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path,
 	FREE(path_var.data);
 	js_invoke_function_2(j_calls->payment_path_failed_meth, path_arr, short_channel_id);
 }
+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_arr(path_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
+	uint32_t *path_arr_ptr = (uint32_t*)(path_arr + 4);
+	for (size_t k = 0; k < path_var.datalen; k++) {
+		LDKRouteHop path_conv_10_var = path_var.data[k];
+		uint64_t path_conv_10_ref = 0;
+		CHECK((((uint64_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+		CHECK((((uint64_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
+		path_conv_10_ref = (uint64_t)path_conv_10_var.inner;
+		if (path_conv_10_var.is_owned) {
+			path_conv_10_ref |= 1;
+		}
+		path_arr_ptr[k] = path_conv_10_ref;
+	}
+	
+	FREE(path_var.data);
+	js_invoke_function_1(j_calls->payment_path_successful_meth, path_arr);
+}
 LDKCVec_u8Z write_LDKScore_jcall(const void* this_arg) {
 	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg;
 	int8_tArray ret = js_invoke_function_0(j_calls->write_meth);
@@ -7920,6 +7574,7 @@ static inline LDKScore LDKScore_init (/*TODO: JS Object Reference */void* o) {
 		.this_arg = (void*) calls,
 		.channel_penalty_msat = channel_penalty_msat_LDKScore_jcall,
 		.payment_path_failed = payment_path_failed_LDKScore_jcall,
+		.payment_path_successful = payment_path_successful_LDKScore_jcall,
 		.write = write_LDKScore_jcall,
 		.free = LDKScore_JCalls_free,
 	};
@@ -7930,17 +7585,23 @@ long  __attribute__((visibility("default"))) TS_LDKScore_new(/*TODO: JS Object R
 	*res_ptr = LDKScore_init(o);
 	return (long)res_ptr;
 }
-int64_t  __attribute__((visibility("default"))) TS_Score_channel_penalty_msat(uint32_t this_arg, int64_t short_channel_id, uint32_t source, uint32_t target) {
+int64_t  __attribute__((visibility("default"))) TS_Score_channel_penalty_msat(uint32_t this_arg, int64_t short_channel_id, int64_t send_amt_msat, uint32_t channel_capacity_msat, uint32_t source, uint32_t target) {
 	void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr;
+	void* channel_capacity_msat_ptr = (void*)(((uint64_t)channel_capacity_msat) & ~1);
+	CHECK_ACCESS(channel_capacity_msat_ptr);
+	LDKCOption_u64Z channel_capacity_msat_conv = *(LDKCOption_u64Z*)(channel_capacity_msat_ptr);
+	channel_capacity_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)channel_capacity_msat) & ~1));
 	LDKNodeId source_conv;
 	source_conv.inner = (void*)(source & (~1));
 	source_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(source_conv);
 	LDKNodeId target_conv;
 	target_conv.inner = (void*)(target & (~1));
 	target_conv.is_owned = false;
-	int64_t ret_val = (this_arg_conv->channel_penalty_msat)(this_arg_conv->this_arg, short_channel_id, &source_conv, &target_conv);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(target_conv);
+	int64_t ret_val = (this_arg_conv->channel_penalty_msat)(this_arg_conv->this_arg, short_channel_id, send_amt_msat, channel_capacity_msat_conv, &source_conv, &target_conv);
 	return ret_val;
 }
 
@@ -7960,12 +7621,36 @@ void  __attribute__((visibility("default"))) TS_Score_payment_path_failed(uint32
 		LDKRouteHop path_conv_10_conv;
 		path_conv_10_conv.inner = (void*)(path_conv_10 & (~1));
 		path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv);
 		path_conv_10_conv = RouteHop_clone(&path_conv_10_conv);
 		path_constr.data[k] = path_conv_10_conv;
 	}
 	(this_arg_conv->payment_path_failed)(this_arg_conv->this_arg, path_constr, short_channel_id);
 }
 
+void  __attribute__((visibility("default"))) TS_Score_payment_path_successful(uint32_t this_arg, uint32_tArray path) {
+	void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr;
+	LDKCVec_RouteHopZ path_constr;
+	path_constr.datalen = *((uint32_t*)path);
+	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 = (uint32_t*)(path + 4);
+	for (size_t k = 0; k < path_constr.datalen; k++) {
+		uint32_t path_conv_10 = path_vals[k];
+		LDKRouteHop path_conv_10_conv;
+		path_conv_10_conv.inner = (void*)(path_conv_10 & (~1));
+		path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv);
+		path_conv_10_conv = RouteHop_clone(&path_conv_10_conv);
+		path_constr.data[k] = path_conv_10_conv;
+	}
+	(this_arg_conv->payment_path_successful)(this_arg_conv->this_arg, path_constr);
+}
+
 int8_tArray  __attribute__((visibility("default"))) TS_Score_write(uint32_t this_arg) {
 	void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
@@ -7977,33 +7662,84 @@ int8_tArray  __attribute__((visibility("default"))) TS_Score_write(uint32_t this
 	return ret_arr;
 }
 
-typedef struct LDKChannelManagerPersister_JCalls {
+typedef struct LDKLockableScore_JCalls {
 	atomic_size_t refcnt;
-	uint32_t persist_manager_meth;
-} LDKChannelManagerPersister_JCalls;
-static void LDKChannelManagerPersister_JCalls_free(void* this_arg) {
-	LDKChannelManagerPersister_JCalls *j_calls = (LDKChannelManagerPersister_JCalls*) this_arg;
+	uint32_t lock_meth;
+} LDKLockableScore_JCalls;
+static void LDKLockableScore_JCalls_free(void* this_arg) {
+	LDKLockableScore_JCalls *j_calls = (LDKLockableScore_JCalls*) this_arg;
 	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
-		js_free(j_calls->persist_manager_meth);
+		js_free(j_calls->lock_meth);
 		FREE(j_calls);
 	}
 }
-LDKCResult_NoneErrorZ persist_manager_LDKChannelManagerPersister_jcall(const void* this_arg, const LDKChannelManager * channel_manager) {
-	LDKChannelManagerPersister_JCalls *j_calls = (LDKChannelManagerPersister_JCalls*) this_arg;
-	LDKChannelManager channel_manager_var = *channel_manager;
-	uint64_t channel_manager_ref = 0;
-	// Warning: we may need a move here but no clone is available for LDKChannelManager
-	CHECK((((uint64_t)channel_manager_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uint64_t)&channel_manager_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	channel_manager_ref = (uint64_t)channel_manager_var.inner;
-	if (channel_manager_var.is_owned) {
-		channel_manager_ref |= 1;
+LDKScore lock_LDKLockableScore_jcall(const void* this_arg) {
+	LDKLockableScore_JCalls *j_calls = (LDKLockableScore_JCalls*) this_arg;
+	uint32_t ret = js_invoke_function_0(j_calls->lock_meth);
+	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
+	CHECK_ACCESS(ret_ptr);
+	LDKScore ret_conv = *(LDKScore*)(ret_ptr);// Warning: we may need a move here but no clone is available for LDKScore
+	
+	return ret_conv;
+}
+static void LDKLockableScore_JCalls_cloned(LDKLockableScore* new_obj) {
+	LDKLockableScore_JCalls *j_calls = (LDKLockableScore_JCalls*) new_obj->this_arg;
+	atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);
+}
+static inline LDKLockableScore LDKLockableScore_init (/*TODO: JS Object Reference */void* o) {
+	LDKLockableScore_JCalls *calls = MALLOC(sizeof(LDKLockableScore_JCalls), "LDKLockableScore_JCalls");
+	atomic_init(&calls->refcnt, 1);
+	//TODO: Assign calls->o from o
+
+	LDKLockableScore ret = {
+		.this_arg = (void*) calls,
+		.lock = lock_LDKLockableScore_jcall,
+		.free = LDKLockableScore_JCalls_free,
+	};
+	return ret;
+}
+long  __attribute__((visibility("default"))) TS_LDKLockableScore_new(/*TODO: JS Object Reference */void* o) {
+	LDKLockableScore *res_ptr = MALLOC(sizeof(LDKLockableScore), "LDKLockableScore");
+	*res_ptr = LDKLockableScore_init(o);
+	return (long)res_ptr;
+}
+uint32_t  __attribute__((visibility("default"))) TS_LockableScore_lock(uint32_t this_arg) {
+	void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKLockableScore* this_arg_conv = (LDKLockableScore*)this_arg_ptr;
+	LDKScore* ret_ret = MALLOC(sizeof(LDKScore), "LDKScore");
+	*ret_ret = (this_arg_conv->lock)(this_arg_conv->this_arg);
+	return (uint64_t)ret_ret;
+}
+
+typedef struct LDKChannelManagerPersister_JCalls {
+	atomic_size_t refcnt;
+	uint32_t persist_manager_meth;
+} LDKChannelManagerPersister_JCalls;
+static void LDKChannelManagerPersister_JCalls_free(void* this_arg) {
+	LDKChannelManagerPersister_JCalls *j_calls = (LDKChannelManagerPersister_JCalls*) this_arg;
+	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
+		js_free(j_calls->persist_manager_meth);
+		FREE(j_calls);
+	}
+}
+LDKCResult_NoneErrorZ persist_manager_LDKChannelManagerPersister_jcall(const void* this_arg, const LDKChannelManager * channel_manager) {
+	LDKChannelManagerPersister_JCalls *j_calls = (LDKChannelManagerPersister_JCalls*) this_arg;
+	LDKChannelManager channel_manager_var = *channel_manager;
+	uint64_t channel_manager_ref = 0;
+	// Warning: we may need a move here but no clone is available for LDKChannelManager
+	CHECK((((uint64_t)channel_manager_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_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 = (uint64_t)channel_manager_var.inner;
+	if (channel_manager_var.is_owned) {
+		channel_manager_ref |= 1;
 	}
 	uint32_t ret = js_invoke_function_1(j_calls->persist_manager_meth, channel_manager_ref);
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr);
-	ret_conv = CResult_NoneErrorZ_clone((LDKCResult_NoneErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 static void LDKChannelManagerPersister_JCalls_cloned(LDKChannelManagerPersister* new_obj) {
@@ -8034,6 +7770,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManagerPersister_pers
 	LDKChannelManager channel_manager_conv;
 	channel_manager_conv.inner = (void*)(channel_manager & (~1));
 	channel_manager_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_manager_conv);
 	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 (uint64_t)ret_conv;
@@ -8067,7 +7804,9 @@ typedef struct LDKPayer_JCalls {
 	uint32_t node_id_meth;
 	uint32_t first_hops_meth;
 	uint32_t send_payment_meth;
+	uint32_t send_spontaneous_payment_meth;
 	uint32_t retry_payment_meth;
+	uint32_t abandon_payment_meth;
 } LDKPayer_JCalls;
 static void LDKPayer_JCalls_free(void* this_arg) {
 	LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg;
@@ -8075,7 +7814,9 @@ static void LDKPayer_JCalls_free(void* this_arg) {
 		js_free(j_calls->node_id_meth);
 		js_free(j_calls->first_hops_meth);
 		js_free(j_calls->send_payment_meth);
+		js_free(j_calls->send_spontaneous_payment_meth);
 		js_free(j_calls->retry_payment_meth);
+		js_free(j_calls->abandon_payment_meth);
 		FREE(j_calls);
 	}
 }
@@ -8102,7 +7843,7 @@ LDKCVec_ChannelDetailsZ first_hops_LDKPayer_jcall(const void* this_arg) {
 		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 = ChannelDetails_clone(&ret_conv_16_conv);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_conv);
 		ret_constr.data[q] = ret_conv_16_conv;
 	}
 	return ret_constr;
@@ -8114,6 +7855,7 @@ LDKCResult_PaymentIdPaymentSendFailureZ send_payment_LDKPayer_jcall(const void*
 	route_var = Route_clone(route);
 	CHECK((((uint64_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_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 = (uint64_t)route_var.inner;
 	if (route_var.is_owned) {
 		route_ref |= 1;
@@ -8126,7 +7868,28 @@ LDKCResult_PaymentIdPaymentSendFailureZ send_payment_LDKPayer_jcall(const void*
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_PaymentIdPaymentSendFailureZ ret_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(ret_ptr);
-	ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone((LDKCResult_PaymentIdPaymentSendFailureZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)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;
+	uint64_t route_ref = 0;
+	route_var = Route_clone(route);
+	CHECK((((uint64_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_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 = (uint64_t)route_var.inner;
+	if (route_var.is_owned) {
+		route_ref |= 1;
+	}
+	int8_tArray payment_preimage_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+	memcpy((uint8_t*)(payment_preimage_arr + 4), payment_preimage.data, 32);
+	uint32_t ret = js_invoke_function_2(j_calls->send_spontaneous_payment_meth, route_ref, payment_preimage_arr);
+	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
+	CHECK_ACCESS(ret_ptr);
+	LDKCResult_PaymentIdPaymentSendFailureZ ret_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(ret_ptr);
+	FREE((void*)ret);
 	return ret_conv;
 }
 LDKCResult_NonePaymentSendFailureZ retry_payment_LDKPayer_jcall(const void* this_arg, const LDKRoute * route, LDKThirtyTwoBytes payment_id) {
@@ -8136,6 +7899,7 @@ LDKCResult_NonePaymentSendFailureZ retry_payment_LDKPayer_jcall(const void* this
 	route_var = Route_clone(route);
 	CHECK((((uint64_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_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 = (uint64_t)route_var.inner;
 	if (route_var.is_owned) {
 		route_ref |= 1;
@@ -8146,9 +7910,15 @@ LDKCResult_NonePaymentSendFailureZ retry_payment_LDKPayer_jcall(const void* this
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NonePaymentSendFailureZ ret_conv = *(LDKCResult_NonePaymentSendFailureZ*)(ret_ptr);
-	ret_conv = CResult_NonePaymentSendFailureZ_clone((LDKCResult_NonePaymentSendFailureZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
+void abandon_payment_LDKPayer_jcall(const void* this_arg, LDKThirtyTwoBytes payment_id) {
+	LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg;
+	int8_tArray payment_id_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+	memcpy((uint8_t*)(payment_id_arr + 4), payment_id.data, 32);
+	js_invoke_function_1(j_calls->abandon_payment_meth, payment_id_arr);
+}
 static void LDKPayer_JCalls_cloned(LDKPayer* new_obj) {
 	LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) new_obj->this_arg;
 	atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);
@@ -8163,7 +7933,9 @@ static inline LDKPayer LDKPayer_init (/*TODO: JS Object Reference */void* o) {
 		.node_id = node_id_LDKPayer_jcall,
 		.first_hops = first_hops_LDKPayer_jcall,
 		.send_payment = send_payment_LDKPayer_jcall,
+		.send_spontaneous_payment = send_spontaneous_payment_LDKPayer_jcall,
 		.retry_payment = retry_payment_LDKPayer_jcall,
+		.abandon_payment = abandon_payment_LDKPayer_jcall,
 		.free = LDKPayer_JCalls_free,
 	};
 	return ret;
@@ -8195,6 +7967,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_Payer_first_hops(uint32
 		uint64_t ret_conv_16_ref = 0;
 		CHECK((((uint64_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var);
 		ret_conv_16_ref = (uint64_t)ret_conv_16_var.inner;
 		if (ret_conv_16_var.is_owned) {
 			ret_conv_16_ref |= 1;
@@ -8213,6 +7986,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Payer_send_payment(uint32_t
 	LDKRoute route_conv;
 	route_conv.inner = (void*)(route & (~1));
 	route_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv);
 	LDKThirtyTwoBytes payment_hash_ref;
 	CHECK(*((uint32_t*)payment_hash) == 32);
 	memcpy(payment_hash_ref.data, (uint8_t*)(payment_hash + 4), 32);
@@ -8224,6 +7998,22 @@ uint32_t  __attribute__((visibility("default"))) TS_Payer_send_payment(uint32_t
 	return (uint64_t)ret_conv;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_Payer_send_spontaneous_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_preimage) {
+	void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { 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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv);
+	LDKThirtyTwoBytes payment_preimage_ref;
+	CHECK(*((uint32_t*)payment_preimage) == 32);
+	memcpy(payment_preimage_ref.data, (uint8_t*)(payment_preimage + 4), 32);
+	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 (uint64_t)ret_conv;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Payer_retry_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_id) {
 	void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
@@ -8231,6 +8021,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Payer_retry_payment(uint32_t
 	LDKRoute route_conv;
 	route_conv.inner = (void*)(route & (~1));
 	route_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv);
 	LDKThirtyTwoBytes payment_id_ref;
 	CHECK(*((uint32_t*)payment_id) == 32);
 	memcpy(payment_id_ref.data, (uint8_t*)(payment_id + 4), 32);
@@ -8239,6 +8030,16 @@ uint32_t  __attribute__((visibility("default"))) TS_Payer_retry_payment(uint32_t
 	return (uint64_t)ret_conv;
 }
 
+void  __attribute__((visibility("default"))) TS_Payer_abandon_payment(uint32_t this_arg, int8_tArray payment_id) {
+	void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKPayer* this_arg_conv = (LDKPayer*)this_arg_ptr;
+	LDKThirtyTwoBytes payment_id_ref;
+	CHECK(*((uint32_t*)payment_id) == 32);
+	memcpy(payment_id_ref.data, (uint8_t*)(payment_id + 4), 32);
+	(this_arg_conv->abandon_payment)(this_arg_conv->this_arg, payment_id_ref);
+}
+
 typedef struct LDKRouter_JCalls {
 	atomic_size_t refcnt;
 	uint32_t find_route_meth;
@@ -8250,7 +8051,7 @@ static void LDKRouter_JCalls_free(void* this_arg) {
 		FREE(j_calls);
 	}
 }
-LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg, LDKPublicKey payer, const LDKRouteParameters * params, LDKCVec_ChannelDetailsZ * first_hops, const LDKScore * scorer) {
+LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg, LDKPublicKey payer, const LDKRouteParameters * params, const uint8_t (* payment_hash)[32], LDKCVec_ChannelDetailsZ * first_hops, const LDKScore * scorer) {
 	LDKRouter_JCalls *j_calls = (LDKRouter_JCalls*) this_arg;
 	int8_tArray payer_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(payer_arr + 4), payer.compressed_form, 33);
@@ -8259,10 +8060,13 @@ LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg,
 	params_var = RouteParameters_clone(params);
 	CHECK((((uint64_t)params_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&params_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(params_var);
 	params_ref = (uint64_t)params_var.inner;
 	if (params_var.is_owned) {
 		params_ref |= 1;
 	}
+	int8_tArray payment_hash_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
+	memcpy((uint8_t*)(payment_hash_arr + 4), *payment_hash, 32);
 	LDKCVec_ChannelDetailsZ *first_hops_var_ptr = first_hops;
 	uint32_tArray first_hops_arr = NULL;
 	if (first_hops != NULL) {
@@ -8274,6 +8078,7 @@ LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg,
 			uint64_t first_hops_conv_16_ref = 0;
 			CHECK((((uint64_t)first_hops_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&first_hops_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_var);
 			first_hops_conv_16_ref = (uint64_t)first_hops_conv_16_var.inner;
 			if (first_hops_conv_16_var.is_owned) {
 				first_hops_conv_16_ref |= 1;
@@ -8284,11 +8089,11 @@ LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg,
 	}
 	// WARNING: This object doesn't live past this scope, needs clone!
 	uint64_t ret_scorer = ((uint64_t)scorer) | 1;
-	uint32_t ret = js_invoke_function_4(j_calls->find_route_meth, payer_arr, params_ref, first_hops_arr, ret_scorer);
+	uint32_t ret = js_invoke_function_5(j_calls->find_route_meth, payer_arr, params_ref, payment_hash_arr, first_hops_arr, ret_scorer);
 	void* ret_ptr = (void*)(((uint64_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_RouteLightningErrorZ ret_conv = *(LDKCResult_RouteLightningErrorZ*)(ret_ptr);
-	ret_conv = CResult_RouteLightningErrorZ_clone((LDKCResult_RouteLightningErrorZ*)(((uint64_t)ret) & ~1));
+	FREE((void*)ret);
 	return ret_conv;
 }
 static void LDKRouter_JCalls_cloned(LDKRouter* new_obj) {
@@ -8312,7 +8117,7 @@ long  __attribute__((visibility("default"))) TS_LDKRouter_new(/*TODO: JS Object
 	*res_ptr = LDKRouter_init(o);
 	return (long)res_ptr;
 }
-uint32_t  __attribute__((visibility("default"))) TS_Router_find_route(uint32_t this_arg, int8_tArray payer, uint32_t params, uint32_tArray first_hops, uint32_t scorer) {
+uint32_t  __attribute__((visibility("default"))) TS_Router_find_route(uint32_t this_arg, int8_tArray payer, uint32_t params, int8_tArray payment_hash, uint32_tArray first_hops, uint32_t scorer) {
 	void* this_arg_ptr = (void*)(((uint64_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKRouter* this_arg_conv = (LDKRouter*)this_arg_ptr;
@@ -8322,6 +8127,11 @@ uint32_t  __attribute__((visibility("default"))) TS_Router_find_route(uint32_t t
 	LDKRouteParameters params_conv;
 	params_conv.inner = (void*)(params & (~1));
 	params_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(params_conv);
+	unsigned char payment_hash_arr[32];
+	CHECK(*((uint32_t*)payment_hash) == 32);
+	memcpy(payment_hash_arr, (uint8_t*)(payment_hash + 4), 32);
+	unsigned char (*payment_hash_ref)[32] = &payment_hash_arr;
 	LDKCVec_ChannelDetailsZ first_hops_constr;
 	LDKCVec_ChannelDetailsZ *first_hops_ptr = NULL;
 	if (first_hops != 0) {
@@ -8336,6 +8146,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Router_find_route(uint32_t t
 			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);
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_conv);
 			first_hops_constr.data[q] = first_hops_conv_16_conv;
 		}
 		first_hops_ptr = &first_hops_constr;
@@ -8344,7 +8155,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Router_find_route(uint32_t t
 	if (!(scorer & 1)) { CHECK_ACCESS(scorer_ptr); }
 	LDKScore* scorer_conv = (LDKScore*)scorer_ptr;
 	LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ");
-	*ret_conv = (this_arg_conv->find_route)(this_arg_conv->this_arg, payer_ref, &params_conv, first_hops_ptr, scorer_conv);
+	*ret_conv = (this_arg_conv->find_route)(this_arg_conv->this_arg, payer_ref, &params_conv, payment_hash_ref, first_hops_ptr, scorer_conv);
 	if (first_hops_ptr != NULL) { FREE(first_hops_constr.data); }
 	return (uint64_t)ret_conv;
 }
@@ -8391,6 +8202,17 @@ void  __attribute__((visibility("default"))) TS_TxOut_free(uint32_t _res) {
 	TxOut_free(_res_conv);
 }
 
+static inline uint64_t TxOut_clone_ptr(LDKTxOut *NONNULL_PTR arg) {
+	LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut");
+	*ret_ref = TxOut_clone(arg);
+	return (uint64_t)ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_TxOut_clone_ptr(uint32_t arg) {
+	LDKTxOut* arg_conv = (LDKTxOut*)(arg & ~1);
+	int64_t ret_val = TxOut_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_TxOut_clone(uint32_t orig) {
 	LDKTxOut* orig_conv = (LDKTxOut*)(orig & ~1);
 	LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut");
@@ -8419,6 +8241,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_SecretKeyErrorZ_err(
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_SecretKeyErrorZ_is_ok(uint32_t o) {
+	LDKCResult_SecretKeyErrorZ* o_conv = (LDKCResult_SecretKeyErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_SecretKeyErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_SecretKeyErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8444,6 +8272,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PublicKeyErrorZ_err(
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_PublicKeyErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PublicKeyErrorZ* o_conv = (LDKCResult_PublicKeyErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_PublicKeyErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_PublicKeyErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8453,6 +8287,17 @@ void  __attribute__((visibility("default"))) TS_CResult_PublicKeyErrorZ_free(uin
 	CResult_PublicKeyErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PublicKeyErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PublicKeyErrorZ* arg_conv = (LDKCResult_PublicKeyErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_PublicKeyErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PublicKeyErrorZ_clone(uint32_t orig) {
 	LDKCResult_PublicKeyErrorZ* orig_conv = (LDKCResult_PublicKeyErrorZ*)(orig & ~1);
 	LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ");
@@ -8464,6 +8309,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysDecode
 	LDKTxCreationKeys o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = TxCreationKeys_clone(&o_conv);
 	LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ");
 	*ret_conv = CResult_TxCreationKeysDecodeErrorZ_ok(o_conv);
@@ -8474,12 +8320,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysDecode
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ");
 	*ret_conv = CResult_TxCreationKeysDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_TxCreationKeysDecodeErrorZ* o_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_TxCreationKeysDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8489,6 +8342,17 @@ void  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysDecodeErro
 	CResult_TxCreationKeysDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_TxCreationKeysDecodeErrorZ* arg_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_TxCreationKeysDecodeErrorZ* orig_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(orig & ~1);
 	LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ");
@@ -8500,6 +8364,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelPublicKeysDec
 	LDKChannelPublicKeys o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ChannelPublicKeys_clone(&o_conv);
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ");
 	*ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_ok(o_conv);
@@ -8510,12 +8375,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelPublicKeysDec
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ");
 	*ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelPublicKeysDecodeErrorZ* o_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ChannelPublicKeysDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8525,6 +8397,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ChannelPublicKeysDecodeE
 	CResult_ChannelPublicKeysDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelPublicKeysDecodeErrorZ* arg_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* orig_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ");
@@ -8536,6 +8419,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysErrorZ
 	LDKTxCreationKeys o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = TxCreationKeys_clone(&o_conv);
 	LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ");
 	*ret_conv = CResult_TxCreationKeysErrorZ_ok(o_conv);
@@ -8549,6 +8433,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysErrorZ
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysErrorZ_is_ok(uint32_t o) {
+	LDKCResult_TxCreationKeysErrorZ* o_conv = (LDKCResult_TxCreationKeysErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_TxCreationKeysErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8558,6 +8448,17 @@ void  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysErrorZ_fre
 	CResult_TxCreationKeysErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_TxCreationKeysErrorZ* arg_conv = (LDKCResult_TxCreationKeysErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_TxCreationKeysErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_TxCreationKeysErrorZ_clone(uint32_t orig) {
 	LDKCResult_TxCreationKeysErrorZ* orig_conv = (LDKCResult_TxCreationKeysErrorZ*)(orig & ~1);
 	LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ");
@@ -8588,6 +8489,18 @@ void  __attribute__((visibility("default"))) TS_COption_u32Z_free(uint32_t _res)
 	COption_u32Z_free(_res_conv);
 }
 
+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);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_COption_u32Z_clone_ptr(uint32_t arg) {
+	LDKCOption_u32Z* arg_conv = (LDKCOption_u32Z*)arg;
+	int64_t ret_val = COption_u32Z_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_COption_u32Z_clone(uint32_t orig) {
 	LDKCOption_u32Z* orig_conv = (LDKCOption_u32Z*)orig;
 	LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z");
@@ -8600,6 +8513,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_HTLCOutputInCommitme
 	LDKHTLCOutputInCommitment o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = HTLCOutputInCommitment_clone(&o_conv);
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ");
 	*ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(o_conv);
@@ -8610,12 +8524,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_HTLCOutputInCommitme
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ");
 	*ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* o_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8625,6 +8546,17 @@ void  __attribute__((visibility("default"))) TS_CResult_HTLCOutputInCommitmentDe
 	CResult_HTLCOutputInCommitmentDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* arg_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* orig_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(orig & ~1);
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ");
@@ -8632,10 +8564,26 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_HTLCOutputInCommitme
 	return (uint64_t)ret_conv;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_COption_NoneZ_some() {
+	uint32_t ret_conv = LDKCOption_NoneZ_to_js(COption_NoneZ_some());
+	return ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_COption_NoneZ_none() {
+	uint32_t ret_conv = LDKCOption_NoneZ_to_js(COption_NoneZ_none());
+	return ret_conv;
+}
+
+void  __attribute__((visibility("default"))) TS_COption_NoneZ_free(uint32_t _res) {
+	LDKCOption_NoneZ _res_conv = LDKCOption_NoneZ_from_js(_res);
+	COption_NoneZ_free(_res_conv);
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(uint32_t o) {
 	LDKCounterpartyChannelTransactionParameters o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = CounterpartyChannelTransactionParameters_clone(&o_conv);
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(o_conv);
@@ -8646,12 +8594,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_CounterpartyChannelT
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8661,6 +8616,17 @@ void  __attribute__((visibility("default"))) TS_CResult_CounterpartyChannelTrans
 	CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(orig & ~1);
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ");
@@ -8672,6 +8638,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelTransactionPa
 	LDKChannelTransactionParameters o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ChannelTransactionParameters_clone(&o_conv);
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_ok(o_conv);
@@ -8682,12 +8649,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelTransactionPa
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8697,6 +8671,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ChannelTransactionParame
 	CResult_ChannelTransactionParametersDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelTransactionParametersDecodeErrorZ* arg_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ");
@@ -8726,6 +8711,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_HolderCommitmentTran
 	LDKHolderCommitmentTransaction o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = HolderCommitmentTransaction_clone(&o_conv);
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_ok(o_conv);
@@ -8736,12 +8722,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_HolderCommitmentTran
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8751,6 +8744,17 @@ void  __attribute__((visibility("default"))) TS_CResult_HolderCommitmentTransact
 	CResult_HolderCommitmentTransactionDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(orig & ~1);
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ");
@@ -8762,6 +8766,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_BuiltCommitmentTrans
 	LDKBuiltCommitmentTransaction o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = BuiltCommitmentTransaction_clone(&o_conv);
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(o_conv);
@@ -8772,12 +8777,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_BuiltCommitmentTrans
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8787,6 +8799,17 @@ void  __attribute__((visibility("default"))) TS_CResult_BuiltCommitmentTransacti
 	CResult_BuiltCommitmentTransactionDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(orig & ~1);
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ");
@@ -8798,6 +8821,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TrustedClosingTransa
 	LDKTrustedClosingTransaction o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -8810,6 +8834,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TrustedClosingTransa
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_TrustedClosingTransactionNoneZ_is_ok(uint32_t o) {
+	LDKCResult_TrustedClosingTransactionNoneZ* o_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_TrustedClosingTransactionNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_TrustedClosingTransactionNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8823,6 +8853,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_CommitmentTransactio
 	LDKCommitmentTransaction o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = CommitmentTransaction_clone(&o_conv);
 	LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_CommitmentTransactionDecodeErrorZ_ok(o_conv);
@@ -8833,12 +8864,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_CommitmentTransactio
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_CommitmentTransactionDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_CommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_CommitmentTransactionDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_CommitmentTransactionDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8848,6 +8886,17 @@ void  __attribute__((visibility("default"))) TS_CResult_CommitmentTransactionDec
 	CResult_CommitmentTransactionDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_CommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_CommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(orig & ~1);
 	LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ");
@@ -8859,6 +8908,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TrustedCommitmentTra
 	LDKTrustedCommitmentTransaction o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -8871,6 +8921,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TrustedCommitmentTra
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok(uint32_t o) {
+	LDKCResult_TrustedCommitmentTransactionNoneZ* o_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_TrustedCommitmentTransactionNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_TrustedCommitmentTransactionNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8906,6 +8962,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_is_ok(uint32_t o) {
+	LDKCResult_CVec_SignatureZNoneZ* o_conv = (LDKCResult_CVec_SignatureZNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_CVec_SignatureZNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8915,6 +8977,17 @@ void  __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_fre
 	CResult_CVec_SignatureZNoneZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_CVec_SignatureZNoneZ* arg_conv = (LDKCResult_CVec_SignatureZNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_CVec_SignatureZNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_CVec_SignatureZNoneZ_clone(uint32_t orig) {
 	LDKCResult_CVec_SignatureZNoneZ* orig_conv = (LDKCResult_CVec_SignatureZNoneZ*)(orig & ~1);
 	LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ");
@@ -8926,6 +8999,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptDecode
 	LDKShutdownScript o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ShutdownScript_clone(&o_conv);
 	LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ");
 	*ret_conv = CResult_ShutdownScriptDecodeErrorZ_ok(o_conv);
@@ -8936,12 +9010,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptDecode
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ");
 	*ret_conv = CResult_ShutdownScriptDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ShutdownScriptDecodeErrorZ* o_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ShutdownScriptDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8951,6 +9032,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptDecodeErro
 	CResult_ShutdownScriptDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ShutdownScriptDecodeErrorZ* arg_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ShutdownScriptDecodeErrorZ* orig_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ");
@@ -8962,6 +9054,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptInvali
 	LDKShutdownScript o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ShutdownScript_clone(&o_conv);
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ");
 	*ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_ok(o_conv);
@@ -8972,12 +9065,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptInvali
 	LDKInvalidShutdownScript e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = InvalidShutdownScript_clone(&e_conv);
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ");
 	*ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(uint32_t o) {
+	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* o_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(o & ~1);
+	jboolean ret_val = CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -8987,6 +9087,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptInvalidShu
 	CResult_ShutdownScriptInvalidShutdownScriptZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* arg_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(arg & ~1);
+	int64_t ret_val = CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone(uint32_t orig) {
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* orig_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(orig & ~1);
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ");
@@ -9007,6 +9118,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneErrorZ_err(uint3
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NoneErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NoneErrorZ* o_conv = (LDKCResult_NoneErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NoneErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NoneErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9016,6 +9133,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NoneErrorZ_free(uint32_t
 	CResult_NoneErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NoneErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneErrorZ* arg_conv = (LDKCResult_NoneErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NoneErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneErrorZ_clone(uint32_t orig) {
 	LDKCResult_NoneErrorZ* orig_conv = (LDKCResult_NoneErrorZ*)(orig & ~1);
 	LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ");
@@ -9027,6 +9155,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteHopDecodeErrorZ
 	LDKRouteHop o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = RouteHop_clone(&o_conv);
 	LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHopDecodeErrorZ_ok(o_conv);
@@ -9037,12 +9166,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteHopDecodeErrorZ
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHopDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_RouteHopDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_RouteHopDecodeErrorZ* o_conv = (LDKCResult_RouteHopDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_RouteHopDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_RouteHopDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9052,6 +9188,17 @@ void  __attribute__((visibility("default"))) TS_CResult_RouteHopDecodeErrorZ_fre
 	CResult_RouteHopDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_RouteHopDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RouteHopDecodeErrorZ* arg_conv = (LDKCResult_RouteHopDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_RouteHopDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteHopDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHopDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ");
@@ -9072,6 +9219,7 @@ void  __attribute__((visibility("default"))) TS_CVec_RouteHopZ_free(uint32_tArra
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_10_conv);
 		_res_constr.data[k] = _res_conv_10_conv;
 	}
 	CVec_RouteHopZ_free(_res_constr);
@@ -9099,6 +9247,7 @@ void  __attribute__((visibility("default"))) TS_CVec_CVec_RouteHopZZ_free(ptrArr
 			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);
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_12_conv_10_conv);
 			_res_conv_12_constr.data[k] = _res_conv_12_conv_10_conv;
 		}
 		_res_constr.data[m] = _res_conv_12_constr;
@@ -9110,6 +9259,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_ok
 	LDKRoute o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -9120,12 +9270,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_er
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_RouteDecodeErrorZ* o_conv = (LDKCResult_RouteDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_RouteDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9135,7 +9292,18 @@ void  __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_free(u
 	CResult_RouteDecodeErrorZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_clone(uint32_t orig) {
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RouteDecodeErrorZ* arg_conv = (LDKCResult_RouteDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_RouteDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteDecodeErrorZ* orig_conv = (LDKCResult_RouteDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ");
 	*ret_conv = CResult_RouteDecodeErrorZ_clone(orig_conv);
@@ -9146,6 +9314,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteParametersDecod
 	LDKRouteParameters o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = RouteParameters_clone(&o_conv);
 	LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ");
 	*ret_conv = CResult_RouteParametersDecodeErrorZ_ok(o_conv);
@@ -9156,12 +9325,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteParametersDecod
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ");
 	*ret_conv = CResult_RouteParametersDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_RouteParametersDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_RouteParametersDecodeErrorZ* o_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_RouteParametersDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_RouteParametersDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9171,6 +9347,17 @@ void  __attribute__((visibility("default"))) TS_CResult_RouteParametersDecodeErr
 	CResult_RouteParametersDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_RouteParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RouteParametersDecodeErrorZ* arg_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_RouteParametersDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteParametersDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteParametersDecodeErrorZ* orig_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ");
@@ -9191,6 +9378,7 @@ void  __attribute__((visibility("default"))) TS_CVec_RouteHintZ_free(uint32_tArr
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_11_conv);
 		_res_constr.data[l] = _res_conv_11_conv;
 	}
 	CVec_RouteHintZ_free(_res_constr);
@@ -9219,6 +9407,18 @@ void  __attribute__((visibility("default"))) TS_COption_u64Z_free(uint32_t _res)
 	COption_u64Z_free(_res_conv);
 }
 
+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);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_COption_u64Z_clone_ptr(uint32_t arg) {
+	LDKCOption_u64Z* arg_conv = (LDKCOption_u64Z*)arg;
+	int64_t ret_val = COption_u64Z_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_COption_u64Z_clone(uint32_t orig) {
 	LDKCOption_u64Z* orig_conv = (LDKCOption_u64Z*)orig;
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
@@ -9231,6 +9431,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PayeeDecodeErrorZ_ok
 	LDKPayee o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = Payee_clone(&o_conv);
 	LDKCResult_PayeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeeDecodeErrorZ), "LDKCResult_PayeeDecodeErrorZ");
 	*ret_conv = CResult_PayeeDecodeErrorZ_ok(o_conv);
@@ -9241,12 +9442,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PayeeDecodeErrorZ_er
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_PayeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeeDecodeErrorZ), "LDKCResult_PayeeDecodeErrorZ");
 	*ret_conv = CResult_PayeeDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_PayeeDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PayeeDecodeErrorZ* o_conv = (LDKCResult_PayeeDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_PayeeDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_PayeeDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9256,6 +9464,17 @@ void  __attribute__((visibility("default"))) TS_CResult_PayeeDecodeErrorZ_free(u
 	CResult_PayeeDecodeErrorZ_free(_res_conv);
 }
 
+static inline uint64_t CResult_PayeeDecodeErrorZ_clone_ptr(LDKCResult_PayeeDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_PayeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeeDecodeErrorZ), "LDKCResult_PayeeDecodeErrorZ");
+	*ret_conv = CResult_PayeeDecodeErrorZ_clone(arg);
+	return (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PayeeDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PayeeDecodeErrorZ* arg_conv = (LDKCResult_PayeeDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_PayeeDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PayeeDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_PayeeDecodeErrorZ* orig_conv = (LDKCResult_PayeeDecodeErrorZ*)(orig & ~1);
 	LDKCResult_PayeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeeDecodeErrorZ), "LDKCResult_PayeeDecodeErrorZ");
@@ -9276,6 +9495,7 @@ void  __attribute__((visibility("default"))) TS_CVec_RouteHintHopZ_free(uint32_t
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv);
 		_res_constr.data[o] = _res_conv_14_conv;
 	}
 	CVec_RouteHintHopZ_free(_res_constr);
@@ -9285,6 +9505,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteHintDecodeError
 	LDKRouteHint o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = RouteHint_clone(&o_conv);
 	LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ");
 	*ret_conv = CResult_RouteHintDecodeErrorZ_ok(o_conv);
@@ -9295,12 +9516,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteHintDecodeError
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ");
 	*ret_conv = CResult_RouteHintDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_RouteHintDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_RouteHintDecodeErrorZ* o_conv = (LDKCResult_RouteHintDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_RouteHintDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_RouteHintDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9310,6 +9538,17 @@ void  __attribute__((visibility("default"))) TS_CResult_RouteHintDecodeErrorZ_fr
 	CResult_RouteHintDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_RouteHintDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RouteHintDecodeErrorZ* arg_conv = (LDKCResult_RouteHintDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_RouteHintDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteHintDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteHintDecodeErrorZ* orig_conv = (LDKCResult_RouteHintDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ");
@@ -9321,6 +9560,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteHintHopDecodeEr
 	LDKRouteHintHop o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = RouteHintHop_clone(&o_conv);
 	LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHintHopDecodeErrorZ_ok(o_conv);
@@ -9331,12 +9571,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteHintHopDecodeEr
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHintHopDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_RouteHintHopDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_RouteHintHopDecodeErrorZ* o_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_RouteHintHopDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_RouteHintHopDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9346,6 +9593,17 @@ void  __attribute__((visibility("default"))) TS_CResult_RouteHintHopDecodeErrorZ
 	CResult_RouteHintHopDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RouteHintHopDecodeErrorZ* arg_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteHintHopDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteHintHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ");
@@ -9366,6 +9624,7 @@ void  __attribute__((visibility("default"))) TS_CVec_ChannelDetailsZ_free(uint32
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv);
 		_res_constr.data[q] = _res_conv_16_conv;
 	}
 	CVec_ChannelDetailsZ_free(_res_constr);
@@ -9375,6 +9634,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteLightningErrorZ
 	LDKRoute o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -9385,12 +9645,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteLightningErrorZ
 	LDKLightningError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_RouteLightningErrorZ_is_ok(uint32_t o) {
+	LDKCResult_RouteLightningErrorZ* o_conv = (LDKCResult_RouteLightningErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_RouteLightningErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_RouteLightningErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9400,6 +9667,17 @@ void  __attribute__((visibility("default"))) TS_CResult_RouteLightningErrorZ_fre
 	CResult_RouteLightningErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_RouteLightningErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RouteLightningErrorZ* arg_conv = (LDKCResult_RouteLightningErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_RouteLightningErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_RouteLightningErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteLightningErrorZ* orig_conv = (LDKCResult_RouteLightningErrorZ*)(orig & ~1);
 	LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ");
@@ -9424,6 +9702,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_er
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_is_ok(uint32_t o) {
+	LDKCResult_TxOutAccessErrorZ* o_conv = (LDKCResult_TxOutAccessErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_TxOutAccessErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9433,6 +9717,17 @@ void  __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_free(u
 	CResult_TxOutAccessErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_TxOutAccessErrorZ* arg_conv = (LDKCResult_TxOutAccessErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_TxOutAccessErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_clone(uint32_t orig) {
 	LDKCResult_TxOutAccessErrorZ* orig_conv = (LDKCResult_TxOutAccessErrorZ*)(orig & ~1);
 	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
@@ -9440,6 +9735,17 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TxOutAccessErrorZ_cl
 	return (uint64_t)ret_conv;
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_usizeTransactionZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_usizeTransactionZ* arg_conv = (LDKC2Tuple_usizeTransactionZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_usizeTransactionZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_usizeTransactionZ_clone(uint32_t orig) {
 	LDKC2Tuple_usizeTransactionZ* orig_conv = (LDKC2Tuple_usizeTransactionZ*)(orig & ~1);
 	LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ");
@@ -9517,6 +9823,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneChannelMonitorUp
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok(uint32_t o) {
+	LDKCResult_NoneChannelMonitorUpdateErrZ* o_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(o & ~1);
+	jboolean ret_val = CResult_NoneChannelMonitorUpdateErrZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NoneChannelMonitorUpdateErrZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9526,6 +9838,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NoneChannelMonitorUpdate
 	CResult_NoneChannelMonitorUpdateErrZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneChannelMonitorUpdateErrZ* arg_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(arg & ~1);
+	int64_t ret_val = CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone(uint32_t orig) {
 	LDKCResult_NoneChannelMonitorUpdateErrZ* orig_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(orig & ~1);
 	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
@@ -9579,6 +9902,18 @@ void  __attribute__((visibility("default"))) TS_COption_C2Tuple_usizeTransaction
 	COption_C2Tuple_usizeTransactionZZ_free(_res_conv);
 }
 
+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);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr(uint32_t arg) {
+	LDKCOption_C2Tuple_usizeTransactionZZ* arg_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)arg;
+	int64_t ret_val = COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_COption_C2Tuple_usizeTransactionZZ_clone(uint32_t orig) {
 	LDKCOption_C2Tuple_usizeTransactionZZ* orig_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)orig;
 	LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ");
@@ -9587,6 +9922,107 @@ uint32_t  __attribute__((visibility("default"))) TS_COption_C2Tuple_usizeTransac
 	return ret_ref;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_COption_ClosureReasonZ_some(uint32_t o) {
+	void* o_ptr = (void*)(((uint64_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKClosureReason o_conv = *(LDKClosureReason*)(o_ptr);
+	o_conv = ClosureReason_clone((LDKClosureReason*)(((uint64_t)o) & ~1));
+	LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ");
+	*ret_copy = COption_ClosureReasonZ_some(o_conv);
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_COption_ClosureReasonZ_none() {
+	LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ");
+	*ret_copy = COption_ClosureReasonZ_none();
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((visibility("default"))) TS_COption_ClosureReasonZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCOption_ClosureReasonZ _res_conv = *(LDKCOption_ClosureReasonZ*)(_res_ptr);
+	FREE((void*)_res);
+	COption_ClosureReasonZ_free(_res_conv);
+}
+
+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);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_COption_ClosureReasonZ_clone_ptr(uint32_t arg) {
+	LDKCOption_ClosureReasonZ* arg_conv = (LDKCOption_ClosureReasonZ*)arg;
+	int64_t ret_val = COption_ClosureReasonZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_COption_ClosureReasonZ_clone(uint32_t orig) {
+	LDKCOption_ClosureReasonZ* orig_conv = (LDKCOption_ClosureReasonZ*)orig;
+	LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ");
+	*ret_copy = COption_ClosureReasonZ_clone(orig_conv);
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uint64_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKCOption_ClosureReasonZ o_conv = *(LDKCOption_ClosureReasonZ*)(o_ptr);
+	o_conv = COption_ClosureReasonZ_clone((LDKCOption_ClosureReasonZ*)(((uint64_t)o) & ~1));
+	LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ");
+	*ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_ok(o_conv);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_err(uint32_t e) {
+	LDKDecodeError e_conv;
+	e_conv.inner = (void*)(e & (~1));
+	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
+	e_conv = DecodeError_clone(&e_conv);
+	LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ");
+	*ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_err(e_conv);
+	return (uint64_t)ret_conv;
+}
+
+jboolean  __attribute__((visibility("default"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_COption_ClosureReasonZDecodeErrorZ* o_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_COption_ClosureReasonZDecodeErrorZ _res_conv = *(LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_COption_ClosureReasonZDecodeErrorZ_free(_res_conv);
+}
+
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_COption_ClosureReasonZDecodeErrorZ* arg_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_COption_ClosureReasonZDecodeErrorZ* orig_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(orig & ~1);
+	LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ");
+	*ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone(orig_conv);
+	return (uint64_t)ret_conv;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_COption_NetworkUpdateZ_some(uint32_t o) {
 	void* o_ptr = (void*)(((uint64_t)o) & ~1);
 	CHECK_ACCESS(o_ptr);
@@ -9614,6 +10050,18 @@ void  __attribute__((visibility("default"))) TS_COption_NetworkUpdateZ_free(uint
 	COption_NetworkUpdateZ_free(_res_conv);
 }
 
+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);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_COption_NetworkUpdateZ_clone_ptr(uint32_t arg) {
+	LDKCOption_NetworkUpdateZ* arg_conv = (LDKCOption_NetworkUpdateZ*)arg;
+	int64_t ret_val = COption_NetworkUpdateZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_COption_NetworkUpdateZ_clone(uint32_t orig) {
 	LDKCOption_NetworkUpdateZ* orig_conv = (LDKCOption_NetworkUpdateZ*)orig;
 	LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ");
@@ -9641,6 +10089,107 @@ void  __attribute__((visibility("default"))) TS_CVec_SpendableOutputDescriptorZ_
 	CVec_SpendableOutputDescriptorZ_free(_res_constr);
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_COption_EventZ_some(uint32_t o) {
+	void* o_ptr = (void*)(((uint64_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKEvent o_conv = *(LDKEvent*)(o_ptr);
+	o_conv = Event_clone((LDKEvent*)(((uint64_t)o) & ~1));
+	LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ");
+	*ret_copy = COption_EventZ_some(o_conv);
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_COption_EventZ_none() {
+	LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ");
+	*ret_copy = COption_EventZ_none();
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((visibility("default"))) TS_COption_EventZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCOption_EventZ _res_conv = *(LDKCOption_EventZ*)(_res_ptr);
+	FREE((void*)_res);
+	COption_EventZ_free(_res_conv);
+}
+
+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);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_COption_EventZ_clone_ptr(uint32_t arg) {
+	LDKCOption_EventZ* arg_conv = (LDKCOption_EventZ*)arg;
+	int64_t ret_val = COption_EventZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_COption_EventZ_clone(uint32_t orig) {
+	LDKCOption_EventZ* orig_conv = (LDKCOption_EventZ*)orig;
+	LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ");
+	*ret_copy = COption_EventZ_clone(orig_conv);
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_EventZDecodeErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uint64_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKCOption_EventZ o_conv = *(LDKCOption_EventZ*)(o_ptr);
+	o_conv = COption_EventZ_clone((LDKCOption_EventZ*)(((uint64_t)o) & ~1));
+	LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ");
+	*ret_conv = CResult_COption_EventZDecodeErrorZ_ok(o_conv);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_EventZDecodeErrorZ_err(uint32_t e) {
+	LDKDecodeError e_conv;
+	e_conv.inner = (void*)(e & (~1));
+	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
+	e_conv = DecodeError_clone(&e_conv);
+	LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ");
+	*ret_conv = CResult_COption_EventZDecodeErrorZ_err(e_conv);
+	return (uint64_t)ret_conv;
+}
+
+jboolean  __attribute__((visibility("default"))) TS_CResult_COption_EventZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_COption_EventZDecodeErrorZ* o_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_COption_EventZDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_COption_EventZDecodeErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_COption_EventZDecodeErrorZ _res_conv = *(LDKCResult_COption_EventZDecodeErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_COption_EventZDecodeErrorZ_free(_res_conv);
+}
+
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_COption_EventZDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_COption_EventZDecodeErrorZ* arg_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_COption_EventZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_EventZDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_COption_EventZDecodeErrorZ* orig_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(orig & ~1);
+	LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ");
+	*ret_conv = CResult_COption_EventZDecodeErrorZ_clone(orig_conv);
+	return (uint64_t)ret_conv;
+}
+
 void  __attribute__((visibility("default"))) TS_CVec_MessageSendEventZ_free(uint32_tArray _res) {
 	LDKCVec_MessageSendEventZ _res_constr;
 	_res_constr.datalen = *((uint32_t*)_res);
@@ -9660,68 +10209,122 @@ void  __attribute__((visibility("default"))) TS_CVec_MessageSendEventZ_free(uint
 	CVec_MessageSendEventZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_InitFeaturesDecodeErrorZ_ok(uint32_t o) {
-	LDKInitFeatures o_conv;
+uint32_t  __attribute__((visibility("default"))) TS_CResult_ScoringParametersDecodeErrorZ_ok(uint32_t o) {
+	LDKScoringParameters o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
-	o_conv = InitFeatures_clone(&o_conv);
-	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
-	*ret_conv = CResult_InitFeaturesDecodeErrorZ_ok(o_conv);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
+	// Warning: we need a move here but no clone is available for LDKScoringParameters
+	LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ");
+	*ret_conv = CResult_ScoringParametersDecodeErrorZ_ok(o_conv);
 	return (uint64_t)ret_conv;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_InitFeaturesDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((visibility("default"))) TS_CResult_ScoringParametersDecodeErrorZ_err(uint32_t e) {
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
-	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
-	*ret_conv = CResult_InitFeaturesDecodeErrorZ_err(e_conv);
+	LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ");
+	*ret_conv = CResult_ScoringParametersDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
-void  __attribute__((visibility("default"))) TS_CResult_InitFeaturesDecodeErrorZ_free(uint32_t _res) {
+jboolean  __attribute__((visibility("default"))) TS_CResult_ScoringParametersDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ScoringParametersDecodeErrorZ* o_conv = (LDKCResult_ScoringParametersDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ScoringParametersDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_ScoringParametersDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_InitFeaturesDecodeErrorZ _res_conv = *(LDKCResult_InitFeaturesDecodeErrorZ*)(_res_ptr);
+	LDKCResult_ScoringParametersDecodeErrorZ _res_conv = *(LDKCResult_ScoringParametersDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_InitFeaturesDecodeErrorZ_free(_res_conv);
+	CResult_ScoringParametersDecodeErrorZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeFeaturesDecodeErrorZ_ok(uint32_t o) {
-	LDKNodeFeatures o_conv;
+uint32_t  __attribute__((visibility("default"))) TS_CResult_ScorerDecodeErrorZ_ok(uint32_t o) {
+	LDKScorer o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
-	o_conv = NodeFeatures_clone(&o_conv);
-	LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ");
-	*ret_conv = CResult_NodeFeaturesDecodeErrorZ_ok(o_conv);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
+	// Warning: we need a move here but no clone is available for LDKScorer
+	LDKCResult_ScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScorerDecodeErrorZ), "LDKCResult_ScorerDecodeErrorZ");
+	*ret_conv = CResult_ScorerDecodeErrorZ_ok(o_conv);
 	return (uint64_t)ret_conv;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeFeaturesDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((visibility("default"))) TS_CResult_ScorerDecodeErrorZ_err(uint32_t e) {
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
-	LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ");
-	*ret_conv = CResult_NodeFeaturesDecodeErrorZ_err(e_conv);
+	LDKCResult_ScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScorerDecodeErrorZ), "LDKCResult_ScorerDecodeErrorZ");
+	*ret_conv = CResult_ScorerDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
-void  __attribute__((visibility("default"))) TS_CResult_NodeFeaturesDecodeErrorZ_free(uint32_t _res) {
+jboolean  __attribute__((visibility("default"))) TS_CResult_ScorerDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ScorerDecodeErrorZ* o_conv = (LDKCResult_ScorerDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ScorerDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_ScorerDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NodeFeaturesDecodeErrorZ _res_conv = *(LDKCResult_NodeFeaturesDecodeErrorZ*)(_res_ptr);
+	LDKCResult_ScorerDecodeErrorZ _res_conv = *(LDKCResult_ScorerDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_NodeFeaturesDecodeErrorZ_free(_res_conv);
+	CResult_ScorerDecodeErrorZ_free(_res_conv);
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_InitFeaturesDecodeErrorZ_ok(uint32_t o) {
+	LDKInitFeatures o_conv;
+	o_conv.inner = (void*)(o & (~1));
+	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
+	o_conv = InitFeatures_clone(&o_conv);
+	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
+	*ret_conv = CResult_InitFeaturesDecodeErrorZ_ok(o_conv);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_InitFeaturesDecodeErrorZ_err(uint32_t e) {
+	LDKDecodeError e_conv;
+	e_conv.inner = (void*)(e & (~1));
+	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
+	e_conv = DecodeError_clone(&e_conv);
+	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
+	*ret_conv = CResult_InitFeaturesDecodeErrorZ_err(e_conv);
+	return (uint64_t)ret_conv;
+}
+
+jboolean  __attribute__((visibility("default"))) TS_CResult_InitFeaturesDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_InitFeaturesDecodeErrorZ* o_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_InitFeaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_InitFeaturesDecodeErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_InitFeaturesDecodeErrorZ _res_conv = *(LDKCResult_InitFeaturesDecodeErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_InitFeaturesDecodeErrorZ_free(_res_conv);
 }
 
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelFeaturesDecodeErrorZ_ok(uint32_t o) {
 	LDKChannelFeatures o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ChannelFeatures_clone(&o_conv);
 	LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ");
 	*ret_conv = CResult_ChannelFeaturesDecodeErrorZ_ok(o_conv);
@@ -9732,12 +10335,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelFeaturesDecod
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ");
 	*ret_conv = CResult_ChannelFeaturesDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ChannelFeaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ChannelFeaturesDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9747,97 +10357,122 @@ void  __attribute__((visibility("default"))) TS_CResult_ChannelFeaturesDecodeErr
 	CResult_ChannelFeaturesDecodeErrorZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_ok(uint32_t o) {
-	LDKInvoiceFeatures o_conv;
+uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeFeaturesDecodeErrorZ_ok(uint32_t o) {
+	LDKNodeFeatures o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
-	o_conv = InvoiceFeatures_clone(&o_conv);
-	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
-	*ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_ok(o_conv);
+	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 (uint64_t)ret_conv;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeFeaturesDecodeErrorZ_err(uint32_t e) {
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
-	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
-	*ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_err(e_conv);
+	LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ");
+	*ret_conv = CResult_NodeFeaturesDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
-void  __attribute__((visibility("default"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_free(uint32_t _res) {
+jboolean  __attribute__((visibility("default"))) TS_CResult_NodeFeaturesDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NodeFeaturesDecodeErrorZ* o_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NodeFeaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_NodeFeaturesDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_InvoiceFeaturesDecodeErrorZ _res_conv = *(LDKCResult_InvoiceFeaturesDecodeErrorZ*)(_res_ptr);
+	LDKCResult_NodeFeaturesDecodeErrorZ _res_conv = *(LDKCResult_NodeFeaturesDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_InvoiceFeaturesDecodeErrorZ_free(_res_conv);
+	CResult_NodeFeaturesDecodeErrorZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_ScoringParametersDecodeErrorZ_ok(uint32_t o) {
-	LDKScoringParameters o_conv;
+uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_ok(uint32_t o) {
+	LDKInvoiceFeatures o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
-	// Warning: we need a move here but no clone is available for LDKScoringParameters
-	LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ");
-	*ret_conv = CResult_ScoringParametersDecodeErrorZ_ok(o_conv);
+	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 (uint64_t)ret_conv;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_ScoringParametersDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_err(uint32_t e) {
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
-	LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ");
-	*ret_conv = CResult_ScoringParametersDecodeErrorZ_err(e_conv);
+	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
+	*ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
-void  __attribute__((visibility("default"))) TS_CResult_ScoringParametersDecodeErrorZ_free(uint32_t _res) {
+jboolean  __attribute__((visibility("default"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_InvoiceFeaturesDecodeErrorZ* o_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_InvoiceFeaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ScoringParametersDecodeErrorZ _res_conv = *(LDKCResult_ScoringParametersDecodeErrorZ*)(_res_ptr);
+	LDKCResult_InvoiceFeaturesDecodeErrorZ _res_conv = *(LDKCResult_InvoiceFeaturesDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_ScoringParametersDecodeErrorZ_free(_res_conv);
+	CResult_InvoiceFeaturesDecodeErrorZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_ScorerDecodeErrorZ_ok(uint32_t o) {
-	LDKScorer o_conv;
+uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok(uint32_t o) {
+	LDKChannelTypeFeatures o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
-	// Warning: we need a move here but no clone is available for LDKScorer
-	LDKCResult_ScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScorerDecodeErrorZ), "LDKCResult_ScorerDecodeErrorZ");
-	*ret_conv = CResult_ScorerDecodeErrorZ_ok(o_conv);
+	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 (uint64_t)ret_conv;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_ScorerDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err(uint32_t e) {
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
-	LDKCResult_ScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScorerDecodeErrorZ), "LDKCResult_ScorerDecodeErrorZ");
-	*ret_conv = CResult_ScorerDecodeErrorZ_err(e_conv);
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ");
+	*ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
-void  __attribute__((visibility("default"))) TS_CResult_ScorerDecodeErrorZ_free(uint32_t _res) {
+jboolean  __attribute__((visibility("default"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ScorerDecodeErrorZ _res_conv = *(LDKCResult_ScorerDecodeErrorZ*)(_res_ptr);
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ _res_conv = *(LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_ScorerDecodeErrorZ_free(_res_conv);
+	CResult_ChannelTypeFeaturesDecodeErrorZ_free(_res_conv);
 }
 
 uint32_t  __attribute__((visibility("default"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(uint32_t o) {
 	LDKDelayedPaymentOutputDescriptor o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = DelayedPaymentOutputDescriptor_clone(&o_conv);
 	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
 	*ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o_conv);
@@ -9848,12 +10483,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_DelayedPaymentOutput
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
 	*ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9863,6 +10505,17 @@ void  __attribute__((visibility("default"))) TS_CResult_DelayedPaymentOutputDesc
 	CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(orig & ~1);
 	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
@@ -9874,6 +10527,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_StaticPaymentOutputD
 	LDKStaticPaymentOutputDescriptor o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = StaticPaymentOutputDescriptor_clone(&o_conv);
 	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ");
 	*ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(o_conv);
@@ -9884,12 +10538,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_StaticPaymentOutputD
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ");
 	*ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9899,6 +10560,17 @@ void  __attribute__((visibility("default"))) TS_CResult_StaticPaymentOutputDescr
 	CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(orig & ~1);
 	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ");
@@ -9920,12 +10592,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_SpendableOutputDescr
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9935,6 +10614,17 @@ void  __attribute__((visibility("default"))) TS_CResult_SpendableOutputDescripto
 	CResult_SpendableOutputDescriptorDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(orig & ~1);
 	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ");
@@ -9954,6 +10644,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneNoneZ_err() {
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NoneNoneZ_is_ok(uint32_t o) {
+	LDKCResult_NoneNoneZ* o_conv = (LDKCResult_NoneNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_NoneNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NoneNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -9963,6 +10659,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NoneNoneZ_free(uint32_t
 	CResult_NoneNoneZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NoneNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneNoneZ* arg_conv = (LDKCResult_NoneNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_NoneNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneNoneZ_clone(uint32_t orig) {
 	LDKCResult_NoneNoneZ* orig_conv = (LDKCResult_NoneNoneZ*)(orig & ~1);
 	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
@@ -9970,6 +10677,17 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneNoneZ_clone(uint
 	return (uint64_t)ret_conv;
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_SignatureCVec_SignatureZZ* arg_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone(uint32_t orig) {
 	LDKC2Tuple_SignatureCVec_SignatureZZ* orig_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(orig & ~1);
 	LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ");
@@ -10025,6 +10743,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_SignatureCVe
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10034,6 +10758,17 @@ void  __attribute__((visibility("default"))) TS_CResult_C2Tuple_SignatureCVec_Si
 	CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(uint32_t orig) {
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(orig & ~1);
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
@@ -10056,6 +10791,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_SignatureNoneZ_err()
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_SignatureNoneZ_is_ok(uint32_t o) {
+	LDKCResult_SignatureNoneZ* o_conv = (LDKCResult_SignatureNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_SignatureNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_SignatureNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10065,6 +10806,17 @@ void  __attribute__((visibility("default"))) TS_CResult_SignatureNoneZ_free(uint
 	CResult_SignatureNoneZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_SignatureNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SignatureNoneZ* arg_conv = (LDKCResult_SignatureNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_SignatureNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_SignatureNoneZ_clone(uint32_t orig) {
 	LDKCResult_SignatureNoneZ* orig_conv = (LDKCResult_SignatureNoneZ*)(orig & ~1);
 	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
@@ -10085,12 +10837,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_SignDecodeErrorZ_err
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ");
 	*ret_conv = CResult_SignDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_SignDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_SignDecodeErrorZ* o_conv = (LDKCResult_SignDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_SignDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_SignDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10100,6 +10859,17 @@ void  __attribute__((visibility("default"))) TS_CResult_SignDecodeErrorZ_free(ui
 	CResult_SignDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_SignDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SignDecodeErrorZ* arg_conv = (LDKCResult_SignDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_SignDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_SignDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_SignDecodeErrorZ* orig_conv = (LDKCResult_SignDecodeErrorZ*)(orig & ~1);
 	LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ");
@@ -10130,6 +10900,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RecoverableSignature
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_RecoverableSignatureNoneZ_is_ok(uint32_t o) {
+	LDKCResult_RecoverableSignatureNoneZ* o_conv = (LDKCResult_RecoverableSignatureNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_RecoverableSignatureNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_RecoverableSignatureNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10139,6 +10915,17 @@ void  __attribute__((visibility("default"))) TS_CResult_RecoverableSignatureNone
 	CResult_RecoverableSignatureNoneZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_RecoverableSignatureNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RecoverableSignatureNoneZ* arg_conv = (LDKCResult_RecoverableSignatureNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_RecoverableSignatureNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_RecoverableSignatureNoneZ_clone(uint32_t orig) {
 	LDKCResult_RecoverableSignatureNoneZ* orig_conv = (LDKCResult_RecoverableSignatureNoneZ*)(orig & ~1);
 	LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ");
@@ -10192,6 +10979,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_CVec_CVec_u8ZZNoneZ_
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok(uint32_t o) {
+	LDKCResult_CVec_CVec_u8ZZNoneZ* o_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_CVec_CVec_u8ZZNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_CVec_CVec_u8ZZNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10201,6 +10994,17 @@ void  __attribute__((visibility("default"))) TS_CResult_CVec_CVec_u8ZZNoneZ_free
 	CResult_CVec_CVec_u8ZZNoneZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_CVec_CVec_u8ZZNoneZ* arg_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone(uint32_t orig) {
 	LDKCResult_CVec_CVec_u8ZZNoneZ* orig_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(orig & ~1);
 	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
@@ -10212,6 +11016,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_InMemorySignerDecode
 	LDKInMemorySigner o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = InMemorySigner_clone(&o_conv);
 	LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
 	*ret_conv = CResult_InMemorySignerDecodeErrorZ_ok(o_conv);
@@ -10222,12 +11027,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_InMemorySignerDecode
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
 	*ret_conv = CResult_InMemorySignerDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_InMemorySignerDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_InMemorySignerDecodeErrorZ* o_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_InMemorySignerDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_InMemorySignerDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10237,6 +11049,17 @@ void  __attribute__((visibility("default"))) TS_CResult_InMemorySignerDecodeErro
 	CResult_InMemorySignerDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_InMemorySignerDecodeErrorZ* arg_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_InMemorySignerDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_InMemorySignerDecodeErrorZ* orig_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(orig & ~1);
 	LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
@@ -10280,6 +11103,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TransactionNoneZ_err
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_TransactionNoneZ_is_ok(uint32_t o) {
+	LDKCResult_TransactionNoneZ* o_conv = (LDKCResult_TransactionNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_TransactionNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_TransactionNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10289,6 +11118,17 @@ void  __attribute__((visibility("default"))) TS_CResult_TransactionNoneZ_free(ui
 	CResult_TransactionNoneZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_TransactionNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_TransactionNoneZ* arg_conv = (LDKCResult_TransactionNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_TransactionNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_TransactionNoneZ_clone(uint32_t orig) {
 	LDKCResult_TransactionNoneZ* orig_conv = (LDKCResult_TransactionNoneZ*)(orig & ~1);
 	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
@@ -10296,6 +11136,17 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_TransactionNoneZ_clo
 	return (uint64_t)ret_conv;
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_BlockHashChannelMonitorZ* arg_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone(uint32_t orig) {
 	LDKC2Tuple_BlockHashChannelMonitorZ* orig_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(orig & ~1);
 	LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ");
@@ -10310,6 +11161,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMoni
 	LDKChannelMonitor b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = (b & 1) || (b == 0);
+	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);
@@ -10372,6 +11224,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_CVec_C2Tuple_BlockHa
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_is_ok(uint32_t o) {
+	LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ* o_conv = (LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10381,6 +11239,17 @@ void  __attribute__((visibility("default"))) TS_CResult_CVec_C2Tuple_BlockHashCh
 	CResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_free(_res_conv);
 }
 
+static inline uint64_t CResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_clone_ptr(LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ *NONNULL_PTR arg) {
+	LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ), "LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ");
+	*ret_conv = CResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_clone(arg);
+	return (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ* arg_conv = (LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ_clone(uint32_t orig) {
 	LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ* orig_conv = (LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ*)(orig & ~1);
 	LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ), "LDKCResult_CVec_C2Tuple_BlockHashChannelMonitorZZErrorZ");
@@ -10411,6 +11280,18 @@ void  __attribute__((visibility("default"))) TS_COption_u16Z_free(uint32_t _res)
 	COption_u16Z_free(_res_conv);
 }
 
+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);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_COption_u16Z_clone_ptr(uint32_t arg) {
+	LDKCOption_u16Z* arg_conv = (LDKCOption_u16Z*)arg;
+	int64_t ret_val = COption_u16Z_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_COption_u16Z_clone(uint32_t orig) {
 	LDKCOption_u16Z* orig_conv = (LDKCOption_u16Z*)orig;
 	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
@@ -10435,6 +11316,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_err(ui
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NoneAPIErrorZ* o_conv = (LDKCResult_NoneAPIErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NoneAPIErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10444,6 +11331,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_free(uint3
 	CResult_NoneAPIErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneAPIErrorZ* arg_conv = (LDKCResult_NoneAPIErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NoneAPIErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneAPIErrorZ_clone(uint32_t orig) {
 	LDKCResult_NoneAPIErrorZ* orig_conv = (LDKCResult_NoneAPIErrorZ*)(orig & ~1);
 	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
@@ -10508,6 +11406,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult__u832APIErrorZ_err(u
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult__u832APIErrorZ_is_ok(uint32_t o) {
+	LDKCResult__u832APIErrorZ* o_conv = (LDKCResult__u832APIErrorZ*)(o & ~1);
+	jboolean ret_val = CResult__u832APIErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult__u832APIErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10517,6 +11421,17 @@ void  __attribute__((visibility("default"))) TS_CResult__u832APIErrorZ_free(uint
 	CResult__u832APIErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult__u832APIErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult__u832APIErrorZ* arg_conv = (LDKCResult__u832APIErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult__u832APIErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult__u832APIErrorZ_clone(uint32_t orig) {
 	LDKCResult__u832APIErrorZ* orig_conv = (LDKCResult__u832APIErrorZ*)(orig & ~1);
 	LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ");
@@ -10543,6 +11458,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentSend
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentSendFailureZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentIdPaymentSendFailureZ* o_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(o & ~1);
+	jboolean ret_val = CResult_PaymentIdPaymentSendFailureZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentSendFailureZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10552,6 +11473,17 @@ void  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentSendFail
 	CResult_PaymentIdPaymentSendFailureZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentIdPaymentSendFailureZ* arg_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(arg & ~1);
+	int64_t ret_val = CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone(uint32_t orig) {
 	LDKCResult_PaymentIdPaymentSendFailureZ* orig_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(orig & ~1);
 	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
@@ -10575,6 +11507,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NonePaymentSendFailu
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NonePaymentSendFailureZ_is_ok(uint32_t o) {
+	LDKCResult_NonePaymentSendFailureZ* o_conv = (LDKCResult_NonePaymentSendFailureZ*)(o & ~1);
+	jboolean ret_val = CResult_NonePaymentSendFailureZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NonePaymentSendFailureZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10584,6 +11522,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NonePaymentSendFailureZ_
 	CResult_NonePaymentSendFailureZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NonePaymentSendFailureZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NonePaymentSendFailureZ* arg_conv = (LDKCResult_NonePaymentSendFailureZ*)(arg & ~1);
+	int64_t ret_val = CResult_NonePaymentSendFailureZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NonePaymentSendFailureZ_clone(uint32_t orig) {
 	LDKCResult_NonePaymentSendFailureZ* orig_conv = (LDKCResult_NonePaymentSendFailureZ*)(orig & ~1);
 	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
@@ -10591,6 +11540,17 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NonePaymentSendFailu
 	return (uint64_t)ret_conv;
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_PaymentHashPaymentIdZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone(uint32_t orig) {
 	LDKC2Tuple_PaymentHashPaymentIdZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(orig & ~1);
 	LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ");
@@ -10639,6 +11599,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashP
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(o & ~1);
+	jboolean ret_val = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10648,6 +11614,17 @@ void  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPayme
 	CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(arg & ~1);
+	int64_t ret_val = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(uint32_t orig) {
 	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(orig & ~1);
 	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ");
@@ -10674,6 +11651,17 @@ void  __attribute__((visibility("default"))) TS_CVec_NetAddressZ_free(uint32_tAr
 	CVec_NetAddressZ_free(_res_constr);
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_PaymentHashPaymentSecretZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone(uint32_t orig) {
 	LDKC2Tuple_PaymentHashPaymentSecretZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(orig & ~1);
 	LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
@@ -10702,6 +11690,156 @@ void  __attribute__((visibility("default"))) TS_C2Tuple_PaymentHashPaymentSecret
 	C2Tuple_PaymentHashPaymentSecretZ_free(_res_conv);
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uint64_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr);
+	o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uint64_t)o) & ~1));
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o_conv);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err() {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err();
+	return (uint64_t)ret_conv;
+}
+
+jboolean  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(_res_conv);
+}
+
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(uint32_t orig) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(orig & ~1);
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(orig_conv);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uint64_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr);
+	o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uint64_t)o) & ~1));
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o_conv);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uint64_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
+	e_conv = APIError_clone((LDKAPIError*)(((uint64_t)e) & ~1));
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(e_conv);
+	return (uint64_t)ret_conv;
+}
+
+jboolean  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(_res_conv);
+}
+
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(uint32_t orig) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(orig & ~1);
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(orig_conv);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentSecretNoneZ_ok(int8_tArray o) {
+	LDKThirtyTwoBytes o_ref;
+	CHECK(*((uint32_t*)o) == 32);
+	memcpy(o_ref.data, (uint8_t*)(o + 4), 32);
+	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
+	*ret_conv = CResult_PaymentSecretNoneZ_ok(o_ref);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentSecretNoneZ_err() {
+	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
+	*ret_conv = CResult_PaymentSecretNoneZ_err();
+	return (uint64_t)ret_conv;
+}
+
+jboolean  __attribute__((visibility("default"))) TS_CResult_PaymentSecretNoneZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentSecretNoneZ* o_conv = (LDKCResult_PaymentSecretNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_PaymentSecretNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_PaymentSecretNoneZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_PaymentSecretNoneZ _res_conv = *(LDKCResult_PaymentSecretNoneZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_PaymentSecretNoneZ_free(_res_conv);
+}
+
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PaymentSecretNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentSecretNoneZ* arg_conv = (LDKCResult_PaymentSecretNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_PaymentSecretNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentSecretNoneZ_clone(uint32_t orig) {
+	LDKCResult_PaymentSecretNoneZ* orig_conv = (LDKCResult_PaymentSecretNoneZ*)(orig & ~1);
+	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
+	*ret_conv = CResult_PaymentSecretNoneZ_clone(orig_conv);
+	return (uint64_t)ret_conv;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentSecretAPIErrorZ_ok(int8_tArray o) {
 	LDKThirtyTwoBytes o_ref;
 	CHECK(*((uint32_t*)o) == 32);
@@ -10721,6 +11859,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentSecretAPIErro
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_PaymentSecretAPIErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentSecretAPIErrorZ* o_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_PaymentSecretAPIErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_PaymentSecretAPIErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10730,6 +11874,17 @@ void  __attribute__((visibility("default"))) TS_CResult_PaymentSecretAPIErrorZ_f
 	CResult_PaymentSecretAPIErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PaymentSecretAPIErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentSecretAPIErrorZ* arg_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_PaymentSecretAPIErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentSecretAPIErrorZ_clone(uint32_t orig) {
 	LDKCResult_PaymentSecretAPIErrorZ* orig_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(orig & ~1);
 	LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ");
@@ -10737,6 +11892,58 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentSecretAPIErro
 	return (uint64_t)ret_conv;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentPreimageAPIErrorZ_ok(int8_tArray o) {
+	LDKThirtyTwoBytes o_ref;
+	CHECK(*((uint32_t*)o) == 32);
+	memcpy(o_ref.data, (uint8_t*)(o + 4), 32);
+	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
+	*ret_conv = CResult_PaymentPreimageAPIErrorZ_ok(o_ref);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentPreimageAPIErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uint64_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
+	e_conv = APIError_clone((LDKAPIError*)(((uint64_t)e) & ~1));
+	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
+	*ret_conv = CResult_PaymentPreimageAPIErrorZ_err(e_conv);
+	return (uint64_t)ret_conv;
+}
+
+jboolean  __attribute__((visibility("default"))) TS_CResult_PaymentPreimageAPIErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentPreimageAPIErrorZ* o_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_PaymentPreimageAPIErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_PaymentPreimageAPIErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_PaymentPreimageAPIErrorZ _res_conv = *(LDKCResult_PaymentPreimageAPIErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_PaymentPreimageAPIErrorZ_free(_res_conv);
+}
+
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentPreimageAPIErrorZ* arg_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentPreimageAPIErrorZ_clone(uint32_t orig) {
+	LDKCResult_PaymentPreimageAPIErrorZ* orig_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(orig & ~1);
+	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
+	*ret_conv = CResult_PaymentPreimageAPIErrorZ_clone(orig_conv);
+	return (uint64_t)ret_conv;
+}
+
 void  __attribute__((visibility("default"))) TS_CVec_ChannelMonitorZ_free(uint32_tArray _res) {
 	LDKCVec_ChannelMonitorZ _res_constr;
 	_res_constr.datalen = *((uint32_t*)_res);
@@ -10750,6 +11957,7 @@ void  __attribute__((visibility("default"))) TS_CVec_ChannelMonitorZ_free(uint32
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv);
 		_res_constr.data[q] = _res_conv_16_conv;
 	}
 	CVec_ChannelMonitorZ_free(_res_constr);
@@ -10762,6 +11970,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMana
 	LDKChannelManager b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = (b & 1) || (b == 0);
+	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);
@@ -10791,12 +12000,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashCha
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10810,6 +12026,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelConfigDecodeE
 	LDKChannelConfig o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ChannelConfig_clone(&o_conv);
 	LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ");
 	*ret_conv = CResult_ChannelConfigDecodeErrorZ_ok(o_conv);
@@ -10820,12 +12037,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelConfigDecodeE
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ");
 	*ret_conv = CResult_ChannelConfigDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ChannelConfigDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelConfigDecodeErrorZ* o_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ChannelConfigDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ChannelConfigDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10835,6 +12059,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ChannelConfigDecodeError
 	CResult_ChannelConfigDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelConfigDecodeErrorZ* arg_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelConfigDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelConfigDecodeErrorZ* orig_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ");
@@ -10846,6 +12081,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_OutPointDecodeErrorZ
 	LDKOutPoint o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = OutPoint_clone(&o_conv);
 	LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ");
 	*ret_conv = CResult_OutPointDecodeErrorZ_ok(o_conv);
@@ -10856,12 +12092,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_OutPointDecodeErrorZ
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ");
 	*ret_conv = CResult_OutPointDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_OutPointDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_OutPointDecodeErrorZ* o_conv = (LDKCResult_OutPointDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_OutPointDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_OutPointDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10871,6 +12114,17 @@ void  __attribute__((visibility("default"))) TS_CResult_OutPointDecodeErrorZ_fre
 	CResult_OutPointDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_OutPointDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_OutPointDecodeErrorZ* arg_conv = (LDKCResult_OutPointDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_OutPointDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_OutPointDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_OutPointDecodeErrorZ* orig_conv = (LDKCResult_OutPointDecodeErrorZ*)(orig & ~1);
 	LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ");
@@ -10904,6 +12158,18 @@ void  __attribute__((visibility("default"))) TS_COption_TypeZ_free(uint32_t _res
 	COption_TypeZ_free(_res_conv);
 }
 
+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);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_COption_TypeZ_clone_ptr(uint32_t arg) {
+	LDKCOption_TypeZ* arg_conv = (LDKCOption_TypeZ*)arg;
+	int64_t ret_val = COption_TypeZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_COption_TypeZ_clone(uint32_t orig) {
 	LDKCOption_TypeZ* orig_conv = (LDKCOption_TypeZ*)orig;
 	LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ");
@@ -10926,12 +12192,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_TypeZDecodeE
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
 	*ret_conv = CResult_COption_TypeZDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_COption_TypeZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_COption_TypeZDecodeErrorZ* o_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_COption_TypeZDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_COption_TypeZDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10941,6 +12214,17 @@ void  __attribute__((visibility("default"))) TS_CResult_COption_TypeZDecodeError
 	CResult_COption_TypeZDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_COption_TypeZDecodeErrorZ* arg_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_TypeZDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_COption_TypeZDecodeErrorZ* orig_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(orig & ~1);
 	LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
@@ -10967,6 +12251,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentErro
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentIdPaymentErrorZ* o_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_PaymentIdPaymentErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -10976,6 +12266,17 @@ void  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentErrorZ_f
 	CResult_PaymentIdPaymentErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentIdPaymentErrorZ* arg_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_PaymentIdPaymentErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PaymentIdPaymentErrorZ_clone(uint32_t orig) {
 	LDKCResult_PaymentIdPaymentErrorZ* orig_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(orig & ~1);
 	LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ");
@@ -10996,6 +12297,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_SiPrefixNoneZ_err()
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_SiPrefixNoneZ_is_ok(uint32_t o) {
+	LDKCResult_SiPrefixNoneZ* o_conv = (LDKCResult_SiPrefixNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_SiPrefixNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_SiPrefixNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11005,6 +12312,17 @@ void  __attribute__((visibility("default"))) TS_CResult_SiPrefixNoneZ_free(uint3
 	CResult_SiPrefixNoneZ_free(_res_conv);
 }
 
+static inline uint64_t CResult_SiPrefixNoneZ_clone_ptr(LDKCResult_SiPrefixNoneZ *NONNULL_PTR arg) {
+	LDKCResult_SiPrefixNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixNoneZ), "LDKCResult_SiPrefixNoneZ");
+	*ret_conv = CResult_SiPrefixNoneZ_clone(arg);
+	return (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_SiPrefixNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SiPrefixNoneZ* arg_conv = (LDKCResult_SiPrefixNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_SiPrefixNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_SiPrefixNoneZ_clone(uint32_t orig) {
 	LDKCResult_SiPrefixNoneZ* orig_conv = (LDKCResult_SiPrefixNoneZ*)(orig & ~1);
 	LDKCResult_SiPrefixNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixNoneZ), "LDKCResult_SiPrefixNoneZ");
@@ -11016,6 +12334,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceNoneZ_ok(uint
 	LDKInvoice o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = Invoice_clone(&o_conv);
 	LDKCResult_InvoiceNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceNoneZ), "LDKCResult_InvoiceNoneZ");
 	*ret_conv = CResult_InvoiceNoneZ_ok(o_conv);
@@ -11028,6 +12347,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceNoneZ_err() {
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_InvoiceNoneZ_is_ok(uint32_t o) {
+	LDKCResult_InvoiceNoneZ* o_conv = (LDKCResult_InvoiceNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_InvoiceNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_InvoiceNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11037,6 +12362,17 @@ void  __attribute__((visibility("default"))) TS_CResult_InvoiceNoneZ_free(uint32
 	CResult_InvoiceNoneZ_free(_res_conv);
 }
 
+static inline uint64_t CResult_InvoiceNoneZ_clone_ptr(LDKCResult_InvoiceNoneZ *NONNULL_PTR arg) {
+	LDKCResult_InvoiceNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceNoneZ), "LDKCResult_InvoiceNoneZ");
+	*ret_conv = CResult_InvoiceNoneZ_clone(arg);
+	return (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_InvoiceNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_InvoiceNoneZ* arg_conv = (LDKCResult_InvoiceNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_InvoiceNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceNoneZ_clone(uint32_t orig) {
 	LDKCResult_InvoiceNoneZ* orig_conv = (LDKCResult_InvoiceNoneZ*)(orig & ~1);
 	LDKCResult_InvoiceNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceNoneZ), "LDKCResult_InvoiceNoneZ");
@@ -11048,6 +12384,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_SignedRawInvoiceNone
 	LDKSignedRawInvoice o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = SignedRawInvoice_clone(&o_conv);
 	LDKCResult_SignedRawInvoiceNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceNoneZ), "LDKCResult_SignedRawInvoiceNoneZ");
 	*ret_conv = CResult_SignedRawInvoiceNoneZ_ok(o_conv);
@@ -11060,6 +12397,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_SignedRawInvoiceNone
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_SignedRawInvoiceNoneZ_is_ok(uint32_t o) {
+	LDKCResult_SignedRawInvoiceNoneZ* o_conv = (LDKCResult_SignedRawInvoiceNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_SignedRawInvoiceNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_SignedRawInvoiceNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11069,6 +12412,17 @@ void  __attribute__((visibility("default"))) TS_CResult_SignedRawInvoiceNoneZ_fr
 	CResult_SignedRawInvoiceNoneZ_free(_res_conv);
 }
 
+static inline uint64_t CResult_SignedRawInvoiceNoneZ_clone_ptr(LDKCResult_SignedRawInvoiceNoneZ *NONNULL_PTR arg) {
+	LDKCResult_SignedRawInvoiceNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceNoneZ), "LDKCResult_SignedRawInvoiceNoneZ");
+	*ret_conv = CResult_SignedRawInvoiceNoneZ_clone(arg);
+	return (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_SignedRawInvoiceNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SignedRawInvoiceNoneZ* arg_conv = (LDKCResult_SignedRawInvoiceNoneZ*)(arg & ~1);
+	int64_t ret_val = CResult_SignedRawInvoiceNoneZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_SignedRawInvoiceNoneZ_clone(uint32_t orig) {
 	LDKCResult_SignedRawInvoiceNoneZ* orig_conv = (LDKCResult_SignedRawInvoiceNoneZ*)(orig & ~1);
 	LDKCResult_SignedRawInvoiceNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceNoneZ), "LDKCResult_SignedRawInvoiceNoneZ");
@@ -11076,6 +12430,17 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_SignedRawInvoiceNone
 	return (uint64_t)ret_conv;
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(uint32_t arg) {
+	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* arg_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(arg & ~1);
+	int64_t ret_val = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(uint32_t orig) {
 	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* orig_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(orig & ~1);
 	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ");
@@ -11087,6 +12452,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_RawInvoice_u832Invoi
 	LDKRawInvoice a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = (a & 1) || (a == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	a_conv = RawInvoice_clone(&a_conv);
 	LDKThirtyTwoBytes b_ref;
 	CHECK(*((uint32_t*)b) == 32);
@@ -11094,6 +12460,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_RawInvoice_u832Invoi
 	LDKInvoiceSignature c_conv;
 	c_conv.inner = (void*)(c & (~1));
 	c_conv.is_owned = (c & 1) || (c == 0);
+	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);
@@ -11113,6 +12480,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PayeePubKeyErrorZ_ok
 	LDKPayeePubKey o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = PayeePubKey_clone(&o_conv);
 	LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ");
 	*ret_conv = CResult_PayeePubKeyErrorZ_ok(o_conv);
@@ -11126,6 +12494,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PayeePubKeyErrorZ_er
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_PayeePubKeyErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PayeePubKeyErrorZ* o_conv = (LDKCResult_PayeePubKeyErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_PayeePubKeyErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_PayeePubKeyErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11135,6 +12509,17 @@ void  __attribute__((visibility("default"))) TS_CResult_PayeePubKeyErrorZ_free(u
 	CResult_PayeePubKeyErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PayeePubKeyErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PayeePubKeyErrorZ* arg_conv = (LDKCResult_PayeePubKeyErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_PayeePubKeyErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PayeePubKeyErrorZ_clone(uint32_t orig) {
 	LDKCResult_PayeePubKeyErrorZ* orig_conv = (LDKCResult_PayeePubKeyErrorZ*)(orig & ~1);
 	LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ");
@@ -11155,6 +12540,7 @@ void  __attribute__((visibility("default"))) TS_CVec_PrivateRouteZ_free(uint32_t
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv);
 		_res_constr.data[o] = _res_conv_14_conv;
 	}
 	CVec_PrivateRouteZ_free(_res_constr);
@@ -11164,6 +12550,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PositiveTimestampCre
 	LDKPositiveTimestamp o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = PositiveTimestamp_clone(&o_conv);
 	LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ");
 	*ret_conv = CResult_PositiveTimestampCreationErrorZ_ok(o_conv);
@@ -11177,6 +12564,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PositiveTimestampCre
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_PositiveTimestampCreationErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PositiveTimestampCreationErrorZ* o_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_PositiveTimestampCreationErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_PositiveTimestampCreationErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11186,6 +12579,17 @@ void  __attribute__((visibility("default"))) TS_CResult_PositiveTimestampCreatio
 	CResult_PositiveTimestampCreationErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PositiveTimestampCreationErrorZ* arg_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_PositiveTimestampCreationErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PositiveTimestampCreationErrorZ_clone(uint32_t orig) {
 	LDKCResult_PositiveTimestampCreationErrorZ* orig_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(orig & ~1);
 	LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ");
@@ -11206,6 +12610,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneSemanticErrorZ_e
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NoneSemanticErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NoneSemanticErrorZ* o_conv = (LDKCResult_NoneSemanticErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NoneSemanticErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NoneSemanticErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11215,6 +12625,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NoneSemanticErrorZ_free(
 	CResult_NoneSemanticErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NoneSemanticErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneSemanticErrorZ* arg_conv = (LDKCResult_NoneSemanticErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NoneSemanticErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneSemanticErrorZ_clone(uint32_t orig) {
 	LDKCResult_NoneSemanticErrorZ* orig_conv = (LDKCResult_NoneSemanticErrorZ*)(orig & ~1);
 	LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ");
@@ -11226,6 +12647,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceSemanticError
 	LDKInvoice o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = Invoice_clone(&o_conv);
 	LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ");
 	*ret_conv = CResult_InvoiceSemanticErrorZ_ok(o_conv);
@@ -11239,6 +12661,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceSemanticError
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_InvoiceSemanticErrorZ_is_ok(uint32_t o) {
+	LDKCResult_InvoiceSemanticErrorZ* o_conv = (LDKCResult_InvoiceSemanticErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_InvoiceSemanticErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_InvoiceSemanticErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11248,6 +12676,17 @@ void  __attribute__((visibility("default"))) TS_CResult_InvoiceSemanticErrorZ_fr
 	CResult_InvoiceSemanticErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_InvoiceSemanticErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_InvoiceSemanticErrorZ* arg_conv = (LDKCResult_InvoiceSemanticErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_InvoiceSemanticErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceSemanticErrorZ_clone(uint32_t orig) {
 	LDKCResult_InvoiceSemanticErrorZ* orig_conv = (LDKCResult_InvoiceSemanticErrorZ*)(orig & ~1);
 	LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ");
@@ -11259,6 +12698,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_DescriptionCreationE
 	LDKDescription o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = Description_clone(&o_conv);
 	LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ");
 	*ret_conv = CResult_DescriptionCreationErrorZ_ok(o_conv);
@@ -11272,6 +12712,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_DescriptionCreationE
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_DescriptionCreationErrorZ_is_ok(uint32_t o) {
+	LDKCResult_DescriptionCreationErrorZ* o_conv = (LDKCResult_DescriptionCreationErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_DescriptionCreationErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_DescriptionCreationErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11281,6 +12727,17 @@ void  __attribute__((visibility("default"))) TS_CResult_DescriptionCreationError
 	CResult_DescriptionCreationErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_DescriptionCreationErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_DescriptionCreationErrorZ* arg_conv = (LDKCResult_DescriptionCreationErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_DescriptionCreationErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_DescriptionCreationErrorZ_clone(uint32_t orig) {
 	LDKCResult_DescriptionCreationErrorZ* orig_conv = (LDKCResult_DescriptionCreationErrorZ*)(orig & ~1);
 	LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ");
@@ -11292,6 +12749,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ExpiryTimeCreationEr
 	LDKExpiryTime o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ExpiryTime_clone(&o_conv);
 	LDKCResult_ExpiryTimeCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ExpiryTimeCreationErrorZ), "LDKCResult_ExpiryTimeCreationErrorZ");
 	*ret_conv = CResult_ExpiryTimeCreationErrorZ_ok(o_conv);
@@ -11305,6 +12763,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ExpiryTimeCreationEr
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ExpiryTimeCreationErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ExpiryTimeCreationErrorZ* o_conv = (LDKCResult_ExpiryTimeCreationErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ExpiryTimeCreationErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ExpiryTimeCreationErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11314,6 +12778,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ExpiryTimeCreationErrorZ
 	CResult_ExpiryTimeCreationErrorZ_free(_res_conv);
 }
 
+static inline uint64_t CResult_ExpiryTimeCreationErrorZ_clone_ptr(LDKCResult_ExpiryTimeCreationErrorZ *NONNULL_PTR arg) {
+	LDKCResult_ExpiryTimeCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ExpiryTimeCreationErrorZ), "LDKCResult_ExpiryTimeCreationErrorZ");
+	*ret_conv = CResult_ExpiryTimeCreationErrorZ_clone(arg);
+	return (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ExpiryTimeCreationErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ExpiryTimeCreationErrorZ* arg_conv = (LDKCResult_ExpiryTimeCreationErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ExpiryTimeCreationErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ExpiryTimeCreationErrorZ_clone(uint32_t orig) {
 	LDKCResult_ExpiryTimeCreationErrorZ* orig_conv = (LDKCResult_ExpiryTimeCreationErrorZ*)(orig & ~1);
 	LDKCResult_ExpiryTimeCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ExpiryTimeCreationErrorZ), "LDKCResult_ExpiryTimeCreationErrorZ");
@@ -11325,6 +12800,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PrivateRouteCreation
 	LDKPrivateRoute o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = PrivateRoute_clone(&o_conv);
 	LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ");
 	*ret_conv = CResult_PrivateRouteCreationErrorZ_ok(o_conv);
@@ -11338,6 +12814,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PrivateRouteCreation
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_PrivateRouteCreationErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PrivateRouteCreationErrorZ* o_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_PrivateRouteCreationErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_PrivateRouteCreationErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11347,6 +12829,17 @@ void  __attribute__((visibility("default"))) TS_CResult_PrivateRouteCreationErro
 	CResult_PrivateRouteCreationErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PrivateRouteCreationErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PrivateRouteCreationErrorZ* arg_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_PrivateRouteCreationErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PrivateRouteCreationErrorZ_clone(uint32_t orig) {
 	LDKCResult_PrivateRouteCreationErrorZ* orig_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(orig & ~1);
 	LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ");
@@ -11368,6 +12861,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_StringErrorZ_err(uin
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_StringErrorZ_is_ok(uint32_t o) {
+	LDKCResult_StringErrorZ* o_conv = (LDKCResult_StringErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_StringErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_StringErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11381,6 +12880,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdate
 	LDKChannelMonitorUpdate o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -11391,12 +12891,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdate
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11406,6 +12913,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdateDeco
 	CResult_ChannelMonitorUpdateDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ");
@@ -11413,10 +12931,112 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelMonitorUpdate
 	return (uint64_t)ret_conv;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_COption_MonitorEventZ_some(uint32_t o) {
+	void* o_ptr = (void*)(((uint64_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKMonitorEvent o_conv = *(LDKMonitorEvent*)(o_ptr);
+	o_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uint64_t)o) & ~1));
+	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
+	*ret_copy = COption_MonitorEventZ_some(o_conv);
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_COption_MonitorEventZ_none() {
+	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
+	*ret_copy = COption_MonitorEventZ_none();
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((visibility("default"))) TS_COption_MonitorEventZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCOption_MonitorEventZ _res_conv = *(LDKCOption_MonitorEventZ*)(_res_ptr);
+	FREE((void*)_res);
+	COption_MonitorEventZ_free(_res_conv);
+}
+
+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);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_COption_MonitorEventZ_clone_ptr(uint32_t arg) {
+	LDKCOption_MonitorEventZ* arg_conv = (LDKCOption_MonitorEventZ*)arg;
+	int64_t ret_val = COption_MonitorEventZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_COption_MonitorEventZ_clone(uint32_t orig) {
+	LDKCOption_MonitorEventZ* orig_conv = (LDKCOption_MonitorEventZ*)orig;
+	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
+	*ret_copy = COption_MonitorEventZ_clone(orig_conv);
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uint64_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKCOption_MonitorEventZ o_conv = *(LDKCOption_MonitorEventZ*)(o_ptr);
+	o_conv = COption_MonitorEventZ_clone((LDKCOption_MonitorEventZ*)(((uint64_t)o) & ~1));
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
+	*ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_ok(o_conv);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_err(uint32_t e) {
+	LDKDecodeError e_conv;
+	e_conv.inner = (void*)(e & (~1));
+	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
+	e_conv = DecodeError_clone(&e_conv);
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
+	*ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_err(e_conv);
+	return (uint64_t)ret_conv;
+}
+
+jboolean  __attribute__((visibility("default"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* o_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_COption_MonitorEventZDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_COption_MonitorEventZDecodeErrorZ _res_conv = *(LDKCResult_COption_MonitorEventZDecodeErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_COption_MonitorEventZDecodeErrorZ_free(_res_conv);
+}
+
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* arg_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* orig_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(orig & ~1);
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
+	*ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone(orig_conv);
+	return (uint64_t)ret_conv;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_HTLCUpdateDecodeErrorZ_ok(uint32_t o) {
 	LDKHTLCUpdate o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = HTLCUpdate_clone(&o_conv);
 	LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ");
 	*ret_conv = CResult_HTLCUpdateDecodeErrorZ_ok(o_conv);
@@ -11427,12 +13047,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_HTLCUpdateDecodeErro
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ");
 	*ret_conv = CResult_HTLCUpdateDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_HTLCUpdateDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_HTLCUpdateDecodeErrorZ* o_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_HTLCUpdateDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_HTLCUpdateDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11442,43 +13069,33 @@ void  __attribute__((visibility("default"))) TS_CResult_HTLCUpdateDecodeErrorZ_f
 	CResult_HTLCUpdateDecodeErrorZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_HTLCUpdateDecodeErrorZ* orig_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(orig & ~1);
+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(orig_conv);
+	*ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone(arg);
 	return (uint64_t)ret_conv;
 }
-
-uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneMonitorUpdateErrorZ_ok() {
-	LDKCResult_NoneMonitorUpdateErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ");
-	*ret_conv = CResult_NoneMonitorUpdateErrorZ_ok();
-	return (uint64_t)ret_conv;
+int64_t  __attribute__((visibility("default"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_HTLCUpdateDecodeErrorZ* arg_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneMonitorUpdateErrorZ_err(uint32_t e) {
-	LDKMonitorUpdateError e_conv;
-	e_conv.inner = (void*)(e & (~1));
-	e_conv.is_owned = (e & 1) || (e == 0);
-	e_conv = MonitorUpdateError_clone(&e_conv);
-	LDKCResult_NoneMonitorUpdateErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ");
-	*ret_conv = CResult_NoneMonitorUpdateErrorZ_err(e_conv);
+uint32_t  __attribute__((visibility("default"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_HTLCUpdateDecodeErrorZ* orig_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(orig & ~1);
+	LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ");
+	*ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone(orig_conv);
 	return (uint64_t)ret_conv;
 }
 
-void  __attribute__((visibility("default"))) TS_CResult_NoneMonitorUpdateErrorZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NoneMonitorUpdateErrorZ _res_conv = *(LDKCResult_NoneMonitorUpdateErrorZ*)(_res_ptr);
-	FREE((void*)_res);
-	CResult_NoneMonitorUpdateErrorZ_free(_res_conv);
+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 ((uint64_t)ret_conv);
 }
-
-uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneMonitorUpdateErrorZ_clone(uint32_t orig) {
-	LDKCResult_NoneMonitorUpdateErrorZ* orig_conv = (LDKCResult_NoneMonitorUpdateErrorZ*)(orig & ~1);
-	LDKCResult_NoneMonitorUpdateErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ");
-	*ret_conv = CResult_NoneMonitorUpdateErrorZ_clone(orig_conv);
-	return (uint64_t)ret_conv;
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_OutPointScriptZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_OutPointScriptZ* arg_conv = (LDKC2Tuple_OutPointScriptZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_OutPointScriptZ_clone_ptr(arg_conv);
+	return ret_val;
 }
 
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_OutPointScriptZ_clone(uint32_t orig) {
@@ -11492,6 +13109,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_OutPointScriptZ_new(
 	LDKOutPoint a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = (a & 1) || (a == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	a_conv = OutPoint_clone(&a_conv);
 	LDKCVec_u8Z b_ref;
 	b_ref.datalen = *((uint32_t*)b);
@@ -11511,6 +13129,17 @@ void  __attribute__((visibility("default"))) TS_C2Tuple_OutPointScriptZ_free(uin
 	C2Tuple_OutPointScriptZ_free(_res_conv);
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_u32ScriptZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_u32ScriptZ* arg_conv = (LDKC2Tuple_u32ScriptZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_u32ScriptZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_u32ScriptZ_clone(uint32_t orig) {
 	LDKC2Tuple_u32ScriptZ* orig_conv = (LDKC2Tuple_u32ScriptZ*)(orig & ~1);
 	LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ");
@@ -11556,6 +13185,17 @@ void  __attribute__((visibility("default"))) TS_CVec_C2Tuple_u32ScriptZZ_free(ui
 	CVec_C2Tuple_u32ScriptZZ_free(_res_constr);
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(uint32_t orig) {
 	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(orig & ~1);
 	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ");
@@ -11654,6 +13294,17 @@ void  __attribute__((visibility("default"))) TS_CVec_TransactionZ_free(ptrArray
 	CVec_TransactionZ_free(_res_constr);
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_u32TxOutZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_u32TxOutZ* arg_conv = (LDKC2Tuple_u32TxOutZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_u32TxOutZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_u32TxOutZ_clone(uint32_t orig) {
 	LDKC2Tuple_u32TxOutZ* orig_conv = (LDKC2Tuple_u32TxOutZ*)(orig & ~1);
 	LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ");
@@ -11699,6 +13350,17 @@ void  __attribute__((visibility("default"))) TS_CVec_C2Tuple_u32TxOutZZ_free(uin
 	CVec_C2Tuple_u32TxOutZZ_free(_res_constr);
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(uint32_t orig) {
 	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(orig & ~1);
 	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ");
@@ -11791,12 +13453,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashCha
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11806,6 +13475,17 @@ void  __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannel
 	CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* arg_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* orig_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(orig & ~1);
 	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ");
@@ -11823,12 +13503,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneLightningErrorZ_
 	LDKLightningError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NoneLightningErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NoneLightningErrorZ* o_conv = (LDKCResult_NoneLightningErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NoneLightningErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NoneLightningErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11838,6 +13525,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NoneLightningErrorZ_free
 	CResult_NoneLightningErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NoneLightningErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneLightningErrorZ* arg_conv = (LDKCResult_NoneLightningErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NoneLightningErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneLightningErrorZ_clone(uint32_t orig) {
 	LDKCResult_NoneLightningErrorZ* orig_conv = (LDKCResult_NoneLightningErrorZ*)(orig & ~1);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
@@ -11845,6 +13543,17 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NoneLightningErrorZ_
 	return (uint64_t)ret_conv;
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C2Tuple_PublicKeyTypeZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_PublicKeyTypeZ* arg_conv = (LDKC2Tuple_PublicKeyTypeZ*)(arg & ~1);
+	int64_t ret_val = C2Tuple_PublicKeyTypeZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_PublicKeyTypeZ_clone(uint32_t orig) {
 	LDKC2Tuple_PublicKeyTypeZ* orig_conv = (LDKC2Tuple_PublicKeyTypeZ*)(orig & ~1);
 	LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ");
@@ -11902,12 +13611,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_boolLightningErrorZ_
 	LDKLightningError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_boolLightningErrorZ_is_ok(uint32_t o) {
+	LDKCResult_boolLightningErrorZ* o_conv = (LDKCResult_boolLightningErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_boolLightningErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_boolLightningErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -11917,6 +13633,17 @@ void  __attribute__((visibility("default"))) TS_CResult_boolLightningErrorZ_free
 	CResult_boolLightningErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_boolLightningErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_boolLightningErrorZ* arg_conv = (LDKCResult_boolLightningErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_boolLightningErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_boolLightningErrorZ_clone(uint32_t orig) {
 	LDKCResult_boolLightningErrorZ* orig_conv = (LDKCResult_boolLightningErrorZ*)(orig & ~1);
 	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
@@ -11924,6 +13651,17 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_boolLightningErrorZ_
 	return (uint64_t)ret_conv;
 }
 
+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 ((uint64_t)ret_conv);
+}
+int64_t  __attribute__((visibility("default"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(uint32_t arg) {
+	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* arg_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(arg & ~1);
+	int64_t ret_val = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(uint32_t orig) {
 	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* orig_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(orig & ~1);
 	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ");
@@ -11935,14 +13673,17 @@ uint32_t  __attribute__((visibility("default"))) TS_C3Tuple_ChannelAnnouncementC
 	LDKChannelAnnouncement a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = (a & 1) || (a == 0);
+	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);
+	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);
+	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);
@@ -11990,6 +13731,7 @@ void  __attribute__((visibility("default"))) TS_CVec_NodeAnnouncementZ_free(uint
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_18_conv);
 		_res_constr.data[s] = _res_conv_18_conv;
 	}
 	CVec_NodeAnnouncementZ_free(_res_constr);
@@ -12027,12 +13769,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_CVec_u8ZPeerHandleEr
 	LDKPeerHandleError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok(uint32_t o) {
+	LDKCResult_CVec_u8ZPeerHandleErrorZ* o_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_CVec_u8ZPeerHandleErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12042,6 +13791,17 @@ void  __attribute__((visibility("default"))) TS_CResult_CVec_u8ZPeerHandleErrorZ
 	CResult_CVec_u8ZPeerHandleErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_CVec_u8ZPeerHandleErrorZ* arg_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone(uint32_t orig) {
 	LDKCResult_CVec_u8ZPeerHandleErrorZ* orig_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(orig & ~1);
 	LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ");
@@ -12059,12 +13819,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NonePeerHandleErrorZ
 	LDKPeerHandleError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NonePeerHandleErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NonePeerHandleErrorZ* o_conv = (LDKCResult_NonePeerHandleErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NonePeerHandleErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NonePeerHandleErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12074,6 +13841,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NonePeerHandleErrorZ_fre
 	CResult_NonePeerHandleErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NonePeerHandleErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NonePeerHandleErrorZ* arg_conv = (LDKCResult_NonePeerHandleErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NonePeerHandleErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NonePeerHandleErrorZ_clone(uint32_t orig) {
 	LDKCResult_NonePeerHandleErrorZ* orig_conv = (LDKCResult_NonePeerHandleErrorZ*)(orig & ~1);
 	LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ");
@@ -12091,12 +13869,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_boolPeerHandleErrorZ
 	LDKPeerHandleError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_boolPeerHandleErrorZ_is_ok(uint32_t o) {
+	LDKCResult_boolPeerHandleErrorZ* o_conv = (LDKCResult_boolPeerHandleErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_boolPeerHandleErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_boolPeerHandleErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12106,6 +13891,17 @@ void  __attribute__((visibility("default"))) TS_CResult_boolPeerHandleErrorZ_fre
 	CResult_boolPeerHandleErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_boolPeerHandleErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_boolPeerHandleErrorZ* arg_conv = (LDKCResult_boolPeerHandleErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_boolPeerHandleErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_boolPeerHandleErrorZ_clone(uint32_t orig) {
 	LDKCResult_boolPeerHandleErrorZ* orig_conv = (LDKCResult_boolPeerHandleErrorZ*)(orig & ~1);
 	LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ");
@@ -12117,6 +13913,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeIdDecodeErrorZ_o
 	LDKNodeId o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = NodeId_clone(&o_conv);
 	LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
 	*ret_conv = CResult_NodeIdDecodeErrorZ_ok(o_conv);
@@ -12127,12 +13924,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeIdDecodeErrorZ_e
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
 	*ret_conv = CResult_NodeIdDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NodeIdDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NodeIdDecodeErrorZ* o_conv = (LDKCResult_NodeIdDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NodeIdDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NodeIdDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12142,6 +13946,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NodeIdDecodeErrorZ_free(
 	CResult_NodeIdDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NodeIdDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NodeIdDecodeErrorZ* arg_conv = (LDKCResult_NodeIdDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NodeIdDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeIdDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_NodeIdDecodeErrorZ* orig_conv = (LDKCResult_NodeIdDecodeErrorZ*)(orig & ~1);
 	LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
@@ -12149,6 +13964,60 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeIdDecodeErrorZ_c
 	return (uint64_t)ret_conv;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uint64_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKCOption_NetworkUpdateZ o_conv = *(LDKCOption_NetworkUpdateZ*)(o_ptr);
+	o_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uint64_t)o) & ~1));
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
+	*ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_ok(o_conv);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err(uint32_t e) {
+	LDKDecodeError e_conv;
+	e_conv.inner = (void*)(e & (~1));
+	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
+	e_conv = DecodeError_clone(&e_conv);
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
+	*ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_err(e_conv);
+	return (uint64_t)ret_conv;
+}
+
+jboolean  __attribute__((visibility("default"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* o_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ _res_conv = *(LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_COption_NetworkUpdateZDecodeErrorZ_free(_res_conv);
+}
+
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* arg_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* orig_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(orig & ~1);
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
+	*ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone(orig_conv);
+	return (uint64_t)ret_conv;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_COption_AccessZ_some(uint32_t o) {
 	void* o_ptr = (void*)(((uint64_t)o) & ~1);
 	CHECK_ACCESS(o_ptr);
@@ -12179,6 +14048,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_DirectionalChannelIn
 	LDKDirectionalChannelInfo o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = DirectionalChannelInfo_clone(&o_conv);
 	LDKCResult_DirectionalChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DirectionalChannelInfoDecodeErrorZ), "LDKCResult_DirectionalChannelInfoDecodeErrorZ");
 	*ret_conv = CResult_DirectionalChannelInfoDecodeErrorZ_ok(o_conv);
@@ -12189,12 +14059,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_DirectionalChannelIn
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_DirectionalChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DirectionalChannelInfoDecodeErrorZ), "LDKCResult_DirectionalChannelInfoDecodeErrorZ");
 	*ret_conv = CResult_DirectionalChannelInfoDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_DirectionalChannelInfoDecodeErrorZ* o_conv = (LDKCResult_DirectionalChannelInfoDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_DirectionalChannelInfoDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12204,6 +14081,17 @@ void  __attribute__((visibility("default"))) TS_CResult_DirectionalChannelInfoDe
 	CResult_DirectionalChannelInfoDecodeErrorZ_free(_res_conv);
 }
 
+static inline uint64_t CResult_DirectionalChannelInfoDecodeErrorZ_clone_ptr(LDKCResult_DirectionalChannelInfoDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_DirectionalChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DirectionalChannelInfoDecodeErrorZ), "LDKCResult_DirectionalChannelInfoDecodeErrorZ");
+	*ret_conv = CResult_DirectionalChannelInfoDecodeErrorZ_clone(arg);
+	return (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_DirectionalChannelInfoDecodeErrorZ* arg_conv = (LDKCResult_DirectionalChannelInfoDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_DirectionalChannelInfoDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_DirectionalChannelInfoDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_DirectionalChannelInfoDecodeErrorZ* orig_conv = (LDKCResult_DirectionalChannelInfoDecodeErrorZ*)(orig & ~1);
 	LDKCResult_DirectionalChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DirectionalChannelInfoDecodeErrorZ), "LDKCResult_DirectionalChannelInfoDecodeErrorZ");
@@ -12215,6 +14103,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelInfoDecodeErr
 	LDKChannelInfo o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ChannelInfo_clone(&o_conv);
 	LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ");
 	*ret_conv = CResult_ChannelInfoDecodeErrorZ_ok(o_conv);
@@ -12225,12 +14114,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelInfoDecodeErr
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ");
 	*ret_conv = CResult_ChannelInfoDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ChannelInfoDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ChannelInfoDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ChannelInfoDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12240,6 +14136,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ChannelInfoDecodeErrorZ_
 	CResult_ChannelInfoDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelInfoDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ");
@@ -12251,6 +14158,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RoutingFeesDecodeErr
 	LDKRoutingFees o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -12261,12 +14169,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RoutingFeesDecodeErr
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_RoutingFeesDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_RoutingFeesDecodeErrorZ* o_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_RoutingFeesDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_RoutingFeesDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12276,6 +14191,17 @@ void  __attribute__((visibility("default"))) TS_CResult_RoutingFeesDecodeErrorZ_
 	CResult_RoutingFeesDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RoutingFeesDecodeErrorZ* arg_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_RoutingFeesDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RoutingFeesDecodeErrorZ* orig_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ");
@@ -12287,6 +14213,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfo
 	LDKNodeAnnouncementInfo o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -12297,12 +14224,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfo
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12312,6 +14246,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfoDeco
 	CResult_NodeAnnouncementInfoDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(orig & ~1);
 	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ");
@@ -12338,6 +14283,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ
 	LDKNodeInfo o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = NodeInfo_clone(&o_conv);
 	LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ");
 	*ret_conv = CResult_NodeInfoDecodeErrorZ_ok(o_conv);
@@ -12348,12 +14294,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NodeInfoDecodeErrorZ* o_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NodeInfoDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12363,6 +14316,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ_fre
 	CResult_NodeInfoDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NodeInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NodeInfoDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeInfoDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_NodeInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(orig & ~1);
 	LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ");
@@ -12374,6 +14338,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NetworkGraphDecodeEr
 	LDKNetworkGraph o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = NetworkGraph_clone(&o_conv);
 	LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ");
 	*ret_conv = CResult_NetworkGraphDecodeErrorZ_ok(o_conv);
@@ -12384,12 +14349,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NetworkGraphDecodeEr
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NetworkGraphDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NetworkGraphDecodeErrorZ* o_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NetworkGraphDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NetworkGraphDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12399,6 +14371,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NetworkGraphDecodeErrorZ
 	CResult_NetworkGraphDecodeErrorZ_free(_res_conv);
 }
 
+static inline uint64_t CResult_NetworkGraphDecodeErrorZ_clone_ptr(LDKCResult_NetworkGraphDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ");
+	*ret_conv = CResult_NetworkGraphDecodeErrorZ_clone(arg);
+	return (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NetworkGraphDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NetworkGraphDecodeErrorZ* arg_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NetworkGraphDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NetworkGraphDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_NetworkGraphDecodeErrorZ* orig_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(orig & ~1);
 	LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ");
@@ -12444,6 +14427,18 @@ void  __attribute__((visibility("default"))) TS_COption_CVec_NetAddressZZ_free(u
 	COption_CVec_NetAddressZZ_free(_res_conv);
 }
 
+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);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_COption_CVec_NetAddressZZ_clone_ptr(uint32_t arg) {
+	LDKCOption_CVec_NetAddressZZ* arg_conv = (LDKCOption_CVec_NetAddressZZ*)arg;
+	int64_t ret_val = COption_CVec_NetAddressZZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_COption_CVec_NetAddressZZ_clone(uint32_t orig) {
 	LDKCOption_CVec_NetAddressZZ* orig_conv = (LDKCOption_CVec_NetAddressZZ*)orig;
 	LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ");
@@ -12466,12 +14461,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NetAddressDecodeErro
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ");
 	*ret_conv = CResult_NetAddressDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NetAddressDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NetAddressDecodeErrorZ* o_conv = (LDKCResult_NetAddressDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NetAddressDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NetAddressDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12481,6 +14483,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NetAddressDecodeErrorZ_f
 	CResult_NetAddressDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NetAddressDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NetAddressDecodeErrorZ* arg_conv = (LDKCResult_NetAddressDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NetAddressDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NetAddressDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_NetAddressDecodeErrorZ* orig_conv = (LDKCResult_NetAddressDecodeErrorZ*)(orig & ~1);
 	LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ");
@@ -12501,6 +14514,7 @@ void  __attribute__((visibility("default"))) TS_CVec_UpdateAddHTLCZ_free(uint32_
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_15_conv);
 		_res_constr.data[p] = _res_conv_15_conv;
 	}
 	CVec_UpdateAddHTLCZ_free(_res_constr);
@@ -12519,6 +14533,7 @@ void  __attribute__((visibility("default"))) TS_CVec_UpdateFulfillHTLCZ_free(uin
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_19_conv);
 		_res_constr.data[t] = _res_conv_19_conv;
 	}
 	CVec_UpdateFulfillHTLCZ_free(_res_constr);
@@ -12537,6 +14552,7 @@ void  __attribute__((visibility("default"))) TS_CVec_UpdateFailHTLCZ_free(uint32
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv);
 		_res_constr.data[q] = _res_conv_16_conv;
 	}
 	CVec_UpdateFailHTLCZ_free(_res_constr);
@@ -12555,6 +14571,7 @@ void  __attribute__((visibility("default"))) TS_CVec_UpdateFailMalformedHTLCZ_fr
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_25_conv);
 		_res_constr.data[z] = _res_conv_25_conv;
 	}
 	CVec_UpdateFailMalformedHTLCZ_free(_res_constr);
@@ -12564,6 +14581,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_AcceptChannelDecodeE
 	LDKAcceptChannel o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = AcceptChannel_clone(&o_conv);
 	LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ");
 	*ret_conv = CResult_AcceptChannelDecodeErrorZ_ok(o_conv);
@@ -12574,12 +14592,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_AcceptChannelDecodeE
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ");
 	*ret_conv = CResult_AcceptChannelDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_AcceptChannelDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_AcceptChannelDecodeErrorZ* o_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_AcceptChannelDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_AcceptChannelDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12589,6 +14614,17 @@ void  __attribute__((visibility("default"))) TS_CResult_AcceptChannelDecodeError
 	CResult_AcceptChannelDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_AcceptChannelDecodeErrorZ* arg_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_AcceptChannelDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_AcceptChannelDecodeErrorZ* orig_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(orig & ~1);
 	LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ");
@@ -12600,6 +14636,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_AnnouncementSignatur
 	LDKAnnouncementSignatures o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = AnnouncementSignatures_clone(&o_conv);
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ");
 	*ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_ok(o_conv);
@@ -12610,12 +14647,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_AnnouncementSignatur
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ");
 	*ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_AnnouncementSignaturesDecodeErrorZ* o_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12625,6 +14669,17 @@ void  __attribute__((visibility("default"))) TS_CResult_AnnouncementSignaturesDe
 	CResult_AnnouncementSignaturesDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_AnnouncementSignaturesDecodeErrorZ* arg_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* orig_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(orig & ~1);
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ");
@@ -12636,6 +14691,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelReestablishDe
 	LDKChannelReestablish o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ChannelReestablish_clone(&o_conv);
 	LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ");
 	*ret_conv = CResult_ChannelReestablishDecodeErrorZ_ok(o_conv);
@@ -12646,12 +14702,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelReestablishDe
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ChannelReestablishDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelReestablishDecodeErrorZ* o_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ChannelReestablishDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ChannelReestablishDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12661,6 +14724,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ChannelReestablishDecode
 	CResult_ChannelReestablishDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelReestablishDecodeErrorZ* arg_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelReestablishDecodeErrorZ* orig_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ");
@@ -12672,6 +14746,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ClosingSignedDecodeE
 	LDKClosingSigned o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ClosingSigned_clone(&o_conv);
 	LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedDecodeErrorZ_ok(o_conv);
@@ -12682,12 +14757,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ClosingSignedDecodeE
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ClosingSignedDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ClosingSignedDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ClosingSignedDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ClosingSignedDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12697,6 +14779,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ClosingSignedDecodeError
 	CResult_ClosingSignedDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ClosingSignedDecodeErrorZ* arg_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ClosingSignedDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ClosingSignedDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ");
@@ -12708,6 +14801,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ClosingSignedFeeRang
 	LDKClosingSignedFeeRange o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ClosingSignedFeeRange_clone(&o_conv);
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(o_conv);
@@ -12718,12 +14812,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ClosingSignedFeeRang
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12733,6 +14834,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ClosingSignedFeeRangeDec
 	CResult_ClosingSignedFeeRangeDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* arg_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ");
@@ -12744,6 +14856,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_CommitmentSignedDeco
 	LDKCommitmentSigned o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = CommitmentSigned_clone(&o_conv);
 	LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ");
 	*ret_conv = CResult_CommitmentSignedDecodeErrorZ_ok(o_conv);
@@ -12754,12 +14867,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_CommitmentSignedDeco
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ");
 	*ret_conv = CResult_CommitmentSignedDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_CommitmentSignedDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_CommitmentSignedDecodeErrorZ* o_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_CommitmentSignedDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_CommitmentSignedDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12769,6 +14889,17 @@ void  __attribute__((visibility("default"))) TS_CResult_CommitmentSignedDecodeEr
 	CResult_CommitmentSignedDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_CommitmentSignedDecodeErrorZ* arg_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_CommitmentSignedDecodeErrorZ* orig_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(orig & ~1);
 	LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ");
@@ -12780,6 +14911,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_FundingCreatedDecode
 	LDKFundingCreated o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = FundingCreated_clone(&o_conv);
 	LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ");
 	*ret_conv = CResult_FundingCreatedDecodeErrorZ_ok(o_conv);
@@ -12790,12 +14922,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_FundingCreatedDecode
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ");
 	*ret_conv = CResult_FundingCreatedDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_FundingCreatedDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_FundingCreatedDecodeErrorZ* o_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_FundingCreatedDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_FundingCreatedDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12805,6 +14944,17 @@ void  __attribute__((visibility("default"))) TS_CResult_FundingCreatedDecodeErro
 	CResult_FundingCreatedDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_FundingCreatedDecodeErrorZ* arg_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_FundingCreatedDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_FundingCreatedDecodeErrorZ* orig_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(orig & ~1);
 	LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ");
@@ -12816,6 +14966,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_FundingSignedDecodeE
 	LDKFundingSigned o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = FundingSigned_clone(&o_conv);
 	LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ");
 	*ret_conv = CResult_FundingSignedDecodeErrorZ_ok(o_conv);
@@ -12826,12 +14977,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_FundingSignedDecodeE
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ");
 	*ret_conv = CResult_FundingSignedDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_FundingSignedDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_FundingSignedDecodeErrorZ* o_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_FundingSignedDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_FundingSignedDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12841,6 +14999,17 @@ void  __attribute__((visibility("default"))) TS_CResult_FundingSignedDecodeError
 	CResult_FundingSignedDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_FundingSignedDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_FundingSignedDecodeErrorZ* arg_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_FundingSignedDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_FundingSignedDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_FundingSignedDecodeErrorZ* orig_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(orig & ~1);
 	LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ");
@@ -12852,6 +15021,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_FundingLockedDecodeE
 	LDKFundingLocked o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = FundingLocked_clone(&o_conv);
 	LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ");
 	*ret_conv = CResult_FundingLockedDecodeErrorZ_ok(o_conv);
@@ -12862,12 +15032,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_FundingLockedDecodeE
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ");
 	*ret_conv = CResult_FundingLockedDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_FundingLockedDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_FundingLockedDecodeErrorZ* o_conv = (LDKCResult_FundingLockedDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_FundingLockedDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_FundingLockedDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12877,6 +15054,17 @@ void  __attribute__((visibility("default"))) TS_CResult_FundingLockedDecodeError
 	CResult_FundingLockedDecodeErrorZ_free(_res_conv);
 }
 
+static inline uint64_t CResult_FundingLockedDecodeErrorZ_clone_ptr(LDKCResult_FundingLockedDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ");
+	*ret_conv = CResult_FundingLockedDecodeErrorZ_clone(arg);
+	return (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_FundingLockedDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_FundingLockedDecodeErrorZ* arg_conv = (LDKCResult_FundingLockedDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_FundingLockedDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_FundingLockedDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_FundingLockedDecodeErrorZ* orig_conv = (LDKCResult_FundingLockedDecodeErrorZ*)(orig & ~1);
 	LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ");
@@ -12888,6 +15076,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_InitDecodeErrorZ_ok(
 	LDKInit o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -12898,12 +15087,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_InitDecodeErrorZ_err
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_InitDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_InitDecodeErrorZ* o_conv = (LDKCResult_InitDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_InitDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_InitDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12913,6 +15109,17 @@ void  __attribute__((visibility("default"))) TS_CResult_InitDecodeErrorZ_free(ui
 	CResult_InitDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_InitDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_InitDecodeErrorZ* arg_conv = (LDKCResult_InitDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_InitDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_InitDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_InitDecodeErrorZ* orig_conv = (LDKCResult_InitDecodeErrorZ*)(orig & ~1);
 	LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ");
@@ -12924,6 +15131,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_OpenChannelDecodeErr
 	LDKOpenChannel o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = OpenChannel_clone(&o_conv);
 	LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ");
 	*ret_conv = CResult_OpenChannelDecodeErrorZ_ok(o_conv);
@@ -12934,12 +15142,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_OpenChannelDecodeErr
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ");
 	*ret_conv = CResult_OpenChannelDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_OpenChannelDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_OpenChannelDecodeErrorZ* o_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_OpenChannelDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_OpenChannelDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12949,6 +15164,17 @@ void  __attribute__((visibility("default"))) TS_CResult_OpenChannelDecodeErrorZ_
 	CResult_OpenChannelDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_OpenChannelDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_OpenChannelDecodeErrorZ* arg_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_OpenChannelDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_OpenChannelDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_OpenChannelDecodeErrorZ* orig_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(orig & ~1);
 	LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ");
@@ -12960,6 +15186,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RevokeAndACKDecodeEr
 	LDKRevokeAndACK o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = RevokeAndACK_clone(&o_conv);
 	LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ");
 	*ret_conv = CResult_RevokeAndACKDecodeErrorZ_ok(o_conv);
@@ -12970,12 +15197,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_RevokeAndACKDecodeEr
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ");
 	*ret_conv = CResult_RevokeAndACKDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_RevokeAndACKDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_RevokeAndACKDecodeErrorZ* o_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_RevokeAndACKDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_RevokeAndACKDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -12985,6 +15219,17 @@ void  __attribute__((visibility("default"))) TS_CResult_RevokeAndACKDecodeErrorZ
 	CResult_RevokeAndACKDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RevokeAndACKDecodeErrorZ* arg_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RevokeAndACKDecodeErrorZ* orig_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ");
@@ -12996,6 +15241,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ShutdownDecodeErrorZ
 	LDKShutdown o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = Shutdown_clone(&o_conv);
 	LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ");
 	*ret_conv = CResult_ShutdownDecodeErrorZ_ok(o_conv);
@@ -13006,12 +15252,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ShutdownDecodeErrorZ
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ");
 	*ret_conv = CResult_ShutdownDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ShutdownDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ShutdownDecodeErrorZ* o_conv = (LDKCResult_ShutdownDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ShutdownDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ShutdownDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13021,6 +15274,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ShutdownDecodeErrorZ_fre
 	CResult_ShutdownDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ShutdownDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ShutdownDecodeErrorZ* arg_conv = (LDKCResult_ShutdownDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ShutdownDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ShutdownDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ShutdownDecodeErrorZ* orig_conv = (LDKCResult_ShutdownDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ");
@@ -13032,6 +15296,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFailHTLCDecode
 	LDKUpdateFailHTLC o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = UpdateFailHTLC_clone(&o_conv);
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_ok(o_conv);
@@ -13042,12 +15307,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFailHTLCDecode
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_UpdateFailHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_UpdateFailHTLCDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13057,6 +15329,17 @@ void  __attribute__((visibility("default"))) TS_CResult_UpdateFailHTLCDecodeErro
 	CResult_UpdateFailHTLCDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_UpdateFailHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ");
@@ -13068,6 +15351,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFailMalformedH
 	LDKUpdateFailMalformedHTLC o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = UpdateFailMalformedHTLC_clone(&o_conv);
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(o_conv);
@@ -13078,12 +15362,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFailMalformedH
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13093,6 +15384,17 @@ void  __attribute__((visibility("default"))) TS_CResult_UpdateFailMalformedHTLCD
 	CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ");
@@ -13104,6 +15406,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFeeDecodeError
 	LDKUpdateFee o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = UpdateFee_clone(&o_conv);
 	LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ");
 	*ret_conv = CResult_UpdateFeeDecodeErrorZ_ok(o_conv);
@@ -13114,12 +15417,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFeeDecodeError
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ");
 	*ret_conv = CResult_UpdateFeeDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_UpdateFeeDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_UpdateFeeDecodeErrorZ* o_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_UpdateFeeDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_UpdateFeeDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13129,6 +15439,17 @@ void  __attribute__((visibility("default"))) TS_CResult_UpdateFeeDecodeErrorZ_fr
 	CResult_UpdateFeeDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_UpdateFeeDecodeErrorZ* arg_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFeeDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UpdateFeeDecodeErrorZ* orig_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ");
@@ -13140,6 +15461,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFulfillHTLCDec
 	LDKUpdateFulfillHTLC o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = UpdateFulfillHTLC_clone(&o_conv);
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_ok(o_conv);
@@ -13150,12 +15472,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFulfillHTLCDec
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13165,6 +15494,17 @@ void  __attribute__((visibility("default"))) TS_CResult_UpdateFulfillHTLCDecodeE
 	CResult_UpdateFulfillHTLCDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ");
@@ -13176,6 +15516,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateAddHTLCDecodeE
 	LDKUpdateAddHTLC o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = UpdateAddHTLC_clone(&o_conv);
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_ok(o_conv);
@@ -13186,12 +15527,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateAddHTLCDecodeE
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_UpdateAddHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_UpdateAddHTLCDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13201,6 +15549,17 @@ void  __attribute__((visibility("default"))) TS_CResult_UpdateAddHTLCDecodeError
 	CResult_UpdateAddHTLCDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_UpdateAddHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ");
@@ -13212,6 +15571,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PingDecodeErrorZ_ok(
 	LDKPing o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13222,12 +15582,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PingDecodeErrorZ_err
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_PingDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PingDecodeErrorZ* o_conv = (LDKCResult_PingDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_PingDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_PingDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13237,6 +15604,17 @@ void  __attribute__((visibility("default"))) TS_CResult_PingDecodeErrorZ_free(ui
 	CResult_PingDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PingDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PingDecodeErrorZ* arg_conv = (LDKCResult_PingDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_PingDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PingDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_PingDecodeErrorZ* orig_conv = (LDKCResult_PingDecodeErrorZ*)(orig & ~1);
 	LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ");
@@ -13248,6 +15626,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PongDecodeErrorZ_ok(
 	LDKPong o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13258,12 +15637,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_PongDecodeErrorZ_err
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_PongDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PongDecodeErrorZ* o_conv = (LDKCResult_PongDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_PongDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_PongDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13273,6 +15659,17 @@ void  __attribute__((visibility("default"))) TS_CResult_PongDecodeErrorZ_free(ui
 	CResult_PongDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_PongDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PongDecodeErrorZ* arg_conv = (LDKCResult_PongDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_PongDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_PongDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_PongDecodeErrorZ* orig_conv = (LDKCResult_PongDecodeErrorZ*)(orig & ~1);
 	LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ");
@@ -13284,6 +15681,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelAnnou
 	LDKUnsignedChannelAnnouncement o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13294,12 +15692,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelAnnou
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13309,6 +15714,17 @@ void  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelAnnouncem
 	CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ");
@@ -13320,6 +15736,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelAnnouncementD
 	LDKChannelAnnouncement o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ChannelAnnouncement_clone(&o_conv);
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_ok(o_conv);
@@ -13330,12 +15747,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelAnnouncementD
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ChannelAnnouncementDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13345,6 +15769,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ChannelAnnouncementDecod
 	CResult_ChannelAnnouncementDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ");
@@ -13356,6 +15791,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelUpdat
 	LDKUnsignedChannelUpdate o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13366,12 +15802,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelUpdat
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13381,6 +15824,17 @@ void  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelUpdateDec
 	CResult_UnsignedChannelUpdateDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* arg_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ");
@@ -13392,6 +15846,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelUpdateDecodeE
 	LDKChannelUpdate o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = ChannelUpdate_clone(&o_conv);
 	LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ");
 	*ret_conv = CResult_ChannelUpdateDecodeErrorZ_ok(o_conv);
@@ -13402,12 +15857,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelUpdateDecodeE
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ");
 	*ret_conv = CResult_ChannelUpdateDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ChannelUpdateDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ChannelUpdateDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ChannelUpdateDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13417,6 +15879,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ChannelUpdateDecodeError
 	CResult_ChannelUpdateDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ");
@@ -13428,6 +15901,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ErrorMessageDecodeEr
 	LDKErrorMessage o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13438,12 +15912,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ErrorMessageDecodeEr
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ErrorMessageDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ErrorMessageDecodeErrorZ* o_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ErrorMessageDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ErrorMessageDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13453,6 +15934,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ErrorMessageDecodeErrorZ
 	CResult_ErrorMessageDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ErrorMessageDecodeErrorZ* arg_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ErrorMessageDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ErrorMessageDecodeErrorZ* orig_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ");
@@ -13464,6 +15956,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UnsignedNodeAnnounce
 	LDKUnsignedNodeAnnouncement o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13474,12 +15967,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_UnsignedNodeAnnounce
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13489,6 +15989,17 @@ void  __attribute__((visibility("default"))) TS_CResult_UnsignedNodeAnnouncement
 	CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ");
@@ -13500,6 +16011,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementDeco
 	LDKNodeAnnouncement o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = NodeAnnouncement_clone(&o_conv);
 	LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_NodeAnnouncementDecodeErrorZ_ok(o_conv);
@@ -13510,12 +16022,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementDeco
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_NodeAnnouncementDecodeErrorZ_err(e_conv);
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_NodeAnnouncementDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13525,6 +16044,17 @@ void  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementDecodeEr
 	CResult_NodeAnnouncementDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NodeAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_NodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(orig & ~1);
 	LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ");
@@ -13536,6 +16066,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_QueryShortChannelIds
 	LDKQueryShortChannelIds o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13546,12 +16077,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_QueryShortChannelIds
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_QueryShortChannelIdsDecodeErrorZ* o_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13561,6 +16099,17 @@ void  __attribute__((visibility("default"))) TS_CResult_QueryShortChannelIdsDeco
 	CResult_QueryShortChannelIdsDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_QueryShortChannelIdsDecodeErrorZ* arg_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* orig_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(orig & ~1);
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ");
@@ -13572,6 +16121,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ReplyShortChannelIds
 	LDKReplyShortChannelIdsEnd o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13582,12 +16132,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ReplyShortChannelIds
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* o_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13597,6 +16154,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ReplyShortChannelIdsEndD
 	CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* arg_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* orig_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ");
@@ -13608,6 +16176,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_QueryChannelRangeDec
 	LDKQueryChannelRange o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13618,12 +16187,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_QueryChannelRangeDec
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_QueryChannelRangeDecodeErrorZ* o_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_QueryChannelRangeDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_QueryChannelRangeDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13633,6 +16209,17 @@ void  __attribute__((visibility("default"))) TS_CResult_QueryChannelRangeDecodeE
 	CResult_QueryChannelRangeDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_QueryChannelRangeDecodeErrorZ* arg_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_QueryChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(orig & ~1);
 	LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ");
@@ -13644,6 +16231,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ReplyChannelRangeDec
 	LDKReplyChannelRange o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13654,12 +16242,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_ReplyChannelRangeDec
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ReplyChannelRangeDecodeErrorZ* o_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_ReplyChannelRangeDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13669,6 +16264,17 @@ void  __attribute__((visibility("default"))) TS_CResult_ReplyChannelRangeDecodeE
 	CResult_ReplyChannelRangeDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ReplyChannelRangeDecodeErrorZ* arg_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ");
@@ -13680,6 +16286,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_GossipTimestampFilte
 	LDKGossipTimestampFilter o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13690,12 +16297,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_GossipTimestampFilte
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
+	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 (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_GossipTimestampFilterDecodeErrorZ* o_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_GossipTimestampFilterDecodeErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13705,6 +16319,17 @@ void  __attribute__((visibility("default"))) TS_CResult_GossipTimestampFilterDec
 	CResult_GossipTimestampFilterDecodeErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_GossipTimestampFilterDecodeErrorZ* arg_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* orig_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(orig & ~1);
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ");
@@ -13716,6 +16341,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceSignOrCreatio
 	LDKInvoice o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	o_conv = Invoice_clone(&o_conv);
 	LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ");
 	*ret_conv = CResult_InvoiceSignOrCreationErrorZ_ok(o_conv);
@@ -13732,6 +16358,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceSignOrCreatio
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_InvoiceSignOrCreationErrorZ_is_ok(uint32_t o) {
+	LDKCResult_InvoiceSignOrCreationErrorZ* o_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(o & ~1);
+	jboolean ret_val = CResult_InvoiceSignOrCreationErrorZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_InvoiceSignOrCreationErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13741,6 +16373,17 @@ void  __attribute__((visibility("default"))) TS_CResult_InvoiceSignOrCreationErr
 	CResult_InvoiceSignOrCreationErrorZ_free(_res_conv);
 }
 
+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 (uint64_t)ret_conv;
+}
+int64_t  __attribute__((visibility("default"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_InvoiceSignOrCreationErrorZ* arg_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(arg & ~1);
+	int64_t ret_val = CResult_InvoiceSignOrCreationErrorZ_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone(uint32_t orig) {
 	LDKCResult_InvoiceSignOrCreationErrorZ* orig_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(orig & ~1);
 	LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ");
@@ -13778,6 +16421,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_LockedChannelMonitor
 	LDKLockedChannelMonitor o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
+	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);
@@ -13790,6 +16434,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CResult_LockedChannelMonitor
 	return (uint64_t)ret_conv;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_CResult_LockedChannelMonitorNoneZ_is_ok(uint32_t o) {
+	LDKCResult_LockedChannelMonitorNoneZ* o_conv = (LDKCResult_LockedChannelMonitorNoneZ*)(o & ~1);
+	jboolean ret_val = CResult_LockedChannelMonitorNoneZ_is_ok(o_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_CResult_LockedChannelMonitorNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uint64_t)_res) & ~1);
@@ -13812,6 +16462,7 @@ void  __attribute__((visibility("default"))) TS_CVec_OutPointZ_free(uint32_tArra
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_10_conv);
 		_res_constr.data[k] = _res_conv_10_conv;
 	}
 	CVec_OutPointZ_free(_res_constr);
@@ -13826,6 +16477,18 @@ void  __attribute__((visibility("default"))) TS_PaymentPurpose_free(uint32_t thi
 	PaymentPurpose_free(this_ptr_conv);
 }
 
+static inline uint64_t PaymentPurpose_clone_ptr(LDKPaymentPurpose *NONNULL_PTR arg) {
+	LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose");
+	*ret_copy = PaymentPurpose_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_PaymentPurpose_clone_ptr(uint32_t arg) {
+	LDKPaymentPurpose* arg_conv = (LDKPaymentPurpose*)arg;
+	int64_t ret_val = PaymentPurpose_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_PaymentPurpose_clone(uint32_t orig) {
 	LDKPaymentPurpose* orig_conv = (LDKPaymentPurpose*)orig;
 	LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose");
@@ -13834,7 +16497,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PaymentPurpose_clone(uint32_
 	return ret_ref;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_PaymentPurpose_invoice_payment(int8_tArray payment_preimage, int8_tArray payment_secret, int64_t user_payment_id) {
+uint32_t  __attribute__((visibility("default"))) TS_PaymentPurpose_invoice_payment(int8_tArray payment_preimage, int8_tArray payment_secret) {
 	LDKThirtyTwoBytes payment_preimage_ref;
 	CHECK(*((uint32_t*)payment_preimage) == 32);
 	memcpy(payment_preimage_ref.data, (uint8_t*)(payment_preimage + 4), 32);
@@ -13842,7 +16505,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PaymentPurpose_invoice_payme
 	CHECK(*((uint32_t*)payment_secret) == 32);
 	memcpy(payment_secret_ref.data, (uint8_t*)(payment_secret + 4), 32);
 	LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose");
-	*ret_copy = PaymentPurpose_invoice_payment(payment_preimage_ref, payment_secret_ref, user_payment_id);
+	*ret_copy = PaymentPurpose_invoice_payment(payment_preimage_ref, payment_secret_ref);
 	uint64_t ret_ref = (uint64_t)ret_copy;
 	return ret_ref;
 }
@@ -13866,6 +16529,18 @@ void  __attribute__((visibility("default"))) TS_ClosureReason_free(uint32_t this
 	ClosureReason_free(this_ptr_conv);
 }
 
+static inline uint64_t ClosureReason_clone_ptr(LDKClosureReason *NONNULL_PTR arg) {
+	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
+	*ret_copy = ClosureReason_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ClosureReason_clone_ptr(uint32_t arg) {
+	LDKClosureReason* arg_conv = (LDKClosureReason*)arg;
+	int64_t ret_val = ClosureReason_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ClosureReason_clone(uint32_t orig) {
 	LDKClosureReason* orig_conv = (LDKClosureReason*)orig;
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
@@ -13903,6 +16578,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ClosureReason_commitment_tx_
 	return ret_ref;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_ClosureReason_funding_timed_out() {
+	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
+	*ret_copy = ClosureReason_funding_timed_out();
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ClosureReason_processing_error(jstring err) {
 	LDKStr err_conv = str_ref_to_owned_c(err);
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
@@ -13934,6 +16616,15 @@ int8_tArray  __attribute__((visibility("default"))) TS_ClosureReason_write(uint3
 	return ret_arr;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_ClosureReason_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = *((uint32_t*)ser);
+	ser_ref.data = (int8_t*)(ser + 4);
+	LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ");
+	*ret_conv = ClosureReason_read(ser_ref);
+	return (uint64_t)ret_conv;
+}
+
 void  __attribute__((visibility("default"))) TS_Event_free(uint32_t this_ptr) {
 	if ((this_ptr & 1) != 0) return;
 	void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1);
@@ -13943,6 +16634,18 @@ void  __attribute__((visibility("default"))) TS_Event_free(uint32_t this_ptr) {
 	Event_free(this_ptr_conv);
 }
 
+static inline uint64_t Event_clone_ptr(LDKEvent *NONNULL_PTR arg) {
+	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
+	*ret_copy = Event_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Event_clone_ptr(uint32_t arg) {
+	LDKEvent* arg_conv = (LDKEvent*)arg;
+	int64_t ret_val = Event_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Event_clone(uint32_t orig) {
 	LDKEvent* orig_conv = (LDKEvent*)orig;
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
@@ -14022,6 +16725,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Event_payment_path_failed(in
 		LDKRouteHop path_conv_10_conv;
 		path_conv_10_conv.inner = (void*)(path_conv_10 & (~1));
 		path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv);
 		path_conv_10_conv = RouteHop_clone(&path_conv_10_conv);
 		path_constr.data[k] = path_conv_10_conv;
 	}
@@ -14032,6 +16736,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Event_payment_path_failed(in
 	LDKRouteParameters retry_conv;
 	retry_conv.inner = (void*)(retry & (~1));
 	retry_conv.is_owned = (retry & 1) || (retry == 0);
+	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);
@@ -14039,6 +16744,19 @@ uint32_t  __attribute__((visibility("default"))) TS_Event_payment_path_failed(in
 	return ret_ref;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_Event_payment_failed(int8_tArray payment_id, int8_tArray payment_hash) {
+	LDKThirtyTwoBytes payment_id_ref;
+	CHECK(*((uint32_t*)payment_id) == 32);
+	memcpy(payment_id_ref.data, (uint8_t*)(payment_id + 4), 32);
+	LDKThirtyTwoBytes payment_hash_ref;
+	CHECK(*((uint32_t*)payment_hash) == 32);
+	memcpy(payment_hash_ref.data, (uint8_t*)(payment_hash + 4), 32);
+	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
+	*ret_copy = Event_payment_failed(payment_id_ref, payment_hash_ref);
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Event_pending_htlcs_forwardable(int64_t time_forwardable) {
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
 	*ret_copy = Event_pending_htlcs_forwardable(time_forwardable);
@@ -14108,6 +16826,35 @@ uint32_t  __attribute__((visibility("default"))) TS_Event_discard_funding(int8_t
 	return ret_ref;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_Event_payment_path_successful(int8_tArray payment_id, int8_tArray payment_hash, uint32_tArray path) {
+	LDKThirtyTwoBytes payment_id_ref;
+	CHECK(*((uint32_t*)payment_id) == 32);
+	memcpy(payment_id_ref.data, (uint8_t*)(payment_id + 4), 32);
+	LDKThirtyTwoBytes payment_hash_ref;
+	CHECK(*((uint32_t*)payment_hash) == 32);
+	memcpy(payment_hash_ref.data, (uint8_t*)(payment_hash + 4), 32);
+	LDKCVec_RouteHopZ path_constr;
+	path_constr.datalen = *((uint32_t*)path);
+	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 = (uint32_t*)(path + 4);
+	for (size_t k = 0; k < path_constr.datalen; k++) {
+		uint32_t path_conv_10 = path_vals[k];
+		LDKRouteHop path_conv_10_conv;
+		path_conv_10_conv.inner = (void*)(path_conv_10 & (~1));
+		path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv);
+		path_conv_10_conv = RouteHop_clone(&path_conv_10_conv);
+		path_constr.data[k] = path_conv_10_conv;
+	}
+	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
+	*ret_copy = Event_payment_path_successful(payment_id_ref, payment_hash_ref, path_constr);
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
 int8_tArray  __attribute__((visibility("default"))) TS_Event_write(uint32_t obj) {
 	LDKEvent* obj_conv = (LDKEvent*)obj;
 	LDKCVec_u8Z ret_var = Event_write(obj_conv);
@@ -14117,6 +16864,15 @@ int8_tArray  __attribute__((visibility("default"))) TS_Event_write(uint32_t obj)
 	return ret_arr;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_Event_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = *((uint32_t*)ser);
+	ser_ref.data = (int8_t*)(ser + 4);
+	LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ");
+	*ret_conv = Event_read(ser_ref);
+	return (uint64_t)ret_conv;
+}
+
 void  __attribute__((visibility("default"))) TS_MessageSendEvent_free(uint32_t this_ptr) {
 	if ((this_ptr & 1) != 0) return;
 	void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1);
@@ -14126,6 +16882,18 @@ void  __attribute__((visibility("default"))) TS_MessageSendEvent_free(uint32_t t
 	MessageSendEvent_free(this_ptr_conv);
 }
 
+static inline uint64_t MessageSendEvent_clone_ptr(LDKMessageSendEvent *NONNULL_PTR arg) {
+	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
+	*ret_copy = MessageSendEvent_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_MessageSendEvent_clone_ptr(uint32_t arg) {
+	LDKMessageSendEvent* arg_conv = (LDKMessageSendEvent*)arg;
+	int64_t ret_val = MessageSendEvent_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_clone(uint32_t orig) {
 	LDKMessageSendEvent* orig_conv = (LDKMessageSendEvent*)orig;
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
@@ -14141,6 +16909,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_accept
 	LDKAcceptChannel msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14155,6 +16924,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_open_c
 	LDKOpenChannel msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14169,6 +16939,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_fundin
 	LDKFundingCreated msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14183,6 +16954,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_fundin
 	LDKFundingSigned msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14197,6 +16969,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_fundin
 	LDKFundingLocked msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	msg_conv = FundingLocked_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_funding_locked(node_id_ref, msg_conv);
@@ -14211,6 +16984,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_announ
 	LDKAnnouncementSignatures msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14225,6 +16999,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_update_htlc
 	LDKCommitmentUpdate updates_conv;
 	updates_conv.inner = (void*)(updates & (~1));
 	updates_conv.is_owned = (updates & 1) || (updates == 0);
+	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);
@@ -14239,6 +17014,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_revoke
 	LDKRevokeAndACK msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14253,6 +17029,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_closin
 	LDKClosingSigned msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14267,6 +17044,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_shutdo
 	LDKShutdown msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14281,6 +17059,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_channe
 	LDKChannelReestablish msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14292,10 +17071,12 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_broadcast_c
 	LDKChannelAnnouncement msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
+	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);
@@ -14307,6 +17088,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_broadcast_n
 	LDKNodeAnnouncement msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14318,6 +17100,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_broadcast_c
 	LDKChannelUpdate msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14332,6 +17115,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_channe
 	LDKChannelUpdate msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14360,6 +17144,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_channe
 	LDKQueryChannelRange msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14374,6 +17159,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_short_
 	LDKQueryShortChannelIds msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14388,6 +17174,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageSendEvent_send_reply_
 	LDKReplyChannelRange msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -14431,6 +17218,18 @@ void  __attribute__((visibility("default"))) TS_APIError_free(uint32_t this_ptr)
 	APIError_free(this_ptr_conv);
 }
 
+static inline uint64_t APIError_clone_ptr(LDKAPIError *NONNULL_PTR arg) {
+	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
+	*ret_copy = APIError_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_APIError_clone_ptr(uint32_t arg) {
+	LDKAPIError* arg_conv = (LDKAPIError*)arg;
+	int64_t ret_val = APIError_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_APIError_clone(uint32_t orig) {
 	LDKAPIError* orig_conv = (LDKAPIError*)orig;
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
@@ -14482,6 +17281,7 @@ uint32_t  __attribute__((visibility("default"))) TS_APIError_incompatible_shutdo
 	LDKShutdownScript script_conv;
 	script_conv.inner = (void*)(script & (~1));
 	script_conv.is_owned = (script & 1) || (script == 0);
+	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);
@@ -14530,6 +17330,11 @@ uint32_t  __attribute__((visibility("default"))) TS_Level_clone(uint32_t orig) {
 	return ret_conv;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_Level_gossip() {
+	uint32_t ret_conv = LDKLevel_to_js(Level_gossip());
+	return ret_conv;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Level_trace() {
 	uint32_t ret_conv = LDKLevel_to_js(Level_trace());
 	return ret_conv;
@@ -14573,6 +17378,147 @@ uint32_t  __attribute__((visibility("default"))) TS_Level_max() {
 	return ret_conv;
 }
 
+void  __attribute__((visibility("default"))) TS_Record_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
+	Record_free(this_obj_conv);
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_Record_get_level(uint32_t this_ptr) {
+	LDKRecord this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	uint32_t ret_conv = LDKLevel_to_js(Record_get_level(&this_ptr_conv));
+	return ret_conv;
+}
+
+void  __attribute__((visibility("default"))) TS_Record_set_level(uint32_t this_ptr, uint32_t val) {
+	LDKRecord this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKLevel val_conv = LDKLevel_from_js(val);
+	Record_set_level(&this_ptr_conv, val_conv);
+}
+
+jstring  __attribute__((visibility("default"))) TS_Record_get_args(uint32_t this_ptr) {
+	LDKRecord this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	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__((visibility("default"))) TS_Record_set_args(uint32_t this_ptr, jstring val) {
+	LDKRecord this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKStr val_conv = str_ref_to_owned_c(val);
+	Record_set_args(&this_ptr_conv, val_conv);
+}
+
+jstring  __attribute__((visibility("default"))) TS_Record_get_module_path(uint32_t this_ptr) {
+	LDKRecord this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	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__((visibility("default"))) TS_Record_set_module_path(uint32_t this_ptr, jstring val) {
+	LDKRecord this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKStr val_conv = str_ref_to_owned_c(val);
+	Record_set_module_path(&this_ptr_conv, val_conv);
+}
+
+jstring  __attribute__((visibility("default"))) TS_Record_get_file(uint32_t this_ptr) {
+	LDKRecord this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	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__((visibility("default"))) TS_Record_set_file(uint32_t this_ptr, jstring val) {
+	LDKRecord this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKStr val_conv = str_ref_to_owned_c(val);
+	Record_set_file(&this_ptr_conv, val_conv);
+}
+
+int32_t  __attribute__((visibility("default"))) TS_Record_get_line(uint32_t this_ptr) {
+	LDKRecord this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	int32_t ret_val = Record_get_line(&this_ptr_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_Record_set_line(uint32_t this_ptr, int32_t val) {
+	LDKRecord this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	Record_set_line(&this_ptr_conv, val);
+}
+
+static inline uint64_t Record_clone_ptr(LDKRecord *NONNULL_PTR arg) {
+	LDKRecord ret_var = Record_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Record_clone_ptr(uint32_t arg) {
+	LDKRecord arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = Record_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_Record_clone(uint32_t orig) {
+	LDKRecord orig_conv;
+	orig_conv.inner = (void*)(orig & (~1));
+	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
+	LDKRecord ret_var = Record_clone(&orig_conv);
+	uint64_t ret_ref = 0;
+	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uint64_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
 void  __attribute__((visibility("default"))) TS_Logger_free(uint32_t this_ptr) {
 	if ((this_ptr & 1) != 0) return;
 	void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1);
@@ -14586,6 +17532,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_free(uint
 	LDKChannelHandshakeConfig this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelHandshakeConfig_free(this_obj_conv);
 }
 
@@ -14593,6 +17540,7 @@ int32_t  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_get_mi
 	LDKChannelHandshakeConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = ChannelHandshakeConfig_get_minimum_depth(&this_ptr_conv);
 	return ret_val;
 }
@@ -14601,6 +17549,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_set_minim
 	LDKChannelHandshakeConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeConfig_set_minimum_depth(&this_ptr_conv, val);
 }
 
@@ -14608,6 +17557,7 @@ int16_t  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_get_ou
 	LDKChannelHandshakeConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = ChannelHandshakeConfig_get_our_to_self_delay(&this_ptr_conv);
 	return ret_val;
 }
@@ -14616,6 +17566,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_set_our_t
 	LDKChannelHandshakeConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeConfig_set_our_to_self_delay(&this_ptr_conv, val);
 }
 
@@ -14623,6 +17574,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_get_ou
 	LDKChannelHandshakeConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelHandshakeConfig_get_our_htlc_minimum_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -14631,6 +17583,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_set_our_h
 	LDKChannelHandshakeConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeConfig_set_our_htlc_minimum_msat(&this_ptr_conv, val);
 }
 
@@ -14639,6 +17592,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_new(i
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -14646,14 +17600,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_new(i
 	return ret_ref;
 }
 
+static inline uint64_t ChannelHandshakeConfig_clone_ptr(LDKChannelHandshakeConfig *NONNULL_PTR arg) {
+	LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_clone_ptr(uint32_t arg) {
+	LDKChannelHandshakeConfig arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelHandshakeConfig_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_clone(uint32_t orig) {
 	LDKChannelHandshakeConfig orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -14666,6 +17643,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelHandshakeConfig_defau
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -14677,6 +17655,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_free(uint
 	LDKChannelHandshakeLimits this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelHandshakeLimits_free(this_obj_conv);
 }
 
@@ -14684,6 +17663,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_get_mi
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelHandshakeLimits_get_min_funding_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -14692,6 +17672,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_set_min_f
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeLimits_set_min_funding_satoshis(&this_ptr_conv, val);
 }
 
@@ -14699,6 +17680,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_get_ma
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelHandshakeLimits_get_max_htlc_minimum_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -14707,6 +17689,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_set_max_h
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeLimits_set_max_htlc_minimum_msat(&this_ptr_conv, val);
 }
 
@@ -14714,6 +17697,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_get_mi
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -14722,6 +17706,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_set_min_m
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(&this_ptr_conv, val);
 }
 
@@ -14729,6 +17714,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_get_ma
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelHandshakeLimits_get_max_channel_reserve_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -14737,6 +17723,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_set_max_c
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeLimits_set_max_channel_reserve_satoshis(&this_ptr_conv, val);
 }
 
@@ -14744,6 +17731,7 @@ int16_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_get_mi
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = ChannelHandshakeLimits_get_min_max_accepted_htlcs(&this_ptr_conv);
 	return ret_val;
 }
@@ -14752,6 +17740,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_set_min_m
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeLimits_set_min_max_accepted_htlcs(&this_ptr_conv, val);
 }
 
@@ -14759,6 +17748,7 @@ int32_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_get_ma
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = ChannelHandshakeLimits_get_max_minimum_depth(&this_ptr_conv);
 	return ret_val;
 }
@@ -14767,6 +17757,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_set_max_m
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeLimits_set_max_minimum_depth(&this_ptr_conv, val);
 }
 
@@ -14774,6 +17765,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_get_f
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = ChannelHandshakeLimits_get_force_announced_channel_preference(&this_ptr_conv);
 	return ret_val;
 }
@@ -14782,6 +17774,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_set_force
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeLimits_set_force_announced_channel_preference(&this_ptr_conv, val);
 }
 
@@ -14789,6 +17782,7 @@ int16_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_get_th
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = ChannelHandshakeLimits_get_their_to_self_delay(&this_ptr_conv);
 	return ret_val;
 }
@@ -14797,6 +17791,7 @@ void  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_set_their
 	LDKChannelHandshakeLimits this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelHandshakeLimits_set_their_to_self_delay(&this_ptr_conv, val);
 }
 
@@ -14805,6 +17800,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_new(i
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -14812,14 +17808,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_new(i
 	return ret_ref;
 }
 
+static inline uint64_t ChannelHandshakeLimits_clone_ptr(LDKChannelHandshakeLimits *NONNULL_PTR arg) {
+	LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_clone_ptr(uint32_t arg) {
+	LDKChannelHandshakeLimits arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelHandshakeLimits_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_clone(uint32_t orig) {
 	LDKChannelHandshakeLimits orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -14832,6 +17851,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelHandshakeLimits_defau
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -14843,6 +17863,7 @@ void  __attribute__((visibility("default"))) TS_ChannelConfig_free(uint32_t this
 	LDKChannelConfig this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelConfig_free(this_obj_conv);
 }
 
@@ -14850,6 +17871,7 @@ int32_t  __attribute__((visibility("default"))) TS_ChannelConfig_get_forwarding_
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = ChannelConfig_get_forwarding_fee_proportional_millionths(&this_ptr_conv);
 	return ret_val;
 }
@@ -14858,6 +17880,7 @@ void  __attribute__((visibility("default"))) TS_ChannelConfig_set_forwarding_fee
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelConfig_set_forwarding_fee_proportional_millionths(&this_ptr_conv, val);
 }
 
@@ -14865,6 +17888,7 @@ int32_t  __attribute__((visibility("default"))) TS_ChannelConfig_get_forwarding_
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = ChannelConfig_get_forwarding_fee_base_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -14873,6 +17897,7 @@ void  __attribute__((visibility("default"))) TS_ChannelConfig_set_forwarding_fee
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelConfig_set_forwarding_fee_base_msat(&this_ptr_conv, val);
 }
 
@@ -14880,6 +17905,7 @@ int16_t  __attribute__((visibility("default"))) TS_ChannelConfig_get_cltv_expiry
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = ChannelConfig_get_cltv_expiry_delta(&this_ptr_conv);
 	return ret_val;
 }
@@ -14888,6 +17914,7 @@ void  __attribute__((visibility("default"))) TS_ChannelConfig_set_cltv_expiry_de
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelConfig_set_cltv_expiry_delta(&this_ptr_conv, val);
 }
 
@@ -14895,6 +17922,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelConfig_get_announced_
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = ChannelConfig_get_announced_channel(&this_ptr_conv);
 	return ret_val;
 }
@@ -14903,6 +17931,7 @@ void  __attribute__((visibility("default"))) TS_ChannelConfig_set_announced_chan
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelConfig_set_announced_channel(&this_ptr_conv, val);
 }
 
@@ -14910,6 +17939,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelConfig_get_commit_upf
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = ChannelConfig_get_commit_upfront_shutdown_pubkey(&this_ptr_conv);
 	return ret_val;
 }
@@ -14918,6 +17948,7 @@ void  __attribute__((visibility("default"))) TS_ChannelConfig_set_commit_upfront
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelConfig_set_commit_upfront_shutdown_pubkey(&this_ptr_conv, val);
 }
 
@@ -14925,6 +17956,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelConfig_get_max_dust_ht
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelConfig_get_max_dust_htlc_exposure_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -14933,6 +17965,7 @@ void  __attribute__((visibility("default"))) TS_ChannelConfig_set_max_dust_htlc_
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelConfig_set_max_dust_htlc_exposure_msat(&this_ptr_conv, val);
 }
 
@@ -14940,6 +17973,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelConfig_get_force_close
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelConfig_get_force_close_avoidance_max_fee_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -14948,6 +17982,7 @@ void  __attribute__((visibility("default"))) TS_ChannelConfig_set_force_close_av
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelConfig_set_force_close_avoidance_max_fee_satoshis(&this_ptr_conv, val);
 }
 
@@ -14956,6 +17991,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelConfig_new(int32_t fo
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -14963,14 +17999,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelConfig_new(int32_t fo
 	return ret_ref;
 }
 
+static inline uint64_t ChannelConfig_clone_ptr(LDKChannelConfig *NONNULL_PTR arg) {
+	LDKChannelConfig ret_var = ChannelConfig_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelConfig_clone_ptr(uint32_t arg) {
+	LDKChannelConfig arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelConfig_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelConfig_clone(uint32_t orig) {
 	LDKChannelConfig orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelConfig ret_var = ChannelConfig_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -14983,6 +18042,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelConfig_default() {
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -14994,6 +18054,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelConfig_write(uint3
 	LDKChannelConfig obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelConfig_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -15014,6 +18075,7 @@ void  __attribute__((visibility("default"))) TS_UserConfig_free(uint32_t this_ob
 	LDKUserConfig this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	UserConfig_free(this_obj_conv);
 }
 
@@ -15021,10 +18083,12 @@ uint32_t  __attribute__((visibility("default"))) TS_UserConfig_get_own_channel_c
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelHandshakeConfig ret_var = UserConfig_get_own_channel_config(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15036,9 +18100,11 @@ void  __attribute__((visibility("default"))) TS_UserConfig_set_own_channel_confi
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelHandshakeConfig val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelHandshakeConfig_clone(&val_conv);
 	UserConfig_set_own_channel_config(&this_ptr_conv, val_conv);
 }
@@ -15047,10 +18113,12 @@ uint32_t  __attribute__((visibility("default"))) TS_UserConfig_get_peer_channel_
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelHandshakeLimits ret_var = UserConfig_get_peer_channel_config_limits(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15062,9 +18130,11 @@ void  __attribute__((visibility("default"))) TS_UserConfig_set_peer_channel_conf
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelHandshakeLimits val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelHandshakeLimits_clone(&val_conv);
 	UserConfig_set_peer_channel_config_limits(&this_ptr_conv, val_conv);
 }
@@ -15073,10 +18143,12 @@ uint32_t  __attribute__((visibility("default"))) TS_UserConfig_get_channel_optio
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelConfig ret_var = UserConfig_get_channel_options(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15088,9 +18160,11 @@ void  __attribute__((visibility("default"))) TS_UserConfig_set_channel_options(u
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelConfig val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelConfig_clone(&val_conv);
 	UserConfig_set_channel_options(&this_ptr_conv, val_conv);
 }
@@ -15099,6 +18173,7 @@ jboolean  __attribute__((visibility("default"))) TS_UserConfig_get_accept_forwar
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = UserConfig_get_accept_forwards_to_priv_channels(&this_ptr_conv);
 	return ret_val;
 }
@@ -15107,26 +18182,48 @@ void  __attribute__((visibility("default"))) TS_UserConfig_set_accept_forwards_t
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UserConfig_set_accept_forwards_to_priv_channels(&this_ptr_conv, val);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_UserConfig_new(uint32_t own_channel_config_arg, uint32_t peer_channel_config_limits_arg, uint32_t channel_options_arg, jboolean accept_forwards_to_priv_channels_arg) {
+jboolean  __attribute__((visibility("default"))) TS_UserConfig_get_accept_inbound_channels(uint32_t this_ptr) {
+	LDKUserConfig this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	jboolean ret_val = UserConfig_get_accept_inbound_channels(&this_ptr_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_UserConfig_set_accept_inbound_channels(uint32_t this_ptr, jboolean val) {
+	LDKUserConfig this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	UserConfig_set_accept_inbound_channels(&this_ptr_conv, val);
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_UserConfig_new(uint32_t own_channel_config_arg, uint32_t peer_channel_config_limits_arg, uint32_t channel_options_arg, jboolean accept_forwards_to_priv_channels_arg, jboolean accept_inbound_channels_arg) {
 	LDKChannelHandshakeConfig own_channel_config_arg_conv;
 	own_channel_config_arg_conv.inner = (void*)(own_channel_config_arg & (~1));
 	own_channel_config_arg_conv.is_owned = (own_channel_config_arg & 1) || (own_channel_config_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(own_channel_config_arg_conv);
 	own_channel_config_arg_conv = ChannelHandshakeConfig_clone(&own_channel_config_arg_conv);
 	LDKChannelHandshakeLimits peer_channel_config_limits_arg_conv;
 	peer_channel_config_limits_arg_conv.inner = (void*)(peer_channel_config_limits_arg & (~1));
 	peer_channel_config_limits_arg_conv.is_owned = (peer_channel_config_limits_arg & 1) || (peer_channel_config_limits_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(peer_channel_config_limits_arg_conv);
 	peer_channel_config_limits_arg_conv = ChannelHandshakeLimits_clone(&peer_channel_config_limits_arg_conv);
 	LDKChannelConfig channel_options_arg_conv;
 	channel_options_arg_conv.inner = (void*)(channel_options_arg & (~1));
 	channel_options_arg_conv.is_owned = (channel_options_arg & 1) || (channel_options_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_options_arg_conv);
 	channel_options_arg_conv = ChannelConfig_clone(&channel_options_arg_conv);
-	LDKUserConfig ret_var = UserConfig_new(own_channel_config_arg_conv, peer_channel_config_limits_arg_conv, channel_options_arg_conv, accept_forwards_to_priv_channels_arg);
+	LDKUserConfig ret_var = UserConfig_new(own_channel_config_arg_conv, peer_channel_config_limits_arg_conv, channel_options_arg_conv, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15134,14 +18231,37 @@ uint32_t  __attribute__((visibility("default"))) TS_UserConfig_new(uint32_t own_
 	return ret_ref;
 }
 
+static inline uint64_t UserConfig_clone_ptr(LDKUserConfig *NONNULL_PTR arg) {
+	LDKUserConfig ret_var = UserConfig_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_UserConfig_clone_ptr(uint32_t arg) {
+	LDKUserConfig arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = UserConfig_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_UserConfig_clone(uint32_t orig) {
 	LDKUserConfig orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUserConfig ret_var = UserConfig_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15154,6 +18274,7 @@ uint32_t  __attribute__((visibility("default"))) TS_UserConfig_default() {
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15165,17 +18286,41 @@ void  __attribute__((visibility("default"))) TS_BestBlock_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	BestBlock_free(this_obj_conv);
 }
 
+static inline uint64_t BestBlock_clone_ptr(LDKBestBlock *NONNULL_PTR arg) {
+	LDKBestBlock ret_var = BestBlock_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_BestBlock_clone_ptr(uint32_t arg) {
+	LDKBestBlock arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = BestBlock_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_BestBlock_clone(uint32_t orig) {
 	LDKBestBlock orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKBestBlock ret_var = BestBlock_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15189,6 +18334,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BestBlock_from_genesis(uint3
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15204,6 +18350,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BestBlock_new(int8_tArray bl
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15215,6 +18362,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_BestBlock_block_hash(uint
 	LDKBestBlock this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), BestBlock_block_hash(&this_arg_conv).data, 32);
 	return ret_arr;
@@ -15224,6 +18372,7 @@ int32_t  __attribute__((visibility("default"))) TS_BestBlock_height(uint32_t thi
 	LDKBestBlock this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int32_t ret_val = BestBlock_height(&this_arg_conv);
 	return ret_val;
 }
@@ -15309,6 +18458,7 @@ void  __attribute__((visibility("default"))) TS_WatchedOutput_free(uint32_t this
 	LDKWatchedOutput this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	WatchedOutput_free(this_obj_conv);
 }
 
@@ -15316,6 +18466,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_WatchedOutput_get_block_h
 	LDKWatchedOutput this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), WatchedOutput_get_block_hash(&this_ptr_conv).data, 32);
 	return ret_arr;
@@ -15325,6 +18476,7 @@ void  __attribute__((visibility("default"))) TS_WatchedOutput_set_block_hash(uin
 	LDKWatchedOutput this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -15335,10 +18487,12 @@ uint32_t  __attribute__((visibility("default"))) TS_WatchedOutput_get_outpoint(u
 	LDKWatchedOutput this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint ret_var = WatchedOutput_get_outpoint(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15350,9 +18504,11 @@ void  __attribute__((visibility("default"))) TS_WatchedOutput_set_outpoint(uint3
 	LDKWatchedOutput this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = OutPoint_clone(&val_conv);
 	WatchedOutput_set_outpoint(&this_ptr_conv, val_conv);
 }
@@ -15361,6 +18517,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_WatchedOutput_get_script_
 	LDKWatchedOutput this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKu8slice ret_var = WatchedOutput_get_script_pubkey(&this_ptr_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -15371,6 +18528,7 @@ void  __attribute__((visibility("default"))) TS_WatchedOutput_set_script_pubkey(
 	LDKWatchedOutput this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_u8Z val_ref;
 	val_ref.datalen = *((uint32_t*)val);
 	val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes");
@@ -15385,6 +18543,7 @@ uint32_t  __attribute__((visibility("default"))) TS_WatchedOutput_new(int8_tArra
 	LDKOutPoint outpoint_arg_conv;
 	outpoint_arg_conv.inner = (void*)(outpoint_arg & (~1));
 	outpoint_arg_conv.is_owned = (outpoint_arg & 1) || (outpoint_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_arg_conv);
 	outpoint_arg_conv = OutPoint_clone(&outpoint_arg_conv);
 	LDKCVec_u8Z script_pubkey_arg_ref;
 	script_pubkey_arg_ref.datalen = *((uint32_t*)script_pubkey_arg);
@@ -15394,6 +18553,7 @@ uint32_t  __attribute__((visibility("default"))) TS_WatchedOutput_new(int8_tArra
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15401,14 +18561,37 @@ uint32_t  __attribute__((visibility("default"))) TS_WatchedOutput_new(int8_tArra
 	return ret_ref;
 }
 
+static inline uint64_t WatchedOutput_clone_ptr(LDKWatchedOutput *NONNULL_PTR arg) {
+	LDKWatchedOutput ret_var = WatchedOutput_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_WatchedOutput_clone_ptr(uint32_t arg) {
+	LDKWatchedOutput arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = WatchedOutput_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_WatchedOutput_clone(uint32_t orig) {
 	LDKWatchedOutput orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKWatchedOutput ret_var = WatchedOutput_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15420,6 +18603,7 @@ int64_t  __attribute__((visibility("default"))) TS_WatchedOutput_hash(uint32_t o
 	LDKWatchedOutput o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = WatchedOutput_hash(&o_conv);
 	return ret_val;
 }
@@ -15474,17 +18658,41 @@ void  __attribute__((visibility("default"))) TS_MonitorUpdateId_free(uint32_t th
 	LDKMonitorUpdateId this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	MonitorUpdateId_free(this_obj_conv);
 }
 
+static inline uint64_t MonitorUpdateId_clone_ptr(LDKMonitorUpdateId *NONNULL_PTR arg) {
+	LDKMonitorUpdateId ret_var = MonitorUpdateId_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_MonitorUpdateId_clone_ptr(uint32_t arg) {
+	LDKMonitorUpdateId arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = MonitorUpdateId_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_MonitorUpdateId_clone(uint32_t orig) {
 	LDKMonitorUpdateId orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKMonitorUpdateId ret_var = MonitorUpdateId_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15496,6 +18704,7 @@ int64_t  __attribute__((visibility("default"))) TS_MonitorUpdateId_hash(uint32_t
 	LDKMonitorUpdateId o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = MonitorUpdateId_hash(&o_conv);
 	return ret_val;
 }
@@ -15504,9 +18713,11 @@ jboolean  __attribute__((visibility("default"))) TS_MonitorUpdateId_eq(uint32_t
 	LDKMonitorUpdateId a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKMonitorUpdateId b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = MonitorUpdateId_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -15524,6 +18735,7 @@ void  __attribute__((visibility("default"))) TS_LockedChannelMonitor_free(uint32
 	LDKLockedChannelMonitor this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	LockedChannelMonitor_free(this_obj_conv);
 }
 
@@ -15531,6 +18743,7 @@ void  __attribute__((visibility("default"))) TS_ChainMonitor_free(uint32_t this_
 	LDKChainMonitor this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChainMonitor_free(this_obj_conv);
 }
 
@@ -15558,6 +18771,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainMonitor_new(uint32_t ch
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15569,6 +18783,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChainMonitor_get_claima
 	LDKChainMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_ChannelDetailsZ ignored_channels_constr;
 	ignored_channels_constr.datalen = *((uint32_t*)ignored_channels);
 	if (ignored_channels_constr.datalen > 0)
@@ -15581,6 +18796,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChainMonitor_get_claima
 		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);
+		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;
 	}
@@ -15603,9 +18819,11 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainMonitor_get_monitor(uin
 	LDKChainMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKOutPoint funding_txo_conv;
 	funding_txo_conv.inner = (void*)(funding_txo & (~1));
 	funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0);
+	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);
@@ -15616,6 +18834,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChainMonitor_list_monit
 	LDKChainMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_OutPointZ ret_var = ChainMonitor_list_monitors(&this_arg_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -15625,6 +18844,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChainMonitor_list_monit
 		uint64_t ret_conv_10_ref = 0;
 		CHECK((((uint64_t)ret_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_10_var);
 		ret_conv_10_ref = (uint64_t)ret_conv_10_var.inner;
 		if (ret_conv_10_var.is_owned) {
 			ret_conv_10_ref |= 1;
@@ -15640,13 +18860,16 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainMonitor_channel_monitor
 	LDKChainMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKOutPoint funding_txo_conv;
 	funding_txo_conv.inner = (void*)(funding_txo & (~1));
 	funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0);
+	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);
+	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);
@@ -15657,6 +18880,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainMonitor_as_Listen(uint3
 	LDKChainMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKListen* ret_ret = MALLOC(sizeof(LDKListen), "LDKListen");
 	*ret_ret = ChainMonitor_as_Listen(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -15666,6 +18890,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainMonitor_as_Confirm(uint
 	LDKChainMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKConfirm* ret_ret = MALLOC(sizeof(LDKConfirm), "LDKConfirm");
 	*ret_ret = ChainMonitor_as_Confirm(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -15675,6 +18900,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainMonitor_as_Watch(uint32
 	LDKChainMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKWatch* ret_ret = MALLOC(sizeof(LDKWatch), "LDKWatch");
 	*ret_ret = ChainMonitor_as_Watch(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -15684,6 +18910,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainMonitor_as_EventsProvid
 	LDKChainMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKEventsProvider* ret_ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider");
 	*ret_ret = ChainMonitor_as_EventsProvider(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -15693,6 +18920,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMonitorUpdate_free(uint32
 	LDKChannelMonitorUpdate this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelMonitorUpdate_free(this_obj_conv);
 }
 
@@ -15700,6 +18928,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelMonitorUpdate_get_upda
 	LDKChannelMonitorUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelMonitorUpdate_get_update_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -15708,17 +18937,41 @@ void  __attribute__((visibility("default"))) TS_ChannelMonitorUpdate_set_update_
 	LDKChannelMonitorUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelMonitorUpdate_set_update_id(&this_ptr_conv, val);
 }
 
+static inline uint64_t ChannelMonitorUpdate_clone_ptr(LDKChannelMonitorUpdate *NONNULL_PTR arg) {
+	LDKChannelMonitorUpdate ret_var = ChannelMonitorUpdate_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelMonitorUpdate_clone_ptr(uint32_t arg) {
+	LDKChannelMonitorUpdate arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelMonitorUpdate_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelMonitorUpdate_clone(uint32_t orig) {
 	LDKChannelMonitorUpdate orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelMonitorUpdate ret_var = ChannelMonitorUpdate_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15730,6 +18983,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelMonitorUpdate_writ
 	LDKChannelMonitorUpdate obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelMonitorUpdate_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -15746,59 +19000,6 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelMonitorUpdate_read(in
 	return (uint64_t)ret_conv;
 }
 
-void  __attribute__((visibility("default"))) TS_MonitorUpdateError_free(uint32_t this_obj) {
-	LDKMonitorUpdateError this_obj_conv;
-	this_obj_conv.inner = (void*)(this_obj & (~1));
-	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
-	MonitorUpdateError_free(this_obj_conv);
-}
-
-jstring  __attribute__((visibility("default"))) TS_MonitorUpdateError_get_a(uint32_t this_ptr) {
-	LDKMonitorUpdateError this_ptr_conv;
-	this_ptr_conv.inner = (void*)(this_ptr & (~1));
-	this_ptr_conv.is_owned = false;
-	LDKStr ret_str = MonitorUpdateError_get_a(&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__((visibility("default"))) TS_MonitorUpdateError_set_a(uint32_t this_ptr, jstring val) {
-	LDKMonitorUpdateError this_ptr_conv;
-	this_ptr_conv.inner = (void*)(this_ptr & (~1));
-	this_ptr_conv.is_owned = false;
-	LDKStr val_conv = str_ref_to_owned_c(val);
-	MonitorUpdateError_set_a(&this_ptr_conv, val_conv);
-}
-
-uint32_t  __attribute__((visibility("default"))) TS_MonitorUpdateError_new(jstring a_arg) {
-	LDKStr a_arg_conv = str_ref_to_owned_c(a_arg);
-	LDKMonitorUpdateError ret_var = MonitorUpdateError_new(a_arg_conv);
-	uint64_t ret_ref = 0;
-	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	ret_ref = (uint64_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-uint32_t  __attribute__((visibility("default"))) TS_MonitorUpdateError_clone(uint32_t orig) {
-	LDKMonitorUpdateError orig_conv;
-	orig_conv.inner = (void*)(orig & (~1));
-	orig_conv.is_owned = false;
-	LDKMonitorUpdateError ret_var = MonitorUpdateError_clone(&orig_conv);
-	uint64_t ret_ref = 0;
-	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	ret_ref = (uint64_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
 void  __attribute__((visibility("default"))) TS_MonitorEvent_free(uint32_t this_ptr) {
 	if ((this_ptr & 1) != 0) return;
 	void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1);
@@ -15808,6 +19009,18 @@ void  __attribute__((visibility("default"))) TS_MonitorEvent_free(uint32_t this_
 	MonitorEvent_free(this_ptr_conv);
 }
 
+static inline uint64_t MonitorEvent_clone_ptr(LDKMonitorEvent *NONNULL_PTR arg) {
+	LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
+	*ret_copy = MonitorEvent_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_MonitorEvent_clone_ptr(uint32_t arg) {
+	LDKMonitorEvent* arg_conv = (LDKMonitorEvent*)arg;
+	int64_t ret_val = MonitorEvent_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_MonitorEvent_clone(uint32_t orig) {
 	LDKMonitorEvent* orig_conv = (LDKMonitorEvent*)orig;
 	LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
@@ -15820,6 +19033,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MonitorEvent_htlcevent(uint3
 	LDKHTLCUpdate a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = (a & 1) || (a == 0);
+	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);
@@ -15831,6 +19045,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MonitorEvent_commitment_tx_c
 	LDKOutPoint a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = (a & 1) || (a == 0);
+	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);
@@ -15842,6 +19057,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MonitorEvent_update_complete
 	LDKOutPoint funding_txo_conv;
 	funding_txo_conv.inner = (void*)(funding_txo & (~1));
 	funding_txo_conv.is_owned = (funding_txo & 1) || (funding_txo == 0);
+	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);
@@ -15853,6 +19069,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MonitorEvent_update_failed(u
 	LDKOutPoint a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = (a & 1) || (a == 0);
+	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);
@@ -15869,21 +19086,54 @@ int8_tArray  __attribute__((visibility("default"))) TS_MonitorEvent_write(uint32
 	return ret_arr;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_MonitorEvent_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = *((uint32_t*)ser);
+	ser_ref.data = (int8_t*)(ser + 4);
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
+	*ret_conv = MonitorEvent_read(ser_ref);
+	return (uint64_t)ret_conv;
+}
+
 void  __attribute__((visibility("default"))) TS_HTLCUpdate_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	HTLCUpdate_free(this_obj_conv);
 }
 
+static inline uint64_t HTLCUpdate_clone_ptr(LDKHTLCUpdate *NONNULL_PTR arg) {
+	LDKHTLCUpdate ret_var = HTLCUpdate_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_HTLCUpdate_clone_ptr(uint32_t arg) {
+	LDKHTLCUpdate arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = HTLCUpdate_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_HTLCUpdate_clone(uint32_t orig) {
 	LDKHTLCUpdate orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKHTLCUpdate ret_var = HTLCUpdate_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15895,6 +19145,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_HTLCUpdate_write(uint32_t
 	LDKHTLCUpdate obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = HTLCUpdate_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -15920,6 +19171,18 @@ void  __attribute__((visibility("default"))) TS_Balance_free(uint32_t this_ptr)
 	Balance_free(this_ptr_conv);
 }
 
+static inline uint64_t Balance_clone_ptr(LDKBalance *NONNULL_PTR arg) {
+	LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance");
+	*ret_copy = Balance_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Balance_clone_ptr(uint32_t arg) {
+	LDKBalance* arg_conv = (LDKBalance*)arg;
+	int64_t ret_val = Balance_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Balance_clone(uint32_t orig) {
 	LDKBalance* orig_conv = (LDKBalance*)orig;
 	LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance");
@@ -15967,17 +19230,41 @@ void  __attribute__((visibility("default"))) TS_ChannelMonitor_free(uint32_t thi
 	LDKChannelMonitor this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelMonitor_free(this_obj_conv);
 }
 
+static inline uint64_t ChannelMonitor_clone_ptr(LDKChannelMonitor *NONNULL_PTR arg) {
+	LDKChannelMonitor ret_var = ChannelMonitor_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelMonitor_clone_ptr(uint32_t arg) {
+	LDKChannelMonitor arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelMonitor_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelMonitor_clone(uint32_t orig) {
 	LDKChannelMonitor orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelMonitor ret_var = ChannelMonitor_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -15989,6 +19276,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelMonitor_write(uint
 	LDKChannelMonitor obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelMonitor_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -16000,9 +19288,11 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelMonitor_update_monito
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelMonitorUpdate updates_conv;
 	updates_conv.inner = (void*)(updates & (~1));
 	updates_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_conv);
 	void* broadcaster_ptr = (void*)(((uint64_t)broadcaster) & ~1);
 	if (!(broadcaster & 1)) { CHECK_ACCESS(broadcaster_ptr); }
 	LDKBroadcasterInterface* broadcaster_conv = (LDKBroadcasterInterface*)broadcaster_ptr;
@@ -16012,7 +19302,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelMonitor_update_monito
 	void* logger_ptr = (void*)(((uint64_t)logger) & ~1);
 	if (!(logger & 1)) { CHECK_ACCESS(logger_ptr); }
 	LDKLogger* logger_conv = (LDKLogger*)logger_ptr;
-	LDKCResult_NoneMonitorUpdateErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneMonitorUpdateErrorZ), "LDKCResult_NoneMonitorUpdateErrorZ");
+	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
 	*ret_conv = ChannelMonitor_update_monitor(&this_arg_conv, &updates_conv, broadcaster_conv, fee_estimator_conv, logger_conv);
 	return (uint64_t)ret_conv;
 }
@@ -16021,6 +19311,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelMonitor_get_latest_upd
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = ChannelMonitor_get_latest_update_id(&this_arg_conv);
 	return ret_val;
 }
@@ -16029,6 +19320,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelMonitor_get_funding_t
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ");
 	*ret_conv = ChannelMonitor_get_funding_txo(&this_arg_conv);
 	return ((uint64_t)ret_conv);
@@ -16038,6 +19330,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelMonitor_get_outp
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ ret_var = ChannelMonitor_get_outputs_to_watch(&this_arg_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -16056,6 +19349,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMonitor_load_outputs_to_w
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	void* filter_ptr = (void*)(((uint64_t)filter) & ~1);
 	if (!(filter & 1)) { CHECK_ACCESS(filter_ptr); }
 	LDKFilter* filter_conv = (LDKFilter*)filter_ptr;
@@ -16066,6 +19360,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelMonitor_get_and_
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_MonitorEventZ ret_var = ChannelMonitor_get_and_clear_pending_monitor_events(&this_arg_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -16085,6 +19380,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelMonitor_get_and_
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_EventZ ret_var = ChannelMonitor_get_and_clear_pending_events(&this_arg_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -16104,6 +19400,7 @@ ptrArray  __attribute__((visibility("default"))) TS_ChannelMonitor_get_latest_ho
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	void* logger_ptr = (void*)(((uint64_t)logger) & ~1);
 	if (!(logger & 1)) { CHECK_ACCESS(logger_ptr); }
 	LDKLogger* logger_conv = (LDKLogger*)logger_ptr;
@@ -16127,6 +19424,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelMonitor_block_co
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char header_arr[80];
 	CHECK(*((uint32_t*)header) == 80);
 	memcpy(header_arr, (uint8_t*)(header + 4), 80);
@@ -16173,6 +19471,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMonitor_block_disconnecte
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char header_arr[80];
 	CHECK(*((uint32_t*)header) == 80);
 	memcpy(header_arr, (uint8_t*)(header + 4), 80);
@@ -16193,6 +19492,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelMonitor_transact
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char header_arr[80];
 	CHECK(*((uint32_t*)header) == 80);
 	memcpy(header_arr, (uint8_t*)(header + 4), 80);
@@ -16239,6 +19539,7 @@ void  __attribute__((visibility("default"))) TS_ChannelMonitor_transaction_uncon
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char txid_arr[32];
 	CHECK(*((uint32_t*)txid) == 32);
 	memcpy(txid_arr, (uint8_t*)(txid + 4), 32);
@@ -16259,6 +19560,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelMonitor_best_blo
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char header_arr[80];
 	CHECK(*((uint32_t*)header) == 80);
 	memcpy(header_arr, (uint8_t*)(header + 4), 80);
@@ -16290,6 +19592,7 @@ ptrArray  __attribute__((visibility("default"))) TS_ChannelMonitor_get_relevant_
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_TxidZ ret_var = ChannelMonitor_get_relevant_txids(&this_arg_conv);
 	ptrArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native ptrArray Bytes");
@@ -16308,10 +19611,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelMonitor_current_best_
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKBestBlock ret_var = ChannelMonitor_current_best_block(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -16323,6 +19628,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelMonitor_get_clai
 	LDKChannelMonitor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_BalanceZ ret_var = ChannelMonitor_get_claimable_balances(&this_arg_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -16354,6 +19660,7 @@ void  __attribute__((visibility("default"))) TS_OutPoint_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	OutPoint_free(this_obj_conv);
 }
 
@@ -16361,6 +19668,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OutPoint_get_txid(uint32_
 	LDKOutPoint this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *OutPoint_get_txid(&this_ptr_conv), 32);
 	return ret_arr;
@@ -16370,6 +19678,7 @@ void  __attribute__((visibility("default"))) TS_OutPoint_set_txid(uint32_t this_
 	LDKOutPoint this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -16380,6 +19689,7 @@ int16_t  __attribute__((visibility("default"))) TS_OutPoint_get_index(uint32_t t
 	LDKOutPoint this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = OutPoint_get_index(&this_ptr_conv);
 	return ret_val;
 }
@@ -16388,6 +19698,7 @@ void  __attribute__((visibility("default"))) TS_OutPoint_set_index(uint32_t this
 	LDKOutPoint this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OutPoint_set_index(&this_ptr_conv, val);
 }
 
@@ -16399,6 +19710,7 @@ uint32_t  __attribute__((visibility("default"))) TS_OutPoint_new(int8_tArray txi
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -16406,14 +19718,37 @@ uint32_t  __attribute__((visibility("default"))) TS_OutPoint_new(int8_tArray txi
 	return ret_ref;
 }
 
+static inline uint64_t OutPoint_clone_ptr(LDKOutPoint *NONNULL_PTR arg) {
+	LDKOutPoint ret_var = OutPoint_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_OutPoint_clone_ptr(uint32_t arg) {
+	LDKOutPoint arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = OutPoint_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_OutPoint_clone(uint32_t orig) {
 	LDKOutPoint orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKOutPoint ret_var = OutPoint_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -16425,9 +19760,11 @@ jboolean  __attribute__((visibility("default"))) TS_OutPoint_eq(uint32_t a, uint
 	LDKOutPoint a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKOutPoint b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = OutPoint_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -16436,6 +19773,7 @@ int64_t  __attribute__((visibility("default"))) TS_OutPoint_hash(uint32_t o) {
 	LDKOutPoint o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = OutPoint_hash(&o_conv);
 	return ret_val;
 }
@@ -16444,6 +19782,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OutPoint_to_channel_id(ui
 	LDKOutPoint this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), OutPoint_to_channel_id(&this_arg_conv).data, 32);
 	return ret_arr;
@@ -16453,6 +19792,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OutPoint_write(uint32_t o
 	LDKOutPoint obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = OutPoint_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -16473,6 +19813,7 @@ void  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescriptor_f
 	LDKDelayedPaymentOutputDescriptor this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	DelayedPaymentOutputDescriptor_free(this_obj_conv);
 }
 
@@ -16480,10 +19821,12 @@ uint32_t  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescript
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint ret_var = DelayedPaymentOutputDescriptor_get_outpoint(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -16495,9 +19838,11 @@ void  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescriptor_s
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = OutPoint_clone(&val_conv);
 	DelayedPaymentOutputDescriptor_set_outpoint(&this_ptr_conv, val_conv);
 }
@@ -16506,6 +19851,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescr
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), DelayedPaymentOutputDescriptor_get_per_commitment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -16515,6 +19861,7 @@ void  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescriptor_s
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -16525,6 +19872,7 @@ int16_t  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescripto
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = DelayedPaymentOutputDescriptor_get_to_self_delay(&this_ptr_conv);
 	return ret_val;
 }
@@ -16533,6 +19881,7 @@ void  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescriptor_s
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	DelayedPaymentOutputDescriptor_set_to_self_delay(&this_ptr_conv, val);
 }
 
@@ -16540,6 +19889,7 @@ void  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescriptor_s
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKTxOut val_conv = *(LDKTxOut*)(val_ptr);
@@ -16551,6 +19901,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescr
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), DelayedPaymentOutputDescriptor_get_revocation_pubkey(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -16560,6 +19911,7 @@ void  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescriptor_s
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -16570,6 +19922,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescr
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *DelayedPaymentOutputDescriptor_get_channel_keys_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -16579,6 +19932,7 @@ void  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescriptor_s
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -16589,6 +19943,7 @@ int64_t  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescripto
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = DelayedPaymentOutputDescriptor_get_channel_value_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -16597,6 +19952,7 @@ void  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescriptor_s
 	LDKDelayedPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	DelayedPaymentOutputDescriptor_set_channel_value_satoshis(&this_ptr_conv, val);
 }
 
@@ -16604,6 +19960,7 @@ uint32_t  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescript
 	LDKOutPoint outpoint_arg_conv;
 	outpoint_arg_conv.inner = (void*)(outpoint_arg & (~1));
 	outpoint_arg_conv.is_owned = (outpoint_arg & 1) || (outpoint_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_arg_conv);
 	outpoint_arg_conv = OutPoint_clone(&outpoint_arg_conv);
 	LDKPublicKey per_commitment_point_arg_ref;
 	CHECK(*((uint32_t*)per_commitment_point_arg) == 33);
@@ -16622,6 +19979,7 @@ uint32_t  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescript
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -16629,14 +19987,37 @@ uint32_t  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescript
 	return ret_ref;
 }
 
+static inline uint64_t DelayedPaymentOutputDescriptor_clone_ptr(LDKDelayedPaymentOutputDescriptor *NONNULL_PTR arg) {
+	LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescriptor_clone_ptr(uint32_t arg) {
+	LDKDelayedPaymentOutputDescriptor arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = DelayedPaymentOutputDescriptor_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescriptor_clone(uint32_t orig) {
 	LDKDelayedPaymentOutputDescriptor orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -16648,6 +20029,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_DelayedPaymentOutputDescr
 	LDKDelayedPaymentOutputDescriptor obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = DelayedPaymentOutputDescriptor_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -16668,6 +20050,7 @@ void  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescriptor_fr
 	LDKStaticPaymentOutputDescriptor this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	StaticPaymentOutputDescriptor_free(this_obj_conv);
 }
 
@@ -16675,10 +20058,12 @@ uint32_t  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescripto
 	LDKStaticPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint ret_var = StaticPaymentOutputDescriptor_get_outpoint(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -16690,9 +20075,11 @@ void  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescriptor_se
 	LDKStaticPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = OutPoint_clone(&val_conv);
 	StaticPaymentOutputDescriptor_set_outpoint(&this_ptr_conv, val_conv);
 }
@@ -16701,6 +20088,7 @@ void  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescriptor_se
 	LDKStaticPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKTxOut val_conv = *(LDKTxOut*)(val_ptr);
@@ -16712,6 +20100,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescri
 	LDKStaticPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *StaticPaymentOutputDescriptor_get_channel_keys_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -16721,6 +20110,7 @@ void  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescriptor_se
 	LDKStaticPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -16731,6 +20121,7 @@ int64_t  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescriptor
 	LDKStaticPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = StaticPaymentOutputDescriptor_get_channel_value_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -16739,6 +20130,7 @@ void  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescriptor_se
 	LDKStaticPaymentOutputDescriptor this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	StaticPaymentOutputDescriptor_set_channel_value_satoshis(&this_ptr_conv, val);
 }
 
@@ -16746,6 +20138,7 @@ uint32_t  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescripto
 	LDKOutPoint outpoint_arg_conv;
 	outpoint_arg_conv.inner = (void*)(outpoint_arg & (~1));
 	outpoint_arg_conv.is_owned = (outpoint_arg & 1) || (outpoint_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_arg_conv);
 	outpoint_arg_conv = OutPoint_clone(&outpoint_arg_conv);
 	void* output_arg_ptr = (void*)(((uint64_t)output_arg) & ~1);
 	CHECK_ACCESS(output_arg_ptr);
@@ -16758,6 +20151,7 @@ uint32_t  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescripto
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -16765,14 +20159,37 @@ uint32_t  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescripto
 	return ret_ref;
 }
 
+static inline uint64_t StaticPaymentOutputDescriptor_clone_ptr(LDKStaticPaymentOutputDescriptor *NONNULL_PTR arg) {
+	LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescriptor_clone_ptr(uint32_t arg) {
+	LDKStaticPaymentOutputDescriptor arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = StaticPaymentOutputDescriptor_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescriptor_clone(uint32_t orig) {
 	LDKStaticPaymentOutputDescriptor orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -16784,6 +20201,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_StaticPaymentOutputDescri
 	LDKStaticPaymentOutputDescriptor obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = StaticPaymentOutputDescriptor_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -16809,6 +20227,18 @@ void  __attribute__((visibility("default"))) TS_SpendableOutputDescriptor_free(u
 	SpendableOutputDescriptor_free(this_ptr_conv);
 }
 
+static inline uint64_t SpendableOutputDescriptor_clone_ptr(LDKSpendableOutputDescriptor *NONNULL_PTR arg) {
+	LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor");
+	*ret_copy = SpendableOutputDescriptor_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_SpendableOutputDescriptor_clone_ptr(uint32_t arg) {
+	LDKSpendableOutputDescriptor* arg_conv = (LDKSpendableOutputDescriptor*)arg;
+	int64_t ret_val = SpendableOutputDescriptor_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_SpendableOutputDescriptor_clone(uint32_t orig) {
 	LDKSpendableOutputDescriptor* orig_conv = (LDKSpendableOutputDescriptor*)orig;
 	LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor");
@@ -16821,6 +20251,7 @@ uint32_t  __attribute__((visibility("default"))) TS_SpendableOutputDescriptor_st
 	LDKOutPoint outpoint_conv;
 	outpoint_conv.inner = (void*)(outpoint & (~1));
 	outpoint_conv.is_owned = (outpoint & 1) || (outpoint == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_conv);
 	outpoint_conv = OutPoint_clone(&outpoint_conv);
 	void* output_ptr = (void*)(((uint64_t)output) & ~1);
 	CHECK_ACCESS(output_ptr);
@@ -16836,6 +20267,7 @@ uint32_t  __attribute__((visibility("default"))) TS_SpendableOutputDescriptor_de
 	LDKDelayedPaymentOutputDescriptor a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = (a & 1) || (a == 0);
+	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);
@@ -16847,6 +20279,7 @@ uint32_t  __attribute__((visibility("default"))) TS_SpendableOutputDescriptor_st
 	LDKStaticPaymentOutputDescriptor a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = (a & 1) || (a == 0);
+	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);
@@ -16881,6 +20314,19 @@ void  __attribute__((visibility("default"))) TS_BaseSign_free(uint32_t this_ptr)
 	BaseSign_free(this_ptr_conv);
 }
 
+static inline uint64_t Sign_clone_ptr(LDKSign *NONNULL_PTR arg) {
+	LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign");
+	*ret_ret = Sign_clone(arg);
+	return (uint64_t)ret_ret;
+}
+int64_t  __attribute__((visibility("default"))) TS_Sign_clone_ptr(uint32_t arg) {
+	void* arg_ptr = (void*)(((uint64_t)arg) & ~1);
+	if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); }
+	LDKSign* arg_conv = (LDKSign*)arg_ptr;
+	int64_t ret_val = Sign_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Sign_clone(uint32_t orig) {
 	void* orig_ptr = (void*)(((uint64_t)orig) & ~1);
 	if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); }
@@ -16912,6 +20358,7 @@ void  __attribute__((visibility("default"))) TS_InMemorySigner_free(uint32_t thi
 	LDKInMemorySigner this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	InMemorySigner_free(this_obj_conv);
 }
 
@@ -16919,6 +20366,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_InMemorySigner_get_fundin
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *InMemorySigner_get_funding_key(&this_ptr_conv), 32);
 	return ret_arr;
@@ -16928,6 +20376,7 @@ void  __attribute__((visibility("default"))) TS_InMemorySigner_set_funding_key(u
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSecretKey val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.bytes, (uint8_t*)(val + 4), 32);
@@ -16938,6 +20387,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_InMemorySigner_get_revoca
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *InMemorySigner_get_revocation_base_key(&this_ptr_conv), 32);
 	return ret_arr;
@@ -16947,6 +20397,7 @@ void  __attribute__((visibility("default"))) TS_InMemorySigner_set_revocation_ba
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSecretKey val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.bytes, (uint8_t*)(val + 4), 32);
@@ -16957,6 +20408,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_InMemorySigner_get_paymen
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *InMemorySigner_get_payment_key(&this_ptr_conv), 32);
 	return ret_arr;
@@ -16966,6 +20418,7 @@ void  __attribute__((visibility("default"))) TS_InMemorySigner_set_payment_key(u
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSecretKey val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.bytes, (uint8_t*)(val + 4), 32);
@@ -16976,6 +20429,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_InMemorySigner_get_delaye
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *InMemorySigner_get_delayed_payment_base_key(&this_ptr_conv), 32);
 	return ret_arr;
@@ -16985,6 +20439,7 @@ void  __attribute__((visibility("default"))) TS_InMemorySigner_set_delayed_payme
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSecretKey val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.bytes, (uint8_t*)(val + 4), 32);
@@ -16995,6 +20450,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_InMemorySigner_get_htlc_b
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *InMemorySigner_get_htlc_base_key(&this_ptr_conv), 32);
 	return ret_arr;
@@ -17004,6 +20460,7 @@ void  __attribute__((visibility("default"))) TS_InMemorySigner_set_htlc_base_key
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSecretKey val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.bytes, (uint8_t*)(val + 4), 32);
@@ -17014,6 +20471,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_InMemorySigner_get_commit
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *InMemorySigner_get_commitment_seed(&this_ptr_conv), 32);
 	return ret_arr;
@@ -17023,20 +20481,44 @@ void  __attribute__((visibility("default"))) TS_InMemorySigner_set_commitment_se
 	LDKInMemorySigner this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
 	InMemorySigner_set_commitment_seed(&this_ptr_conv, val_ref);
 }
 
+static inline uint64_t InMemorySigner_clone_ptr(LDKInMemorySigner *NONNULL_PTR arg) {
+	LDKInMemorySigner ret_var = InMemorySigner_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_InMemorySigner_clone_ptr(uint32_t arg) {
+	LDKInMemorySigner arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = InMemorySigner_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_clone(uint32_t orig) {
 	LDKInMemorySigner orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInMemorySigner ret_var = InMemorySigner_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17070,6 +20552,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_new(int8_tArr
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17081,10 +20564,12 @@ uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_counterparty_
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelPublicKeys ret_var = InMemorySigner_counterparty_pubkeys(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17096,6 +20581,7 @@ int16_t  __attribute__((visibility("default"))) TS_InMemorySigner_counterparty_s
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int16_t ret_val = InMemorySigner_counterparty_selected_contest_delay(&this_arg_conv);
 	return ret_val;
 }
@@ -17104,6 +20590,7 @@ int16_t  __attribute__((visibility("default"))) TS_InMemorySigner_holder_selecte
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int16_t ret_val = InMemorySigner_holder_selected_contest_delay(&this_arg_conv);
 	return ret_val;
 }
@@ -17112,6 +20599,7 @@ jboolean  __attribute__((visibility("default"))) TS_InMemorySigner_is_outbound(u
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	jboolean ret_val = InMemorySigner_is_outbound(&this_arg_conv);
 	return ret_val;
 }
@@ -17120,10 +20608,12 @@ uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_funding_outpo
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKOutPoint ret_var = InMemorySigner_funding_outpoint(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17135,10 +20625,12 @@ uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_get_channel_p
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelTransactionParameters ret_var = InMemorySigner_get_channel_parameters(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17146,10 +20638,20 @@ uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_get_channel_p
 	return ret_ref;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_InMemorySigner_opt_anchors(uint32_t this_arg) {
+	LDKInMemorySigner this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	jboolean ret_val = InMemorySigner_opt_anchors(&this_arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_sign_counterparty_payment_input(uint32_t this_arg, int8_tArray spend_tx, int64_t input_idx, uint32_t descriptor) {
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKTransaction spend_tx_ref;
 	spend_tx_ref.datalen = *((uint32_t*)spend_tx);
 	spend_tx_ref.data = MALLOC(spend_tx_ref.datalen, "LDKTransaction Bytes");
@@ -17158,6 +20660,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_sign_counterp
 	LDKStaticPaymentOutputDescriptor descriptor_conv;
 	descriptor_conv.inner = (void*)(descriptor & (~1));
 	descriptor_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(descriptor_conv);
 	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
 	*ret_conv = InMemorySigner_sign_counterparty_payment_input(&this_arg_conv, spend_tx_ref, input_idx, &descriptor_conv);
 	return (uint64_t)ret_conv;
@@ -17167,6 +20670,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_sign_dynamic_
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKTransaction spend_tx_ref;
 	spend_tx_ref.datalen = *((uint32_t*)spend_tx);
 	spend_tx_ref.data = MALLOC(spend_tx_ref.datalen, "LDKTransaction Bytes");
@@ -17175,6 +20679,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_sign_dynamic_
 	LDKDelayedPaymentOutputDescriptor descriptor_conv;
 	descriptor_conv.inner = (void*)(descriptor & (~1));
 	descriptor_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(descriptor_conv);
 	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
 	*ret_conv = InMemorySigner_sign_dynamic_p2wsh_input(&this_arg_conv, spend_tx_ref, input_idx, &descriptor_conv);
 	return (uint64_t)ret_conv;
@@ -17184,6 +20689,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_as_BaseSign(u
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKBaseSign* ret_ret = MALLOC(sizeof(LDKBaseSign), "LDKBaseSign");
 	*ret_ret = InMemorySigner_as_BaseSign(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -17193,6 +20699,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InMemorySigner_as_Sign(uint3
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign");
 	*ret_ret = InMemorySigner_as_Sign(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -17202,6 +20709,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_InMemorySigner_write(uint
 	LDKInMemorySigner obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = InMemorySigner_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -17222,6 +20730,7 @@ void  __attribute__((visibility("default"))) TS_KeysManager_free(uint32_t this_o
 	LDKKeysManager this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	KeysManager_free(this_obj_conv);
 }
 
@@ -17234,6 +20743,7 @@ uint32_t  __attribute__((visibility("default"))) TS_KeysManager_new(int8_tArray
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17245,6 +20755,7 @@ uint32_t  __attribute__((visibility("default"))) TS_KeysManager_derive_channel_k
 	LDKKeysManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char params_arr[32];
 	CHECK(*((uint32_t*)params) == 32);
 	memcpy(params_arr, (uint8_t*)(params + 4), 32);
@@ -17253,6 +20764,7 @@ uint32_t  __attribute__((visibility("default"))) TS_KeysManager_derive_channel_k
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17264,6 +20776,7 @@ uint32_t  __attribute__((visibility("default"))) TS_KeysManager_spend_spendable_
 	LDKKeysManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_SpendableOutputDescriptorZ descriptors_constr;
 	descriptors_constr.datalen = *((uint32_t*)descriptors);
 	if (descriptors_constr.datalen > 0)
@@ -17307,6 +20820,7 @@ uint32_t  __attribute__((visibility("default"))) TS_KeysManager_as_KeysInterface
 	LDKKeysManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKKeysInterface* ret_ret = MALLOC(sizeof(LDKKeysInterface), "LDKKeysInterface");
 	*ret_ret = KeysManager_as_KeysInterface(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -17316,6 +20830,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManager_free(uint32_t thi
 	LDKChannelManager this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelManager_free(this_obj_conv);
 }
 
@@ -17323,6 +20838,7 @@ void  __attribute__((visibility("default"))) TS_ChainParameters_free(uint32_t th
 	LDKChainParameters this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChainParameters_free(this_obj_conv);
 }
 
@@ -17330,6 +20846,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainParameters_get_network(
 	LDKChainParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	uint32_t ret_conv = LDKNetwork_to_js(ChainParameters_get_network(&this_ptr_conv));
 	return ret_conv;
 }
@@ -17338,6 +20855,7 @@ void  __attribute__((visibility("default"))) TS_ChainParameters_set_network(uint
 	LDKChainParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNetwork val_conv = LDKNetwork_from_js(val);
 	ChainParameters_set_network(&this_ptr_conv, val_conv);
 }
@@ -17346,10 +20864,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainParameters_get_best_blo
 	LDKChainParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKBestBlock ret_var = ChainParameters_get_best_block(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17361,9 +20881,11 @@ void  __attribute__((visibility("default"))) TS_ChainParameters_set_best_block(u
 	LDKChainParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKBestBlock val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = BestBlock_clone(&val_conv);
 	ChainParameters_set_best_block(&this_ptr_conv, val_conv);
 }
@@ -17373,11 +20895,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainParameters_new(uint32_t
 	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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(best_block_arg_conv);
 	best_block_arg_conv = BestBlock_clone(&best_block_arg_conv);
 	LDKChainParameters ret_var = ChainParameters_new(network_arg_conv, best_block_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17385,14 +20909,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ChainParameters_new(uint32_t
 	return ret_ref;
 }
 
+static inline uint64_t ChainParameters_clone_ptr(LDKChainParameters *NONNULL_PTR arg) {
+	LDKChainParameters ret_var = ChainParameters_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChainParameters_clone_ptr(uint32_t arg) {
+	LDKChainParameters arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChainParameters_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChainParameters_clone(uint32_t orig) {
 	LDKChainParameters orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChainParameters ret_var = ChainParameters_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17404,6 +20951,7 @@ void  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_free(
 	LDKCounterpartyForwardingInfo this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	CounterpartyForwardingInfo_free(this_obj_conv);
 }
 
@@ -17411,6 +20959,7 @@ int32_t  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_ge
 	LDKCounterpartyForwardingInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = CounterpartyForwardingInfo_get_fee_base_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -17419,6 +20968,7 @@ void  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_set_f
 	LDKCounterpartyForwardingInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	CounterpartyForwardingInfo_set_fee_base_msat(&this_ptr_conv, val);
 }
 
@@ -17426,6 +20976,7 @@ int32_t  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_ge
 	LDKCounterpartyForwardingInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = CounterpartyForwardingInfo_get_fee_proportional_millionths(&this_ptr_conv);
 	return ret_val;
 }
@@ -17434,6 +20985,7 @@ void  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_set_f
 	LDKCounterpartyForwardingInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	CounterpartyForwardingInfo_set_fee_proportional_millionths(&this_ptr_conv, val);
 }
 
@@ -17441,6 +20993,7 @@ int16_t  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_ge
 	LDKCounterpartyForwardingInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = CounterpartyForwardingInfo_get_cltv_expiry_delta(&this_ptr_conv);
 	return ret_val;
 }
@@ -17449,6 +21002,7 @@ void  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_set_c
 	LDKCounterpartyForwardingInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	CounterpartyForwardingInfo_set_cltv_expiry_delta(&this_ptr_conv, val);
 }
 
@@ -17457,6 +21011,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_n
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17464,14 +21019,37 @@ uint32_t  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_n
 	return ret_ref;
 }
 
+static inline uint64_t CounterpartyForwardingInfo_clone_ptr(LDKCounterpartyForwardingInfo *NONNULL_PTR arg) {
+	LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_clone_ptr(uint32_t arg) {
+	LDKCounterpartyForwardingInfo arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = CounterpartyForwardingInfo_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CounterpartyForwardingInfo_clone(uint32_t orig) {
 	LDKCounterpartyForwardingInfo orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17483,6 +21061,7 @@ void  __attribute__((visibility("default"))) TS_ChannelCounterparty_free(uint32_
 	LDKChannelCounterparty this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelCounterparty_free(this_obj_conv);
 }
 
@@ -17490,6 +21069,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelCounterparty_get_n
 	LDKChannelCounterparty this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelCounterparty_get_node_id(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -17499,6 +21079,7 @@ void  __attribute__((visibility("default"))) TS_ChannelCounterparty_set_node_id(
 	LDKChannelCounterparty this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -17509,10 +21090,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelCounterparty_get_feat
 	LDKChannelCounterparty this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKInitFeatures ret_var = ChannelCounterparty_get_features(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17524,9 +21107,11 @@ void  __attribute__((visibility("default"))) TS_ChannelCounterparty_set_features
 	LDKChannelCounterparty this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKInitFeatures val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = InitFeatures_clone(&val_conv);
 	ChannelCounterparty_set_features(&this_ptr_conv, val_conv);
 }
@@ -17535,6 +21120,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelCounterparty_get_unspe
 	LDKChannelCounterparty this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelCounterparty_get_unspendable_punishment_reserve(&this_ptr_conv);
 	return ret_val;
 }
@@ -17543,6 +21129,7 @@ void  __attribute__((visibility("default"))) TS_ChannelCounterparty_set_unspenda
 	LDKChannelCounterparty this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelCounterparty_set_unspendable_punishment_reserve(&this_ptr_conv, val);
 }
 
@@ -17550,11 +21137,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelCounterparty_get_forw
 	LDKChannelCounterparty this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCounterpartyForwardingInfo ret_var = ChannelCounterparty_get_forwarding_info(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -17567,9 +21156,11 @@ void  __attribute__((visibility("default"))) TS_ChannelCounterparty_set_forwardi
 	LDKChannelCounterparty this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCounterpartyForwardingInfo val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = CounterpartyForwardingInfo_clone(&val_conv);
 	ChannelCounterparty_set_forwarding_info(&this_ptr_conv, val_conv);
 }
@@ -17581,15 +21172,18 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelCounterparty_new(int8
 	LDKInitFeatures features_arg_conv;
 	features_arg_conv.inner = (void*)(features_arg & (~1));
 	features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0);
+	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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(forwarding_info_arg_conv);
 	forwarding_info_arg_conv = CounterpartyForwardingInfo_clone(&forwarding_info_arg_conv);
 	LDKChannelCounterparty ret_var = ChannelCounterparty_new(node_id_arg_ref, features_arg_conv, unspendable_punishment_reserve_arg, forwarding_info_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17597,14 +21191,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelCounterparty_new(int8
 	return ret_ref;
 }
 
+static inline uint64_t ChannelCounterparty_clone_ptr(LDKChannelCounterparty *NONNULL_PTR arg) {
+	LDKChannelCounterparty ret_var = ChannelCounterparty_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelCounterparty_clone_ptr(uint32_t arg) {
+	LDKChannelCounterparty arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelCounterparty_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelCounterparty_clone(uint32_t orig) {
 	LDKChannelCounterparty orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelCounterparty ret_var = ChannelCounterparty_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17616,6 +21233,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_free(uint32_t thi
 	LDKChannelDetails this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelDetails_free(this_obj_conv);
 }
 
@@ -17623,6 +21241,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelDetails_get_channe
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *ChannelDetails_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -17632,6 +21251,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_channel_id(ui
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -17642,10 +21262,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_counterpa
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelCounterparty ret_var = ChannelDetails_get_counterparty(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17657,9 +21279,11 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_counterparty(
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelCounterparty val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelCounterparty_clone(&val_conv);
 	ChannelDetails_set_counterparty(&this_ptr_conv, val_conv);
 }
@@ -17668,11 +21292,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_funding_t
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint ret_var = ChannelDetails_get_funding_txo(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -17685,9 +21311,11 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_funding_txo(u
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = OutPoint_clone(&val_conv);
 	ChannelDetails_set_funding_txo(&this_ptr_conv, val_conv);
 }
@@ -17696,6 +21324,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_short_cha
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = ChannelDetails_get_short_channel_id(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -17706,6 +21335,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_short_channel
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
@@ -17717,6 +21347,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_channel_va
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelDetails_get_channel_value_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -17725,6 +21356,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_channel_value
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelDetails_set_channel_value_satoshis(&this_ptr_conv, val);
 }
 
@@ -17732,6 +21364,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_unspendab
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = ChannelDetails_get_unspendable_punishment_reserve(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -17742,6 +21375,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_unspendable_p
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
@@ -17753,6 +21387,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_user_chann
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelDetails_get_user_channel_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -17761,13 +21396,32 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_user_channel_
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelDetails_set_user_channel_id(&this_ptr_conv, val);
 }
 
+int64_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_balance_msat(uint32_t this_ptr) {
+	LDKChannelDetails this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	int64_t ret_val = ChannelDetails_get_balance_msat(&this_ptr_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_ChannelDetails_set_balance_msat(uint32_t this_ptr, int64_t val) {
+	LDKChannelDetails this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	ChannelDetails_set_balance_msat(&this_ptr_conv, val);
+}
+
 int64_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_outbound_capacity_msat(uint32_t this_ptr) {
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelDetails_get_outbound_capacity_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -17776,6 +21430,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_outbound_capa
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelDetails_set_outbound_capacity_msat(&this_ptr_conv, val);
 }
 
@@ -17783,6 +21438,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_inbound_ca
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelDetails_get_inbound_capacity_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -17791,6 +21447,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_inbound_capac
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelDetails_set_inbound_capacity_msat(&this_ptr_conv, val);
 }
 
@@ -17798,6 +21455,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_confirmat
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z");
 	*ret_copy = ChannelDetails_get_confirmations_required(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -17808,6 +21466,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_confirmations
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKCOption_u32Z val_conv = *(LDKCOption_u32Z*)(val_ptr);
@@ -17819,6 +21478,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_get_force_clo
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
 	*ret_copy = ChannelDetails_get_force_close_spend_delay(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -17829,6 +21489,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_force_close_s
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKCOption_u16Z val_conv = *(LDKCOption_u16Z*)(val_ptr);
@@ -17840,6 +21501,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelDetails_get_is_outbou
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = ChannelDetails_get_is_outbound(&this_ptr_conv);
 	return ret_val;
 }
@@ -17848,6 +21510,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_is_outbound(u
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelDetails_set_is_outbound(&this_ptr_conv, val);
 }
 
@@ -17855,6 +21518,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelDetails_get_is_fundin
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = ChannelDetails_get_is_funding_locked(&this_ptr_conv);
 	return ret_val;
 }
@@ -17863,6 +21527,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_is_funding_lo
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelDetails_set_is_funding_locked(&this_ptr_conv, val);
 }
 
@@ -17870,6 +21535,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelDetails_get_is_usable
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = ChannelDetails_get_is_usable(&this_ptr_conv);
 	return ret_val;
 }
@@ -17878,6 +21544,7 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_is_usable(uin
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelDetails_set_is_usable(&this_ptr_conv, val);
 }
 
@@ -17885,6 +21552,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelDetails_get_is_public
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = ChannelDetails_get_is_public(&this_ptr_conv);
 	return ret_val;
 }
@@ -17893,20 +21561,23 @@ void  __attribute__((visibility("default"))) TS_ChannelDetails_set_is_public(uin
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelDetails_set_is_public(&this_ptr_conv, val);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_new(int8_tArray channel_id_arg, uint32_t counterparty_arg, uint32_t funding_txo_arg, uint32_t short_channel_id_arg, int64_t channel_value_satoshis_arg, uint32_t unspendable_punishment_reserve_arg, int64_t user_channel_id_arg, int64_t outbound_capacity_msat_arg, int64_t inbound_capacity_msat_arg, uint32_t confirmations_required_arg, uint32_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_funding_locked_arg, jboolean is_usable_arg, jboolean is_public_arg) {
+uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_new(int8_tArray channel_id_arg, uint32_t counterparty_arg, uint32_t funding_txo_arg, uint32_t short_channel_id_arg, int64_t channel_value_satoshis_arg, uint32_t unspendable_punishment_reserve_arg, int64_t user_channel_id_arg, int64_t balance_msat_arg, int64_t outbound_capacity_msat_arg, int64_t inbound_capacity_msat_arg, uint32_t confirmations_required_arg, uint32_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_funding_locked_arg, jboolean is_usable_arg, jboolean is_public_arg) {
 	LDKThirtyTwoBytes channel_id_arg_ref;
 	CHECK(*((uint32_t*)channel_id_arg) == 32);
 	memcpy(channel_id_arg_ref.data, (uint8_t*)(channel_id_arg + 4), 32);
 	LDKChannelCounterparty counterparty_arg_conv;
 	counterparty_arg_conv.inner = (void*)(counterparty_arg & (~1));
 	counterparty_arg_conv.is_owned = (counterparty_arg & 1) || (counterparty_arg == 0);
+	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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_arg_conv);
 	funding_txo_arg_conv = OutPoint_clone(&funding_txo_arg_conv);
 	void* short_channel_id_arg_ptr = (void*)(((uint64_t)short_channel_id_arg) & ~1);
 	CHECK_ACCESS(short_channel_id_arg_ptr);
@@ -17923,10 +21594,11 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_new(int8_tArr
 	CHECK_ACCESS(force_close_spend_delay_arg_ptr);
 	LDKCOption_u16Z force_close_spend_delay_arg_conv = *(LDKCOption_u16Z*)(force_close_spend_delay_arg_ptr);
 	force_close_spend_delay_arg_conv = COption_u16Z_clone((LDKCOption_u16Z*)(((uint64_t)force_close_spend_delay_arg) & ~1));
-	LDKChannelDetails ret_var = ChannelDetails_new(channel_id_arg_ref, counterparty_arg_conv, funding_txo_arg_conv, short_channel_id_arg_conv, channel_value_satoshis_arg, unspendable_punishment_reserve_arg_conv, user_channel_id_arg, outbound_capacity_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg_conv, force_close_spend_delay_arg_conv, is_outbound_arg, is_funding_locked_arg, is_usable_arg, is_public_arg);
+	LDKChannelDetails ret_var = ChannelDetails_new(channel_id_arg_ref, counterparty_arg_conv, funding_txo_arg_conv, short_channel_id_arg_conv, channel_value_satoshis_arg, unspendable_punishment_reserve_arg_conv, user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg_conv, force_close_spend_delay_arg_conv, is_outbound_arg, is_funding_locked_arg, is_usable_arg, is_public_arg);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17934,14 +21606,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_new(int8_tArr
 	return ret_ref;
 }
 
+static inline uint64_t ChannelDetails_clone_ptr(LDKChannelDetails *NONNULL_PTR arg) {
+	LDKChannelDetails ret_var = ChannelDetails_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelDetails_clone_ptr(uint32_t arg) {
+	LDKChannelDetails arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelDetails_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelDetails_clone(uint32_t orig) {
 	LDKChannelDetails orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelDetails ret_var = ChannelDetails_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -17958,6 +21653,18 @@ void  __attribute__((visibility("default"))) TS_PaymentSendFailure_free(uint32_t
 	PaymentSendFailure_free(this_ptr_conv);
 }
 
+static inline uint64_t PaymentSendFailure_clone_ptr(LDKPaymentSendFailure *NONNULL_PTR arg) {
+	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
+	*ret_copy = PaymentSendFailure_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_PaymentSendFailure_clone_ptr(uint32_t arg) {
+	LDKPaymentSendFailure* arg_conv = (LDKPaymentSendFailure*)arg;
+	int64_t ret_val = PaymentSendFailure_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_PaymentSendFailure_clone(uint32_t orig) {
 	LDKPaymentSendFailure* orig_conv = (LDKPaymentSendFailure*)orig;
 	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
@@ -18039,6 +21746,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PaymentSendFailure_partial_f
 	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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(failed_paths_retry_conv);
 	failed_paths_retry_conv = RouteParameters_clone(&failed_paths_retry_conv);
 	LDKThirtyTwoBytes payment_id_ref;
 	CHECK(*((uint32_t*)payment_id) == 32);
@@ -18068,15 +21776,18 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_new(uint32_t
 	LDKUserConfig config_conv;
 	config_conv.inner = (void*)(config & (~1));
 	config_conv.is_owned = (config & 1) || (config == 0);
+	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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(params_conv);
 	params_conv = ChainParameters_clone(&params_conv);
 	LDKChannelManager ret_var = ChannelManager_new(fee_est_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, keys_manager_conv, config_conv, params_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18088,10 +21799,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_get_current_d
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKUserConfig ret_var = ChannelManager_get_current_default_configuration(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18103,12 +21816,14 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_create_channe
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKPublicKey their_network_key_ref;
 	CHECK(*((uint32_t*)their_network_key) == 33);
 	memcpy(their_network_key_ref.compressed_form, (uint8_t*)(their_network_key + 4), 33);
 	LDKUserConfig override_config_conv;
 	override_config_conv.inner = (void*)(override_config & (~1));
 	override_config_conv.is_owned = (override_config & 1) || (override_config == 0);
+	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);
@@ -18119,6 +21834,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelManager_list_cha
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_ChannelDetailsZ ret_var = ChannelManager_list_channels(&this_arg_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -18128,6 +21844,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelManager_list_cha
 		uint64_t ret_conv_16_ref = 0;
 		CHECK((((uint64_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var);
 		ret_conv_16_ref = (uint64_t)ret_conv_16_var.inner;
 		if (ret_conv_16_var.is_owned) {
 			ret_conv_16_ref |= 1;
@@ -18143,6 +21860,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelManager_list_usa
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_ChannelDetailsZ ret_var = ChannelManager_list_usable_channels(&this_arg_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -18152,6 +21870,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_ChannelManager_list_usa
 		uint64_t ret_conv_16_ref = 0;
 		CHECK((((uint64_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var);
 		ret_conv_16_ref = (uint64_t)ret_conv_16_var.inner;
 		if (ret_conv_16_var.is_owned) {
 			ret_conv_16_ref |= 1;
@@ -18167,6 +21886,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_close_channel
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char channel_id_arr[32];
 	CHECK(*((uint32_t*)channel_id) == 32);
 	memcpy(channel_id_arr, (uint8_t*)(channel_id + 4), 32);
@@ -18180,6 +21900,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_close_channel
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char channel_id_arr[32];
 	CHECK(*((uint32_t*)channel_id) == 32);
 	memcpy(channel_id_arr, (uint8_t*)(channel_id + 4), 32);
@@ -18193,6 +21914,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_force_close_c
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char channel_id_arr[32];
 	CHECK(*((uint32_t*)channel_id) == 32);
 	memcpy(channel_id_arr, (uint8_t*)(channel_id + 4), 32);
@@ -18206,6 +21928,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManager_force_close_all_c
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	ChannelManager_force_close_all_channels(&this_arg_conv);
 }
 
@@ -18213,9 +21936,11 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_send_payment(
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKRoute route_conv;
 	route_conv.inner = (void*)(route & (~1));
 	route_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv);
 	LDKThirtyTwoBytes payment_hash_ref;
 	CHECK(*((uint32_t*)payment_hash) == 32);
 	memcpy(payment_hash_ref.data, (uint8_t*)(payment_hash + 4), 32);
@@ -18231,9 +21956,11 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_retry_payment
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKRoute route_conv;
 	route_conv.inner = (void*)(route & (~1));
 	route_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv);
 	LDKThirtyTwoBytes payment_id_ref;
 	CHECK(*((uint32_t*)payment_id) == 32);
 	memcpy(payment_id_ref.data, (uint8_t*)(payment_id + 4), 32);
@@ -18242,13 +21969,26 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_retry_payment
 	return (uint64_t)ret_conv;
 }
 
+void  __attribute__((visibility("default"))) TS_ChannelManager_abandon_payment(uint32_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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	LDKThirtyTwoBytes payment_id_ref;
+	CHECK(*((uint32_t*)payment_id) == 32);
+	memcpy(payment_id_ref.data, (uint8_t*)(payment_id + 4), 32);
+	ChannelManager_abandon_payment(&this_arg_conv, payment_id_ref);
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_send_spontaneous_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_preimage) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKRoute route_conv;
 	route_conv.inner = (void*)(route & (~1));
 	route_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_conv);
 	LDKThirtyTwoBytes payment_preimage_ref;
 	CHECK(*((uint32_t*)payment_preimage) == 32);
 	memcpy(payment_preimage_ref.data, (uint8_t*)(payment_preimage + 4), 32);
@@ -18261,6 +22001,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_funding_trans
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char temporary_channel_id_arr[32];
 	CHECK(*((uint32_t*)temporary_channel_id) == 32);
 	memcpy(temporary_channel_id_arr, (uint8_t*)(temporary_channel_id + 4), 32);
@@ -18279,6 +22020,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManager_broadcast_node_an
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKThreeBytes rgb_ref;
 	CHECK(*((uint32_t*)rgb) == 3);
 	memcpy(rgb_ref.data, (uint8_t*)(rgb + 4), 3);
@@ -18306,6 +22048,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManager_process_pending_h
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	ChannelManager_process_pending_htlc_forwards(&this_arg_conv);
 }
 
@@ -18313,6 +22056,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManager_timer_tick_occurr
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	ChannelManager_timer_tick_occurred(&this_arg_conv);
 }
 
@@ -18320,6 +22064,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelManager_fail_htlc_bac
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char payment_hash_arr[32];
 	CHECK(*((uint32_t*)payment_hash) == 32);
 	memcpy(payment_hash_arr, (uint8_t*)(payment_hash + 4), 32);
@@ -18332,6 +22077,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelManager_claim_funds(u
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKThirtyTwoBytes payment_preimage_ref;
 	CHECK(*((uint32_t*)payment_preimage) == 32);
 	memcpy(payment_preimage_ref.data, (uint8_t*)(payment_preimage + 4), 32);
@@ -18343,28 +22089,62 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelManager_get_our_no
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelManager_get_our_node_id(&this_arg_conv).compressed_form, 33);
 	return ret_arr;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_create_inbound_payment(uint32_t this_arg, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs, int64_t user_payment_id) {
+uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_create_inbound_payment(uint32_t this_arg, uint32_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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	void* min_value_msat_ptr = (void*)(((uint64_t)min_value_msat) & ~1);
 	CHECK_ACCESS(min_value_msat_ptr);
 	LDKCOption_u64Z min_value_msat_conv = *(LDKCOption_u64Z*)(min_value_msat_ptr);
 	min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)min_value_msat) & ~1));
-	LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
-	*ret_conv = ChannelManager_create_inbound_payment(&this_arg_conv, min_value_msat_conv, invoice_expiry_delta_secs, user_payment_id);
-	return ((uint64_t)ret_conv);
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
+	*ret_conv = ChannelManager_create_inbound_payment(&this_arg_conv, min_value_msat_conv, invoice_expiry_delta_secs);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_create_inbound_payment_legacy(uint32_t this_arg, uint32_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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	void* min_value_msat_ptr = (void*)(((uint64_t)min_value_msat) & ~1);
+	CHECK_ACCESS(min_value_msat_ptr);
+	LDKCOption_u64Z min_value_msat_conv = *(LDKCOption_u64Z*)(min_value_msat_ptr);
+	min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)min_value_msat) & ~1));
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
+	*ret_conv = ChannelManager_create_inbound_payment_legacy(&this_arg_conv, min_value_msat_conv, invoice_expiry_delta_secs);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) 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) {
+	LDKChannelManager this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	LDKThirtyTwoBytes payment_hash_ref;
+	CHECK(*((uint32_t*)payment_hash) == 32);
+	memcpy(payment_hash_ref.data, (uint8_t*)(payment_hash + 4), 32);
+	void* min_value_msat_ptr = (void*)(((uint64_t)min_value_msat) & ~1);
+	CHECK_ACCESS(min_value_msat_ptr);
+	LDKCOption_u64Z min_value_msat_conv = *(LDKCOption_u64Z*)(min_value_msat_ptr);
+	min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)min_value_msat) & ~1));
+	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
+	*ret_conv = ChannelManager_create_inbound_payment_for_hash(&this_arg_conv, payment_hash_ref, min_value_msat_conv, invoice_expiry_delta_secs);
+	return (uint64_t)ret_conv;
 }
 
-uint32_t  __attribute__((visibility("default"))) 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, int64_t user_payment_id) {
+uint32_t  __attribute__((visibility("default"))) 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) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKThirtyTwoBytes payment_hash_ref;
 	CHECK(*((uint32_t*)payment_hash) == 32);
 	memcpy(payment_hash_ref.data, (uint8_t*)(payment_hash + 4), 32);
@@ -18373,7 +22153,23 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_create_inboun
 	LDKCOption_u64Z min_value_msat_conv = *(LDKCOption_u64Z*)(min_value_msat_ptr);
 	min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)min_value_msat) & ~1));
 	LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ");
-	*ret_conv = ChannelManager_create_inbound_payment_for_hash(&this_arg_conv, payment_hash_ref, min_value_msat_conv, invoice_expiry_delta_secs, user_payment_id);
+	*ret_conv = ChannelManager_create_inbound_payment_for_hash_legacy(&this_arg_conv, payment_hash_ref, min_value_msat_conv, invoice_expiry_delta_secs);
+	return (uint64_t)ret_conv;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_get_payment_preimage(uint32_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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	LDKThirtyTwoBytes payment_hash_ref;
+	CHECK(*((uint32_t*)payment_hash) == 32);
+	memcpy(payment_hash_ref.data, (uint8_t*)(payment_hash + 4), 32);
+	LDKThirtyTwoBytes payment_secret_ref;
+	CHECK(*((uint32_t*)payment_secret) == 32);
+	memcpy(payment_secret_ref.data, (uint8_t*)(payment_secret + 4), 32);
+	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
+	*ret_conv = ChannelManager_get_payment_preimage(&this_arg_conv, payment_hash_ref, payment_secret_ref);
 	return (uint64_t)ret_conv;
 }
 
@@ -18381,6 +22177,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_as_MessageSen
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider");
 	*ret_ret = ChannelManager_as_MessageSendEventsProvider(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -18390,6 +22187,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_as_EventsProv
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKEventsProvider* ret_ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider");
 	*ret_ret = ChannelManager_as_EventsProvider(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -18399,6 +22197,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_as_Listen(uin
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKListen* ret_ret = MALLOC(sizeof(LDKListen), "LDKListen");
 	*ret_ret = ChannelManager_as_Listen(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -18408,6 +22207,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_as_Confirm(ui
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKConfirm* ret_ret = MALLOC(sizeof(LDKConfirm), "LDKConfirm");
 	*ret_ret = ChannelManager_as_Confirm(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -18417,6 +22217,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelManager_await_persist
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	jboolean ret_val = ChannelManager_await_persistable_update_timeout(&this_arg_conv, max_wait);
 	return ret_val;
 }
@@ -18425,6 +22226,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManager_await_persistable
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	ChannelManager_await_persistable_update(&this_arg_conv);
 }
 
@@ -18432,10 +22234,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_current_best_
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKBestBlock ret_var = ChannelManager_current_best_block(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18447,6 +22251,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_as_ChannelMes
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelMessageHandler* ret_ret = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler");
 	*ret_ret = ChannelManager_as_ChannelMessageHandler(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -18456,6 +22261,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelManager_write(uint
 	LDKChannelManager obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelManager_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -18467,6 +22273,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_free(uint
 	LDKChannelManagerReadArgs this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelManagerReadArgs_free(this_obj_conv);
 }
 
@@ -18474,6 +22281,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_get_k
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
 	uint64_t ret_ret = ((uint64_t)ChannelManagerReadArgs_get_keys_manager(&this_ptr_conv)) | 1;
 	return ret_ret;
@@ -18483,6 +22291,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_keys_
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKKeysInterface val_conv = *(LDKKeysInterface*)(val_ptr);
@@ -18493,6 +22302,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_get_f
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
 	uint64_t ret_ret = ((uint64_t)ChannelManagerReadArgs_get_fee_estimator(&this_ptr_conv)) | 1;
 	return ret_ret;
@@ -18502,6 +22312,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_fee_e
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKFeeEstimator val_conv = *(LDKFeeEstimator*)(val_ptr);
@@ -18512,6 +22323,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_get_c
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
 	uint64_t ret_ret = ((uint64_t)ChannelManagerReadArgs_get_chain_monitor(&this_ptr_conv)) | 1;
 	return ret_ret;
@@ -18521,6 +22333,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_chain
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKWatch val_conv = *(LDKWatch*)(val_ptr);
@@ -18531,6 +22344,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_get_t
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
 	uint64_t ret_ret = ((uint64_t)ChannelManagerReadArgs_get_tx_broadcaster(&this_ptr_conv)) | 1;
 	return ret_ret;
@@ -18540,6 +22354,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_tx_br
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKBroadcasterInterface val_conv = *(LDKBroadcasterInterface*)(val_ptr);
@@ -18550,6 +22365,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_get_l
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
 	uint64_t ret_ret = ((uint64_t)ChannelManagerReadArgs_get_logger(&this_ptr_conv)) | 1;
 	return ret_ret;
@@ -18559,6 +22375,7 @@ void  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_logge
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKLogger val_conv = *(LDKLogger*)(val_ptr);
@@ -18569,10 +22386,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_get_d
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUserConfig ret_var = ChannelManagerReadArgs_get_default_config(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18584,9 +22403,11 @@ void  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_set_defau
 	LDKChannelManagerReadArgs this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUserConfig val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = UserConfig_clone(&val_conv);
 	ChannelManagerReadArgs_set_default_config(&this_ptr_conv, val_conv);
 }
@@ -18610,6 +22431,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_new(u
 	LDKUserConfig default_config_conv;
 	default_config_conv.inner = (void*)(default_config & (~1));
 	default_config_conv.is_owned = (default_config & 1) || (default_config == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(default_config_conv);
 	default_config_conv = UserConfig_clone(&default_config_conv);
 	LDKCVec_ChannelMonitorZ channel_monitors_constr;
 	channel_monitors_constr.datalen = *((uint32_t*)channel_monitors);
@@ -18623,12 +22445,14 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManagerReadArgs_new(u
 		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);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_monitors_conv_16_conv);
 		channel_monitors_constr.data[q] = channel_monitors_conv_16_conv;
 	}
 	LDKChannelManagerReadArgs ret_var = ChannelManagerReadArgs_new(keys_manager_conv, fee_estimator_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, default_config_conv, channel_monitors_constr);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18643,6 +22467,7 @@ uint32_t  __attribute__((visibility("default"))) TS_C2Tuple_BlockHashChannelMana
 	LDKChannelManagerReadArgs arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = (arg & 1) || (arg == 0);
+	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);
@@ -18653,17 +22478,41 @@ void  __attribute__((visibility("default"))) TS_DecodeError_free(uint32_t this_o
 	LDKDecodeError this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	DecodeError_free(this_obj_conv);
 }
 
+static inline uint64_t DecodeError_clone_ptr(LDKDecodeError *NONNULL_PTR arg) {
+	LDKDecodeError ret_var = DecodeError_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_DecodeError_clone_ptr(uint32_t arg) {
+	LDKDecodeError arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = DecodeError_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_DecodeError_clone(uint32_t orig) {
 	LDKDecodeError orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKDecodeError ret_var = DecodeError_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18675,6 +22524,7 @@ void  __attribute__((visibility("default"))) TS_Init_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	Init_free(this_obj_conv);
 }
 
@@ -18682,10 +22532,12 @@ uint32_t  __attribute__((visibility("default"))) TS_Init_get_features(uint32_t t
 	LDKInit this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKInitFeatures ret_var = Init_get_features(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18697,9 +22549,11 @@ void  __attribute__((visibility("default"))) TS_Init_set_features(uint32_t this_
 	LDKInit this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKInitFeatures val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = InitFeatures_clone(&val_conv);
 	Init_set_features(&this_ptr_conv, val_conv);
 }
@@ -18708,11 +22562,13 @@ uint32_t  __attribute__((visibility("default"))) TS_Init_new(uint32_t features_a
 	LDKInitFeatures features_arg_conv;
 	features_arg_conv.inner = (void*)(features_arg & (~1));
 	features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv);
 	features_arg_conv = InitFeatures_clone(&features_arg_conv);
 	LDKInit ret_var = Init_new(features_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18720,14 +22576,37 @@ uint32_t  __attribute__((visibility("default"))) TS_Init_new(uint32_t features_a
 	return ret_ref;
 }
 
+static inline uint64_t Init_clone_ptr(LDKInit *NONNULL_PTR arg) {
+	LDKInit ret_var = Init_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Init_clone_ptr(uint32_t arg) {
+	LDKInit arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = Init_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Init_clone(uint32_t orig) {
 	LDKInit orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInit ret_var = Init_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18739,6 +22618,7 @@ void  __attribute__((visibility("default"))) TS_ErrorMessage_free(uint32_t this_
 	LDKErrorMessage this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ErrorMessage_free(this_obj_conv);
 }
 
@@ -18746,6 +22626,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ErrorMessage_get_channel_
 	LDKErrorMessage this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *ErrorMessage_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -18755,6 +22636,7 @@ void  __attribute__((visibility("default"))) TS_ErrorMessage_set_channel_id(uint
 	LDKErrorMessage this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -18765,6 +22647,7 @@ jstring  __attribute__((visibility("default"))) TS_ErrorMessage_get_data(uint32_
 	LDKErrorMessage this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	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);
@@ -18775,6 +22658,7 @@ void  __attribute__((visibility("default"))) TS_ErrorMessage_set_data(uint32_t t
 	LDKErrorMessage this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKStr val_conv = str_ref_to_owned_c(val);
 	ErrorMessage_set_data(&this_ptr_conv, val_conv);
 }
@@ -18788,6 +22672,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ErrorMessage_new(int8_tArray
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18795,14 +22680,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ErrorMessage_new(int8_tArray
 	return ret_ref;
 }
 
+static inline uint64_t ErrorMessage_clone_ptr(LDKErrorMessage *NONNULL_PTR arg) {
+	LDKErrorMessage ret_var = ErrorMessage_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ErrorMessage_clone_ptr(uint32_t arg) {
+	LDKErrorMessage arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ErrorMessage_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ErrorMessage_clone(uint32_t orig) {
 	LDKErrorMessage orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKErrorMessage ret_var = ErrorMessage_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18814,6 +22722,7 @@ void  __attribute__((visibility("default"))) TS_Ping_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	Ping_free(this_obj_conv);
 }
 
@@ -18821,6 +22730,7 @@ int16_t  __attribute__((visibility("default"))) TS_Ping_get_ponglen(uint32_t thi
 	LDKPing this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = Ping_get_ponglen(&this_ptr_conv);
 	return ret_val;
 }
@@ -18829,6 +22739,7 @@ void  __attribute__((visibility("default"))) TS_Ping_set_ponglen(uint32_t this_p
 	LDKPing this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	Ping_set_ponglen(&this_ptr_conv, val);
 }
 
@@ -18836,6 +22747,7 @@ int16_t  __attribute__((visibility("default"))) TS_Ping_get_byteslen(uint32_t th
 	LDKPing this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = Ping_get_byteslen(&this_ptr_conv);
 	return ret_val;
 }
@@ -18844,6 +22756,7 @@ void  __attribute__((visibility("default"))) TS_Ping_set_byteslen(uint32_t this_
 	LDKPing this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	Ping_set_byteslen(&this_ptr_conv, val);
 }
 
@@ -18852,6 +22765,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Ping_new(int16_t ponglen_arg
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18859,14 +22773,37 @@ uint32_t  __attribute__((visibility("default"))) TS_Ping_new(int16_t ponglen_arg
 	return ret_ref;
 }
 
+static inline uint64_t Ping_clone_ptr(LDKPing *NONNULL_PTR arg) {
+	LDKPing ret_var = Ping_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Ping_clone_ptr(uint32_t arg) {
+	LDKPing arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = Ping_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Ping_clone(uint32_t orig) {
 	LDKPing orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPing ret_var = Ping_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18878,6 +22815,7 @@ void  __attribute__((visibility("default"))) TS_Pong_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	Pong_free(this_obj_conv);
 }
 
@@ -18885,6 +22823,7 @@ int16_t  __attribute__((visibility("default"))) TS_Pong_get_byteslen(uint32_t th
 	LDKPong this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = Pong_get_byteslen(&this_ptr_conv);
 	return ret_val;
 }
@@ -18893,6 +22832,7 @@ void  __attribute__((visibility("default"))) TS_Pong_set_byteslen(uint32_t this_
 	LDKPong this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	Pong_set_byteslen(&this_ptr_conv, val);
 }
 
@@ -18901,6 +22841,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Pong_new(int16_t byteslen_ar
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18908,14 +22849,37 @@ uint32_t  __attribute__((visibility("default"))) TS_Pong_new(int16_t byteslen_ar
 	return ret_ref;
 }
 
+static inline uint64_t Pong_clone_ptr(LDKPong *NONNULL_PTR arg) {
+	LDKPong ret_var = Pong_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Pong_clone_ptr(uint32_t arg) {
+	LDKPong arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = Pong_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Pong_clone(uint32_t orig) {
 	LDKPong orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPong ret_var = Pong_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -18927,6 +22891,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_free(uint32_t this_o
 	LDKOpenChannel this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	OpenChannel_free(this_obj_conv);
 }
 
@@ -18934,6 +22899,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OpenChannel_get_chain_has
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *OpenChannel_get_chain_hash(&this_ptr_conv), 32);
 	return ret_arr;
@@ -18943,6 +22909,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_chain_hash(uint3
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -18953,6 +22920,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OpenChannel_get_temporary
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *OpenChannel_get_temporary_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -18962,6 +22930,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_temporary_channe
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -18972,6 +22941,7 @@ int64_t  __attribute__((visibility("default"))) TS_OpenChannel_get_funding_satos
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = OpenChannel_get_funding_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -18980,6 +22950,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_funding_satoshis
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OpenChannel_set_funding_satoshis(&this_ptr_conv, val);
 }
 
@@ -18987,6 +22958,7 @@ int64_t  __attribute__((visibility("default"))) TS_OpenChannel_get_push_msat(uin
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = OpenChannel_get_push_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -18995,6 +22967,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_push_msat(uint32
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OpenChannel_set_push_msat(&this_ptr_conv, val);
 }
 
@@ -19002,6 +22975,7 @@ int64_t  __attribute__((visibility("default"))) TS_OpenChannel_get_dust_limit_sa
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = OpenChannel_get_dust_limit_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -19010,6 +22984,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_dust_limit_satos
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OpenChannel_set_dust_limit_satoshis(&this_ptr_conv, val);
 }
 
@@ -19017,6 +22992,7 @@ int64_t  __attribute__((visibility("default"))) TS_OpenChannel_get_max_htlc_valu
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = OpenChannel_get_max_htlc_value_in_flight_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -19025,6 +23001,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_max_htlc_value_i
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OpenChannel_set_max_htlc_value_in_flight_msat(&this_ptr_conv, val);
 }
 
@@ -19032,6 +23009,7 @@ int64_t  __attribute__((visibility("default"))) TS_OpenChannel_get_channel_reser
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = OpenChannel_get_channel_reserve_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -19040,6 +23018,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_channel_reserve_
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OpenChannel_set_channel_reserve_satoshis(&this_ptr_conv, val);
 }
 
@@ -19047,6 +23026,7 @@ int64_t  __attribute__((visibility("default"))) TS_OpenChannel_get_htlc_minimum_
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = OpenChannel_get_htlc_minimum_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -19055,6 +23035,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_htlc_minimum_msa
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OpenChannel_set_htlc_minimum_msat(&this_ptr_conv, val);
 }
 
@@ -19062,6 +23043,7 @@ int32_t  __attribute__((visibility("default"))) TS_OpenChannel_get_feerate_per_k
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = OpenChannel_get_feerate_per_kw(&this_ptr_conv);
 	return ret_val;
 }
@@ -19070,6 +23052,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_feerate_per_kw(u
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OpenChannel_set_feerate_per_kw(&this_ptr_conv, val);
 }
 
@@ -19077,6 +23060,7 @@ int16_t  __attribute__((visibility("default"))) TS_OpenChannel_get_to_self_delay
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = OpenChannel_get_to_self_delay(&this_ptr_conv);
 	return ret_val;
 }
@@ -19085,6 +23069,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_to_self_delay(ui
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OpenChannel_set_to_self_delay(&this_ptr_conv, val);
 }
 
@@ -19092,6 +23077,7 @@ int16_t  __attribute__((visibility("default"))) TS_OpenChannel_get_max_accepted_
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = OpenChannel_get_max_accepted_htlcs(&this_ptr_conv);
 	return ret_val;
 }
@@ -19100,6 +23086,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_max_accepted_htl
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OpenChannel_set_max_accepted_htlcs(&this_ptr_conv, val);
 }
 
@@ -19107,6 +23094,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OpenChannel_get_funding_p
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), OpenChannel_get_funding_pubkey(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19116,6 +23104,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_funding_pubkey(u
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19126,6 +23115,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OpenChannel_get_revocatio
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), OpenChannel_get_revocation_basepoint(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19135,6 +23125,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_revocation_basep
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19145,6 +23136,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OpenChannel_get_payment_p
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), OpenChannel_get_payment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19154,6 +23146,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_payment_point(ui
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19164,6 +23157,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OpenChannel_get_delayed_p
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), OpenChannel_get_delayed_payment_basepoint(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19173,6 +23167,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_delayed_payment_
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19183,6 +23178,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OpenChannel_get_htlc_base
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), OpenChannel_get_htlc_basepoint(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19192,6 +23188,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_htlc_basepoint(u
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19202,6 +23199,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OpenChannel_get_first_per
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), OpenChannel_get_first_per_commitment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19211,6 +23209,7 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_first_per_commit
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19221,6 +23220,7 @@ int8_t  __attribute__((visibility("default"))) TS_OpenChannel_get_channel_flags(
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_t ret_val = OpenChannel_get_channel_flags(&this_ptr_conv);
 	return ret_val;
 }
@@ -19229,17 +23229,73 @@ void  __attribute__((visibility("default"))) TS_OpenChannel_set_channel_flags(ui
 	LDKOpenChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	OpenChannel_set_channel_flags(&this_ptr_conv, val);
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_OpenChannel_get_channel_type(uint32_t this_ptr) {
+	LDKOpenChannel this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKChannelTypeFeatures ret_var = OpenChannel_get_channel_type(&this_ptr_conv);
+	uint64_t ret_ref = 0;
+	if ((uint64_t)ret_var.inner > 4096) {
+		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+		ret_ref = (uint64_t)ret_var.inner;
+		if (ret_var.is_owned) {
+			ret_ref |= 1;
+		}
+	}
+	return ret_ref;
+}
+
+void  __attribute__((visibility("default"))) TS_OpenChannel_set_channel_type(uint32_t this_ptr, uint32_t val) {
+	LDKOpenChannel this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKChannelTypeFeatures val_conv;
+	val_conv.inner = (void*)(val & (~1));
+	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
+	val_conv = ChannelTypeFeatures_clone(&val_conv);
+	OpenChannel_set_channel_type(&this_ptr_conv, val_conv);
+}
+
+static inline uint64_t OpenChannel_clone_ptr(LDKOpenChannel *NONNULL_PTR arg) {
+	LDKOpenChannel ret_var = OpenChannel_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_OpenChannel_clone_ptr(uint32_t arg) {
+	LDKOpenChannel arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = OpenChannel_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_OpenChannel_clone(uint32_t orig) {
 	LDKOpenChannel orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKOpenChannel ret_var = OpenChannel_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19251,6 +23307,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_free(uint32_t this
 	LDKAcceptChannel this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	AcceptChannel_free(this_obj_conv);
 }
 
@@ -19258,6 +23315,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AcceptChannel_get_tempora
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *AcceptChannel_get_temporary_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -19267,6 +23325,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_temporary_chan
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -19277,6 +23336,7 @@ int64_t  __attribute__((visibility("default"))) TS_AcceptChannel_get_dust_limit_
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = AcceptChannel_get_dust_limit_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -19285,6 +23345,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_dust_limit_sat
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	AcceptChannel_set_dust_limit_satoshis(&this_ptr_conv, val);
 }
 
@@ -19292,6 +23353,7 @@ int64_t  __attribute__((visibility("default"))) TS_AcceptChannel_get_max_htlc_va
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = AcceptChannel_get_max_htlc_value_in_flight_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -19300,6 +23362,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_max_htlc_value
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	AcceptChannel_set_max_htlc_value_in_flight_msat(&this_ptr_conv, val);
 }
 
@@ -19307,6 +23370,7 @@ int64_t  __attribute__((visibility("default"))) TS_AcceptChannel_get_channel_res
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = AcceptChannel_get_channel_reserve_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -19315,6 +23379,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_channel_reserv
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	AcceptChannel_set_channel_reserve_satoshis(&this_ptr_conv, val);
 }
 
@@ -19322,6 +23387,7 @@ int64_t  __attribute__((visibility("default"))) TS_AcceptChannel_get_htlc_minimu
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = AcceptChannel_get_htlc_minimum_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -19330,6 +23396,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_htlc_minimum_m
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	AcceptChannel_set_htlc_minimum_msat(&this_ptr_conv, val);
 }
 
@@ -19337,6 +23404,7 @@ int32_t  __attribute__((visibility("default"))) TS_AcceptChannel_get_minimum_dep
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = AcceptChannel_get_minimum_depth(&this_ptr_conv);
 	return ret_val;
 }
@@ -19345,6 +23413,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_minimum_depth(
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	AcceptChannel_set_minimum_depth(&this_ptr_conv, val);
 }
 
@@ -19352,6 +23421,7 @@ int16_t  __attribute__((visibility("default"))) TS_AcceptChannel_get_to_self_del
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = AcceptChannel_get_to_self_delay(&this_ptr_conv);
 	return ret_val;
 }
@@ -19360,6 +23430,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_to_self_delay(
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	AcceptChannel_set_to_self_delay(&this_ptr_conv, val);
 }
 
@@ -19367,6 +23438,7 @@ int16_t  __attribute__((visibility("default"))) TS_AcceptChannel_get_max_accepte
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = AcceptChannel_get_max_accepted_htlcs(&this_ptr_conv);
 	return ret_val;
 }
@@ -19375,6 +23447,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_max_accepted_h
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	AcceptChannel_set_max_accepted_htlcs(&this_ptr_conv, val);
 }
 
@@ -19382,6 +23455,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AcceptChannel_get_funding
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), AcceptChannel_get_funding_pubkey(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19391,6 +23465,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_funding_pubkey
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19401,6 +23476,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AcceptChannel_get_revocat
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), AcceptChannel_get_revocation_basepoint(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19410,6 +23486,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_revocation_bas
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19420,6 +23497,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AcceptChannel_get_payment
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), AcceptChannel_get_payment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19429,6 +23507,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_payment_point(
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19439,6 +23518,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AcceptChannel_get_delayed
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), AcceptChannel_get_delayed_payment_basepoint(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19448,6 +23528,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_delayed_paymen
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19458,6 +23539,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AcceptChannel_get_htlc_ba
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), AcceptChannel_get_htlc_basepoint(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19467,6 +23549,7 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_htlc_basepoint
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19477,6 +23560,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AcceptChannel_get_first_p
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), AcceptChannel_get_first_per_commitment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19486,20 +23570,44 @@ void  __attribute__((visibility("default"))) TS_AcceptChannel_set_first_per_comm
 	LDKAcceptChannel this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
 	AcceptChannel_set_first_per_commitment_point(&this_ptr_conv, val_ref);
 }
 
+static inline uint64_t AcceptChannel_clone_ptr(LDKAcceptChannel *NONNULL_PTR arg) {
+	LDKAcceptChannel ret_var = AcceptChannel_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_AcceptChannel_clone_ptr(uint32_t arg) {
+	LDKAcceptChannel arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = AcceptChannel_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_AcceptChannel_clone(uint32_t orig) {
 	LDKAcceptChannel orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKAcceptChannel ret_var = AcceptChannel_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19511,6 +23619,7 @@ void  __attribute__((visibility("default"))) TS_FundingCreated_free(uint32_t thi
 	LDKFundingCreated this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	FundingCreated_free(this_obj_conv);
 }
 
@@ -19518,6 +23627,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_FundingCreated_get_tempor
 	LDKFundingCreated this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *FundingCreated_get_temporary_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -19527,6 +23637,7 @@ void  __attribute__((visibility("default"))) TS_FundingCreated_set_temporary_cha
 	LDKFundingCreated this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -19537,6 +23648,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_FundingCreated_get_fundin
 	LDKFundingCreated this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *FundingCreated_get_funding_txid(&this_ptr_conv), 32);
 	return ret_arr;
@@ -19546,6 +23658,7 @@ void  __attribute__((visibility("default"))) TS_FundingCreated_set_funding_txid(
 	LDKFundingCreated this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -19556,6 +23669,7 @@ int16_t  __attribute__((visibility("default"))) TS_FundingCreated_get_funding_ou
 	LDKFundingCreated this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = FundingCreated_get_funding_output_index(&this_ptr_conv);
 	return ret_val;
 }
@@ -19564,6 +23678,7 @@ void  __attribute__((visibility("default"))) TS_FundingCreated_set_funding_outpu
 	LDKFundingCreated this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	FundingCreated_set_funding_output_index(&this_ptr_conv, val);
 }
 
@@ -19571,6 +23686,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_FundingCreated_get_signat
 	LDKFundingCreated this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), FundingCreated_get_signature(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -19580,6 +23696,7 @@ void  __attribute__((visibility("default"))) TS_FundingCreated_set_signature(uin
 	LDKFundingCreated this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -19600,6 +23717,7 @@ uint32_t  __attribute__((visibility("default"))) TS_FundingCreated_new(int8_tArr
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19607,14 +23725,37 @@ uint32_t  __attribute__((visibility("default"))) TS_FundingCreated_new(int8_tArr
 	return ret_ref;
 }
 
+static inline uint64_t FundingCreated_clone_ptr(LDKFundingCreated *NONNULL_PTR arg) {
+	LDKFundingCreated ret_var = FundingCreated_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_FundingCreated_clone_ptr(uint32_t arg) {
+	LDKFundingCreated arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = FundingCreated_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_FundingCreated_clone(uint32_t orig) {
 	LDKFundingCreated orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKFundingCreated ret_var = FundingCreated_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19626,6 +23767,7 @@ void  __attribute__((visibility("default"))) TS_FundingSigned_free(uint32_t this
 	LDKFundingSigned this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	FundingSigned_free(this_obj_conv);
 }
 
@@ -19633,6 +23775,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_FundingSigned_get_channel
 	LDKFundingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *FundingSigned_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -19642,6 +23785,7 @@ void  __attribute__((visibility("default"))) TS_FundingSigned_set_channel_id(uin
 	LDKFundingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -19652,6 +23796,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_FundingSigned_get_signatu
 	LDKFundingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), FundingSigned_get_signature(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -19661,6 +23806,7 @@ void  __attribute__((visibility("default"))) TS_FundingSigned_set_signature(uint
 	LDKFundingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -19678,6 +23824,7 @@ uint32_t  __attribute__((visibility("default"))) TS_FundingSigned_new(int8_tArra
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19685,14 +23832,37 @@ uint32_t  __attribute__((visibility("default"))) TS_FundingSigned_new(int8_tArra
 	return ret_ref;
 }
 
+static inline uint64_t FundingSigned_clone_ptr(LDKFundingSigned *NONNULL_PTR arg) {
+	LDKFundingSigned ret_var = FundingSigned_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_FundingSigned_clone_ptr(uint32_t arg) {
+	LDKFundingSigned arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = FundingSigned_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_FundingSigned_clone(uint32_t orig) {
 	LDKFundingSigned orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKFundingSigned ret_var = FundingSigned_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19704,6 +23874,7 @@ void  __attribute__((visibility("default"))) TS_FundingLocked_free(uint32_t this
 	LDKFundingLocked this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	FundingLocked_free(this_obj_conv);
 }
 
@@ -19711,6 +23882,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_FundingLocked_get_channel
 	LDKFundingLocked this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *FundingLocked_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -19720,6 +23892,7 @@ void  __attribute__((visibility("default"))) TS_FundingLocked_set_channel_id(uin
 	LDKFundingLocked this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -19730,6 +23903,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_FundingLocked_get_next_pe
 	LDKFundingLocked this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), FundingLocked_get_next_per_commitment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -19739,6 +23913,7 @@ void  __attribute__((visibility("default"))) TS_FundingLocked_set_next_per_commi
 	LDKFundingLocked this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -19756,6 +23931,7 @@ uint32_t  __attribute__((visibility("default"))) TS_FundingLocked_new(int8_tArra
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19763,14 +23939,37 @@ uint32_t  __attribute__((visibility("default"))) TS_FundingLocked_new(int8_tArra
 	return ret_ref;
 }
 
+static inline uint64_t FundingLocked_clone_ptr(LDKFundingLocked *NONNULL_PTR arg) {
+	LDKFundingLocked ret_var = FundingLocked_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_FundingLocked_clone_ptr(uint32_t arg) {
+	LDKFundingLocked arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = FundingLocked_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_FundingLocked_clone(uint32_t orig) {
 	LDKFundingLocked orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKFundingLocked ret_var = FundingLocked_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19782,6 +23981,7 @@ void  __attribute__((visibility("default"))) TS_Shutdown_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	Shutdown_free(this_obj_conv);
 }
 
@@ -19789,6 +23989,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Shutdown_get_channel_id(u
 	LDKShutdown this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *Shutdown_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -19798,6 +23999,7 @@ void  __attribute__((visibility("default"))) TS_Shutdown_set_channel_id(uint32_t
 	LDKShutdown this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -19808,6 +24010,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Shutdown_get_scriptpubkey
 	LDKShutdown this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKu8slice ret_var = Shutdown_get_scriptpubkey(&this_ptr_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -19818,6 +24021,7 @@ void  __attribute__((visibility("default"))) TS_Shutdown_set_scriptpubkey(uint32
 	LDKShutdown this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_u8Z val_ref;
 	val_ref.datalen = *((uint32_t*)val);
 	val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes");
@@ -19837,6 +24041,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Shutdown_new(int8_tArray cha
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19844,14 +24049,37 @@ uint32_t  __attribute__((visibility("default"))) TS_Shutdown_new(int8_tArray cha
 	return ret_ref;
 }
 
+static inline uint64_t Shutdown_clone_ptr(LDKShutdown *NONNULL_PTR arg) {
+	LDKShutdown ret_var = Shutdown_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Shutdown_clone_ptr(uint32_t arg) {
+	LDKShutdown arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = Shutdown_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Shutdown_clone(uint32_t orig) {
 	LDKShutdown orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKShutdown ret_var = Shutdown_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19863,6 +24091,7 @@ void  __attribute__((visibility("default"))) TS_ClosingSignedFeeRange_free(uint3
 	LDKClosingSignedFeeRange this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ClosingSignedFeeRange_free(this_obj_conv);
 }
 
@@ -19870,6 +24099,7 @@ int64_t  __attribute__((visibility("default"))) TS_ClosingSignedFeeRange_get_min
 	LDKClosingSignedFeeRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ClosingSignedFeeRange_get_min_fee_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -19878,6 +24108,7 @@ void  __attribute__((visibility("default"))) TS_ClosingSignedFeeRange_set_min_fe
 	LDKClosingSignedFeeRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ClosingSignedFeeRange_set_min_fee_satoshis(&this_ptr_conv, val);
 }
 
@@ -19885,6 +24116,7 @@ int64_t  __attribute__((visibility("default"))) TS_ClosingSignedFeeRange_get_max
 	LDKClosingSignedFeeRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ClosingSignedFeeRange_get_max_fee_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -19893,6 +24125,7 @@ void  __attribute__((visibility("default"))) TS_ClosingSignedFeeRange_set_max_fe
 	LDKClosingSignedFeeRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ClosingSignedFeeRange_set_max_fee_satoshis(&this_ptr_conv, val);
 }
 
@@ -19901,6 +24134,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ClosingSignedFeeRange_new(in
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19908,14 +24142,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ClosingSignedFeeRange_new(in
 	return ret_ref;
 }
 
+static inline uint64_t ClosingSignedFeeRange_clone_ptr(LDKClosingSignedFeeRange *NONNULL_PTR arg) {
+	LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ClosingSignedFeeRange_clone_ptr(uint32_t arg) {
+	LDKClosingSignedFeeRange arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ClosingSignedFeeRange_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ClosingSignedFeeRange_clone(uint32_t orig) {
 	LDKClosingSignedFeeRange orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -19927,6 +24184,7 @@ void  __attribute__((visibility("default"))) TS_ClosingSigned_free(uint32_t this
 	LDKClosingSigned this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ClosingSigned_free(this_obj_conv);
 }
 
@@ -19934,6 +24192,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ClosingSigned_get_channel
 	LDKClosingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *ClosingSigned_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -19943,6 +24202,7 @@ void  __attribute__((visibility("default"))) TS_ClosingSigned_set_channel_id(uin
 	LDKClosingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -19953,6 +24213,7 @@ int64_t  __attribute__((visibility("default"))) TS_ClosingSigned_get_fee_satoshi
 	LDKClosingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ClosingSigned_get_fee_satoshis(&this_ptr_conv);
 	return ret_val;
 }
@@ -19961,6 +24222,7 @@ void  __attribute__((visibility("default"))) TS_ClosingSigned_set_fee_satoshis(u
 	LDKClosingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ClosingSigned_set_fee_satoshis(&this_ptr_conv, val);
 }
 
@@ -19968,6 +24230,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ClosingSigned_get_signatu
 	LDKClosingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ClosingSigned_get_signature(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -19977,6 +24240,7 @@ void  __attribute__((visibility("default"))) TS_ClosingSigned_set_signature(uint
 	LDKClosingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -19987,11 +24251,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ClosingSigned_get_fee_range(
 	LDKClosingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKClosingSignedFeeRange ret_var = ClosingSigned_get_fee_range(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -20004,9 +24270,11 @@ void  __attribute__((visibility("default"))) TS_ClosingSigned_set_fee_range(uint
 	LDKClosingSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKClosingSignedFeeRange val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ClosingSignedFeeRange_clone(&val_conv);
 	ClosingSigned_set_fee_range(&this_ptr_conv, val_conv);
 }
@@ -20021,11 +24289,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ClosingSigned_new(int8_tArra
 	LDKClosingSignedFeeRange fee_range_arg_conv;
 	fee_range_arg_conv.inner = (void*)(fee_range_arg & (~1));
 	fee_range_arg_conv.is_owned = (fee_range_arg & 1) || (fee_range_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(fee_range_arg_conv);
 	fee_range_arg_conv = ClosingSignedFeeRange_clone(&fee_range_arg_conv);
 	LDKClosingSigned ret_var = ClosingSigned_new(channel_id_arg_ref, fee_satoshis_arg, signature_arg_ref, fee_range_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20033,14 +24303,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ClosingSigned_new(int8_tArra
 	return ret_ref;
 }
 
+static inline uint64_t ClosingSigned_clone_ptr(LDKClosingSigned *NONNULL_PTR arg) {
+	LDKClosingSigned ret_var = ClosingSigned_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ClosingSigned_clone_ptr(uint32_t arg) {
+	LDKClosingSigned arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ClosingSigned_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ClosingSigned_clone(uint32_t orig) {
 	LDKClosingSigned orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKClosingSigned ret_var = ClosingSigned_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20052,6 +24345,7 @@ void  __attribute__((visibility("default"))) TS_UpdateAddHTLC_free(uint32_t this
 	LDKUpdateAddHTLC this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	UpdateAddHTLC_free(this_obj_conv);
 }
 
@@ -20059,6 +24353,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateAddHTLC_get_channel
 	LDKUpdateAddHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UpdateAddHTLC_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20068,6 +24363,7 @@ void  __attribute__((visibility("default"))) TS_UpdateAddHTLC_set_channel_id(uin
 	LDKUpdateAddHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20078,6 +24374,7 @@ int64_t  __attribute__((visibility("default"))) TS_UpdateAddHTLC_get_htlc_id(uin
 	LDKUpdateAddHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = UpdateAddHTLC_get_htlc_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -20086,6 +24383,7 @@ void  __attribute__((visibility("default"))) TS_UpdateAddHTLC_set_htlc_id(uint32
 	LDKUpdateAddHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UpdateAddHTLC_set_htlc_id(&this_ptr_conv, val);
 }
 
@@ -20093,6 +24391,7 @@ int64_t  __attribute__((visibility("default"))) TS_UpdateAddHTLC_get_amount_msat
 	LDKUpdateAddHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = UpdateAddHTLC_get_amount_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -20101,6 +24400,7 @@ void  __attribute__((visibility("default"))) TS_UpdateAddHTLC_set_amount_msat(ui
 	LDKUpdateAddHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UpdateAddHTLC_set_amount_msat(&this_ptr_conv, val);
 }
 
@@ -20108,6 +24408,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateAddHTLC_get_payment
 	LDKUpdateAddHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UpdateAddHTLC_get_payment_hash(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20117,6 +24418,7 @@ void  __attribute__((visibility("default"))) TS_UpdateAddHTLC_set_payment_hash(u
 	LDKUpdateAddHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20127,6 +24429,7 @@ int32_t  __attribute__((visibility("default"))) TS_UpdateAddHTLC_get_cltv_expiry
 	LDKUpdateAddHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = UpdateAddHTLC_get_cltv_expiry(&this_ptr_conv);
 	return ret_val;
 }
@@ -20135,17 +24438,41 @@ void  __attribute__((visibility("default"))) TS_UpdateAddHTLC_set_cltv_expiry(ui
 	LDKUpdateAddHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UpdateAddHTLC_set_cltv_expiry(&this_ptr_conv, val);
 }
 
+static inline uint64_t UpdateAddHTLC_clone_ptr(LDKUpdateAddHTLC *NONNULL_PTR arg) {
+	LDKUpdateAddHTLC ret_var = UpdateAddHTLC_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_UpdateAddHTLC_clone_ptr(uint32_t arg) {
+	LDKUpdateAddHTLC arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = UpdateAddHTLC_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_UpdateAddHTLC_clone(uint32_t orig) {
 	LDKUpdateAddHTLC orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUpdateAddHTLC ret_var = UpdateAddHTLC_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20157,6 +24484,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_free(uint32_t
 	LDKUpdateFulfillHTLC this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	UpdateFulfillHTLC_free(this_obj_conv);
 }
 
@@ -20164,6 +24492,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_get_cha
 	LDKUpdateFulfillHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UpdateFulfillHTLC_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20173,6 +24502,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_set_channel_id
 	LDKUpdateFulfillHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20183,6 +24513,7 @@ int64_t  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_get_htlc_id
 	LDKUpdateFulfillHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = UpdateFulfillHTLC_get_htlc_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -20191,6 +24522,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_set_htlc_id(ui
 	LDKUpdateFulfillHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UpdateFulfillHTLC_set_htlc_id(&this_ptr_conv, val);
 }
 
@@ -20198,6 +24530,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_get_pay
 	LDKUpdateFulfillHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UpdateFulfillHTLC_get_payment_preimage(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20207,6 +24540,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_set_payment_pr
 	LDKUpdateFulfillHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20224,6 +24558,7 @@ uint32_t  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_new(int8_t
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20231,14 +24566,37 @@ uint32_t  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_new(int8_t
 	return ret_ref;
 }
 
+static inline uint64_t UpdateFulfillHTLC_clone_ptr(LDKUpdateFulfillHTLC *NONNULL_PTR arg) {
+	LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_clone_ptr(uint32_t arg) {
+	LDKUpdateFulfillHTLC arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = UpdateFulfillHTLC_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_clone(uint32_t orig) {
 	LDKUpdateFulfillHTLC orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20250,6 +24608,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFailHTLC_free(uint32_t thi
 	LDKUpdateFailHTLC this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	UpdateFailHTLC_free(this_obj_conv);
 }
 
@@ -20257,6 +24616,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateFailHTLC_get_channe
 	LDKUpdateFailHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UpdateFailHTLC_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20266,6 +24626,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFailHTLC_set_channel_id(ui
 	LDKUpdateFailHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20276,6 +24637,7 @@ int64_t  __attribute__((visibility("default"))) TS_UpdateFailHTLC_get_htlc_id(ui
 	LDKUpdateFailHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = UpdateFailHTLC_get_htlc_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -20284,17 +24646,41 @@ void  __attribute__((visibility("default"))) TS_UpdateFailHTLC_set_htlc_id(uint3
 	LDKUpdateFailHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UpdateFailHTLC_set_htlc_id(&this_ptr_conv, val);
 }
 
+static inline uint64_t UpdateFailHTLC_clone_ptr(LDKUpdateFailHTLC *NONNULL_PTR arg) {
+	LDKUpdateFailHTLC ret_var = UpdateFailHTLC_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_UpdateFailHTLC_clone_ptr(uint32_t arg) {
+	LDKUpdateFailHTLC arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = UpdateFailHTLC_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_UpdateFailHTLC_clone(uint32_t orig) {
 	LDKUpdateFailHTLC orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUpdateFailHTLC ret_var = UpdateFailHTLC_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20306,6 +24692,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFailMalformedHTLC_free(uin
 	LDKUpdateFailMalformedHTLC this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	UpdateFailMalformedHTLC_free(this_obj_conv);
 }
 
@@ -20313,6 +24700,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateFailMalformedHTLC_g
 	LDKUpdateFailMalformedHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UpdateFailMalformedHTLC_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20322,6 +24710,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFailMalformedHTLC_set_chan
 	LDKUpdateFailMalformedHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20332,6 +24721,7 @@ int64_t  __attribute__((visibility("default"))) TS_UpdateFailMalformedHTLC_get_h
 	LDKUpdateFailMalformedHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = UpdateFailMalformedHTLC_get_htlc_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -20340,6 +24730,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFailMalformedHTLC_set_htlc
 	LDKUpdateFailMalformedHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UpdateFailMalformedHTLC_set_htlc_id(&this_ptr_conv, val);
 }
 
@@ -20347,6 +24738,7 @@ int16_t  __attribute__((visibility("default"))) TS_UpdateFailMalformedHTLC_get_f
 	LDKUpdateFailMalformedHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = UpdateFailMalformedHTLC_get_failure_code(&this_ptr_conv);
 	return ret_val;
 }
@@ -20355,17 +24747,41 @@ void  __attribute__((visibility("default"))) TS_UpdateFailMalformedHTLC_set_fail
 	LDKUpdateFailMalformedHTLC this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UpdateFailMalformedHTLC_set_failure_code(&this_ptr_conv, val);
 }
 
+static inline uint64_t UpdateFailMalformedHTLC_clone_ptr(LDKUpdateFailMalformedHTLC *NONNULL_PTR arg) {
+	LDKUpdateFailMalformedHTLC ret_var = UpdateFailMalformedHTLC_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_UpdateFailMalformedHTLC_clone_ptr(uint32_t arg) {
+	LDKUpdateFailMalformedHTLC arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = UpdateFailMalformedHTLC_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_UpdateFailMalformedHTLC_clone(uint32_t orig) {
 	LDKUpdateFailMalformedHTLC orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUpdateFailMalformedHTLC ret_var = UpdateFailMalformedHTLC_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20377,6 +24793,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentSigned_free(uint32_t t
 	LDKCommitmentSigned this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	CommitmentSigned_free(this_obj_conv);
 }
 
@@ -20384,6 +24801,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_CommitmentSigned_get_chan
 	LDKCommitmentSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *CommitmentSigned_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20393,6 +24811,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentSigned_set_channel_id(
 	LDKCommitmentSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20403,6 +24822,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_CommitmentSigned_get_sign
 	LDKCommitmentSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), CommitmentSigned_get_signature(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -20412,6 +24832,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentSigned_set_signature(u
 	LDKCommitmentSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -20422,6 +24843,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentSigned_set_htlc_signat
 	LDKCommitmentSigned this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_SignatureZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -20464,6 +24886,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentSigned_new(int8_tA
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20471,14 +24894,37 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentSigned_new(int8_tA
 	return ret_ref;
 }
 
+static inline uint64_t CommitmentSigned_clone_ptr(LDKCommitmentSigned *NONNULL_PTR arg) {
+	LDKCommitmentSigned ret_var = CommitmentSigned_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_CommitmentSigned_clone_ptr(uint32_t arg) {
+	LDKCommitmentSigned arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = CommitmentSigned_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CommitmentSigned_clone(uint32_t orig) {
 	LDKCommitmentSigned orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCommitmentSigned ret_var = CommitmentSigned_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20490,6 +24936,7 @@ void  __attribute__((visibility("default"))) TS_RevokeAndACK_free(uint32_t this_
 	LDKRevokeAndACK this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	RevokeAndACK_free(this_obj_conv);
 }
 
@@ -20497,6 +24944,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RevokeAndACK_get_channel_
 	LDKRevokeAndACK this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *RevokeAndACK_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20506,6 +24954,7 @@ void  __attribute__((visibility("default"))) TS_RevokeAndACK_set_channel_id(uint
 	LDKRevokeAndACK this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20516,6 +24965,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RevokeAndACK_get_per_comm
 	LDKRevokeAndACK this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *RevokeAndACK_get_per_commitment_secret(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20525,6 +24975,7 @@ void  __attribute__((visibility("default"))) TS_RevokeAndACK_set_per_commitment_
 	LDKRevokeAndACK this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20535,6 +24986,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RevokeAndACK_get_next_per
 	LDKRevokeAndACK this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), RevokeAndACK_get_next_per_commitment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -20544,6 +24996,7 @@ void  __attribute__((visibility("default"))) TS_RevokeAndACK_set_next_per_commit
 	LDKRevokeAndACK this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -20564,6 +25017,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RevokeAndACK_new(int8_tArray
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20571,14 +25025,37 @@ uint32_t  __attribute__((visibility("default"))) TS_RevokeAndACK_new(int8_tArray
 	return ret_ref;
 }
 
+static inline uint64_t RevokeAndACK_clone_ptr(LDKRevokeAndACK *NONNULL_PTR arg) {
+	LDKRevokeAndACK ret_var = RevokeAndACK_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_RevokeAndACK_clone_ptr(uint32_t arg) {
+	LDKRevokeAndACK arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = RevokeAndACK_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_RevokeAndACK_clone(uint32_t orig) {
 	LDKRevokeAndACK orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRevokeAndACK ret_var = RevokeAndACK_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20590,6 +25067,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFee_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	UpdateFee_free(this_obj_conv);
 }
 
@@ -20597,6 +25075,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateFee_get_channel_id(
 	LDKUpdateFee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UpdateFee_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20606,6 +25085,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFee_set_channel_id(uint32_
 	LDKUpdateFee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20616,6 +25096,7 @@ int32_t  __attribute__((visibility("default"))) TS_UpdateFee_get_feerate_per_kw(
 	LDKUpdateFee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = UpdateFee_get_feerate_per_kw(&this_ptr_conv);
 	return ret_val;
 }
@@ -20624,6 +25105,7 @@ void  __attribute__((visibility("default"))) TS_UpdateFee_set_feerate_per_kw(uin
 	LDKUpdateFee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UpdateFee_set_feerate_per_kw(&this_ptr_conv, val);
 }
 
@@ -20635,6 +25117,7 @@ uint32_t  __attribute__((visibility("default"))) TS_UpdateFee_new(int8_tArray ch
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20642,14 +25125,37 @@ uint32_t  __attribute__((visibility("default"))) TS_UpdateFee_new(int8_tArray ch
 	return ret_ref;
 }
 
+static inline uint64_t UpdateFee_clone_ptr(LDKUpdateFee *NONNULL_PTR arg) {
+	LDKUpdateFee ret_var = UpdateFee_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_UpdateFee_clone_ptr(uint32_t arg) {
+	LDKUpdateFee arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = UpdateFee_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_UpdateFee_clone(uint32_t orig) {
 	LDKUpdateFee orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUpdateFee ret_var = UpdateFee_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20661,6 +25167,7 @@ void  __attribute__((visibility("default"))) TS_DataLossProtect_free(uint32_t th
 	LDKDataLossProtect this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	DataLossProtect_free(this_obj_conv);
 }
 
@@ -20668,6 +25175,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_DataLossProtect_get_your_
 	LDKDataLossProtect this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *DataLossProtect_get_your_last_per_commitment_secret(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20677,6 +25185,7 @@ void  __attribute__((visibility("default"))) TS_DataLossProtect_set_your_last_pe
 	LDKDataLossProtect this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20687,6 +25196,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_DataLossProtect_get_my_cu
 	LDKDataLossProtect this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), DataLossProtect_get_my_current_per_commitment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -20696,6 +25206,7 @@ void  __attribute__((visibility("default"))) TS_DataLossProtect_set_my_current_p
 	LDKDataLossProtect this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -20713,6 +25224,7 @@ uint32_t  __attribute__((visibility("default"))) TS_DataLossProtect_new(int8_tAr
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20720,14 +25232,37 @@ uint32_t  __attribute__((visibility("default"))) TS_DataLossProtect_new(int8_tAr
 	return ret_ref;
 }
 
+static inline uint64_t DataLossProtect_clone_ptr(LDKDataLossProtect *NONNULL_PTR arg) {
+	LDKDataLossProtect ret_var = DataLossProtect_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_DataLossProtect_clone_ptr(uint32_t arg) {
+	LDKDataLossProtect arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = DataLossProtect_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_DataLossProtect_clone(uint32_t orig) {
 	LDKDataLossProtect orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKDataLossProtect ret_var = DataLossProtect_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20739,6 +25274,7 @@ void  __attribute__((visibility("default"))) TS_ChannelReestablish_free(uint32_t
 	LDKChannelReestablish this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelReestablish_free(this_obj_conv);
 }
 
@@ -20746,6 +25282,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelReestablish_get_ch
 	LDKChannelReestablish this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *ChannelReestablish_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20755,6 +25292,7 @@ void  __attribute__((visibility("default"))) TS_ChannelReestablish_set_channel_i
 	LDKChannelReestablish this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20765,6 +25303,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelReestablish_get_next_l
 	LDKChannelReestablish this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelReestablish_get_next_local_commitment_number(&this_ptr_conv);
 	return ret_val;
 }
@@ -20773,6 +25312,7 @@ void  __attribute__((visibility("default"))) TS_ChannelReestablish_set_next_loca
 	LDKChannelReestablish this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelReestablish_set_next_local_commitment_number(&this_ptr_conv, val);
 }
 
@@ -20780,6 +25320,7 @@ int64_t  __attribute__((visibility("default"))) TS_ChannelReestablish_get_next_r
 	LDKChannelReestablish this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ChannelReestablish_get_next_remote_commitment_number(&this_ptr_conv);
 	return ret_val;
 }
@@ -20788,17 +25329,41 @@ void  __attribute__((visibility("default"))) TS_ChannelReestablish_set_next_remo
 	LDKChannelReestablish this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelReestablish_set_next_remote_commitment_number(&this_ptr_conv, val);
 }
 
+static inline uint64_t ChannelReestablish_clone_ptr(LDKChannelReestablish *NONNULL_PTR arg) {
+	LDKChannelReestablish ret_var = ChannelReestablish_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelReestablish_clone_ptr(uint32_t arg) {
+	LDKChannelReestablish arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelReestablish_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelReestablish_clone(uint32_t orig) {
 	LDKChannelReestablish orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelReestablish ret_var = ChannelReestablish_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20810,6 +25375,7 @@ void  __attribute__((visibility("default"))) TS_AnnouncementSignatures_free(uint
 	LDKAnnouncementSignatures this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	AnnouncementSignatures_free(this_obj_conv);
 }
 
@@ -20817,6 +25383,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AnnouncementSignatures_ge
 	LDKAnnouncementSignatures this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *AnnouncementSignatures_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
@@ -20826,6 +25393,7 @@ void  __attribute__((visibility("default"))) TS_AnnouncementSignatures_set_chann
 	LDKAnnouncementSignatures this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -20836,6 +25404,7 @@ int64_t  __attribute__((visibility("default"))) TS_AnnouncementSignatures_get_sh
 	LDKAnnouncementSignatures this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = AnnouncementSignatures_get_short_channel_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -20844,6 +25413,7 @@ void  __attribute__((visibility("default"))) TS_AnnouncementSignatures_set_short
 	LDKAnnouncementSignatures this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	AnnouncementSignatures_set_short_channel_id(&this_ptr_conv, val);
 }
 
@@ -20851,6 +25421,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AnnouncementSignatures_ge
 	LDKAnnouncementSignatures this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), AnnouncementSignatures_get_node_signature(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -20860,6 +25431,7 @@ void  __attribute__((visibility("default"))) TS_AnnouncementSignatures_set_node_
 	LDKAnnouncementSignatures this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -20870,6 +25442,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AnnouncementSignatures_ge
 	LDKAnnouncementSignatures this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), AnnouncementSignatures_get_bitcoin_signature(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -20879,6 +25452,7 @@ void  __attribute__((visibility("default"))) TS_AnnouncementSignatures_set_bitco
 	LDKAnnouncementSignatures this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -20899,6 +25473,7 @@ uint32_t  __attribute__((visibility("default"))) TS_AnnouncementSignatures_new(i
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20906,14 +25481,37 @@ uint32_t  __attribute__((visibility("default"))) TS_AnnouncementSignatures_new(i
 	return ret_ref;
 }
 
+static inline uint64_t AnnouncementSignatures_clone_ptr(LDKAnnouncementSignatures *NONNULL_PTR arg) {
+	LDKAnnouncementSignatures ret_var = AnnouncementSignatures_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_AnnouncementSignatures_clone_ptr(uint32_t arg) {
+	LDKAnnouncementSignatures arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = AnnouncementSignatures_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_AnnouncementSignatures_clone(uint32_t orig) {
 	LDKAnnouncementSignatures orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKAnnouncementSignatures ret_var = AnnouncementSignatures_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -20930,6 +25528,18 @@ void  __attribute__((visibility("default"))) TS_NetAddress_free(uint32_t this_pt
 	NetAddress_free(this_ptr_conv);
 }
 
+static inline uint64_t NetAddress_clone_ptr(LDKNetAddress *NONNULL_PTR arg) {
+	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
+	*ret_copy = NetAddress_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_NetAddress_clone_ptr(uint32_t arg) {
+	LDKNetAddress* arg_conv = (LDKNetAddress*)arg;
+	int64_t ret_val = NetAddress_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_NetAddress_clone(uint32_t orig) {
 	LDKNetAddress* orig_conv = (LDKNetAddress*)orig;
 	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
@@ -20958,12 +25568,12 @@ uint32_t  __attribute__((visibility("default"))) TS_NetAddress_ipv6(int8_tArray
 	return ret_ref;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_NetAddress_onion_v2(int8_tArray addr, int16_t port) {
-	LDKTenBytes addr_ref;
-	CHECK(*((uint32_t*)addr) == 10);
-	memcpy(addr_ref.data, (uint8_t*)(addr + 4), 10);
+uint32_t  __attribute__((visibility("default"))) TS_NetAddress_onion_v2(int8_tArray a) {
+	LDKTwelveBytes a_ref;
+	CHECK(*((uint32_t*)a) == 12);
+	memcpy(a_ref.data, (uint8_t*)(a + 4), 12);
 	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
-	*ret_copy = NetAddress_onion_v2(addr_ref, port);
+	*ret_copy = NetAddress_onion_v2(a_ref);
 	uint64_t ret_ref = (uint64_t)ret_copy;
 	return ret_ref;
 }
@@ -21000,6 +25610,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_free(ui
 	LDKUnsignedNodeAnnouncement this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	UnsignedNodeAnnouncement_free(this_obj_conv);
 }
 
@@ -21007,10 +25618,12 @@ uint32_t  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_get
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeFeatures ret_var = UnsignedNodeAnnouncement_get_features(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21022,9 +25635,11 @@ void  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_set_fea
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeFeatures val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = NodeFeatures_clone(&val_conv);
 	UnsignedNodeAnnouncement_set_features(&this_ptr_conv, val_conv);
 }
@@ -21033,6 +25648,7 @@ int32_t  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_get_
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = UnsignedNodeAnnouncement_get_timestamp(&this_ptr_conv);
 	return ret_val;
 }
@@ -21041,6 +25657,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_set_tim
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UnsignedNodeAnnouncement_set_timestamp(&this_ptr_conv, val);
 }
 
@@ -21048,6 +25665,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), UnsignedNodeAnnouncement_get_node_id(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -21057,6 +25675,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_set_nod
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -21067,6 +25686,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(3, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UnsignedNodeAnnouncement_get_rgb(&this_ptr_conv), 3);
 	return ret_arr;
@@ -21076,6 +25696,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_set_rgb
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThreeBytes val_ref;
 	CHECK(*((uint32_t*)val) == 3);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 3);
@@ -21086,6 +25707,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UnsignedNodeAnnouncement_get_alias(&this_ptr_conv), 32);
 	return ret_arr;
@@ -21095,6 +25717,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_set_ali
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -21105,6 +25728,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_set_add
 	LDKUnsignedNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_NetAddressZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -21123,14 +25747,37 @@ void  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_set_add
 	UnsignedNodeAnnouncement_set_addresses(&this_ptr_conv, val_constr);
 }
 
+static inline uint64_t UnsignedNodeAnnouncement_clone_ptr(LDKUnsignedNodeAnnouncement *NONNULL_PTR arg) {
+	LDKUnsignedNodeAnnouncement ret_var = UnsignedNodeAnnouncement_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_clone_ptr(uint32_t arg) {
+	LDKUnsignedNodeAnnouncement arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = UnsignedNodeAnnouncement_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_clone(uint32_t orig) {
 	LDKUnsignedNodeAnnouncement orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUnsignedNodeAnnouncement ret_var = UnsignedNodeAnnouncement_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21142,6 +25789,7 @@ void  __attribute__((visibility("default"))) TS_NodeAnnouncement_free(uint32_t t
 	LDKNodeAnnouncement this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	NodeAnnouncement_free(this_obj_conv);
 }
 
@@ -21149,6 +25797,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_NodeAnnouncement_get_sign
 	LDKNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), NodeAnnouncement_get_signature(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -21158,6 +25807,7 @@ void  __attribute__((visibility("default"))) TS_NodeAnnouncement_set_signature(u
 	LDKNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -21168,10 +25818,12 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeAnnouncement_get_content
 	LDKNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUnsignedNodeAnnouncement ret_var = NodeAnnouncement_get_contents(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21183,9 +25835,11 @@ void  __attribute__((visibility("default"))) TS_NodeAnnouncement_set_contents(ui
 	LDKNodeAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUnsignedNodeAnnouncement val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = UnsignedNodeAnnouncement_clone(&val_conv);
 	NodeAnnouncement_set_contents(&this_ptr_conv, val_conv);
 }
@@ -21197,11 +25851,13 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeAnnouncement_new(int8_tA
 	LDKUnsignedNodeAnnouncement contents_arg_conv;
 	contents_arg_conv.inner = (void*)(contents_arg & (~1));
 	contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(contents_arg_conv);
 	contents_arg_conv = UnsignedNodeAnnouncement_clone(&contents_arg_conv);
 	LDKNodeAnnouncement ret_var = NodeAnnouncement_new(signature_arg_ref, contents_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21209,14 +25865,37 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeAnnouncement_new(int8_tA
 	return ret_ref;
 }
 
+static inline uint64_t NodeAnnouncement_clone_ptr(LDKNodeAnnouncement *NONNULL_PTR arg) {
+	LDKNodeAnnouncement ret_var = NodeAnnouncement_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_NodeAnnouncement_clone_ptr(uint32_t arg) {
+	LDKNodeAnnouncement arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = NodeAnnouncement_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_NodeAnnouncement_clone(uint32_t orig) {
 	LDKNodeAnnouncement orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNodeAnnouncement ret_var = NodeAnnouncement_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21228,6 +25907,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_free
 	LDKUnsignedChannelAnnouncement this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	UnsignedChannelAnnouncement_free(this_obj_conv);
 }
 
@@ -21235,10 +25915,12 @@ uint32_t  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelFeatures ret_var = UnsignedChannelAnnouncement_get_features(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21250,9 +25932,11 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_set_
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelFeatures val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelFeatures_clone(&val_conv);
 	UnsignedChannelAnnouncement_set_features(&this_ptr_conv, val_conv);
 }
@@ -21261,6 +25945,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedChannelAnnounceme
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UnsignedChannelAnnouncement_get_chain_hash(&this_ptr_conv), 32);
 	return ret_arr;
@@ -21270,6 +25955,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_set_
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -21280,6 +25966,7 @@ int64_t  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_g
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = UnsignedChannelAnnouncement_get_short_channel_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -21288,6 +25975,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_set_
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UnsignedChannelAnnouncement_set_short_channel_id(&this_ptr_conv, val);
 }
 
@@ -21295,6 +25983,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedChannelAnnounceme
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), UnsignedChannelAnnouncement_get_node_id_1(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -21304,6 +25993,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_set_
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -21314,6 +26004,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedChannelAnnounceme
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), UnsignedChannelAnnouncement_get_node_id_2(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -21323,6 +26014,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_set_
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -21333,6 +26025,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedChannelAnnounceme
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), UnsignedChannelAnnouncement_get_bitcoin_key_1(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -21342,6 +26035,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_set_
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -21352,6 +26046,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedChannelAnnounceme
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), UnsignedChannelAnnouncement_get_bitcoin_key_2(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -21361,20 +26056,44 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_set_
 	LDKUnsignedChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
 	UnsignedChannelAnnouncement_set_bitcoin_key_2(&this_ptr_conv, val_ref);
 }
 
+static inline uint64_t UnsignedChannelAnnouncement_clone_ptr(LDKUnsignedChannelAnnouncement *NONNULL_PTR arg) {
+	LDKUnsignedChannelAnnouncement ret_var = UnsignedChannelAnnouncement_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_clone_ptr(uint32_t arg) {
+	LDKUnsignedChannelAnnouncement arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = UnsignedChannelAnnouncement_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_UnsignedChannelAnnouncement_clone(uint32_t orig) {
 	LDKUnsignedChannelAnnouncement orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUnsignedChannelAnnouncement ret_var = UnsignedChannelAnnouncement_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21386,6 +26105,7 @@ void  __attribute__((visibility("default"))) TS_ChannelAnnouncement_free(uint32_
 	LDKChannelAnnouncement this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelAnnouncement_free(this_obj_conv);
 }
 
@@ -21393,6 +26113,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelAnnouncement_get_n
 	LDKChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelAnnouncement_get_node_signature_1(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -21402,6 +26123,7 @@ void  __attribute__((visibility("default"))) TS_ChannelAnnouncement_set_node_sig
 	LDKChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -21412,6 +26134,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelAnnouncement_get_n
 	LDKChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelAnnouncement_get_node_signature_2(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -21421,6 +26144,7 @@ void  __attribute__((visibility("default"))) TS_ChannelAnnouncement_set_node_sig
 	LDKChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -21431,6 +26155,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelAnnouncement_get_b
 	LDKChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelAnnouncement_get_bitcoin_signature_1(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -21440,6 +26165,7 @@ void  __attribute__((visibility("default"))) TS_ChannelAnnouncement_set_bitcoin_
 	LDKChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -21450,6 +26176,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelAnnouncement_get_b
 	LDKChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelAnnouncement_get_bitcoin_signature_2(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -21459,6 +26186,7 @@ void  __attribute__((visibility("default"))) TS_ChannelAnnouncement_set_bitcoin_
 	LDKChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -21469,10 +26197,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelAnnouncement_get_cont
 	LDKChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUnsignedChannelAnnouncement ret_var = ChannelAnnouncement_get_contents(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21484,9 +26214,11 @@ void  __attribute__((visibility("default"))) TS_ChannelAnnouncement_set_contents
 	LDKChannelAnnouncement this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUnsignedChannelAnnouncement val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = UnsignedChannelAnnouncement_clone(&val_conv);
 	ChannelAnnouncement_set_contents(&this_ptr_conv, val_conv);
 }
@@ -21507,11 +26239,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelAnnouncement_new(int8
 	LDKUnsignedChannelAnnouncement contents_arg_conv;
 	contents_arg_conv.inner = (void*)(contents_arg & (~1));
 	contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(contents_arg_conv);
 	contents_arg_conv = UnsignedChannelAnnouncement_clone(&contents_arg_conv);
 	LDKChannelAnnouncement ret_var = ChannelAnnouncement_new(node_signature_1_arg_ref, node_signature_2_arg_ref, bitcoin_signature_1_arg_ref, bitcoin_signature_2_arg_ref, contents_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21519,14 +26253,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelAnnouncement_new(int8
 	return ret_ref;
 }
 
+static inline uint64_t ChannelAnnouncement_clone_ptr(LDKChannelAnnouncement *NONNULL_PTR arg) {
+	LDKChannelAnnouncement ret_var = ChannelAnnouncement_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelAnnouncement_clone_ptr(uint32_t arg) {
+	LDKChannelAnnouncement arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelAnnouncement_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelAnnouncement_clone(uint32_t orig) {
 	LDKChannelAnnouncement orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelAnnouncement ret_var = ChannelAnnouncement_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21538,6 +26295,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_free(uint3
 	LDKUnsignedChannelUpdate this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	UnsignedChannelUpdate_free(this_obj_conv);
 }
 
@@ -21545,6 +26303,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_get
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *UnsignedChannelUpdate_get_chain_hash(&this_ptr_conv), 32);
 	return ret_arr;
@@ -21554,6 +26313,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_set_chain_
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -21564,6 +26324,7 @@ int64_t  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_get_sho
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = UnsignedChannelUpdate_get_short_channel_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -21572,6 +26333,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_set_short_
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UnsignedChannelUpdate_set_short_channel_id(&this_ptr_conv, val);
 }
 
@@ -21579,6 +26341,7 @@ int32_t  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_get_tim
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = UnsignedChannelUpdate_get_timestamp(&this_ptr_conv);
 	return ret_val;
 }
@@ -21587,6 +26350,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_set_timest
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UnsignedChannelUpdate_set_timestamp(&this_ptr_conv, val);
 }
 
@@ -21594,6 +26358,7 @@ int8_t  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_get_flag
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_t ret_val = UnsignedChannelUpdate_get_flags(&this_ptr_conv);
 	return ret_val;
 }
@@ -21602,6 +26367,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_set_flags(
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UnsignedChannelUpdate_set_flags(&this_ptr_conv, val);
 }
 
@@ -21609,6 +26375,7 @@ int16_t  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_get_clt
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = UnsignedChannelUpdate_get_cltv_expiry_delta(&this_ptr_conv);
 	return ret_val;
 }
@@ -21617,6 +26384,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_set_cltv_e
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UnsignedChannelUpdate_set_cltv_expiry_delta(&this_ptr_conv, val);
 }
 
@@ -21624,6 +26392,7 @@ int64_t  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_get_htl
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = UnsignedChannelUpdate_get_htlc_minimum_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -21632,6 +26401,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_set_htlc_m
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UnsignedChannelUpdate_set_htlc_minimum_msat(&this_ptr_conv, val);
 }
 
@@ -21639,6 +26409,7 @@ int32_t  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_get_fee
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = UnsignedChannelUpdate_get_fee_base_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -21647,6 +26418,7 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_set_fee_ba
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UnsignedChannelUpdate_set_fee_base_msat(&this_ptr_conv, val);
 }
 
@@ -21654,6 +26426,7 @@ int32_t  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_get_fee
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = UnsignedChannelUpdate_get_fee_proportional_millionths(&this_ptr_conv);
 	return ret_val;
 }
@@ -21662,17 +26435,41 @@ void  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_set_fee_pr
 	LDKUnsignedChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	UnsignedChannelUpdate_set_fee_proportional_millionths(&this_ptr_conv, val);
 }
 
+static inline uint64_t UnsignedChannelUpdate_clone_ptr(LDKUnsignedChannelUpdate *NONNULL_PTR arg) {
+	LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_clone_ptr(uint32_t arg) {
+	LDKUnsignedChannelUpdate arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = UnsignedChannelUpdate_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_clone(uint32_t orig) {
 	LDKUnsignedChannelUpdate orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21684,6 +26481,7 @@ void  __attribute__((visibility("default"))) TS_ChannelUpdate_free(uint32_t this
 	LDKChannelUpdate this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelUpdate_free(this_obj_conv);
 }
 
@@ -21691,6 +26489,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelUpdate_get_signatu
 	LDKChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelUpdate_get_signature(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -21700,6 +26499,7 @@ void  __attribute__((visibility("default"))) TS_ChannelUpdate_set_signature(uint
 	LDKChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -21710,10 +26510,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelUpdate_get_contents(u
 	LDKChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUnsignedChannelUpdate ret_var = ChannelUpdate_get_contents(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21725,9 +26527,11 @@ void  __attribute__((visibility("default"))) TS_ChannelUpdate_set_contents(uint3
 	LDKChannelUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUnsignedChannelUpdate val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = UnsignedChannelUpdate_clone(&val_conv);
 	ChannelUpdate_set_contents(&this_ptr_conv, val_conv);
 }
@@ -21739,11 +26543,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelUpdate_new(int8_tArra
 	LDKUnsignedChannelUpdate contents_arg_conv;
 	contents_arg_conv.inner = (void*)(contents_arg & (~1));
 	contents_arg_conv.is_owned = (contents_arg & 1) || (contents_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(contents_arg_conv);
 	contents_arg_conv = UnsignedChannelUpdate_clone(&contents_arg_conv);
 	LDKChannelUpdate ret_var = ChannelUpdate_new(signature_arg_ref, contents_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21751,14 +26557,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelUpdate_new(int8_tArra
 	return ret_ref;
 }
 
+static inline uint64_t ChannelUpdate_clone_ptr(LDKChannelUpdate *NONNULL_PTR arg) {
+	LDKChannelUpdate ret_var = ChannelUpdate_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelUpdate_clone_ptr(uint32_t arg) {
+	LDKChannelUpdate arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelUpdate_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelUpdate_clone(uint32_t orig) {
 	LDKChannelUpdate orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelUpdate ret_var = ChannelUpdate_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21770,6 +26599,7 @@ void  __attribute__((visibility("default"))) TS_QueryChannelRange_free(uint32_t
 	LDKQueryChannelRange this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	QueryChannelRange_free(this_obj_conv);
 }
 
@@ -21777,6 +26607,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_QueryChannelRange_get_cha
 	LDKQueryChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *QueryChannelRange_get_chain_hash(&this_ptr_conv), 32);
 	return ret_arr;
@@ -21786,6 +26617,7 @@ void  __attribute__((visibility("default"))) TS_QueryChannelRange_set_chain_hash
 	LDKQueryChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -21796,6 +26628,7 @@ int32_t  __attribute__((visibility("default"))) TS_QueryChannelRange_get_first_b
 	LDKQueryChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = QueryChannelRange_get_first_blocknum(&this_ptr_conv);
 	return ret_val;
 }
@@ -21804,6 +26637,7 @@ void  __attribute__((visibility("default"))) TS_QueryChannelRange_set_first_bloc
 	LDKQueryChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	QueryChannelRange_set_first_blocknum(&this_ptr_conv, val);
 }
 
@@ -21811,6 +26645,7 @@ int32_t  __attribute__((visibility("default"))) TS_QueryChannelRange_get_number_
 	LDKQueryChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = QueryChannelRange_get_number_of_blocks(&this_ptr_conv);
 	return ret_val;
 }
@@ -21819,6 +26654,7 @@ void  __attribute__((visibility("default"))) TS_QueryChannelRange_set_number_of_
 	LDKQueryChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	QueryChannelRange_set_number_of_blocks(&this_ptr_conv, val);
 }
 
@@ -21830,6 +26666,7 @@ uint32_t  __attribute__((visibility("default"))) TS_QueryChannelRange_new(int8_t
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21837,14 +26674,37 @@ uint32_t  __attribute__((visibility("default"))) TS_QueryChannelRange_new(int8_t
 	return ret_ref;
 }
 
+static inline uint64_t QueryChannelRange_clone_ptr(LDKQueryChannelRange *NONNULL_PTR arg) {
+	LDKQueryChannelRange ret_var = QueryChannelRange_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_QueryChannelRange_clone_ptr(uint32_t arg) {
+	LDKQueryChannelRange arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = QueryChannelRange_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_QueryChannelRange_clone(uint32_t orig) {
 	LDKQueryChannelRange orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKQueryChannelRange ret_var = QueryChannelRange_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21856,6 +26716,7 @@ void  __attribute__((visibility("default"))) TS_ReplyChannelRange_free(uint32_t
 	LDKReplyChannelRange this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ReplyChannelRange_free(this_obj_conv);
 }
 
@@ -21863,6 +26724,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ReplyChannelRange_get_cha
 	LDKReplyChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *ReplyChannelRange_get_chain_hash(&this_ptr_conv), 32);
 	return ret_arr;
@@ -21872,6 +26734,7 @@ void  __attribute__((visibility("default"))) TS_ReplyChannelRange_set_chain_hash
 	LDKReplyChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -21882,6 +26745,7 @@ int32_t  __attribute__((visibility("default"))) TS_ReplyChannelRange_get_first_b
 	LDKReplyChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = ReplyChannelRange_get_first_blocknum(&this_ptr_conv);
 	return ret_val;
 }
@@ -21890,6 +26754,7 @@ void  __attribute__((visibility("default"))) TS_ReplyChannelRange_set_first_bloc
 	LDKReplyChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ReplyChannelRange_set_first_blocknum(&this_ptr_conv, val);
 }
 
@@ -21897,6 +26762,7 @@ int32_t  __attribute__((visibility("default"))) TS_ReplyChannelRange_get_number_
 	LDKReplyChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = ReplyChannelRange_get_number_of_blocks(&this_ptr_conv);
 	return ret_val;
 }
@@ -21905,6 +26771,7 @@ void  __attribute__((visibility("default"))) TS_ReplyChannelRange_set_number_of_
 	LDKReplyChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ReplyChannelRange_set_number_of_blocks(&this_ptr_conv, val);
 }
 
@@ -21912,6 +26779,7 @@ jboolean  __attribute__((visibility("default"))) TS_ReplyChannelRange_get_sync_c
 	LDKReplyChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = ReplyChannelRange_get_sync_complete(&this_ptr_conv);
 	return ret_val;
 }
@@ -21920,6 +26788,7 @@ void  __attribute__((visibility("default"))) TS_ReplyChannelRange_set_sync_compl
 	LDKReplyChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ReplyChannelRange_set_sync_complete(&this_ptr_conv, val);
 }
 
@@ -21927,6 +26796,7 @@ void  __attribute__((visibility("default"))) TS_ReplyChannelRange_set_short_chan
 	LDKReplyChannelRange this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_u64Z val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -21960,6 +26830,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ReplyChannelRange_new(int8_t
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21967,14 +26838,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ReplyChannelRange_new(int8_t
 	return ret_ref;
 }
 
+static inline uint64_t ReplyChannelRange_clone_ptr(LDKReplyChannelRange *NONNULL_PTR arg) {
+	LDKReplyChannelRange ret_var = ReplyChannelRange_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ReplyChannelRange_clone_ptr(uint32_t arg) {
+	LDKReplyChannelRange arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ReplyChannelRange_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ReplyChannelRange_clone(uint32_t orig) {
 	LDKReplyChannelRange orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKReplyChannelRange ret_var = ReplyChannelRange_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -21986,6 +26880,7 @@ void  __attribute__((visibility("default"))) TS_QueryShortChannelIds_free(uint32
 	LDKQueryShortChannelIds this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	QueryShortChannelIds_free(this_obj_conv);
 }
 
@@ -21993,6 +26888,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_QueryShortChannelIds_get_
 	LDKQueryShortChannelIds this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *QueryShortChannelIds_get_chain_hash(&this_ptr_conv), 32);
 	return ret_arr;
@@ -22002,6 +26898,7 @@ void  __attribute__((visibility("default"))) TS_QueryShortChannelIds_set_chain_h
 	LDKQueryShortChannelIds this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -22012,6 +26909,7 @@ void  __attribute__((visibility("default"))) TS_QueryShortChannelIds_set_short_c
 	LDKQueryShortChannelIds this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_u64Z val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -22045,6 +26943,7 @@ uint32_t  __attribute__((visibility("default"))) TS_QueryShortChannelIds_new(int
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22052,14 +26951,37 @@ uint32_t  __attribute__((visibility("default"))) TS_QueryShortChannelIds_new(int
 	return ret_ref;
 }
 
+static inline uint64_t QueryShortChannelIds_clone_ptr(LDKQueryShortChannelIds *NONNULL_PTR arg) {
+	LDKQueryShortChannelIds ret_var = QueryShortChannelIds_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_QueryShortChannelIds_clone_ptr(uint32_t arg) {
+	LDKQueryShortChannelIds arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = QueryShortChannelIds_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_QueryShortChannelIds_clone(uint32_t orig) {
 	LDKQueryShortChannelIds orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKQueryShortChannelIds ret_var = QueryShortChannelIds_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22071,6 +26993,7 @@ void  __attribute__((visibility("default"))) TS_ReplyShortChannelIdsEnd_free(uin
 	LDKReplyShortChannelIdsEnd this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ReplyShortChannelIdsEnd_free(this_obj_conv);
 }
 
@@ -22078,6 +27001,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ReplyShortChannelIdsEnd_g
 	LDKReplyShortChannelIdsEnd this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *ReplyShortChannelIdsEnd_get_chain_hash(&this_ptr_conv), 32);
 	return ret_arr;
@@ -22087,6 +27011,7 @@ void  __attribute__((visibility("default"))) TS_ReplyShortChannelIdsEnd_set_chai
 	LDKReplyShortChannelIdsEnd this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -22097,6 +27022,7 @@ jboolean  __attribute__((visibility("default"))) TS_ReplyShortChannelIdsEnd_get_
 	LDKReplyShortChannelIdsEnd this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = ReplyShortChannelIdsEnd_get_full_information(&this_ptr_conv);
 	return ret_val;
 }
@@ -22105,6 +27031,7 @@ void  __attribute__((visibility("default"))) TS_ReplyShortChannelIdsEnd_set_full
 	LDKReplyShortChannelIdsEnd this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ReplyShortChannelIdsEnd_set_full_information(&this_ptr_conv, val);
 }
 
@@ -22116,6 +27043,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ReplyShortChannelIdsEnd_new(
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22123,14 +27051,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ReplyShortChannelIdsEnd_new(
 	return ret_ref;
 }
 
+static inline uint64_t ReplyShortChannelIdsEnd_clone_ptr(LDKReplyShortChannelIdsEnd *NONNULL_PTR arg) {
+	LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ReplyShortChannelIdsEnd_clone_ptr(uint32_t arg) {
+	LDKReplyShortChannelIdsEnd arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ReplyShortChannelIdsEnd_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ReplyShortChannelIdsEnd_clone(uint32_t orig) {
 	LDKReplyShortChannelIdsEnd orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22142,6 +27093,7 @@ void  __attribute__((visibility("default"))) TS_GossipTimestampFilter_free(uint3
 	LDKGossipTimestampFilter this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	GossipTimestampFilter_free(this_obj_conv);
 }
 
@@ -22149,6 +27101,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_GossipTimestampFilter_get
 	LDKGossipTimestampFilter this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *GossipTimestampFilter_get_chain_hash(&this_ptr_conv), 32);
 	return ret_arr;
@@ -22158,6 +27111,7 @@ void  __attribute__((visibility("default"))) TS_GossipTimestampFilter_set_chain_
 	LDKGossipTimestampFilter this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -22168,6 +27122,7 @@ int32_t  __attribute__((visibility("default"))) TS_GossipTimestampFilter_get_fir
 	LDKGossipTimestampFilter this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = GossipTimestampFilter_get_first_timestamp(&this_ptr_conv);
 	return ret_val;
 }
@@ -22176,6 +27131,7 @@ void  __attribute__((visibility("default"))) TS_GossipTimestampFilter_set_first_
 	LDKGossipTimestampFilter this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	GossipTimestampFilter_set_first_timestamp(&this_ptr_conv, val);
 }
 
@@ -22183,6 +27139,7 @@ int32_t  __attribute__((visibility("default"))) TS_GossipTimestampFilter_get_tim
 	LDKGossipTimestampFilter this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = GossipTimestampFilter_get_timestamp_range(&this_ptr_conv);
 	return ret_val;
 }
@@ -22191,6 +27148,7 @@ void  __attribute__((visibility("default"))) TS_GossipTimestampFilter_set_timest
 	LDKGossipTimestampFilter this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	GossipTimestampFilter_set_timestamp_range(&this_ptr_conv, val);
 }
 
@@ -22202,6 +27160,7 @@ uint32_t  __attribute__((visibility("default"))) TS_GossipTimestampFilter_new(in
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22209,14 +27168,37 @@ uint32_t  __attribute__((visibility("default"))) TS_GossipTimestampFilter_new(in
 	return ret_ref;
 }
 
+static inline uint64_t GossipTimestampFilter_clone_ptr(LDKGossipTimestampFilter *NONNULL_PTR arg) {
+	LDKGossipTimestampFilter ret_var = GossipTimestampFilter_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_GossipTimestampFilter_clone_ptr(uint32_t arg) {
+	LDKGossipTimestampFilter arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = GossipTimestampFilter_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_GossipTimestampFilter_clone(uint32_t orig) {
 	LDKGossipTimestampFilter orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKGossipTimestampFilter ret_var = GossipTimestampFilter_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22233,6 +27215,18 @@ void  __attribute__((visibility("default"))) TS_ErrorAction_free(uint32_t this_p
 	ErrorAction_free(this_ptr_conv);
 }
 
+static inline uint64_t ErrorAction_clone_ptr(LDKErrorAction *NONNULL_PTR arg) {
+	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
+	*ret_copy = ErrorAction_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ErrorAction_clone_ptr(uint32_t arg) {
+	LDKErrorAction* arg_conv = (LDKErrorAction*)arg;
+	int64_t ret_val = ErrorAction_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ErrorAction_clone(uint32_t orig) {
 	LDKErrorAction* orig_conv = (LDKErrorAction*)orig;
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
@@ -22245,6 +27239,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ErrorAction_disconnect_peer(
 	LDKErrorMessage msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -22267,10 +27262,18 @@ uint32_t  __attribute__((visibility("default"))) TS_ErrorAction_ignore_and_log(u
 	return ret_ref;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_ErrorAction_ignore_duplicate_gossip() {
+	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
+	*ret_copy = ErrorAction_ignore_duplicate_gossip();
+	uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ErrorAction_send_error_message(uint32_t msg) {
 	LDKErrorMessage msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -22282,6 +27285,7 @@ void  __attribute__((visibility("default"))) TS_LightningError_free(uint32_t thi
 	LDKLightningError this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	LightningError_free(this_obj_conv);
 }
 
@@ -22289,6 +27293,7 @@ jstring  __attribute__((visibility("default"))) TS_LightningError_get_err(uint32
 	LDKLightningError this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	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);
@@ -22299,6 +27304,7 @@ void  __attribute__((visibility("default"))) TS_LightningError_set_err(uint32_t
 	LDKLightningError this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKStr val_conv = str_ref_to_owned_c(val);
 	LightningError_set_err(&this_ptr_conv, val_conv);
 }
@@ -22307,6 +27313,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LightningError_get_action(ui
 	LDKLightningError this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
 	*ret_copy = LightningError_get_action(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -22317,6 +27324,7 @@ void  __attribute__((visibility("default"))) TS_LightningError_set_action(uint32
 	LDKLightningError this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKErrorAction val_conv = *(LDKErrorAction*)(val_ptr);
@@ -22334,6 +27342,7 @@ uint32_t  __attribute__((visibility("default"))) TS_LightningError_new(jstring e
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22341,14 +27350,37 @@ uint32_t  __attribute__((visibility("default"))) TS_LightningError_new(jstring e
 	return ret_ref;
 }
 
+static inline uint64_t LightningError_clone_ptr(LDKLightningError *NONNULL_PTR arg) {
+	LDKLightningError ret_var = LightningError_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_LightningError_clone_ptr(uint32_t arg) {
+	LDKLightningError arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = LightningError_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_LightningError_clone(uint32_t orig) {
 	LDKLightningError orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKLightningError ret_var = LightningError_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22360,6 +27392,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_free(uint32_t t
 	LDKCommitmentUpdate this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	CommitmentUpdate_free(this_obj_conv);
 }
 
@@ -22367,6 +27400,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_CommitmentUpdate_get_up
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_UpdateAddHTLCZ ret_var = CommitmentUpdate_get_update_add_htlcs(&this_ptr_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -22376,6 +27410,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_CommitmentUpdate_get_up
 		uint64_t ret_conv_15_ref = 0;
 		CHECK((((uint64_t)ret_conv_15_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_15_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_15_var);
 		ret_conv_15_ref = (uint64_t)ret_conv_15_var.inner;
 		if (ret_conv_15_var.is_owned) {
 			ret_conv_15_ref |= 1;
@@ -22391,6 +27426,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_add_
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_UpdateAddHTLCZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -22403,6 +27439,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_add_
 		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);
+		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;
 	}
@@ -22413,6 +27450,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_CommitmentUpdate_get_up
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_UpdateFulfillHTLCZ ret_var = CommitmentUpdate_get_update_fulfill_htlcs(&this_ptr_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -22422,6 +27460,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_CommitmentUpdate_get_up
 		uint64_t ret_conv_19_ref = 0;
 		CHECK((((uint64_t)ret_conv_19_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_19_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_19_var);
 		ret_conv_19_ref = (uint64_t)ret_conv_19_var.inner;
 		if (ret_conv_19_var.is_owned) {
 			ret_conv_19_ref |= 1;
@@ -22437,6 +27476,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fulf
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_UpdateFulfillHTLCZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -22449,6 +27489,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fulf
 		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);
+		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;
 	}
@@ -22459,6 +27500,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_CommitmentUpdate_get_up
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_UpdateFailHTLCZ ret_var = CommitmentUpdate_get_update_fail_htlcs(&this_ptr_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -22468,6 +27510,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_CommitmentUpdate_get_up
 		uint64_t ret_conv_16_ref = 0;
 		CHECK((((uint64_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var);
 		ret_conv_16_ref = (uint64_t)ret_conv_16_var.inner;
 		if (ret_conv_16_var.is_owned) {
 			ret_conv_16_ref |= 1;
@@ -22483,6 +27526,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fail
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_UpdateFailHTLCZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -22495,6 +27539,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fail
 		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);
+		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;
 	}
@@ -22505,6 +27550,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_CommitmentUpdate_get_up
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_UpdateFailMalformedHTLCZ ret_var = CommitmentUpdate_get_update_fail_malformed_htlcs(&this_ptr_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -22514,6 +27560,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_CommitmentUpdate_get_up
 		uint64_t ret_conv_25_ref = 0;
 		CHECK((((uint64_t)ret_conv_25_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_25_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_25_var);
 		ret_conv_25_ref = (uint64_t)ret_conv_25_var.inner;
 		if (ret_conv_25_var.is_owned) {
 			ret_conv_25_ref |= 1;
@@ -22529,6 +27576,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fail
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_UpdateFailMalformedHTLCZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -22541,6 +27589,7 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fail
 		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);
+		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;
 	}
@@ -22551,11 +27600,13 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentUpdate_get_update_
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUpdateFee ret_var = CommitmentUpdate_get_update_fee(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -22568,9 +27619,11 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_set_update_fee(
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUpdateFee val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = UpdateFee_clone(&val_conv);
 	CommitmentUpdate_set_update_fee(&this_ptr_conv, val_conv);
 }
@@ -22579,10 +27632,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentUpdate_get_commitm
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCommitmentSigned ret_var = CommitmentUpdate_get_commitment_signed(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22594,9 +27649,11 @@ void  __attribute__((visibility("default"))) TS_CommitmentUpdate_set_commitment_
 	LDKCommitmentUpdate this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCommitmentSigned val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = CommitmentSigned_clone(&val_conv);
 	CommitmentUpdate_set_commitment_signed(&this_ptr_conv, val_conv);
 }
@@ -22614,6 +27671,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentUpdate_new(uint32_
 		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);
+		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;
 	}
@@ -22629,6 +27687,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentUpdate_new(uint32_
 		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);
+		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;
 	}
@@ -22644,6 +27703,7 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentUpdate_new(uint32_
 		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);
+		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;
 	}
@@ -22659,21 +27719,25 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentUpdate_new(uint32_
 		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);
+		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;
 	}
 	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);
+	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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_signed_arg_conv);
 	commitment_signed_arg_conv = CommitmentSigned_clone(&commitment_signed_arg_conv);
 	LDKCommitmentUpdate ret_var = CommitmentUpdate_new(update_add_htlcs_arg_constr, update_fulfill_htlcs_arg_constr, update_fail_htlcs_arg_constr, update_fail_malformed_htlcs_arg_constr, update_fee_arg_conv, commitment_signed_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22681,14 +27745,37 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentUpdate_new(uint32_
 	return ret_ref;
 }
 
+static inline uint64_t CommitmentUpdate_clone_ptr(LDKCommitmentUpdate *NONNULL_PTR arg) {
+	LDKCommitmentUpdate ret_var = CommitmentUpdate_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_CommitmentUpdate_clone_ptr(uint32_t arg) {
+	LDKCommitmentUpdate arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = CommitmentUpdate_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CommitmentUpdate_clone(uint32_t orig) {
 	LDKCommitmentUpdate orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCommitmentUpdate ret_var = CommitmentUpdate_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -22718,6 +27805,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AcceptChannel_write(uint3
 	LDKAcceptChannel obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = AcceptChannel_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22738,6 +27826,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_AnnouncementSignatures_wr
 	LDKAnnouncementSignatures obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = AnnouncementSignatures_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22758,6 +27847,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelReestablish_write(
 	LDKChannelReestablish obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelReestablish_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22778,6 +27868,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ClosingSigned_write(uint3
 	LDKClosingSigned obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ClosingSigned_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22798,6 +27889,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ClosingSignedFeeRange_wri
 	LDKClosingSignedFeeRange obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ClosingSignedFeeRange_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22818,6 +27910,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_CommitmentSigned_write(ui
 	LDKCommitmentSigned obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = CommitmentSigned_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22838,6 +27931,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_FundingCreated_write(uint
 	LDKFundingCreated obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = FundingCreated_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22858,6 +27952,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_FundingSigned_write(uint3
 	LDKFundingSigned obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = FundingSigned_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22878,6 +27973,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_FundingLocked_write(uint3
 	LDKFundingLocked obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = FundingLocked_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22898,6 +27994,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Init_write(uint32_t obj)
 	LDKInit obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = Init_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22918,6 +28015,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_OpenChannel_write(uint32_
 	LDKOpenChannel obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = OpenChannel_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22938,6 +28036,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RevokeAndACK_write(uint32
 	LDKRevokeAndACK obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = RevokeAndACK_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22958,6 +28057,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Shutdown_write(uint32_t o
 	LDKShutdown obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = Shutdown_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22978,6 +28078,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateFailHTLC_write(uint
 	LDKUpdateFailHTLC obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = UpdateFailHTLC_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -22998,6 +28099,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateFailMalformedHTLC_w
 	LDKUpdateFailMalformedHTLC obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = UpdateFailMalformedHTLC_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23018,6 +28120,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateFee_write(uint32_t
 	LDKUpdateFee obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = UpdateFee_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23038,6 +28141,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateFulfillHTLC_write(u
 	LDKUpdateFulfillHTLC obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = UpdateFulfillHTLC_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23058,6 +28162,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UpdateAddHTLC_write(uint3
 	LDKUpdateAddHTLC obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = UpdateAddHTLC_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23078,6 +28183,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Ping_write(uint32_t obj)
 	LDKPing obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = Ping_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23098,6 +28204,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Pong_write(uint32_t obj)
 	LDKPong obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = Pong_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23118,6 +28225,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedChannelAnnounceme
 	LDKUnsignedChannelAnnouncement obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = UnsignedChannelAnnouncement_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23138,6 +28246,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelAnnouncement_write
 	LDKChannelAnnouncement obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelAnnouncement_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23158,6 +28267,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedChannelUpdate_wri
 	LDKUnsignedChannelUpdate obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = UnsignedChannelUpdate_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23178,6 +28288,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelUpdate_write(uint3
 	LDKChannelUpdate obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelUpdate_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23198,6 +28309,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ErrorMessage_write(uint32
 	LDKErrorMessage obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ErrorMessage_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23218,6 +28330,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_UnsignedNodeAnnouncement_
 	LDKUnsignedNodeAnnouncement obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = UnsignedNodeAnnouncement_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23238,6 +28351,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_NodeAnnouncement_write(ui
 	LDKNodeAnnouncement obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = NodeAnnouncement_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23267,6 +28381,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_QueryShortChannelIds_writ
 	LDKQueryShortChannelIds obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = QueryShortChannelIds_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23278,6 +28393,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ReplyShortChannelIdsEnd_w
 	LDKReplyShortChannelIdsEnd obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ReplyShortChannelIdsEnd_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23298,6 +28414,7 @@ int32_t  __attribute__((visibility("default"))) TS_QueryChannelRange_end_blocknu
 	LDKQueryChannelRange this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int32_t ret_val = QueryChannelRange_end_blocknum(&this_arg_conv);
 	return ret_val;
 }
@@ -23306,6 +28423,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_QueryChannelRange_write(u
 	LDKQueryChannelRange obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = QueryChannelRange_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23335,6 +28453,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ReplyChannelRange_write(u
 	LDKReplyChannelRange obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ReplyChannelRange_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23346,6 +28465,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_GossipTimestampFilter_wri
 	LDKGossipTimestampFilter obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = GossipTimestampFilter_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23375,6 +28495,7 @@ void  __attribute__((visibility("default"))) TS_IgnoringMessageHandler_free(uint
 	LDKIgnoringMessageHandler this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	IgnoringMessageHandler_free(this_obj_conv);
 }
 
@@ -23383,6 +28504,7 @@ uint32_t  __attribute__((visibility("default"))) TS_IgnoringMessageHandler_new()
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -23394,6 +28516,7 @@ uint32_t  __attribute__((visibility("default"))) TS_IgnoringMessageHandler_as_Me
 	LDKIgnoringMessageHandler this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider");
 	*ret_ret = IgnoringMessageHandler_as_MessageSendEventsProvider(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -23403,6 +28526,7 @@ uint32_t  __attribute__((visibility("default"))) TS_IgnoringMessageHandler_as_Ro
 	LDKIgnoringMessageHandler this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKRoutingMessageHandler* ret_ret = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler");
 	*ret_ret = IgnoringMessageHandler_as_RoutingMessageHandler(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -23412,6 +28536,7 @@ uint32_t  __attribute__((visibility("default"))) TS_IgnoringMessageHandler_as_Cu
 	LDKIgnoringMessageHandler this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCustomMessageReader* ret_ret = MALLOC(sizeof(LDKCustomMessageReader), "LDKCustomMessageReader");
 	*ret_ret = IgnoringMessageHandler_as_CustomMessageReader(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -23421,6 +28546,7 @@ uint32_t  __attribute__((visibility("default"))) TS_IgnoringMessageHandler_as_Cu
 	LDKIgnoringMessageHandler this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCustomMessageHandler* ret_ret = MALLOC(sizeof(LDKCustomMessageHandler), "LDKCustomMessageHandler");
 	*ret_ret = IgnoringMessageHandler_as_CustomMessageHandler(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -23430,6 +28556,7 @@ void  __attribute__((visibility("default"))) TS_ErroringMessageHandler_free(uint
 	LDKErroringMessageHandler this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ErroringMessageHandler_free(this_obj_conv);
 }
 
@@ -23438,6 +28565,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ErroringMessageHandler_new()
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -23449,6 +28577,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ErroringMessageHandler_as_Me
 	LDKErroringMessageHandler this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider");
 	*ret_ret = ErroringMessageHandler_as_MessageSendEventsProvider(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -23458,6 +28587,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ErroringMessageHandler_as_Ch
 	LDKErroringMessageHandler this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelMessageHandler* ret_ret = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler");
 	*ret_ret = ErroringMessageHandler_as_ChannelMessageHandler(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -23467,6 +28597,7 @@ void  __attribute__((visibility("default"))) TS_MessageHandler_free(uint32_t thi
 	LDKMessageHandler this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	MessageHandler_free(this_obj_conv);
 }
 
@@ -23474,6 +28605,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageHandler_get_chan_hand
 	LDKMessageHandler this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
 	uint64_t ret_ret = ((uint64_t)MessageHandler_get_chan_handler(&this_ptr_conv)) | 1;
 	return ret_ret;
@@ -23483,6 +28615,7 @@ void  __attribute__((visibility("default"))) TS_MessageHandler_set_chan_handler(
 	LDKMessageHandler this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKChannelMessageHandler val_conv = *(LDKChannelMessageHandler*)(val_ptr);
@@ -23493,6 +28626,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageHandler_get_route_han
 	LDKMessageHandler this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
 	uint64_t ret_ret = ((uint64_t)MessageHandler_get_route_handler(&this_ptr_conv)) | 1;
 	return ret_ret;
@@ -23502,6 +28636,7 @@ void  __attribute__((visibility("default"))) TS_MessageHandler_set_route_handler
 	LDKMessageHandler this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKRoutingMessageHandler val_conv = *(LDKRoutingMessageHandler*)(val_ptr);
@@ -23519,6 +28654,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageHandler_new(uint32_t
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -23526,6 +28662,19 @@ uint32_t  __attribute__((visibility("default"))) TS_MessageHandler_new(uint32_t
 	return ret_ref;
 }
 
+static inline uint64_t SocketDescriptor_clone_ptr(LDKSocketDescriptor *NONNULL_PTR arg) {
+	LDKSocketDescriptor* ret_ret = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor");
+	*ret_ret = SocketDescriptor_clone(arg);
+	return (uint64_t)ret_ret;
+}
+int64_t  __attribute__((visibility("default"))) TS_SocketDescriptor_clone_ptr(uint32_t arg) {
+	void* arg_ptr = (void*)(((uint64_t)arg) & ~1);
+	if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); }
+	LDKSocketDescriptor* arg_conv = (LDKSocketDescriptor*)arg_ptr;
+	int64_t ret_val = SocketDescriptor_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_SocketDescriptor_clone(uint32_t orig) {
 	void* orig_ptr = (void*)(((uint64_t)orig) & ~1);
 	if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); }
@@ -23548,6 +28697,7 @@ void  __attribute__((visibility("default"))) TS_PeerHandleError_free(uint32_t th
 	LDKPeerHandleError this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	PeerHandleError_free(this_obj_conv);
 }
 
@@ -23555,6 +28705,7 @@ jboolean  __attribute__((visibility("default"))) TS_PeerHandleError_get_no_conne
 	LDKPeerHandleError this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = PeerHandleError_get_no_connection_possible(&this_ptr_conv);
 	return ret_val;
 }
@@ -23563,6 +28714,7 @@ void  __attribute__((visibility("default"))) TS_PeerHandleError_set_no_connectio
 	LDKPeerHandleError this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	PeerHandleError_set_no_connection_possible(&this_ptr_conv, val);
 }
 
@@ -23571,6 +28723,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PeerHandleError_new(jboolean
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -23578,14 +28731,37 @@ uint32_t  __attribute__((visibility("default"))) TS_PeerHandleError_new(jboolean
 	return ret_ref;
 }
 
+static inline uint64_t PeerHandleError_clone_ptr(LDKPeerHandleError *NONNULL_PTR arg) {
+	LDKPeerHandleError ret_var = PeerHandleError_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_PeerHandleError_clone_ptr(uint32_t arg) {
+	LDKPeerHandleError arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = PeerHandleError_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_PeerHandleError_clone(uint32_t orig) {
 	LDKPeerHandleError orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPeerHandleError ret_var = PeerHandleError_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -23597,6 +28773,7 @@ void  __attribute__((visibility("default"))) TS_PeerManager_free(uint32_t this_o
 	LDKPeerManager this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	PeerManager_free(this_obj_conv);
 }
 
@@ -23604,6 +28781,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PeerManager_new(uint32_t mes
 	LDKMessageHandler message_handler_conv;
 	message_handler_conv.inner = (void*)(message_handler & (~1));
 	message_handler_conv.is_owned = (message_handler & 1) || (message_handler == 0);
+	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(*((uint32_t*)our_node_secret) == 32);
@@ -23622,6 +28800,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PeerManager_new(uint32_t mes
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -23633,6 +28812,7 @@ ptrArray  __attribute__((visibility("default"))) TS_PeerManager_get_peer_node_id
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_PublicKeyZ ret_var = PeerManager_get_peer_node_ids(&this_arg_conv);
 	ptrArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native ptrArray Bytes");
@@ -23651,6 +28831,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PeerManager_new_outbound_con
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKPublicKey their_node_id_ref;
 	CHECK(*((uint32_t*)their_node_id) == 33);
 	memcpy(their_node_id_ref.compressed_form, (uint8_t*)(their_node_id + 4), 33);
@@ -23666,6 +28847,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PeerManager_new_inbound_conn
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	void* descriptor_ptr = (void*)(((uint64_t)descriptor) & ~1);
 	CHECK_ACCESS(descriptor_ptr);
 	LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(descriptor_ptr);
@@ -23678,6 +28860,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PeerManager_write_buffer_spa
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	void* descriptor_ptr = (void*)(((uint64_t)descriptor) & ~1);
 	if (!(descriptor & 1)) { CHECK_ACCESS(descriptor_ptr); }
 	LDKSocketDescriptor* descriptor_conv = (LDKSocketDescriptor*)descriptor_ptr;
@@ -23690,6 +28873,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PeerManager_read_event(uint3
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	void* peer_descriptor_ptr = (void*)(((uint64_t)peer_descriptor) & ~1);
 	if (!(peer_descriptor & 1)) { CHECK_ACCESS(peer_descriptor_ptr); }
 	LDKSocketDescriptor* peer_descriptor_conv = (LDKSocketDescriptor*)peer_descriptor_ptr;
@@ -23705,6 +28889,7 @@ void  __attribute__((visibility("default"))) TS_PeerManager_process_events(uint3
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	PeerManager_process_events(&this_arg_conv);
 }
 
@@ -23712,6 +28897,7 @@ void  __attribute__((visibility("default"))) TS_PeerManager_socket_disconnected(
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	void* descriptor_ptr = (void*)(((uint64_t)descriptor) & ~1);
 	if (!(descriptor & 1)) { CHECK_ACCESS(descriptor_ptr); }
 	LDKSocketDescriptor* descriptor_conv = (LDKSocketDescriptor*)descriptor_ptr;
@@ -23722,6 +28908,7 @@ void  __attribute__((visibility("default"))) TS_PeerManager_disconnect_by_node_i
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKPublicKey node_id_ref;
 	CHECK(*((uint32_t*)node_id) == 33);
 	memcpy(node_id_ref.compressed_form, (uint8_t*)(node_id + 4), 33);
@@ -23732,6 +28919,7 @@ void  __attribute__((visibility("default"))) TS_PeerManager_disconnect_all_peers
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	PeerManager_disconnect_all_peers(&this_arg_conv);
 }
 
@@ -23739,9 +28927,20 @@ void  __attribute__((visibility("default"))) TS_PeerManager_timer_tick_occurred(
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	PeerManager_timer_tick_occurred(&this_arg_conv);
 }
 
+int64_t  __attribute__((visibility("default"))) TS_htlc_success_tx_weight(jboolean opt_anchors) {
+	int64_t ret_val = htlc_success_tx_weight(opt_anchors);
+	return ret_val;
+}
+
+int64_t  __attribute__((visibility("default"))) TS_htlc_timeout_tx_weight(jboolean opt_anchors) {
+	int64_t ret_val = htlc_timeout_tx_weight(opt_anchors);
+	return ret_val;
+}
+
 int8_tArray  __attribute__((visibility("default"))) TS_build_commitment_secret(int8_tArray commitment_seed, int64_t idx) {
 	unsigned char commitment_seed_arr[32];
 	CHECK(*((uint32_t*)commitment_seed) == 32);
@@ -23764,6 +28963,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_build_closing_transaction
 	LDKOutPoint funding_outpoint_conv;
 	funding_outpoint_conv.inner = (void*)(funding_outpoint & (~1));
 	funding_outpoint_conv.is_owned = (funding_outpoint & 1) || (funding_outpoint == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_outpoint_conv);
 	funding_outpoint_conv = OutPoint_clone(&funding_outpoint_conv);
 	LDKTransaction ret_var = build_closing_transaction(to_holder_value_sat, to_counterparty_value_sat, to_holder_script_ref, to_counterparty_script_ref, funding_outpoint_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
@@ -23827,6 +29027,7 @@ void  __attribute__((visibility("default"))) TS_TxCreationKeys_free(uint32_t thi
 	LDKTxCreationKeys this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	TxCreationKeys_free(this_obj_conv);
 }
 
@@ -23834,6 +29035,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_TxCreationKeys_get_per_co
 	LDKTxCreationKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), TxCreationKeys_get_per_commitment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -23843,6 +29045,7 @@ void  __attribute__((visibility("default"))) TS_TxCreationKeys_set_per_commitmen
 	LDKTxCreationKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -23853,6 +29056,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_TxCreationKeys_get_revoca
 	LDKTxCreationKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), TxCreationKeys_get_revocation_key(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -23862,6 +29066,7 @@ void  __attribute__((visibility("default"))) TS_TxCreationKeys_set_revocation_ke
 	LDKTxCreationKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -23872,6 +29077,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_TxCreationKeys_get_broadc
 	LDKTxCreationKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), TxCreationKeys_get_broadcaster_htlc_key(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -23881,6 +29087,7 @@ void  __attribute__((visibility("default"))) TS_TxCreationKeys_set_broadcaster_h
 	LDKTxCreationKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -23891,6 +29098,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_TxCreationKeys_get_counte
 	LDKTxCreationKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), TxCreationKeys_get_countersignatory_htlc_key(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -23900,6 +29108,7 @@ void  __attribute__((visibility("default"))) TS_TxCreationKeys_set_countersignat
 	LDKTxCreationKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -23910,6 +29119,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_TxCreationKeys_get_broadc
 	LDKTxCreationKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), TxCreationKeys_get_broadcaster_delayed_payment_key(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -23919,6 +29129,7 @@ void  __attribute__((visibility("default"))) TS_TxCreationKeys_set_broadcaster_d
 	LDKTxCreationKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -23945,6 +29156,7 @@ uint32_t  __attribute__((visibility("default"))) TS_TxCreationKeys_new(int8_tArr
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -23952,14 +29164,37 @@ uint32_t  __attribute__((visibility("default"))) TS_TxCreationKeys_new(int8_tArr
 	return ret_ref;
 }
 
+static inline uint64_t TxCreationKeys_clone_ptr(LDKTxCreationKeys *NONNULL_PTR arg) {
+	LDKTxCreationKeys ret_var = TxCreationKeys_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_TxCreationKeys_clone_ptr(uint32_t arg) {
+	LDKTxCreationKeys arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = TxCreationKeys_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_TxCreationKeys_clone(uint32_t orig) {
 	LDKTxCreationKeys orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKTxCreationKeys ret_var = TxCreationKeys_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -23971,6 +29206,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_TxCreationKeys_write(uint
 	LDKTxCreationKeys obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = TxCreationKeys_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -23991,6 +29227,7 @@ void  __attribute__((visibility("default"))) TS_ChannelPublicKeys_free(uint32_t
 	LDKChannelPublicKeys this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelPublicKeys_free(this_obj_conv);
 }
 
@@ -23998,6 +29235,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelPublicKeys_get_fun
 	LDKChannelPublicKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelPublicKeys_get_funding_pubkey(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -24007,6 +29245,7 @@ void  __attribute__((visibility("default"))) TS_ChannelPublicKeys_set_funding_pu
 	LDKChannelPublicKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -24017,6 +29256,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelPublicKeys_get_rev
 	LDKChannelPublicKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelPublicKeys_get_revocation_basepoint(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -24026,6 +29266,7 @@ void  __attribute__((visibility("default"))) TS_ChannelPublicKeys_set_revocation
 	LDKChannelPublicKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -24036,6 +29277,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelPublicKeys_get_pay
 	LDKChannelPublicKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelPublicKeys_get_payment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -24045,6 +29287,7 @@ void  __attribute__((visibility("default"))) TS_ChannelPublicKeys_set_payment_po
 	LDKChannelPublicKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -24055,6 +29298,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelPublicKeys_get_del
 	LDKChannelPublicKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelPublicKeys_get_delayed_payment_basepoint(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -24064,6 +29308,7 @@ void  __attribute__((visibility("default"))) TS_ChannelPublicKeys_set_delayed_pa
 	LDKChannelPublicKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -24074,6 +29319,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelPublicKeys_get_htl
 	LDKChannelPublicKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ChannelPublicKeys_get_htlc_basepoint(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -24083,6 +29329,7 @@ void  __attribute__((visibility("default"))) TS_ChannelPublicKeys_set_htlc_basep
 	LDKChannelPublicKeys this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -24109,6 +29356,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelPublicKeys_new(int8_t
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24116,14 +29364,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelPublicKeys_new(int8_t
 	return ret_ref;
 }
 
+static inline uint64_t ChannelPublicKeys_clone_ptr(LDKChannelPublicKeys *NONNULL_PTR arg) {
+	LDKChannelPublicKeys ret_var = ChannelPublicKeys_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelPublicKeys_clone_ptr(uint32_t arg) {
+	LDKChannelPublicKeys arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelPublicKeys_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelPublicKeys_clone(uint32_t orig) {
 	LDKChannelPublicKeys orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelPublicKeys ret_var = ChannelPublicKeys_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24135,6 +29406,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelPublicKeys_write(u
 	LDKChannelPublicKeys obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelPublicKeys_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -24179,9 +29451,11 @@ uint32_t  __attribute__((visibility("default"))) TS_TxCreationKeys_from_channel_
 	LDKChannelPublicKeys broadcaster_keys_conv;
 	broadcaster_keys_conv.inner = (void*)(broadcaster_keys & (~1));
 	broadcaster_keys_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(broadcaster_keys_conv);
 	LDKChannelPublicKeys countersignatory_keys_conv;
 	countersignatory_keys_conv.inner = (void*)(countersignatory_keys & (~1));
 	countersignatory_keys_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(countersignatory_keys_conv);
 	LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ");
 	*ret_conv = TxCreationKeys_from_channel_static_keys(per_commitment_point_ref, &broadcaster_keys_conv, &countersignatory_keys_conv);
 	return (uint64_t)ret_conv;
@@ -24205,6 +29479,7 @@ void  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_free(uint
 	LDKHTLCOutputInCommitment this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	HTLCOutputInCommitment_free(this_obj_conv);
 }
 
@@ -24212,6 +29487,7 @@ jboolean  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_get_o
 	LDKHTLCOutputInCommitment this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = HTLCOutputInCommitment_get_offered(&this_ptr_conv);
 	return ret_val;
 }
@@ -24220,6 +29496,7 @@ void  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_set_offer
 	LDKHTLCOutputInCommitment this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	HTLCOutputInCommitment_set_offered(&this_ptr_conv, val);
 }
 
@@ -24227,6 +29504,7 @@ int64_t  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_get_am
 	LDKHTLCOutputInCommitment this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = HTLCOutputInCommitment_get_amount_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -24235,6 +29513,7 @@ void  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_set_amoun
 	LDKHTLCOutputInCommitment this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	HTLCOutputInCommitment_set_amount_msat(&this_ptr_conv, val);
 }
 
@@ -24242,6 +29521,7 @@ int32_t  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_get_cl
 	LDKHTLCOutputInCommitment this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = HTLCOutputInCommitment_get_cltv_expiry(&this_ptr_conv);
 	return ret_val;
 }
@@ -24250,6 +29530,7 @@ void  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_set_cltv_
 	LDKHTLCOutputInCommitment this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	HTLCOutputInCommitment_set_cltv_expiry(&this_ptr_conv, val);
 }
 
@@ -24257,6 +29538,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_ge
 	LDKHTLCOutputInCommitment this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *HTLCOutputInCommitment_get_payment_hash(&this_ptr_conv), 32);
 	return ret_arr;
@@ -24266,6 +29548,7 @@ void  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_set_payme
 	LDKHTLCOutputInCommitment this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -24276,6 +29559,7 @@ uint32_t  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_get_t
 	LDKHTLCOutputInCommitment this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z");
 	*ret_copy = HTLCOutputInCommitment_get_transaction_output_index(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -24286,6 +29570,7 @@ void  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_set_trans
 	LDKHTLCOutputInCommitment this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKCOption_u32Z val_conv = *(LDKCOption_u32Z*)(val_ptr);
@@ -24305,6 +29590,7 @@ uint32_t  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_new(j
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24312,14 +29598,37 @@ uint32_t  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_new(j
 	return ret_ref;
 }
 
+static inline uint64_t HTLCOutputInCommitment_clone_ptr(LDKHTLCOutputInCommitment *NONNULL_PTR arg) {
+	LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_clone_ptr(uint32_t arg) {
+	LDKHTLCOutputInCommitment arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = HTLCOutputInCommitment_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_clone(uint32_t orig) {
 	LDKHTLCOutputInCommitment orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24331,6 +29640,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_wr
 	LDKHTLCOutputInCommitment obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = HTLCOutputInCommitment_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -24347,14 +29657,16 @@ uint32_t  __attribute__((visibility("default"))) TS_HTLCOutputInCommitment_read(
 	return (uint64_t)ret_conv;
 }
 
-int8_tArray  __attribute__((visibility("default"))) TS_get_htlc_redeemscript(uint32_t htlc, uint32_t keys) {
+int8_tArray  __attribute__((visibility("default"))) TS_get_htlc_redeemscript(uint32_t htlc, jboolean opt_anchors, uint32_t keys) {
 	LDKHTLCOutputInCommitment htlc_conv;
 	htlc_conv.inner = (void*)(htlc & (~1));
 	htlc_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv);
 	LDKTxCreationKeys keys_conv;
 	keys_conv.inner = (void*)(keys & (~1));
 	keys_conv.is_owned = false;
-	LDKCVec_u8Z ret_var = get_htlc_redeemscript(&htlc_conv, &keys_conv);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(keys_conv);
+	LDKCVec_u8Z ret_var = get_htlc_redeemscript(&htlc_conv, opt_anchors, &keys_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
 	CVec_u8Z_free(ret_var);
@@ -24375,7 +29687,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_make_funding_redeemscript
 	return ret_arr;
 }
 
-int8_tArray  __attribute__((visibility("default"))) TS_build_htlc_transaction(int8_tArray commitment_txid, int32_t feerate_per_kw, int16_t contest_delay, uint32_t htlc, int8_tArray broadcaster_delayed_payment_key, int8_tArray revocation_key) {
+int8_tArray  __attribute__((visibility("default"))) TS_build_htlc_transaction(int8_tArray commitment_txid, int32_t feerate_per_kw, int16_t contest_delay, uint32_t htlc, jboolean opt_anchors, int8_tArray broadcaster_delayed_payment_key, int8_tArray revocation_key) {
 	unsigned char commitment_txid_arr[32];
 	CHECK(*((uint32_t*)commitment_txid) == 32);
 	memcpy(commitment_txid_arr, (uint8_t*)(commitment_txid + 4), 32);
@@ -24383,23 +29695,36 @@ int8_tArray  __attribute__((visibility("default"))) TS_build_htlc_transaction(in
 	LDKHTLCOutputInCommitment htlc_conv;
 	htlc_conv.inner = (void*)(htlc & (~1));
 	htlc_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv);
 	LDKPublicKey broadcaster_delayed_payment_key_ref;
 	CHECK(*((uint32_t*)broadcaster_delayed_payment_key) == 33);
 	memcpy(broadcaster_delayed_payment_key_ref.compressed_form, (uint8_t*)(broadcaster_delayed_payment_key + 4), 33);
 	LDKPublicKey revocation_key_ref;
 	CHECK(*((uint32_t*)revocation_key) == 33);
 	memcpy(revocation_key_ref.compressed_form, (uint8_t*)(revocation_key + 4), 33);
-	LDKTransaction ret_var = build_htlc_transaction(commitment_txid_ref, feerate_per_kw, contest_delay, &htlc_conv, broadcaster_delayed_payment_key_ref, revocation_key_ref);
+	LDKTransaction ret_var = build_htlc_transaction(commitment_txid_ref, feerate_per_kw, contest_delay, &htlc_conv, opt_anchors, broadcaster_delayed_payment_key_ref, revocation_key_ref);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
 	Transaction_free(ret_var);
 	return ret_arr;
 }
 
+int8_tArray  __attribute__((visibility("default"))) TS_get_anchor_redeemscript(int8_tArray funding_pubkey) {
+	LDKPublicKey funding_pubkey_ref;
+	CHECK(*((uint32_t*)funding_pubkey) == 33);
+	memcpy(funding_pubkey_ref.compressed_form, (uint8_t*)(funding_pubkey + 4), 33);
+	LDKCVec_u8Z ret_var = get_anchor_redeemscript(funding_pubkey_ref);
+	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
+	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
 void  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelTransactionParameters_free(this_obj_conv);
 }
 
@@ -24407,10 +29732,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelTransactionParameters
 	LDKChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelPublicKeys ret_var = ChannelTransactionParameters_get_holder_pubkeys(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24422,9 +29749,11 @@ void  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_set
 	LDKChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelPublicKeys val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelPublicKeys_clone(&val_conv);
 	ChannelTransactionParameters_set_holder_pubkeys(&this_ptr_conv, val_conv);
 }
@@ -24433,6 +29762,7 @@ int16_t  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_
 	LDKChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = ChannelTransactionParameters_get_holder_selected_contest_delay(&this_ptr_conv);
 	return ret_val;
 }
@@ -24441,6 +29771,7 @@ void  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_set
 	LDKChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelTransactionParameters_set_holder_selected_contest_delay(&this_ptr_conv, val);
 }
 
@@ -24448,6 +29779,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelTransactionParameters
 	LDKChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = ChannelTransactionParameters_get_is_outbound_from_holder(&this_ptr_conv);
 	return ret_val;
 }
@@ -24456,6 +29788,7 @@ void  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_set
 	LDKChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ChannelTransactionParameters_set_is_outbound_from_holder(&this_ptr_conv, val);
 }
 
@@ -24463,11 +29796,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelTransactionParameters
 	LDKChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCounterpartyChannelTransactionParameters ret_var = ChannelTransactionParameters_get_counterparty_parameters(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -24480,9 +29815,11 @@ void  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_set
 	LDKChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCounterpartyChannelTransactionParameters val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = CounterpartyChannelTransactionParameters_clone(&val_conv);
 	ChannelTransactionParameters_set_counterparty_parameters(&this_ptr_conv, val_conv);
 }
@@ -24491,11 +29828,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelTransactionParameters
 	LDKChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint ret_var = ChannelTransactionParameters_get_funding_outpoint(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -24508,30 +29847,55 @@ void  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_set
 	LDKChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = OutPoint_clone(&val_conv);
 	ChannelTransactionParameters_set_funding_outpoint(&this_ptr_conv, val_conv);
 }
 
-uint32_t  __attribute__((visibility("default"))) 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  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_get_opt_anchors(uint32_t this_ptr) {
+	LDKChannelTransactionParameters this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	uint32_t ret_conv = LDKCOption_NoneZ_to_js(ChannelTransactionParameters_get_opt_anchors(&this_ptr_conv));
+	return ret_conv;
+}
+
+void  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_set_opt_anchors(uint32_t this_ptr, uint32_t val) {
+	LDKChannelTransactionParameters this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKCOption_NoneZ val_conv = LDKCOption_NoneZ_from_js(val);
+	ChannelTransactionParameters_set_opt_anchors(&this_ptr_conv, val_conv);
+}
+
+uint32_t  __attribute__((visibility("default"))) 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) {
 	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);
+	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);
+	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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_outpoint_arg_conv);
 	funding_outpoint_arg_conv = OutPoint_clone(&funding_outpoint_arg_conv);
-	LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_new(holder_pubkeys_arg_conv, holder_selected_contest_delay_arg, is_outbound_from_holder_arg, counterparty_parameters_arg_conv, funding_outpoint_arg_conv);
+	LDKCOption_NoneZ opt_anchors_arg_conv = LDKCOption_NoneZ_from_js(opt_anchors_arg);
+	LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_new(holder_pubkeys_arg_conv, holder_selected_contest_delay_arg, is_outbound_from_holder_arg, counterparty_parameters_arg_conv, funding_outpoint_arg_conv, opt_anchors_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24539,14 +29903,37 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelTransactionParameters
 	return ret_ref;
 }
 
+static inline uint64_t ChannelTransactionParameters_clone_ptr(LDKChannelTransactionParameters *NONNULL_PTR arg) {
+	LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_clone_ptr(uint32_t arg) {
+	LDKChannelTransactionParameters arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelTransactionParameters_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelTransactionParameters_clone(uint32_t orig) {
 	LDKChannelTransactionParameters orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24558,6 +29945,7 @@ void  __attribute__((visibility("default"))) TS_CounterpartyChannelTransactionPa
 	LDKCounterpartyChannelTransactionParameters this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	CounterpartyChannelTransactionParameters_free(this_obj_conv);
 }
 
@@ -24565,10 +29953,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CounterpartyChannelTransacti
 	LDKCounterpartyChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelPublicKeys ret_var = CounterpartyChannelTransactionParameters_get_pubkeys(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24580,9 +29970,11 @@ void  __attribute__((visibility("default"))) TS_CounterpartyChannelTransactionPa
 	LDKCounterpartyChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelPublicKeys val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelPublicKeys_clone(&val_conv);
 	CounterpartyChannelTransactionParameters_set_pubkeys(&this_ptr_conv, val_conv);
 }
@@ -24591,6 +29983,7 @@ int16_t  __attribute__((visibility("default"))) TS_CounterpartyChannelTransactio
 	LDKCounterpartyChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = CounterpartyChannelTransactionParameters_get_selected_contest_delay(&this_ptr_conv);
 	return ret_val;
 }
@@ -24599,6 +29992,7 @@ void  __attribute__((visibility("default"))) TS_CounterpartyChannelTransactionPa
 	LDKCounterpartyChannelTransactionParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	CounterpartyChannelTransactionParameters_set_selected_contest_delay(&this_ptr_conv, val);
 }
 
@@ -24606,11 +30000,13 @@ uint32_t  __attribute__((visibility("default"))) TS_CounterpartyChannelTransacti
 	LDKChannelPublicKeys pubkeys_arg_conv;
 	pubkeys_arg_conv.inner = (void*)(pubkeys_arg & (~1));
 	pubkeys_arg_conv.is_owned = (pubkeys_arg & 1) || (pubkeys_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(pubkeys_arg_conv);
 	pubkeys_arg_conv = ChannelPublicKeys_clone(&pubkeys_arg_conv);
 	LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_new(pubkeys_arg_conv, selected_contest_delay_arg);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24618,14 +30014,37 @@ uint32_t  __attribute__((visibility("default"))) TS_CounterpartyChannelTransacti
 	return ret_ref;
 }
 
+static inline uint64_t CounterpartyChannelTransactionParameters_clone_ptr(LDKCounterpartyChannelTransactionParameters *NONNULL_PTR arg) {
+	LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_CounterpartyChannelTransactionParameters_clone_ptr(uint32_t arg) {
+	LDKCounterpartyChannelTransactionParameters arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = CounterpartyChannelTransactionParameters_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CounterpartyChannelTransactionParameters_clone(uint32_t orig) {
 	LDKCounterpartyChannelTransactionParameters orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24637,6 +30056,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelTransactionParameters
 	LDKChannelTransactionParameters this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	jboolean ret_val = ChannelTransactionParameters_is_populated(&this_arg_conv);
 	return ret_val;
 }
@@ -24645,10 +30065,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelTransactionParameters
 	LDKChannelTransactionParameters this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKDirectedChannelTransactionParameters ret_var = ChannelTransactionParameters_as_holder_broadcastable(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24660,10 +30082,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelTransactionParameters
 	LDKChannelTransactionParameters this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKDirectedChannelTransactionParameters ret_var = ChannelTransactionParameters_as_counterparty_broadcastable(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24675,6 +30099,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_CounterpartyChannelTransa
 	LDKCounterpartyChannelTransactionParameters obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = CounterpartyChannelTransactionParameters_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -24695,6 +30120,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelTransactionParamet
 	LDKChannelTransactionParameters obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelTransactionParameters_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -24715,6 +30141,7 @@ void  __attribute__((visibility("default"))) TS_DirectedChannelTransactionParame
 	LDKDirectedChannelTransactionParameters this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	DirectedChannelTransactionParameters_free(this_obj_conv);
 }
 
@@ -24722,10 +30149,12 @@ uint32_t  __attribute__((visibility("default"))) TS_DirectedChannelTransactionPa
 	LDKDirectedChannelTransactionParameters this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelPublicKeys ret_var = DirectedChannelTransactionParameters_broadcaster_pubkeys(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24737,10 +30166,12 @@ uint32_t  __attribute__((visibility("default"))) TS_DirectedChannelTransactionPa
 	LDKDirectedChannelTransactionParameters this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelPublicKeys ret_var = DirectedChannelTransactionParameters_countersignatory_pubkeys(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24752,6 +30183,7 @@ int16_t  __attribute__((visibility("default"))) TS_DirectedChannelTransactionPar
 	LDKDirectedChannelTransactionParameters this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int16_t ret_val = DirectedChannelTransactionParameters_contest_delay(&this_arg_conv);
 	return ret_val;
 }
@@ -24760,6 +30192,7 @@ jboolean  __attribute__((visibility("default"))) TS_DirectedChannelTransactionPa
 	LDKDirectedChannelTransactionParameters this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	jboolean ret_val = DirectedChannelTransactionParameters_is_outbound(&this_arg_conv);
 	return ret_val;
 }
@@ -24768,10 +30201,12 @@ uint32_t  __attribute__((visibility("default"))) TS_DirectedChannelTransactionPa
 	LDKDirectedChannelTransactionParameters this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKOutPoint ret_var = DirectedChannelTransactionParameters_funding_outpoint(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24779,10 +30214,20 @@ uint32_t  __attribute__((visibility("default"))) TS_DirectedChannelTransactionPa
 	return ret_ref;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_DirectedChannelTransactionParameters_opt_anchors(uint32_t this_arg) {
+	LDKDirectedChannelTransactionParameters this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	jboolean ret_val = DirectedChannelTransactionParameters_opt_anchors(&this_arg_conv);
+	return ret_val;
+}
+
 void  __attribute__((visibility("default"))) TS_HolderCommitmentTransaction_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	HolderCommitmentTransaction_free(this_obj_conv);
 }
 
@@ -24790,6 +30235,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_HolderCommitmentTransacti
 	LDKHolderCommitmentTransaction this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(64, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), HolderCommitmentTransaction_get_counterparty_sig(&this_ptr_conv).compact_form, 64);
 	return ret_arr;
@@ -24799,6 +30245,7 @@ void  __attribute__((visibility("default"))) TS_HolderCommitmentTransaction_set_
 	LDKHolderCommitmentTransaction this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKSignature val_ref;
 	CHECK(*((uint32_t*)val) == 64);
 	memcpy(val_ref.compact_form, (uint8_t*)(val + 4), 64);
@@ -24809,6 +30256,7 @@ void  __attribute__((visibility("default"))) TS_HolderCommitmentTransaction_set_
 	LDKHolderCommitmentTransaction this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_SignatureZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -24826,14 +30274,37 @@ void  __attribute__((visibility("default"))) TS_HolderCommitmentTransaction_set_
 	HolderCommitmentTransaction_set_counterparty_htlc_sigs(&this_ptr_conv, val_constr);
 }
 
+static inline uint64_t HolderCommitmentTransaction_clone_ptr(LDKHolderCommitmentTransaction *NONNULL_PTR arg) {
+	LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_HolderCommitmentTransaction_clone_ptr(uint32_t arg) {
+	LDKHolderCommitmentTransaction arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = HolderCommitmentTransaction_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_HolderCommitmentTransaction_clone(uint32_t orig) {
 	LDKHolderCommitmentTransaction orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24845,6 +30316,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_HolderCommitmentTransacti
 	LDKHolderCommitmentTransaction obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = HolderCommitmentTransaction_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -24865,6 +30337,7 @@ uint32_t  __attribute__((visibility("default"))) TS_HolderCommitmentTransaction_
 	LDKCommitmentTransaction commitment_tx_conv;
 	commitment_tx_conv.inner = (void*)(commitment_tx & (~1));
 	commitment_tx_conv.is_owned = (commitment_tx & 1) || (commitment_tx == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv);
 	commitment_tx_conv = CommitmentTransaction_clone(&commitment_tx_conv);
 	LDKSignature counterparty_sig_ref;
 	CHECK(*((uint32_t*)counterparty_sig) == 64);
@@ -24893,6 +30366,7 @@ uint32_t  __attribute__((visibility("default"))) TS_HolderCommitmentTransaction_
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24904,6 +30378,7 @@ void  __attribute__((visibility("default"))) TS_BuiltCommitmentTransaction_free(
 	LDKBuiltCommitmentTransaction this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	BuiltCommitmentTransaction_free(this_obj_conv);
 }
 
@@ -24911,6 +30386,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_BuiltCommitmentTransactio
 	LDKBuiltCommitmentTransaction this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKTransaction ret_var = BuiltCommitmentTransaction_get_transaction(&this_ptr_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -24922,6 +30398,7 @@ void  __attribute__((visibility("default"))) TS_BuiltCommitmentTransaction_set_t
 	LDKBuiltCommitmentTransaction this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKTransaction val_ref;
 	val_ref.datalen = *((uint32_t*)val);
 	val_ref.data = MALLOC(val_ref.datalen, "LDKTransaction Bytes");
@@ -24934,6 +30411,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_BuiltCommitmentTransactio
 	LDKBuiltCommitmentTransaction this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *BuiltCommitmentTransaction_get_txid(&this_ptr_conv), 32);
 	return ret_arr;
@@ -24943,6 +30421,7 @@ void  __attribute__((visibility("default"))) TS_BuiltCommitmentTransaction_set_t
 	LDKBuiltCommitmentTransaction this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -24962,6 +30441,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BuiltCommitmentTransaction_n
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24969,14 +30449,37 @@ uint32_t  __attribute__((visibility("default"))) TS_BuiltCommitmentTransaction_n
 	return ret_ref;
 }
 
+static inline uint64_t BuiltCommitmentTransaction_clone_ptr(LDKBuiltCommitmentTransaction *NONNULL_PTR arg) {
+	LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_BuiltCommitmentTransaction_clone_ptr(uint32_t arg) {
+	LDKBuiltCommitmentTransaction arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = BuiltCommitmentTransaction_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_BuiltCommitmentTransaction_clone(uint32_t orig) {
 	LDKBuiltCommitmentTransaction orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -24988,6 +30491,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_BuiltCommitmentTransactio
 	LDKBuiltCommitmentTransaction obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = BuiltCommitmentTransaction_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -25008,6 +30512,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_BuiltCommitmentTransactio
 	LDKBuiltCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKu8slice funding_redeemscript_ref;
 	funding_redeemscript_ref.datalen = *((uint32_t*)funding_redeemscript);
 	funding_redeemscript_ref.data = (int8_t*)(funding_redeemscript + 4);
@@ -25020,6 +30525,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_BuiltCommitmentTransactio
 	LDKBuiltCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char funding_key_arr[32];
 	CHECK(*((uint32_t*)funding_key) == 32);
 	memcpy(funding_key_arr, (uint8_t*)(funding_key + 4), 32);
@@ -25036,17 +30542,41 @@ void  __attribute__((visibility("default"))) TS_ClosingTransaction_free(uint32_t
 	LDKClosingTransaction this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ClosingTransaction_free(this_obj_conv);
 }
 
+static inline uint64_t ClosingTransaction_clone_ptr(LDKClosingTransaction *NONNULL_PTR arg) {
+	LDKClosingTransaction ret_var = ClosingTransaction_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ClosingTransaction_clone_ptr(uint32_t arg) {
+	LDKClosingTransaction arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ClosingTransaction_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ClosingTransaction_clone(uint32_t orig) {
 	LDKClosingTransaction orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKClosingTransaction ret_var = ClosingTransaction_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25058,6 +30588,7 @@ int64_t  __attribute__((visibility("default"))) TS_ClosingTransaction_hash(uint3
 	LDKClosingTransaction o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = ClosingTransaction_hash(&o_conv);
 	return ret_val;
 }
@@ -25074,11 +30605,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ClosingTransaction_new(int64
 	LDKOutPoint funding_outpoint_conv;
 	funding_outpoint_conv.inner = (void*)(funding_outpoint & (~1));
 	funding_outpoint_conv.is_owned = (funding_outpoint & 1) || (funding_outpoint == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_outpoint_conv);
 	funding_outpoint_conv = OutPoint_clone(&funding_outpoint_conv);
 	LDKClosingTransaction ret_var = ClosingTransaction_new(to_holder_value_sat, to_counterparty_value_sat, to_holder_script_ref, to_counterparty_script_ref, funding_outpoint_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25090,10 +30623,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ClosingTransaction_trust(uin
 	LDKClosingTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKTrustedClosingTransaction ret_var = ClosingTransaction_trust(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25105,9 +30640,11 @@ uint32_t  __attribute__((visibility("default"))) TS_ClosingTransaction_verify(ui
 	LDKClosingTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKOutPoint funding_outpoint_conv;
 	funding_outpoint_conv.inner = (void*)(funding_outpoint & (~1));
 	funding_outpoint_conv.is_owned = (funding_outpoint & 1) || (funding_outpoint == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_outpoint_conv);
 	funding_outpoint_conv = OutPoint_clone(&funding_outpoint_conv);
 	LDKCResult_TrustedClosingTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedClosingTransactionNoneZ), "LDKCResult_TrustedClosingTransactionNoneZ");
 	*ret_conv = ClosingTransaction_verify(&this_arg_conv, funding_outpoint_conv);
@@ -25118,6 +30655,7 @@ int64_t  __attribute__((visibility("default"))) TS_ClosingTransaction_to_holder_
 	LDKClosingTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = ClosingTransaction_to_holder_value_sat(&this_arg_conv);
 	return ret_val;
 }
@@ -25126,6 +30664,7 @@ int64_t  __attribute__((visibility("default"))) TS_ClosingTransaction_to_counter
 	LDKClosingTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = ClosingTransaction_to_counterparty_value_sat(&this_arg_conv);
 	return ret_val;
 }
@@ -25134,6 +30673,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ClosingTransaction_to_hol
 	LDKClosingTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKu8slice ret_var = ClosingTransaction_to_holder_script(&this_arg_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -25144,6 +30684,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ClosingTransaction_to_cou
 	LDKClosingTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKu8slice ret_var = ClosingTransaction_to_counterparty_script(&this_arg_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -25154,6 +30695,7 @@ void  __attribute__((visibility("default"))) TS_TrustedClosingTransaction_free(u
 	LDKTrustedClosingTransaction this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	TrustedClosingTransaction_free(this_obj_conv);
 }
 
@@ -25161,6 +30703,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_TrustedClosingTransaction
 	LDKTrustedClosingTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKTransaction ret_var = TrustedClosingTransaction_built_transaction(&this_arg_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -25172,6 +30715,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_TrustedClosingTransaction
 	LDKTrustedClosingTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKu8slice funding_redeemscript_ref;
 	funding_redeemscript_ref.datalen = *((uint32_t*)funding_redeemscript);
 	funding_redeemscript_ref.data = (int8_t*)(funding_redeemscript + 4);
@@ -25184,6 +30728,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_TrustedClosingTransaction
 	LDKTrustedClosingTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char funding_key_arr[32];
 	CHECK(*((uint32_t*)funding_key) == 32);
 	memcpy(funding_key_arr, (uint8_t*)(funding_key + 4), 32);
@@ -25200,17 +30745,41 @@ void  __attribute__((visibility("default"))) TS_CommitmentTransaction_free(uint3
 	LDKCommitmentTransaction this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	CommitmentTransaction_free(this_obj_conv);
 }
 
+static inline uint64_t CommitmentTransaction_clone_ptr(LDKCommitmentTransaction *NONNULL_PTR arg) {
+	LDKCommitmentTransaction ret_var = CommitmentTransaction_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_CommitmentTransaction_clone_ptr(uint32_t arg) {
+	LDKCommitmentTransaction arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = CommitmentTransaction_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_CommitmentTransaction_clone(uint32_t orig) {
 	LDKCommitmentTransaction orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCommitmentTransaction ret_var = CommitmentTransaction_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25222,6 +30791,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_CommitmentTransaction_wri
 	LDKCommitmentTransaction obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = CommitmentTransaction_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -25242,6 +30812,7 @@ int64_t  __attribute__((visibility("default"))) TS_CommitmentTransaction_commitm
 	LDKCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = CommitmentTransaction_commitment_number(&this_arg_conv);
 	return ret_val;
 }
@@ -25250,6 +30821,7 @@ int64_t  __attribute__((visibility("default"))) TS_CommitmentTransaction_to_broa
 	LDKCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = CommitmentTransaction_to_broadcaster_value_sat(&this_arg_conv);
 	return ret_val;
 }
@@ -25258,6 +30830,7 @@ int64_t  __attribute__((visibility("default"))) TS_CommitmentTransaction_to_coun
 	LDKCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = CommitmentTransaction_to_countersignatory_value_sat(&this_arg_conv);
 	return ret_val;
 }
@@ -25266,6 +30839,7 @@ int32_t  __attribute__((visibility("default"))) TS_CommitmentTransaction_feerate
 	LDKCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int32_t ret_val = CommitmentTransaction_feerate_per_kw(&this_arg_conv);
 	return ret_val;
 }
@@ -25274,10 +30848,12 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentTransaction_trust(
 	LDKCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKTrustedCommitmentTransaction ret_var = CommitmentTransaction_trust(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25289,15 +30865,19 @@ uint32_t  __attribute__((visibility("default"))) TS_CommitmentTransaction_verify
 	LDKCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKDirectedChannelTransactionParameters channel_parameters_conv;
 	channel_parameters_conv.inner = (void*)(channel_parameters & (~1));
 	channel_parameters_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv);
 	LDKChannelPublicKeys broadcaster_keys_conv;
 	broadcaster_keys_conv.inner = (void*)(broadcaster_keys & (~1));
 	broadcaster_keys_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(broadcaster_keys_conv);
 	LDKChannelPublicKeys countersignatory_keys_conv;
 	countersignatory_keys_conv.inner = (void*)(countersignatory_keys & (~1));
 	countersignatory_keys_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(countersignatory_keys_conv);
 	LDKCResult_TrustedCommitmentTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedCommitmentTransactionNoneZ), "LDKCResult_TrustedCommitmentTransactionNoneZ");
 	*ret_conv = CommitmentTransaction_verify(&this_arg_conv, &channel_parameters_conv, &broadcaster_keys_conv, &countersignatory_keys_conv);
 	return (uint64_t)ret_conv;
@@ -25307,6 +30887,7 @@ void  __attribute__((visibility("default"))) TS_TrustedCommitmentTransaction_fre
 	LDKTrustedCommitmentTransaction this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	TrustedCommitmentTransaction_free(this_obj_conv);
 }
 
@@ -25314,6 +30895,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_TrustedCommitmentTransact
 	LDKTrustedCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), TrustedCommitmentTransaction_txid(&this_arg_conv).data, 32);
 	return ret_arr;
@@ -25323,10 +30905,12 @@ uint32_t  __attribute__((visibility("default"))) TS_TrustedCommitmentTransaction
 	LDKTrustedCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKBuiltCommitmentTransaction ret_var = TrustedCommitmentTransaction_built_transaction(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25338,10 +30922,12 @@ uint32_t  __attribute__((visibility("default"))) TS_TrustedCommitmentTransaction
 	LDKTrustedCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKTxCreationKeys ret_var = TrustedCommitmentTransaction_keys(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25349,10 +30935,20 @@ uint32_t  __attribute__((visibility("default"))) TS_TrustedCommitmentTransaction
 	return ret_ref;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_TrustedCommitmentTransaction_opt_anchors(uint32_t this_arg) {
+	LDKTrustedCommitmentTransaction this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	jboolean ret_val = TrustedCommitmentTransaction_opt_anchors(&this_arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_TrustedCommitmentTransaction_get_htlc_sigs(uint32_t this_arg, int8_tArray htlc_base_key, uint32_t channel_parameters) {
 	LDKTrustedCommitmentTransaction this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char htlc_base_key_arr[32];
 	CHECK(*((uint32_t*)htlc_base_key) == 32);
 	memcpy(htlc_base_key_arr, (uint8_t*)(htlc_base_key + 4), 32);
@@ -25360,6 +30956,7 @@ uint32_t  __attribute__((visibility("default"))) TS_TrustedCommitmentTransaction
 	LDKDirectedChannelTransactionParameters channel_parameters_conv;
 	channel_parameters_conv.inner = (void*)(channel_parameters & (~1));
 	channel_parameters_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv);
 	LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ");
 	*ret_conv = TrustedCommitmentTransaction_get_htlc_sigs(&this_arg_conv, htlc_base_key_ref, &channel_parameters_conv);
 	return (uint64_t)ret_conv;
@@ -25380,9 +30977,11 @@ jboolean  __attribute__((visibility("default"))) TS_InitFeatures_eq(uint32_t a,
 	LDKInitFeatures a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKInitFeatures b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = InitFeatures_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -25391,9 +30990,11 @@ jboolean  __attribute__((visibility("default"))) TS_NodeFeatures_eq(uint32_t a,
 	LDKNodeFeatures a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKNodeFeatures b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = NodeFeatures_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -25402,9 +31003,11 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelFeatures_eq(uint32_t
 	LDKChannelFeatures a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKChannelFeatures b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = ChannelFeatures_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -25413,21 +31016,59 @@ jboolean  __attribute__((visibility("default"))) TS_InvoiceFeatures_eq(uint32_t
 	LDKInvoiceFeatures a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKInvoiceFeatures b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = InvoiceFeatures_eq(&a_conv, &b_conv);
 	return ret_val;
 }
 
+jboolean  __attribute__((visibility("default"))) TS_ChannelTypeFeatures_eq(uint32_t a, uint32_t b) {
+	LDKChannelTypeFeatures a_conv;
+	a_conv.inner = (void*)(a & (~1));
+	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
+	LDKChannelTypeFeatures b_conv;
+	b_conv.inner = (void*)(b & (~1));
+	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
+	jboolean ret_val = ChannelTypeFeatures_eq(&a_conv, &b_conv);
+	return ret_val;
+}
+
+static inline uint64_t InitFeatures_clone_ptr(LDKInitFeatures *NONNULL_PTR arg) {
+	LDKInitFeatures ret_var = InitFeatures_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_InitFeatures_clone_ptr(uint32_t arg) {
+	LDKInitFeatures arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = InitFeatures_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_InitFeatures_clone(uint32_t orig) {
 	LDKInitFeatures orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInitFeatures ret_var = InitFeatures_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25435,14 +31076,37 @@ uint32_t  __attribute__((visibility("default"))) TS_InitFeatures_clone(uint32_t
 	return ret_ref;
 }
 
+static inline uint64_t NodeFeatures_clone_ptr(LDKNodeFeatures *NONNULL_PTR arg) {
+	LDKNodeFeatures ret_var = NodeFeatures_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_NodeFeatures_clone_ptr(uint32_t arg) {
+	LDKNodeFeatures arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = NodeFeatures_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_NodeFeatures_clone(uint32_t orig) {
 	LDKNodeFeatures orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNodeFeatures ret_var = NodeFeatures_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25450,14 +31114,37 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeFeatures_clone(uint32_t
 	return ret_ref;
 }
 
+static inline uint64_t ChannelFeatures_clone_ptr(LDKChannelFeatures *NONNULL_PTR arg) {
+	LDKChannelFeatures ret_var = ChannelFeatures_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelFeatures_clone_ptr(uint32_t arg) {
+	LDKChannelFeatures arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelFeatures_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ChannelFeatures_clone(uint32_t orig) {
 	LDKChannelFeatures orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelFeatures ret_var = ChannelFeatures_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25465,14 +31152,75 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelFeatures_clone(uint32
 	return ret_ref;
 }
 
+static inline uint64_t InvoiceFeatures_clone_ptr(LDKInvoiceFeatures *NONNULL_PTR arg) {
+	LDKInvoiceFeatures ret_var = InvoiceFeatures_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_InvoiceFeatures_clone_ptr(uint32_t arg) {
+	LDKInvoiceFeatures arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = InvoiceFeatures_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_InvoiceFeatures_clone(uint32_t orig) {
 	LDKInvoiceFeatures orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInvoiceFeatures ret_var = InvoiceFeatures_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uint64_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline uint64_t ChannelTypeFeatures_clone_ptr(LDKChannelTypeFeatures *NONNULL_PTR arg) {
+	LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ChannelTypeFeatures_clone_ptr(uint32_t arg) {
+	LDKChannelTypeFeatures arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelTypeFeatures_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_ChannelTypeFeatures_clone(uint32_t orig) {
+	LDKChannelTypeFeatures orig_conv;
+	orig_conv.inner = (void*)(orig & (~1));
+	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
+	LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_clone(&orig_conv);
+	uint64_t ret_ref = 0;
+	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25484,6 +31232,7 @@ void  __attribute__((visibility("default"))) TS_InitFeatures_free(uint32_t this_
 	LDKInitFeatures this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	InitFeatures_free(this_obj_conv);
 }
 
@@ -25491,6 +31240,7 @@ void  __attribute__((visibility("default"))) TS_NodeFeatures_free(uint32_t this_
 	LDKNodeFeatures this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	NodeFeatures_free(this_obj_conv);
 }
 
@@ -25498,6 +31248,7 @@ void  __attribute__((visibility("default"))) TS_ChannelFeatures_free(uint32_t th
 	LDKChannelFeatures this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelFeatures_free(this_obj_conv);
 }
 
@@ -25505,14 +31256,24 @@ void  __attribute__((visibility("default"))) TS_InvoiceFeatures_free(uint32_t th
 	LDKInvoiceFeatures this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	InvoiceFeatures_free(this_obj_conv);
 }
 
+void  __attribute__((visibility("default"))) TS_ChannelTypeFeatures_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
+	ChannelTypeFeatures_free(this_obj_conv);
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_InitFeatures_empty() {
 	LDKInitFeatures ret_var = InitFeatures_empty();
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25525,6 +31286,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InitFeatures_known() {
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25536,6 +31298,7 @@ jboolean  __attribute__((visibility("default"))) TS_InitFeatures_requires_unknow
 	LDKInitFeatures this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	jboolean ret_val = InitFeatures_requires_unknown_bits(&this_arg_conv);
 	return ret_val;
 }
@@ -25545,6 +31308,7 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeFeatures_empty() {
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25557,6 +31321,7 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeFeatures_known() {
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25568,6 +31333,7 @@ jboolean  __attribute__((visibility("default"))) TS_NodeFeatures_requires_unknow
 	LDKNodeFeatures this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	jboolean ret_val = NodeFeatures_requires_unknown_bits(&this_arg_conv);
 	return ret_val;
 }
@@ -25577,6 +31343,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelFeatures_empty() {
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25589,6 +31356,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelFeatures_known() {
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25600,6 +31368,7 @@ jboolean  __attribute__((visibility("default"))) TS_ChannelFeatures_requires_unk
 	LDKChannelFeatures this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	jboolean ret_val = ChannelFeatures_requires_unknown_bits(&this_arg_conv);
 	return ret_val;
 }
@@ -25609,6 +31378,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InvoiceFeatures_empty() {
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25621,6 +31391,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InvoiceFeatures_known() {
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25632,31 +31403,43 @@ jboolean  __attribute__((visibility("default"))) TS_InvoiceFeatures_requires_unk
 	LDKInvoiceFeatures this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	jboolean ret_val = InvoiceFeatures_requires_unknown_bits(&this_arg_conv);
 	return ret_val;
 }
 
-jboolean  __attribute__((visibility("default"))) TS_InitFeatures_supports_payment_secret(uint32_t this_arg) {
-	LDKInitFeatures this_arg_conv;
-	this_arg_conv.inner = (void*)(this_arg & (~1));
-	this_arg_conv.is_owned = false;
-	jboolean ret_val = InitFeatures_supports_payment_secret(&this_arg_conv);
-	return ret_val;
+uint32_t  __attribute__((visibility("default"))) TS_ChannelTypeFeatures_empty() {
+	LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_empty();
+	uint64_t ret_ref = 0;
+	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uint64_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-jboolean  __attribute__((visibility("default"))) TS_NodeFeatures_supports_payment_secret(uint32_t this_arg) {
-	LDKNodeFeatures this_arg_conv;
-	this_arg_conv.inner = (void*)(this_arg & (~1));
-	this_arg_conv.is_owned = false;
-	jboolean ret_val = NodeFeatures_supports_payment_secret(&this_arg_conv);
-	return ret_val;
+uint32_t  __attribute__((visibility("default"))) TS_ChannelTypeFeatures_known() {
+	LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_known();
+	uint64_t ret_ref = 0;
+	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uint64_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-jboolean  __attribute__((visibility("default"))) TS_InvoiceFeatures_supports_payment_secret(uint32_t this_arg) {
-	LDKInvoiceFeatures this_arg_conv;
+jboolean  __attribute__((visibility("default"))) TS_ChannelTypeFeatures_requires_unknown_bits(uint32_t this_arg) {
+	LDKChannelTypeFeatures this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
-	jboolean ret_val = InvoiceFeatures_supports_payment_secret(&this_arg_conv);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	jboolean ret_val = ChannelTypeFeatures_requires_unknown_bits(&this_arg_conv);
 	return ret_val;
 }
 
@@ -25664,6 +31447,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_InitFeatures_write(uint32
 	LDKInitFeatures obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = InitFeatures_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -25671,21 +31455,20 @@ int8_tArray  __attribute__((visibility("default"))) TS_InitFeatures_write(uint32
 	return ret_arr;
 }
 
-int8_tArray  __attribute__((visibility("default"))) TS_NodeFeatures_write(uint32_t obj) {
-	LDKNodeFeatures obj_conv;
-	obj_conv.inner = (void*)(obj & (~1));
-	obj_conv.is_owned = false;
-	LDKCVec_u8Z ret_var = NodeFeatures_write(&obj_conv);
-	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
-	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
+uint32_t  __attribute__((visibility("default"))) TS_InitFeatures_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = *((uint32_t*)ser);
+	ser_ref.data = (int8_t*)(ser + 4);
+	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
+	*ret_conv = InitFeatures_read(ser_ref);
+	return (uint64_t)ret_conv;
 }
 
 int8_tArray  __attribute__((visibility("default"))) TS_ChannelFeatures_write(uint32_t obj) {
 	LDKChannelFeatures obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelFeatures_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -25693,26 +31476,27 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelFeatures_write(uin
 	return ret_arr;
 }
 
-int8_tArray  __attribute__((visibility("default"))) TS_InvoiceFeatures_write(uint32_t obj) {
-	LDKInvoiceFeatures obj_conv;
+uint32_t  __attribute__((visibility("default"))) TS_ChannelFeatures_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = *((uint32_t*)ser);
+	ser_ref.data = (int8_t*)(ser + 4);
+	LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ");
+	*ret_conv = ChannelFeatures_read(ser_ref);
+	return (uint64_t)ret_conv;
+}
+
+int8_tArray  __attribute__((visibility("default"))) TS_NodeFeatures_write(uint32_t obj) {
+	LDKNodeFeatures obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
-	LDKCVec_u8Z ret_var = InvoiceFeatures_write(&obj_conv);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
+	LDKCVec_u8Z ret_var = NodeFeatures_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
 	CVec_u8Z_free(ret_var);
 	return ret_arr;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_InitFeatures_read(int8_tArray ser) {
-	LDKu8slice ser_ref;
-	ser_ref.datalen = *((uint32_t*)ser);
-	ser_ref.data = (int8_t*)(ser + 4);
-	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
-	*ret_conv = InitFeatures_read(ser_ref);
-	return (uint64_t)ret_conv;
-}
-
 uint32_t  __attribute__((visibility("default"))) TS_NodeFeatures_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = *((uint32_t*)ser);
@@ -25722,21 +31506,45 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeFeatures_read(int8_tArra
 	return (uint64_t)ret_conv;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_ChannelFeatures_read(int8_tArray ser) {
+int8_tArray  __attribute__((visibility("default"))) TS_InvoiceFeatures_write(uint32_t obj) {
+	LDKInvoiceFeatures obj_conv;
+	obj_conv.inner = (void*)(obj & (~1));
+	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
+	LDKCVec_u8Z ret_var = InvoiceFeatures_write(&obj_conv);
+	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
+	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_InvoiceFeatures_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = *((uint32_t*)ser);
 	ser_ref.data = (int8_t*)(ser + 4);
-	LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ");
-	*ret_conv = ChannelFeatures_read(ser_ref);
+	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
+	*ret_conv = InvoiceFeatures_read(ser_ref);
 	return (uint64_t)ret_conv;
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_InvoiceFeatures_read(int8_tArray ser) {
+int8_tArray  __attribute__((visibility("default"))) TS_ChannelTypeFeatures_write(uint32_t obj) {
+	LDKChannelTypeFeatures obj_conv;
+	obj_conv.inner = (void*)(obj & (~1));
+	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
+	LDKCVec_u8Z ret_var = ChannelTypeFeatures_write(&obj_conv);
+	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
+	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_ChannelTypeFeatures_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = *((uint32_t*)ser);
 	ser_ref.data = (int8_t*)(ser + 4);
-	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
-	*ret_conv = InvoiceFeatures_read(ser_ref);
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ");
+	*ret_conv = ChannelTypeFeatures_read(ser_ref);
 	return (uint64_t)ret_conv;
 }
 
@@ -25744,17 +31552,41 @@ void  __attribute__((visibility("default"))) TS_ShutdownScript_free(uint32_t thi
 	LDKShutdownScript this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ShutdownScript_free(this_obj_conv);
 }
 
+static inline uint64_t ShutdownScript_clone_ptr(LDKShutdownScript *NONNULL_PTR arg) {
+	LDKShutdownScript ret_var = ShutdownScript_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ShutdownScript_clone_ptr(uint32_t arg) {
+	LDKShutdownScript arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ShutdownScript_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ShutdownScript_clone(uint32_t orig) {
 	LDKShutdownScript orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKShutdownScript ret_var = ShutdownScript_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25766,6 +31598,7 @@ void  __attribute__((visibility("default"))) TS_InvalidShutdownScript_free(uint3
 	LDKInvalidShutdownScript this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	InvalidShutdownScript_free(this_obj_conv);
 }
 
@@ -25773,6 +31606,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_InvalidShutdownScript_get
 	LDKInvalidShutdownScript this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKu8slice ret_var = InvalidShutdownScript_get_script(&this_ptr_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -25783,6 +31617,7 @@ void  __attribute__((visibility("default"))) TS_InvalidShutdownScript_set_script
 	LDKInvalidShutdownScript this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_u8Z val_ref;
 	val_ref.datalen = *((uint32_t*)val);
 	val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes");
@@ -25799,6 +31634,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InvalidShutdownScript_new(in
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25806,14 +31642,37 @@ uint32_t  __attribute__((visibility("default"))) TS_InvalidShutdownScript_new(in
 	return ret_ref;
 }
 
+static inline uint64_t InvalidShutdownScript_clone_ptr(LDKInvalidShutdownScript *NONNULL_PTR arg) {
+	LDKInvalidShutdownScript ret_var = InvalidShutdownScript_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_InvalidShutdownScript_clone_ptr(uint32_t arg) {
+	LDKInvalidShutdownScript arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = InvalidShutdownScript_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_InvalidShutdownScript_clone(uint32_t orig) {
 	LDKInvalidShutdownScript orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInvalidShutdownScript ret_var = InvalidShutdownScript_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25825,6 +31684,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ShutdownScript_write(uint
 	LDKShutdownScript obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ShutdownScript_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -25850,6 +31710,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ShutdownScript_new_p2wpkh(in
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25866,6 +31727,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ShutdownScript_new_p2wsh(int
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -25886,6 +31748,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ShutdownScript_into_inner
 	LDKShutdownScript this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	this_arg_conv = ShutdownScript_clone(&this_arg_conv);
 	LDKCVec_u8Z ret_var = ShutdownScript_into_inner(this_arg_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
@@ -25898,6 +31761,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ShutdownScript_as_legacy_
 	LDKShutdownScript this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ShutdownScript_as_legacy_pubkey(&this_arg_conv).compressed_form, 33);
 	return ret_arr;
@@ -25907,9 +31771,11 @@ jboolean  __attribute__((visibility("default"))) TS_ShutdownScript_is_compatible
 	LDKShutdownScript this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKInitFeatures features_conv;
 	features_conv.inner = (void*)(features & (~1));
 	features_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(features_conv);
 	jboolean ret_val = ShutdownScript_is_compatible(&this_arg_conv, &features_conv);
 	return ret_val;
 }
@@ -25923,6 +31789,19 @@ void  __attribute__((visibility("default"))) TS_CustomMessageReader_free(uint32_
 	CustomMessageReader_free(this_ptr_conv);
 }
 
+static inline uint64_t Type_clone_ptr(LDKType *NONNULL_PTR arg) {
+	LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType");
+	*ret_ret = Type_clone(arg);
+	return (uint64_t)ret_ret;
+}
+int64_t  __attribute__((visibility("default"))) TS_Type_clone_ptr(uint32_t arg) {
+	void* arg_ptr = (void*)(((uint64_t)arg) & ~1);
+	if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); }
+	LDKType* arg_conv = (LDKType*)arg_ptr;
+	int64_t ret_val = Type_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Type_clone(uint32_t orig) {
 	void* orig_ptr = (void*)(((uint64_t)orig) & ~1);
 	if (!(orig & 1)) { CHECK_ACCESS(orig_ptr); }
@@ -25941,63 +31820,45 @@ void  __attribute__((visibility("default"))) TS_Type_free(uint32_t this_ptr) {
 	Type_free(this_ptr_conv);
 }
 
-void  __attribute__((visibility("default"))) TS_Score_free(uint32_t this_ptr) {
-	if ((this_ptr & 1) != 0) return;
-	void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1);
-	CHECK_ACCESS(this_ptr_ptr);
-	LDKScore this_ptr_conv = *(LDKScore*)(this_ptr_ptr);
-	FREE((void*)this_ptr);
-	Score_free(this_ptr_conv);
-}
-
-void  __attribute__((visibility("default"))) TS_LockableScore_free(uint32_t this_obj) {
-	LDKLockableScore this_obj_conv;
+void  __attribute__((visibility("default"))) TS_NodeId_free(uint32_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);
-	LockableScore_free(this_obj_conv);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
+	NodeId_free(this_obj_conv);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_LockableScore_new(uint32_t score) {
-	void* score_ptr = (void*)(((uint64_t)score) & ~1);
-	CHECK_ACCESS(score_ptr);
-	LDKScore score_conv = *(LDKScore*)(score_ptr);
-	LDKLockableScore ret_var = LockableScore_new(score_conv);
-	uint64_t ret_ref = 0;
-	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	ret_ref = (uint64_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+static inline uint64_t NodeId_clone_ptr(LDKNodeId *NONNULL_PTR arg) {
+	LDKNodeId ret_var = NodeId_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
 }
-
-int8_tArray  __attribute__((visibility("default"))) TS_LockableScore_write(uint32_t obj) {
-	LDKLockableScore obj_conv;
-	obj_conv.inner = (void*)(obj & (~1));
-	obj_conv.is_owned = false;
-	LDKCVec_u8Z ret_var = LockableScore_write(&obj_conv);
-	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
-	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
+	return ret_ref;
 }
-
-void  __attribute__((visibility("default"))) TS_NodeId_free(uint32_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);
-	NodeId_free(this_obj_conv);
+int64_t  __attribute__((visibility("default"))) TS_NodeId_clone_ptr(uint32_t arg) {
+	LDKNodeId arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = NodeId_clone_ptr(&arg_conv);
+	return ret_val;
 }
 
 uint32_t  __attribute__((visibility("default"))) TS_NodeId_clone(uint32_t orig) {
 	LDKNodeId orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNodeId ret_var = NodeId_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26013,6 +31874,7 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeId_from_pubkey(int8_tArr
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26024,6 +31886,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_NodeId_as_slice(uint32_t
 	LDKNodeId this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKu8slice ret_var = NodeId_as_slice(&this_arg_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -26034,6 +31897,7 @@ int64_t  __attribute__((visibility("default"))) TS_NodeId_hash(uint32_t o) {
 	LDKNodeId o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = NodeId_hash(&o_conv);
 	return ret_val;
 }
@@ -26042,6 +31906,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_NodeId_write(uint32_t obj
 	LDKNodeId obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = NodeId_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -26062,17 +31927,41 @@ void  __attribute__((visibility("default"))) TS_NetworkGraph_free(uint32_t this_
 	LDKNetworkGraph this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	NetworkGraph_free(this_obj_conv);
 }
 
+static inline uint64_t NetworkGraph_clone_ptr(LDKNetworkGraph *NONNULL_PTR arg) {
+	LDKNetworkGraph ret_var = NetworkGraph_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_NetworkGraph_clone_ptr(uint32_t arg) {
+	LDKNetworkGraph arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = NetworkGraph_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_NetworkGraph_clone(uint32_t orig) {
 	LDKNetworkGraph orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNetworkGraph ret_var = NetworkGraph_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26084,6 +31973,7 @@ void  __attribute__((visibility("default"))) TS_ReadOnlyNetworkGraph_free(uint32
 	LDKReadOnlyNetworkGraph this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ReadOnlyNetworkGraph_free(this_obj_conv);
 }
 
@@ -26096,6 +31986,18 @@ void  __attribute__((visibility("default"))) TS_NetworkUpdate_free(uint32_t this
 	NetworkUpdate_free(this_ptr_conv);
 }
 
+static inline uint64_t NetworkUpdate_clone_ptr(LDKNetworkUpdate *NONNULL_PTR arg) {
+	LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate");
+	*ret_copy = NetworkUpdate_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_NetworkUpdate_clone_ptr(uint32_t arg) {
+	LDKNetworkUpdate* arg_conv = (LDKNetworkUpdate*)arg;
+	int64_t ret_val = NetworkUpdate_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_NetworkUpdate_clone(uint32_t orig) {
 	LDKNetworkUpdate* orig_conv = (LDKNetworkUpdate*)orig;
 	LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate");
@@ -26108,6 +32010,7 @@ uint32_t  __attribute__((visibility("default"))) TS_NetworkUpdate_channel_update
 	LDKChannelUpdate msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	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);
@@ -26141,10 +32044,20 @@ int8_tArray  __attribute__((visibility("default"))) TS_NetworkUpdate_write(uint3
 	return ret_arr;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_NetworkUpdate_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = *((uint32_t*)ser);
+	ser_ref.data = (int8_t*)(ser + 4);
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
+	*ret_conv = NetworkUpdate_read(ser_ref);
+	return (uint64_t)ret_conv;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_NetGraphMsgHandler_as_EventHandler(uint32_t this_arg) {
 	LDKNetGraphMsgHandler this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKEventHandler* ret_ret = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler");
 	*ret_ret = NetGraphMsgHandler_as_EventHandler(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -26154,6 +32067,7 @@ void  __attribute__((visibility("default"))) TS_NetGraphMsgHandler_free(uint32_t
 	LDKNetGraphMsgHandler this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	NetGraphMsgHandler_free(this_obj_conv);
 }
 
@@ -26161,6 +32075,7 @@ uint32_t  __attribute__((visibility("default"))) TS_NetGraphMsgHandler_new(uint3
 	LDKNetworkGraph network_graph_conv;
 	network_graph_conv.inner = (void*)(network_graph & (~1));
 	network_graph_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv);
 	void* chain_access_ptr = (void*)(((uint64_t)chain_access) & ~1);
 	CHECK_ACCESS(chain_access_ptr);
 	LDKCOption_AccessZ chain_access_conv = *(LDKCOption_AccessZ*)(chain_access_ptr);
@@ -26175,6 +32090,7 @@ uint32_t  __attribute__((visibility("default"))) TS_NetGraphMsgHandler_new(uint3
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26186,6 +32102,7 @@ void  __attribute__((visibility("default"))) TS_NetGraphMsgHandler_add_chain_acc
 	LDKNetGraphMsgHandler this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	void* chain_access_ptr = (void*)(((uint64_t)chain_access) & ~1);
 	CHECK_ACCESS(chain_access_ptr);
 	LDKCOption_AccessZ chain_access_conv = *(LDKCOption_AccessZ*)(chain_access_ptr);
@@ -26200,6 +32117,7 @@ uint32_t  __attribute__((visibility("default"))) TS_NetGraphMsgHandler_as_Routin
 	LDKNetGraphMsgHandler this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKRoutingMessageHandler* ret_ret = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler");
 	*ret_ret = NetGraphMsgHandler_as_RoutingMessageHandler(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -26209,6 +32127,7 @@ uint32_t  __attribute__((visibility("default"))) TS_NetGraphMsgHandler_as_Messag
 	LDKNetGraphMsgHandler this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider");
 	*ret_ret = NetGraphMsgHandler_as_MessageSendEventsProvider(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -26218,6 +32137,7 @@ void  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_free(uint
 	LDKDirectionalChannelInfo this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	DirectionalChannelInfo_free(this_obj_conv);
 }
 
@@ -26225,6 +32145,7 @@ int32_t  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_get_la
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = DirectionalChannelInfo_get_last_update(&this_ptr_conv);
 	return ret_val;
 }
@@ -26233,6 +32154,7 @@ void  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_set_last_
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	DirectionalChannelInfo_set_last_update(&this_ptr_conv, val);
 }
 
@@ -26240,6 +32162,7 @@ jboolean  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_get_e
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	jboolean ret_val = DirectionalChannelInfo_get_enabled(&this_ptr_conv);
 	return ret_val;
 }
@@ -26248,6 +32171,7 @@ void  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_set_enabl
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	DirectionalChannelInfo_set_enabled(&this_ptr_conv, val);
 }
 
@@ -26255,6 +32179,7 @@ int16_t  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_get_cl
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = DirectionalChannelInfo_get_cltv_expiry_delta(&this_ptr_conv);
 	return ret_val;
 }
@@ -26263,6 +32188,7 @@ void  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_set_cltv_
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	DirectionalChannelInfo_set_cltv_expiry_delta(&this_ptr_conv, val);
 }
 
@@ -26270,6 +32196,7 @@ int64_t  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_get_ht
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = DirectionalChannelInfo_get_htlc_minimum_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -26278,6 +32205,7 @@ void  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_set_htlc_
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	DirectionalChannelInfo_set_htlc_minimum_msat(&this_ptr_conv, val);
 }
 
@@ -26285,6 +32213,7 @@ uint32_t  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_get_h
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = DirectionalChannelInfo_get_htlc_maximum_msat(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -26295,6 +32224,7 @@ void  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_set_htlc_
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
@@ -26306,10 +32236,12 @@ uint32_t  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_get_f
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRoutingFees ret_var = DirectionalChannelInfo_get_fees(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26321,9 +32253,11 @@ void  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_set_fees(
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRoutingFees val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = RoutingFees_clone(&val_conv);
 	DirectionalChannelInfo_set_fees(&this_ptr_conv, val_conv);
 }
@@ -26332,11 +32266,13 @@ uint32_t  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_get_l
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelUpdate ret_var = DirectionalChannelInfo_get_last_update_message(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -26349,9 +32285,11 @@ void  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_set_last_
 	LDKDirectionalChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelUpdate val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelUpdate_clone(&val_conv);
 	DirectionalChannelInfo_set_last_update_message(&this_ptr_conv, val_conv);
 }
@@ -26364,15 +32302,18 @@ uint32_t  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_new(i
 	LDKRoutingFees fees_arg_conv;
 	fees_arg_conv.inner = (void*)(fees_arg & (~1));
 	fees_arg_conv.is_owned = (fees_arg & 1) || (fees_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(fees_arg_conv);
 	fees_arg_conv = RoutingFees_clone(&fees_arg_conv);
 	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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(last_update_message_arg_conv);
 	last_update_message_arg_conv = ChannelUpdate_clone(&last_update_message_arg_conv);
 	LDKDirectionalChannelInfo ret_var = DirectionalChannelInfo_new(last_update_arg, enabled_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg_conv, fees_arg_conv, last_update_message_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26380,14 +32321,37 @@ uint32_t  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_new(i
 	return ret_ref;
 }
 
+static inline uint64_t DirectionalChannelInfo_clone_ptr(LDKDirectionalChannelInfo *NONNULL_PTR arg) {
+	LDKDirectionalChannelInfo ret_var = DirectionalChannelInfo_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_clone_ptr(uint32_t arg) {
+	LDKDirectionalChannelInfo arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = DirectionalChannelInfo_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_clone(uint32_t orig) {
 	LDKDirectionalChannelInfo orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKDirectionalChannelInfo ret_var = DirectionalChannelInfo_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26399,6 +32363,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_DirectionalChannelInfo_wr
 	LDKDirectionalChannelInfo obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = DirectionalChannelInfo_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -26419,6 +32384,7 @@ void  __attribute__((visibility("default"))) TS_ChannelInfo_free(uint32_t this_o
 	LDKChannelInfo this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ChannelInfo_free(this_obj_conv);
 }
 
@@ -26426,10 +32392,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelInfo_get_features(uin
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelFeatures ret_var = ChannelInfo_get_features(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26441,9 +32409,11 @@ void  __attribute__((visibility("default"))) TS_ChannelInfo_set_features(uint32_
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelFeatures val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelFeatures_clone(&val_conv);
 	ChannelInfo_set_features(&this_ptr_conv, val_conv);
 }
@@ -26452,10 +32422,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelInfo_get_node_one(uin
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeId ret_var = ChannelInfo_get_node_one(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26467,9 +32439,11 @@ void  __attribute__((visibility("default"))) TS_ChannelInfo_set_node_one(uint32_
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeId val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = NodeId_clone(&val_conv);
 	ChannelInfo_set_node_one(&this_ptr_conv, val_conv);
 }
@@ -26478,11 +32452,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelInfo_get_one_to_two(u
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKDirectionalChannelInfo ret_var = ChannelInfo_get_one_to_two(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -26495,9 +32471,11 @@ void  __attribute__((visibility("default"))) TS_ChannelInfo_set_one_to_two(uint3
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKDirectionalChannelInfo val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = DirectionalChannelInfo_clone(&val_conv);
 	ChannelInfo_set_one_to_two(&this_ptr_conv, val_conv);
 }
@@ -26506,10 +32484,12 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelInfo_get_node_two(uin
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeId ret_var = ChannelInfo_get_node_two(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26521,9 +32501,11 @@ void  __attribute__((visibility("default"))) TS_ChannelInfo_set_node_two(uint32_
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeId val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = NodeId_clone(&val_conv);
 	ChannelInfo_set_node_two(&this_ptr_conv, val_conv);
 }
@@ -26532,11 +32514,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelInfo_get_two_to_one(u
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKDirectionalChannelInfo ret_var = ChannelInfo_get_two_to_one(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -26549,9 +32533,11 @@ void  __attribute__((visibility("default"))) TS_ChannelInfo_set_two_to_one(uint3
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKDirectionalChannelInfo val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = DirectionalChannelInfo_clone(&val_conv);
 	ChannelInfo_set_two_to_one(&this_ptr_conv, val_conv);
 }
@@ -26560,6 +32546,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelInfo_get_capacity_sat
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = ChannelInfo_get_capacity_sats(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -26570,6 +32557,7 @@ void  __attribute__((visibility("default"))) TS_ChannelInfo_set_capacity_sats(ui
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
@@ -26581,11 +32569,13 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelInfo_get_announcement
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelAnnouncement ret_var = ChannelInfo_get_announcement_message(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -26598,61 +32588,46 @@ void  __attribute__((visibility("default"))) TS_ChannelInfo_set_announcement_mes
 	LDKChannelInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelAnnouncement val_conv;
 	val_conv.inner = (void*)(val & (~1));
-	val_conv.is_owned = (val & 1) || (val == 0);
-	val_conv = ChannelAnnouncement_clone(&val_conv);
-	ChannelInfo_set_announcement_message(&this_ptr_conv, val_conv);
-}
-
-uint32_t  __attribute__((visibility("default"))) TS_ChannelInfo_new(uint32_t features_arg, uint32_t node_one_arg, uint32_t one_to_two_arg, uint32_t node_two_arg, uint32_t two_to_one_arg, uint32_t capacity_sats_arg, uint32_t announcement_message_arg) {
-	LDKChannelFeatures 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 = ChannelFeatures_clone(&features_arg_conv);
-	LDKNodeId node_one_arg_conv;
-	node_one_arg_conv.inner = (void*)(node_one_arg & (~1));
-	node_one_arg_conv.is_owned = (node_one_arg & 1) || (node_one_arg == 0);
-	node_one_arg_conv = NodeId_clone(&node_one_arg_conv);
-	LDKDirectionalChannelInfo one_to_two_arg_conv;
-	one_to_two_arg_conv.inner = (void*)(one_to_two_arg & (~1));
-	one_to_two_arg_conv.is_owned = (one_to_two_arg & 1) || (one_to_two_arg == 0);
-	one_to_two_arg_conv = DirectionalChannelInfo_clone(&one_to_two_arg_conv);
-	LDKNodeId node_two_arg_conv;
-	node_two_arg_conv.inner = (void*)(node_two_arg & (~1));
-	node_two_arg_conv.is_owned = (node_two_arg & 1) || (node_two_arg == 0);
-	node_two_arg_conv = NodeId_clone(&node_two_arg_conv);
-	LDKDirectionalChannelInfo two_to_one_arg_conv;
-	two_to_one_arg_conv.inner = (void*)(two_to_one_arg & (~1));
-	two_to_one_arg_conv.is_owned = (two_to_one_arg & 1) || (two_to_one_arg == 0);
-	two_to_one_arg_conv = DirectionalChannelInfo_clone(&two_to_one_arg_conv);
-	void* capacity_sats_arg_ptr = (void*)(((uint64_t)capacity_sats_arg) & ~1);
-	CHECK_ACCESS(capacity_sats_arg_ptr);
-	LDKCOption_u64Z capacity_sats_arg_conv = *(LDKCOption_u64Z*)(capacity_sats_arg_ptr);
-	capacity_sats_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uint64_t)capacity_sats_arg) & ~1));
-	LDKChannelAnnouncement 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 = ChannelAnnouncement_clone(&announcement_message_arg_conv);
-	LDKChannelInfo ret_var = ChannelInfo_new(features_arg_conv, node_one_arg_conv, one_to_two_arg_conv, node_two_arg_conv, two_to_one_arg_conv, capacity_sats_arg_conv, announcement_message_arg_conv);
-	uint64_t ret_ref = 0;
-	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	ret_ref = (uint64_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
+	val_conv.is_owned = (val & 1) || (val == 0);
+	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 uint64_t ChannelInfo_clone_ptr(LDKChannelInfo *NONNULL_PTR arg) {
+	LDKChannelInfo ret_var = ChannelInfo_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
 	return ret_ref;
 }
+int64_t  __attribute__((visibility("default"))) TS_ChannelInfo_clone_ptr(uint32_t arg) {
+	LDKChannelInfo arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ChannelInfo_clone_ptr(&arg_conv);
+	return ret_val;
+}
 
 uint32_t  __attribute__((visibility("default"))) TS_ChannelInfo_clone(uint32_t orig) {
 	LDKChannelInfo orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelInfo ret_var = ChannelInfo_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26664,6 +32639,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ChannelInfo_write(uint32_
 	LDKChannelInfo obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ChannelInfo_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -26684,6 +32660,7 @@ void  __attribute__((visibility("default"))) TS_RoutingFees_free(uint32_t this_o
 	LDKRoutingFees this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	RoutingFees_free(this_obj_conv);
 }
 
@@ -26691,6 +32668,7 @@ int32_t  __attribute__((visibility("default"))) TS_RoutingFees_get_base_msat(uin
 	LDKRoutingFees this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = RoutingFees_get_base_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -26699,6 +32677,7 @@ void  __attribute__((visibility("default"))) TS_RoutingFees_set_base_msat(uint32
 	LDKRoutingFees this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	RoutingFees_set_base_msat(&this_ptr_conv, val);
 }
 
@@ -26706,6 +32685,7 @@ int32_t  __attribute__((visibility("default"))) TS_RoutingFees_get_proportional_
 	LDKRoutingFees this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = RoutingFees_get_proportional_millionths(&this_ptr_conv);
 	return ret_val;
 }
@@ -26714,6 +32694,7 @@ void  __attribute__((visibility("default"))) TS_RoutingFees_set_proportional_mil
 	LDKRoutingFees this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	RoutingFees_set_proportional_millionths(&this_ptr_conv, val);
 }
 
@@ -26722,6 +32703,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RoutingFees_new(int32_t base
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26733,21 +32715,46 @@ jboolean  __attribute__((visibility("default"))) TS_RoutingFees_eq(uint32_t a, u
 	LDKRoutingFees a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKRoutingFees b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = RoutingFees_eq(&a_conv, &b_conv);
 	return ret_val;
 }
 
+static inline uint64_t RoutingFees_clone_ptr(LDKRoutingFees *NONNULL_PTR arg) {
+	LDKRoutingFees ret_var = RoutingFees_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_RoutingFees_clone_ptr(uint32_t arg) {
+	LDKRoutingFees arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = RoutingFees_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_RoutingFees_clone(uint32_t orig) {
 	LDKRoutingFees orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRoutingFees ret_var = RoutingFees_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26759,6 +32766,7 @@ int64_t  __attribute__((visibility("default"))) TS_RoutingFees_hash(uint32_t o)
 	LDKRoutingFees o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = RoutingFees_hash(&o_conv);
 	return ret_val;
 }
@@ -26767,6 +32775,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RoutingFees_write(uint32_
 	LDKRoutingFees obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = RoutingFees_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -26787,6 +32796,7 @@ void  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_free(uint32
 	LDKNodeAnnouncementInfo this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	NodeAnnouncementInfo_free(this_obj_conv);
 }
 
@@ -26794,10 +32804,12 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_get_fea
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeFeatures ret_var = NodeAnnouncementInfo_get_features(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26809,9 +32821,11 @@ void  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_set_feature
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeFeatures val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = NodeFeatures_clone(&val_conv);
 	NodeAnnouncementInfo_set_features(&this_ptr_conv, val_conv);
 }
@@ -26820,6 +32834,7 @@ int32_t  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_get_last
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = NodeAnnouncementInfo_get_last_update(&this_ptr_conv);
 	return ret_val;
 }
@@ -26828,6 +32843,7 @@ void  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_set_last_up
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	NodeAnnouncementInfo_set_last_update(&this_ptr_conv, val);
 }
 
@@ -26835,6 +32851,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_get_
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(3, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *NodeAnnouncementInfo_get_rgb(&this_ptr_conv), 3);
 	return ret_arr;
@@ -26844,6 +32861,7 @@ void  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_set_rgb(uin
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThreeBytes val_ref;
 	CHECK(*((uint32_t*)val) == 3);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 3);
@@ -26854,6 +32872,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_get_
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *NodeAnnouncementInfo_get_alias(&this_ptr_conv), 32);
 	return ret_arr;
@@ -26863,6 +32882,7 @@ void  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_set_alias(u
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(*((uint32_t*)val) == 32);
 	memcpy(val_ref.data, (uint8_t*)(val + 4), 32);
@@ -26873,6 +32893,7 @@ void  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_set_address
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_NetAddressZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -26895,11 +32916,13 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_get_ann
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeAnnouncement ret_var = NodeAnnouncementInfo_get_announcement_message(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -26912,9 +32935,11 @@ void  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_set_announc
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeAnnouncement val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = NodeAnnouncement_clone(&val_conv);
 	NodeAnnouncementInfo_set_announcement_message(&this_ptr_conv, val_conv);
 }
@@ -26923,6 +32948,7 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_new(uin
 	LDKNodeFeatures features_arg_conv;
 	features_arg_conv.inner = (void*)(features_arg & (~1));
 	features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv);
 	features_arg_conv = NodeFeatures_clone(&features_arg_conv);
 	LDKThreeBytes rgb_arg_ref;
 	CHECK(*((uint32_t*)rgb_arg) == 3);
@@ -26947,11 +32973,13 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_new(uin
 	LDKNodeAnnouncement announcement_message_arg_conv;
 	announcement_message_arg_conv.inner = (void*)(announcement_message_arg & (~1));
 	announcement_message_arg_conv.is_owned = (announcement_message_arg & 1) || (announcement_message_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(announcement_message_arg_conv);
 	announcement_message_arg_conv = NodeAnnouncement_clone(&announcement_message_arg_conv);
 	LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_new(features_arg_conv, last_update_arg, rgb_arg_ref, alias_arg_ref, addresses_arg_constr, announcement_message_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26959,14 +32987,37 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_new(uin
 	return ret_ref;
 }
 
+static inline uint64_t NodeAnnouncementInfo_clone_ptr(LDKNodeAnnouncementInfo *NONNULL_PTR arg) {
+	LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_clone_ptr(uint32_t arg) {
+	LDKNodeAnnouncementInfo arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = NodeAnnouncementInfo_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_clone(uint32_t orig) {
 	LDKNodeAnnouncementInfo orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -26978,6 +33029,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_NodeAnnouncementInfo_writ
 	LDKNodeAnnouncementInfo obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = NodeAnnouncementInfo_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -26998,6 +33050,7 @@ void  __attribute__((visibility("default"))) TS_NodeInfo_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	NodeInfo_free(this_obj_conv);
 }
 
@@ -27005,6 +33058,7 @@ void  __attribute__((visibility("default"))) TS_NodeInfo_set_channels(uint32_t t
 	LDKNodeInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_u64Z val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -27023,11 +33077,13 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeInfo_get_lowest_inbound_
 	LDKNodeInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRoutingFees ret_var = NodeInfo_get_lowest_inbound_channel_fees(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -27040,9 +33096,11 @@ void  __attribute__((visibility("default"))) TS_NodeInfo_set_lowest_inbound_chan
 	LDKNodeInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRoutingFees val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = RoutingFees_clone(&val_conv);
 	NodeInfo_set_lowest_inbound_channel_fees(&this_ptr_conv, val_conv);
 }
@@ -27051,11 +33109,13 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeInfo_get_announcement_in
 	LDKNodeInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeAnnouncementInfo ret_var = NodeInfo_get_announcement_info(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -27068,9 +33128,11 @@ void  __attribute__((visibility("default"))) TS_NodeInfo_set_announcement_info(u
 	LDKNodeInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeAnnouncementInfo val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = NodeAnnouncementInfo_clone(&val_conv);
 	NodeInfo_set_announcement_info(&this_ptr_conv, val_conv);
 }
@@ -27090,15 +33152,18 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeInfo_new(int64_tArray ch
 	LDKRoutingFees lowest_inbound_channel_fees_arg_conv;
 	lowest_inbound_channel_fees_arg_conv.inner = (void*)(lowest_inbound_channel_fees_arg & (~1));
 	lowest_inbound_channel_fees_arg_conv.is_owned = (lowest_inbound_channel_fees_arg & 1) || (lowest_inbound_channel_fees_arg == 0);
+	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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(announcement_info_arg_conv);
 	announcement_info_arg_conv = NodeAnnouncementInfo_clone(&announcement_info_arg_conv);
 	LDKNodeInfo ret_var = NodeInfo_new(channels_arg_constr, lowest_inbound_channel_fees_arg_conv, announcement_info_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27106,14 +33171,37 @@ uint32_t  __attribute__((visibility("default"))) TS_NodeInfo_new(int64_tArray ch
 	return ret_ref;
 }
 
+static inline uint64_t NodeInfo_clone_ptr(LDKNodeInfo *NONNULL_PTR arg) {
+	LDKNodeInfo ret_var = NodeInfo_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_NodeInfo_clone_ptr(uint32_t arg) {
+	LDKNodeInfo arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = NodeInfo_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_NodeInfo_clone(uint32_t orig) {
 	LDKNodeInfo orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNodeInfo ret_var = NodeInfo_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27125,6 +33213,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_NodeInfo_write(uint32_t o
 	LDKNodeInfo obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = NodeInfo_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -27145,6 +33234,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_NetworkGraph_write(uint32
 	LDKNetworkGraph obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = NetworkGraph_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -27169,6 +33259,7 @@ uint32_t  __attribute__((visibility("default"))) TS_NetworkGraph_new(int8_tArray
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27180,10 +33271,12 @@ uint32_t  __attribute__((visibility("default"))) TS_NetworkGraph_read_only(uint3
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKReadOnlyNetworkGraph ret_var = NetworkGraph_read_only(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27195,9 +33288,11 @@ uint32_t  __attribute__((visibility("default"))) TS_NetworkGraph_update_node_fro
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKNodeAnnouncement msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = NetworkGraph_update_node_from_announcement(&this_arg_conv, &msg_conv);
 	return (uint64_t)ret_conv;
@@ -27207,9 +33302,11 @@ uint32_t  __attribute__((visibility("default"))) TS_NetworkGraph_update_node_fro
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKUnsignedNodeAnnouncement msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = NetworkGraph_update_node_from_unsigned_announcement(&this_arg_conv, &msg_conv);
 	return (uint64_t)ret_conv;
@@ -27219,9 +33316,11 @@ uint32_t  __attribute__((visibility("default"))) TS_NetworkGraph_update_channel_
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelAnnouncement msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	void* chain_access_ptr = (void*)(((uint64_t)chain_access) & ~1);
 	CHECK_ACCESS(chain_access_ptr);
 	LDKCOption_AccessZ chain_access_conv = *(LDKCOption_AccessZ*)(chain_access_ptr);
@@ -27238,9 +33337,11 @@ uint32_t  __attribute__((visibility("default"))) TS_NetworkGraph_update_channel_
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKUnsignedChannelAnnouncement msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	void* chain_access_ptr = (void*)(((uint64_t)chain_access) & ~1);
 	CHECK_ACCESS(chain_access_ptr);
 	LDKCOption_AccessZ chain_access_conv = *(LDKCOption_AccessZ*)(chain_access_ptr);
@@ -27257,6 +33358,7 @@ void  __attribute__((visibility("default"))) TS_NetworkGraph_close_channel_from_
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	NetworkGraph_close_channel_from_update(&this_arg_conv, short_channel_id, is_permanent);
 }
 
@@ -27264,19 +33366,30 @@ void  __attribute__((visibility("default"))) TS_NetworkGraph_fail_node(uint32_t
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKPublicKey _node_id_ref;
 	CHECK(*((uint32_t*)_node_id) == 33);
 	memcpy(_node_id_ref.compressed_form, (uint8_t*)(_node_id + 4), 33);
 	NetworkGraph_fail_node(&this_arg_conv, _node_id_ref, is_permanent);
 }
 
+void  __attribute__((visibility("default"))) TS_NetworkGraph_remove_stale_channels_with_time(uint32_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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	NetworkGraph_remove_stale_channels_with_time(&this_arg_conv, current_time_unix);
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_NetworkGraph_update_channel(uint32_t this_arg, uint32_t msg) {
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelUpdate msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = NetworkGraph_update_channel(&this_arg_conv, &msg_conv);
 	return (uint64_t)ret_conv;
@@ -27286,9 +33399,11 @@ uint32_t  __attribute__((visibility("default"))) TS_NetworkGraph_update_channel_
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKUnsignedChannelUpdate msg_conv;
 	msg_conv.inner = (void*)(msg & (~1));
 	msg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = NetworkGraph_update_channel_unsigned(&this_arg_conv, &msg_conv);
 	return (uint64_t)ret_conv;
@@ -27298,6 +33413,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ReadOnlyNetworkGraph_get_add
 	LDKReadOnlyNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKPublicKey pubkey_ref;
 	CHECK(*((uint32_t*)pubkey) == 33);
 	memcpy(pubkey_ref.compressed_form, (uint8_t*)(pubkey + 4), 33);
@@ -27311,6 +33427,7 @@ void  __attribute__((visibility("default"))) TS_RouteHop_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	RouteHop_free(this_obj_conv);
 }
 
@@ -27318,6 +33435,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RouteHop_get_pubkey(uint3
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), RouteHop_get_pubkey(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -27327,6 +33445,7 @@ void  __attribute__((visibility("default"))) TS_RouteHop_set_pubkey(uint32_t thi
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -27337,10 +33456,12 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHop_get_node_features(u
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeFeatures ret_var = RouteHop_get_node_features(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27352,9 +33473,11 @@ void  __attribute__((visibility("default"))) TS_RouteHop_set_node_features(uint3
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeFeatures val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = NodeFeatures_clone(&val_conv);
 	RouteHop_set_node_features(&this_ptr_conv, val_conv);
 }
@@ -27363,6 +33486,7 @@ int64_t  __attribute__((visibility("default"))) TS_RouteHop_get_short_channel_id
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = RouteHop_get_short_channel_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -27371,6 +33495,7 @@ void  __attribute__((visibility("default"))) TS_RouteHop_set_short_channel_id(ui
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	RouteHop_set_short_channel_id(&this_ptr_conv, val);
 }
 
@@ -27378,10 +33503,12 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHop_get_channel_feature
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelFeatures ret_var = RouteHop_get_channel_features(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27393,9 +33520,11 @@ void  __attribute__((visibility("default"))) TS_RouteHop_set_channel_features(ui
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelFeatures val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelFeatures_clone(&val_conv);
 	RouteHop_set_channel_features(&this_ptr_conv, val_conv);
 }
@@ -27404,6 +33533,7 @@ int64_t  __attribute__((visibility("default"))) TS_RouteHop_get_fee_msat(uint32_
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = RouteHop_get_fee_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -27412,6 +33542,7 @@ void  __attribute__((visibility("default"))) TS_RouteHop_set_fee_msat(uint32_t t
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	RouteHop_set_fee_msat(&this_ptr_conv, val);
 }
 
@@ -27419,6 +33550,7 @@ int32_t  __attribute__((visibility("default"))) TS_RouteHop_get_cltv_expiry_delt
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = RouteHop_get_cltv_expiry_delta(&this_ptr_conv);
 	return ret_val;
 }
@@ -27427,6 +33559,7 @@ void  __attribute__((visibility("default"))) TS_RouteHop_set_cltv_expiry_delta(u
 	LDKRouteHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	RouteHop_set_cltv_expiry_delta(&this_ptr_conv, val);
 }
 
@@ -27437,15 +33570,18 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHop_new(int8_tArray pub
 	LDKNodeFeatures node_features_arg_conv;
 	node_features_arg_conv.inner = (void*)(node_features_arg & (~1));
 	node_features_arg_conv.is_owned = (node_features_arg & 1) || (node_features_arg == 0);
+	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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_features_arg_conv);
 	channel_features_arg_conv = ChannelFeatures_clone(&channel_features_arg_conv);
 	LDKRouteHop ret_var = RouteHop_new(pubkey_arg_ref, node_features_arg_conv, short_channel_id_arg, channel_features_arg_conv, fee_msat_arg, cltv_expiry_delta_arg);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27453,14 +33589,37 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHop_new(int8_tArray pub
 	return ret_ref;
 }
 
+static inline uint64_t RouteHop_clone_ptr(LDKRouteHop *NONNULL_PTR arg) {
+	LDKRouteHop ret_var = RouteHop_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_RouteHop_clone_ptr(uint32_t arg) {
+	LDKRouteHop arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = RouteHop_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_RouteHop_clone(uint32_t orig) {
 	LDKRouteHop orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRouteHop ret_var = RouteHop_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27472,6 +33631,7 @@ int64_t  __attribute__((visibility("default"))) TS_RouteHop_hash(uint32_t o) {
 	LDKRouteHop o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = RouteHop_hash(&o_conv);
 	return ret_val;
 }
@@ -27480,9 +33640,11 @@ jboolean  __attribute__((visibility("default"))) TS_RouteHop_eq(uint32_t a, uint
 	LDKRouteHop a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKRouteHop b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = RouteHop_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -27491,6 +33653,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RouteHop_write(uint32_t o
 	LDKRouteHop obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = RouteHop_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -27511,6 +33674,7 @@ void  __attribute__((visibility("default"))) TS_Route_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	Route_free(this_obj_conv);
 }
 
@@ -27518,6 +33682,7 @@ ptrArray  __attribute__((visibility("default"))) TS_Route_get_paths(uint32_t thi
 	LDKRoute this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_CVec_RouteHopZZ ret_var = Route_get_paths(&this_ptr_conv);
 	ptrArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native ptrArray Bytes");
@@ -27532,6 +33697,7 @@ ptrArray  __attribute__((visibility("default"))) TS_Route_get_paths(uint32_t thi
 			uint64_t ret_conv_12_conv_10_ref = 0;
 			CHECK((((uint64_t)ret_conv_12_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uint64_t)&ret_conv_12_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_12_conv_10_var);
 			ret_conv_12_conv_10_ref = (uint64_t)ret_conv_12_conv_10_var.inner;
 			if (ret_conv_12_conv_10_var.is_owned) {
 				ret_conv_12_conv_10_ref |= 1;
@@ -27551,6 +33717,7 @@ void  __attribute__((visibility("default"))) TS_Route_set_paths(uint32_t this_pt
 	LDKRoute this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_CVec_RouteHopZZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -27572,6 +33739,7 @@ void  __attribute__((visibility("default"))) TS_Route_set_paths(uint32_t this_pt
 			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);
+			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;
 		}
@@ -27584,11 +33752,13 @@ uint32_t  __attribute__((visibility("default"))) TS_Route_get_payee(uint32_t thi
 	LDKRoute this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPayee ret_var = Route_get_payee(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -27601,9 +33771,11 @@ void  __attribute__((visibility("default"))) TS_Route_set_payee(uint32_t this_pt
 	LDKRoute this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPayee val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = Payee_clone(&val_conv);
 	Route_set_payee(&this_ptr_conv, val_conv);
 }
@@ -27630,6 +33802,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Route_new(ptrArray paths_arg
 			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);
+			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;
 		}
@@ -27638,11 +33811,13 @@ uint32_t  __attribute__((visibility("default"))) TS_Route_new(ptrArray paths_arg
 	LDKPayee payee_arg_conv;
 	payee_arg_conv.inner = (void*)(payee_arg & (~1));
 	payee_arg_conv.is_owned = (payee_arg & 1) || (payee_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(payee_arg_conv);
 	payee_arg_conv = Payee_clone(&payee_arg_conv);
 	LDKRoute ret_var = Route_new(paths_arg_constr, payee_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27650,14 +33825,37 @@ uint32_t  __attribute__((visibility("default"))) TS_Route_new(ptrArray paths_arg
 	return ret_ref;
 }
 
+static inline uint64_t Route_clone_ptr(LDKRoute *NONNULL_PTR arg) {
+	LDKRoute ret_var = Route_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Route_clone_ptr(uint32_t arg) {
+	LDKRoute arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = Route_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Route_clone(uint32_t orig) {
 	LDKRoute orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRoute ret_var = Route_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27669,6 +33867,7 @@ int64_t  __attribute__((visibility("default"))) TS_Route_hash(uint32_t o) {
 	LDKRoute o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = Route_hash(&o_conv);
 	return ret_val;
 }
@@ -27677,9 +33876,11 @@ jboolean  __attribute__((visibility("default"))) TS_Route_eq(uint32_t a, uint32_
 	LDKRoute a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKRoute b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = Route_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -27688,6 +33889,7 @@ int64_t  __attribute__((visibility("default"))) TS_Route_get_total_fees(uint32_t
 	LDKRoute this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = Route_get_total_fees(&this_arg_conv);
 	return ret_val;
 }
@@ -27696,6 +33898,7 @@ int64_t  __attribute__((visibility("default"))) TS_Route_get_total_amount(uint32
 	LDKRoute this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = Route_get_total_amount(&this_arg_conv);
 	return ret_val;
 }
@@ -27704,6 +33907,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Route_write(uint32_t obj)
 	LDKRoute obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = Route_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -27724,6 +33928,7 @@ void  __attribute__((visibility("default"))) TS_RouteParameters_free(uint32_t th
 	LDKRouteParameters this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	RouteParameters_free(this_obj_conv);
 }
 
@@ -27731,10 +33936,12 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteParameters_get_payee(ui
 	LDKRouteParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPayee ret_var = RouteParameters_get_payee(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27746,9 +33953,11 @@ void  __attribute__((visibility("default"))) TS_RouteParameters_set_payee(uint32
 	LDKRouteParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPayee val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = Payee_clone(&val_conv);
 	RouteParameters_set_payee(&this_ptr_conv, val_conv);
 }
@@ -27757,6 +33966,7 @@ int64_t  __attribute__((visibility("default"))) TS_RouteParameters_get_final_val
 	LDKRouteParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = RouteParameters_get_final_value_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -27765,6 +33975,7 @@ void  __attribute__((visibility("default"))) TS_RouteParameters_set_final_value_
 	LDKRouteParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	RouteParameters_set_final_value_msat(&this_ptr_conv, val);
 }
 
@@ -27772,6 +33983,7 @@ int32_t  __attribute__((visibility("default"))) TS_RouteParameters_get_final_clt
 	LDKRouteParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int32_t ret_val = RouteParameters_get_final_cltv_expiry_delta(&this_ptr_conv);
 	return ret_val;
 }
@@ -27780,6 +33992,7 @@ void  __attribute__((visibility("default"))) TS_RouteParameters_set_final_cltv_e
 	LDKRouteParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	RouteParameters_set_final_cltv_expiry_delta(&this_ptr_conv, val);
 }
 
@@ -27787,11 +34000,13 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteParameters_new(uint32_t
 	LDKPayee payee_arg_conv;
 	payee_arg_conv.inner = (void*)(payee_arg & (~1));
 	payee_arg_conv.is_owned = (payee_arg & 1) || (payee_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(payee_arg_conv);
 	payee_arg_conv = Payee_clone(&payee_arg_conv);
 	LDKRouteParameters ret_var = RouteParameters_new(payee_arg_conv, final_value_msat_arg, final_cltv_expiry_delta_arg);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27799,14 +34014,37 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteParameters_new(uint32_t
 	return ret_ref;
 }
 
+static inline uint64_t RouteParameters_clone_ptr(LDKRouteParameters *NONNULL_PTR arg) {
+	LDKRouteParameters ret_var = RouteParameters_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_RouteParameters_clone_ptr(uint32_t arg) {
+	LDKRouteParameters arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = RouteParameters_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_RouteParameters_clone(uint32_t orig) {
 	LDKRouteParameters orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRouteParameters ret_var = RouteParameters_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27818,6 +34056,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RouteParameters_write(uin
 	LDKRouteParameters obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = RouteParameters_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -27838,6 +34077,7 @@ void  __attribute__((visibility("default"))) TS_Payee_free(uint32_t this_obj) {
 	LDKPayee this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	Payee_free(this_obj_conv);
 }
 
@@ -27845,6 +34085,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Payee_get_pubkey(uint32_t
 	LDKPayee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), Payee_get_pubkey(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -27854,6 +34095,7 @@ void  __attribute__((visibility("default"))) TS_Payee_set_pubkey(uint32_t this_p
 	LDKPayee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -27864,11 +34106,13 @@ uint32_t  __attribute__((visibility("default"))) TS_Payee_get_features(uint32_t
 	LDKPayee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKInvoiceFeatures ret_var = Payee_get_features(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -27881,9 +34125,11 @@ void  __attribute__((visibility("default"))) TS_Payee_set_features(uint32_t this
 	LDKPayee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKInvoiceFeatures val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = InvoiceFeatures_clone(&val_conv);
 	Payee_set_features(&this_ptr_conv, val_conv);
 }
@@ -27892,6 +34138,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_Payee_get_route_hints(u
 	LDKPayee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_RouteHintZ ret_var = Payee_get_route_hints(&this_ptr_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -27901,6 +34148,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_Payee_get_route_hints(u
 		uint64_t ret_conv_11_ref = 0;
 		CHECK((((uint64_t)ret_conv_11_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_11_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_11_var);
 		ret_conv_11_ref = (uint64_t)ret_conv_11_var.inner;
 		if (ret_conv_11_var.is_owned) {
 			ret_conv_11_ref |= 1;
@@ -27916,6 +34164,7 @@ void  __attribute__((visibility("default"))) TS_Payee_set_route_hints(uint32_t t
 	LDKPayee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_RouteHintZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -27928,6 +34177,7 @@ void  __attribute__((visibility("default"))) TS_Payee_set_route_hints(uint32_t t
 		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);
+		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;
 	}
@@ -27938,6 +34188,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Payee_get_expiry_time(uint32
 	LDKPayee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = Payee_get_expiry_time(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -27948,6 +34199,7 @@ void  __attribute__((visibility("default"))) TS_Payee_set_expiry_time(uint32_t t
 	LDKPayee this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
@@ -27962,6 +34214,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Payee_new(int8_tArray pubkey
 	LDKInvoiceFeatures features_arg_conv;
 	features_arg_conv.inner = (void*)(features_arg & (~1));
 	features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(features_arg_conv);
 	features_arg_conv = InvoiceFeatures_clone(&features_arg_conv);
 	LDKCVec_RouteHintZ route_hints_arg_constr;
 	route_hints_arg_constr.datalen = *((uint32_t*)route_hints_arg);
@@ -27975,6 +34228,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Payee_new(int8_tArray pubkey
 		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);
+		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;
 	}
@@ -27986,6 +34240,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Payee_new(int8_tArray pubkey
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -27993,14 +34248,37 @@ uint32_t  __attribute__((visibility("default"))) TS_Payee_new(int8_tArray pubkey
 	return ret_ref;
 }
 
+static inline uint64_t Payee_clone_ptr(LDKPayee *NONNULL_PTR arg) {
+	LDKPayee ret_var = Payee_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Payee_clone_ptr(uint32_t arg) {
+	LDKPayee arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = Payee_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Payee_clone(uint32_t orig) {
 	LDKPayee orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPayee ret_var = Payee_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28012,6 +34290,7 @@ int64_t  __attribute__((visibility("default"))) TS_Payee_hash(uint32_t o) {
 	LDKPayee o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = Payee_hash(&o_conv);
 	return ret_val;
 }
@@ -28020,9 +34299,11 @@ jboolean  __attribute__((visibility("default"))) TS_Payee_eq(uint32_t a, uint32_
 	LDKPayee a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKPayee b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = Payee_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -28031,6 +34312,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Payee_write(uint32_t obj)
 	LDKPayee obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = Payee_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -28055,6 +34337,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Payee_from_node_id(int8_tArr
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28070,6 +34353,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Payee_for_keysend(int8_tArra
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28081,6 +34365,7 @@ void  __attribute__((visibility("default"))) TS_RouteHint_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	RouteHint_free(this_obj_conv);
 }
 
@@ -28088,6 +34373,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_RouteHint_get_a(uint32_
 	LDKRouteHint this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_RouteHintHopZ ret_var = RouteHint_get_a(&this_ptr_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -28097,6 +34383,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_RouteHint_get_a(uint32_
 		uint64_t ret_conv_14_ref = 0;
 		CHECK((((uint64_t)ret_conv_14_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_14_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var);
 		ret_conv_14_ref = (uint64_t)ret_conv_14_var.inner;
 		if (ret_conv_14_var.is_owned) {
 			ret_conv_14_ref |= 1;
@@ -28112,6 +34399,7 @@ void  __attribute__((visibility("default"))) TS_RouteHint_set_a(uint32_t this_pt
 	LDKRouteHint this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCVec_RouteHintHopZ val_constr;
 	val_constr.datalen = *((uint32_t*)val);
 	if (val_constr.datalen > 0)
@@ -28124,6 +34412,7 @@ void  __attribute__((visibility("default"))) TS_RouteHint_set_a(uint32_t this_pt
 		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);
+		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;
 	}
@@ -28143,6 +34432,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHint_new(uint32_tArray
 		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);
+		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;
 	}
@@ -28150,6 +34440,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHint_new(uint32_tArray
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28157,14 +34448,37 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHint_new(uint32_tArray
 	return ret_ref;
 }
 
+static inline uint64_t RouteHint_clone_ptr(LDKRouteHint *NONNULL_PTR arg) {
+	LDKRouteHint ret_var = RouteHint_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_RouteHint_clone_ptr(uint32_t arg) {
+	LDKRouteHint arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = RouteHint_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_RouteHint_clone(uint32_t orig) {
 	LDKRouteHint orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRouteHint ret_var = RouteHint_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28176,6 +34490,7 @@ int64_t  __attribute__((visibility("default"))) TS_RouteHint_hash(uint32_t o) {
 	LDKRouteHint o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = RouteHint_hash(&o_conv);
 	return ret_val;
 }
@@ -28184,9 +34499,11 @@ jboolean  __attribute__((visibility("default"))) TS_RouteHint_eq(uint32_t a, uin
 	LDKRouteHint a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKRouteHint b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = RouteHint_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -28195,6 +34512,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RouteHint_write(uint32_t
 	LDKRouteHint obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = RouteHint_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -28215,6 +34533,7 @@ void  __attribute__((visibility("default"))) TS_RouteHintHop_free(uint32_t this_
 	LDKRouteHintHop this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	RouteHintHop_free(this_obj_conv);
 }
 
@@ -28222,6 +34541,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RouteHintHop_get_src_node
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), RouteHintHop_get_src_node_id(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -28231,6 +34551,7 @@ void  __attribute__((visibility("default"))) TS_RouteHintHop_set_src_node_id(uin
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -28241,6 +34562,7 @@ int64_t  __attribute__((visibility("default"))) TS_RouteHintHop_get_short_channe
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = RouteHintHop_get_short_channel_id(&this_ptr_conv);
 	return ret_val;
 }
@@ -28249,6 +34571,7 @@ void  __attribute__((visibility("default"))) TS_RouteHintHop_set_short_channel_i
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	RouteHintHop_set_short_channel_id(&this_ptr_conv, val);
 }
 
@@ -28256,10 +34579,12 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHintHop_get_fees(uint32
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRoutingFees ret_var = RouteHintHop_get_fees(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28271,9 +34596,11 @@ void  __attribute__((visibility("default"))) TS_RouteHintHop_set_fees(uint32_t t
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRoutingFees val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = RoutingFees_clone(&val_conv);
 	RouteHintHop_set_fees(&this_ptr_conv, val_conv);
 }
@@ -28282,6 +34609,7 @@ int16_t  __attribute__((visibility("default"))) TS_RouteHintHop_get_cltv_expiry_
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int16_t ret_val = RouteHintHop_get_cltv_expiry_delta(&this_ptr_conv);
 	return ret_val;
 }
@@ -28290,6 +34618,7 @@ void  __attribute__((visibility("default"))) TS_RouteHintHop_set_cltv_expiry_del
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	RouteHintHop_set_cltv_expiry_delta(&this_ptr_conv, val);
 }
 
@@ -28297,6 +34626,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHintHop_get_htlc_minimu
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = RouteHintHop_get_htlc_minimum_msat(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -28307,6 +34637,7 @@ void  __attribute__((visibility("default"))) TS_RouteHintHop_set_htlc_minimum_ms
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
@@ -28318,6 +34649,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHintHop_get_htlc_maximu
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = RouteHintHop_get_htlc_maximum_msat(&this_ptr_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -28328,6 +34660,7 @@ void  __attribute__((visibility("default"))) TS_RouteHintHop_set_htlc_maximum_ms
 	LDKRouteHintHop this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	void* val_ptr = (void*)(((uint64_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
@@ -28342,6 +34675,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHintHop_new(int8_tArray
 	LDKRoutingFees fees_arg_conv;
 	fees_arg_conv.inner = (void*)(fees_arg & (~1));
 	fees_arg_conv.is_owned = (fees_arg & 1) || (fees_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(fees_arg_conv);
 	fees_arg_conv = RoutingFees_clone(&fees_arg_conv);
 	void* htlc_minimum_msat_arg_ptr = (void*)(((uint64_t)htlc_minimum_msat_arg) & ~1);
 	CHECK_ACCESS(htlc_minimum_msat_arg_ptr);
@@ -28355,6 +34689,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHintHop_new(int8_tArray
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28362,14 +34697,37 @@ uint32_t  __attribute__((visibility("default"))) TS_RouteHintHop_new(int8_tArray
 	return ret_ref;
 }
 
+static inline uint64_t RouteHintHop_clone_ptr(LDKRouteHintHop *NONNULL_PTR arg) {
+	LDKRouteHintHop ret_var = RouteHintHop_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_RouteHintHop_clone_ptr(uint32_t arg) {
+	LDKRouteHintHop arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = RouteHintHop_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_RouteHintHop_clone(uint32_t orig) {
 	LDKRouteHintHop orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRouteHintHop ret_var = RouteHintHop_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28381,6 +34739,7 @@ int64_t  __attribute__((visibility("default"))) TS_RouteHintHop_hash(uint32_t o)
 	LDKRouteHintHop o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = RouteHintHop_hash(&o_conv);
 	return ret_val;
 }
@@ -28389,9 +34748,11 @@ jboolean  __attribute__((visibility("default"))) TS_RouteHintHop_eq(uint32_t a,
 	LDKRouteHintHop a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKRouteHintHop b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = RouteHintHop_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -28400,6 +34761,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RouteHintHop_write(uint32
 	LDKRouteHintHop obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = RouteHintHop_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -28423,9 +34785,11 @@ uint32_t  __attribute__((visibility("default"))) TS_find_route(int8_tArray our_n
 	LDKRouteParameters params_conv;
 	params_conv.inner = (void*)(params & (~1));
 	params_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(params_conv);
 	LDKNetworkGraph network_conv;
 	network_conv.inner = (void*)(network & (~1));
 	network_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(network_conv);
 	LDKCVec_ChannelDetailsZ first_hops_constr;
 	LDKCVec_ChannelDetailsZ *first_hops_ptr = NULL;
 	if (first_hops != 0) {
@@ -28440,6 +34804,7 @@ uint32_t  __attribute__((visibility("default"))) TS_find_route(int8_tArray our_n
 			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);
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_conv);
 			first_hops_constr.data[q] = first_hops_conv_16_conv;
 		}
 		first_hops_ptr = &first_hops_constr;
@@ -28456,10 +34821,53 @@ uint32_t  __attribute__((visibility("default"))) TS_find_route(int8_tArray our_n
 	return (uint64_t)ret_conv;
 }
 
+void  __attribute__((visibility("default"))) TS_Score_free(uint32_t this_ptr) {
+	if ((this_ptr & 1) != 0) return;
+	void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1);
+	CHECK_ACCESS(this_ptr_ptr);
+	LDKScore this_ptr_conv = *(LDKScore*)(this_ptr_ptr);
+	FREE((void*)this_ptr);
+	Score_free(this_ptr_conv);
+}
+
+void  __attribute__((visibility("default"))) TS_LockableScore_free(uint32_t this_ptr) {
+	if ((this_ptr & 1) != 0) return;
+	void* this_ptr_ptr = (void*)(((uint64_t)this_ptr) & ~1);
+	CHECK_ACCESS(this_ptr_ptr);
+	LDKLockableScore this_ptr_conv = *(LDKLockableScore*)(this_ptr_ptr);
+	FREE((void*)this_ptr);
+	LockableScore_free(this_ptr_conv);
+}
+
+void  __attribute__((visibility("default"))) TS_MultiThreadedLockableScore_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
+	MultiThreadedLockableScore_free(this_obj_conv);
+}
+
+uint32_t  __attribute__((visibility("default"))) TS_MultiThreadedLockableScore_new(uint32_t score) {
+	void* score_ptr = (void*)(((uint64_t)score) & ~1);
+	CHECK_ACCESS(score_ptr);
+	LDKScore score_conv = *(LDKScore*)(score_ptr);
+	LDKMultiThreadedLockableScore ret_var = MultiThreadedLockableScore_new(score_conv);
+	uint64_t ret_ref = 0;
+	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uint64_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
 void  __attribute__((visibility("default"))) TS_Scorer_free(uint32_t this_obj) {
 	LDKScorer this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	Scorer_free(this_obj_conv);
 }
 
@@ -28467,6 +34875,7 @@ void  __attribute__((visibility("default"))) TS_ScoringParameters_free(uint32_t
 	LDKScoringParameters this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ScoringParameters_free(this_obj_conv);
 }
 
@@ -28474,6 +34883,7 @@ int64_t  __attribute__((visibility("default"))) TS_ScoringParameters_get_base_pe
 	LDKScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ScoringParameters_get_base_penalty_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -28482,6 +34892,7 @@ void  __attribute__((visibility("default"))) TS_ScoringParameters_set_base_penal
 	LDKScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ScoringParameters_set_base_penalty_msat(&this_ptr_conv, val);
 }
 
@@ -28489,6 +34900,7 @@ int64_t  __attribute__((visibility("default"))) TS_ScoringParameters_get_failure
 	LDKScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ScoringParameters_get_failure_penalty_msat(&this_ptr_conv);
 	return ret_val;
 }
@@ -28497,13 +34909,49 @@ void  __attribute__((visibility("default"))) TS_ScoringParameters_set_failure_pe
 	LDKScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ScoringParameters_set_failure_penalty_msat(&this_ptr_conv, val);
 }
 
+int16_t  __attribute__((visibility("default"))) TS_ScoringParameters_get_overuse_penalty_start_1024th(uint32_t this_ptr) {
+	LDKScoringParameters this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	int16_t ret_val = ScoringParameters_get_overuse_penalty_start_1024th(&this_ptr_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_ScoringParameters_set_overuse_penalty_start_1024th(uint32_t this_ptr, int16_t val) {
+	LDKScoringParameters this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	ScoringParameters_set_overuse_penalty_start_1024th(&this_ptr_conv, val);
+}
+
+int64_t  __attribute__((visibility("default"))) TS_ScoringParameters_get_overuse_penalty_msat_per_1024th(uint32_t this_ptr) {
+	LDKScoringParameters this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	int64_t ret_val = ScoringParameters_get_overuse_penalty_msat_per_1024th(&this_ptr_conv);
+	return ret_val;
+}
+
+void  __attribute__((visibility("default"))) TS_ScoringParameters_set_overuse_penalty_msat_per_1024th(uint32_t this_ptr, int64_t val) {
+	LDKScoringParameters this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	ScoringParameters_set_overuse_penalty_msat_per_1024th(&this_ptr_conv, val);
+}
+
 int64_t  __attribute__((visibility("default"))) TS_ScoringParameters_get_failure_penalty_half_life(uint32_t this_ptr) {
 	LDKScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = ScoringParameters_get_failure_penalty_half_life(&this_ptr_conv);
 	return ret_val;
 }
@@ -28512,14 +34960,16 @@ void  __attribute__((visibility("default"))) TS_ScoringParameters_set_failure_pe
 	LDKScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	ScoringParameters_set_failure_penalty_half_life(&this_ptr_conv, val);
 }
 
-uint32_t  __attribute__((visibility("default"))) TS_ScoringParameters_new(int64_t base_penalty_msat_arg, int64_t failure_penalty_msat_arg, int64_t failure_penalty_half_life_arg) {
-	LDKScoringParameters ret_var = ScoringParameters_new(base_penalty_msat_arg, failure_penalty_msat_arg, failure_penalty_half_life_arg);
+uint32_t  __attribute__((visibility("default"))) TS_ScoringParameters_new(int64_t base_penalty_msat_arg, int64_t failure_penalty_msat_arg, int16_t overuse_penalty_start_1024th_arg, int64_t overuse_penalty_msat_per_1024th_arg, int64_t failure_penalty_half_life_arg) {
+	LDKScoringParameters ret_var = ScoringParameters_new(base_penalty_msat_arg, failure_penalty_msat_arg, overuse_penalty_start_1024th_arg, overuse_penalty_msat_per_1024th_arg, failure_penalty_half_life_arg);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28531,6 +34981,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_ScoringParameters_write(u
 	LDKScoringParameters obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = ScoringParameters_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -28551,11 +35002,13 @@ uint32_t  __attribute__((visibility("default"))) TS_Scorer_new(uint32_t params)
 	LDKScoringParameters params_conv;
 	params_conv.inner = (void*)(params & (~1));
 	params_conv.is_owned = (params & 1) || (params == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(params_conv);
 	// Warning: we need a move here but no clone is available for LDKScoringParameters
 	LDKScorer ret_var = Scorer_new(params_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28568,6 +35021,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Scorer_default() {
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28580,6 +35034,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ScoringParameters_default()
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28591,6 +35046,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Scorer_as_Score(uint32_t thi
 	LDKScorer this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKScore* ret_ret = MALLOC(sizeof(LDKScore), "LDKScore");
 	*ret_ret = Scorer_as_Score(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -28600,6 +35056,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Scorer_write(uint32_t obj
 	LDKScorer obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
 	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
 	LDKCVec_u8Z ret_var = Scorer_write(&obj_conv);
 	int8_tArray ret_arr = init_arr(ret_var.datalen, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), ret_var.data, ret_var.datalen);
@@ -28620,6 +35077,7 @@ void  __attribute__((visibility("default"))) TS_FilesystemPersister_free(uint32_
 	LDKFilesystemPersister this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	FilesystemPersister_free(this_obj_conv);
 }
 
@@ -28629,6 +35087,7 @@ uint32_t  __attribute__((visibility("default"))) TS_FilesystemPersister_new(jstr
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28640,6 +35099,7 @@ jstring  __attribute__((visibility("default"))) TS_FilesystemPersister_get_data_
 	LDKFilesystemPersister this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKStr ret_str = FilesystemPersister_get_data_dir(&this_arg_conv);
 	jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len);
 	Str_free(ret_str);
@@ -28651,6 +35111,7 @@ uint32_t  __attribute__((visibility("default"))) TS_FilesystemPersister_persist_
 	LDKChannelManager manager_conv;
 	manager_conv.inner = (void*)(manager & (~1));
 	manager_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(manager_conv);
 	LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ");
 	*ret_conv = FilesystemPersister_persist_manager(data_dir_conv, &manager_conv);
 	return (uint64_t)ret_conv;
@@ -28660,6 +35121,7 @@ uint32_t  __attribute__((visibility("default"))) TS_FilesystemPersister_read_cha
 	LDKFilesystemPersister this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	void* keys_manager_ptr = (void*)(((uint64_t)keys_manager) & ~1);
 	CHECK_ACCESS(keys_manager_ptr);
 	LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr);
@@ -28672,6 +35134,7 @@ uint32_t  __attribute__((visibility("default"))) TS_FilesystemPersister_as_Persi
 	LDKFilesystemPersister this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKPersist* ret_ret = MALLOC(sizeof(LDKPersist), "LDKPersist");
 	*ret_ret = FilesystemPersister_as_Persist(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -28681,6 +35144,7 @@ void  __attribute__((visibility("default"))) TS_BackgroundProcessor_free(uint32_
 	LDKBackgroundProcessor this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	BackgroundProcessor_free(this_obj_conv);
 }
 
@@ -28703,15 +35167,19 @@ uint32_t  __attribute__((visibility("default"))) TS_BackgroundProcessor_start(ui
 	LDKChainMonitor chain_monitor_conv;
 	chain_monitor_conv.inner = (void*)(chain_monitor & (~1));
 	chain_monitor_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(chain_monitor_conv);
 	LDKChannelManager channel_manager_conv;
 	channel_manager_conv.inner = (void*)(channel_manager & (~1));
 	channel_manager_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_manager_conv);
 	LDKNetGraphMsgHandler net_graph_msg_handler_conv;
 	net_graph_msg_handler_conv.inner = (void*)(net_graph_msg_handler & (~1));
 	net_graph_msg_handler_conv.is_owned = (net_graph_msg_handler & 1) || (net_graph_msg_handler == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(net_graph_msg_handler_conv);
 	LDKPeerManager peer_manager_conv;
 	peer_manager_conv.inner = (void*)(peer_manager & (~1));
 	peer_manager_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(peer_manager_conv);
 	void* logger_ptr = (void*)(((uint64_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
@@ -28719,6 +35187,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BackgroundProcessor_start(ui
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28730,6 +35199,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BackgroundProcessor_join(uin
 	LDKBackgroundProcessor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	// Warning: we need a move here but no clone is available for LDKBackgroundProcessor
 	LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ");
 	*ret_conv = BackgroundProcessor_join(this_arg_conv);
@@ -28740,6 +35210,7 @@ uint32_t  __attribute__((visibility("default"))) TS_BackgroundProcessor_stop(uin
 	LDKBackgroundProcessor this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	// Warning: we need a move here but no clone is available for LDKBackgroundProcessor
 	LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ");
 	*ret_conv = BackgroundProcessor_stop(this_arg_conv);
@@ -28754,6 +35225,7 @@ void  __attribute__((visibility("default"))) TS_Invoice_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	Invoice_free(this_obj_conv);
 }
 
@@ -28761,21 +35233,46 @@ jboolean  __attribute__((visibility("default"))) TS_Invoice_eq(uint32_t a, uint3
 	LDKInvoice a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKInvoice b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = Invoice_eq(&a_conv, &b_conv);
 	return ret_val;
 }
 
+static inline uint64_t Invoice_clone_ptr(LDKInvoice *NONNULL_PTR arg) {
+	LDKInvoice ret_var = Invoice_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Invoice_clone_ptr(uint32_t arg) {
+	LDKInvoice arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = Invoice_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Invoice_clone(uint32_t orig) {
 	LDKInvoice orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInvoice ret_var = Invoice_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28787,6 +35284,7 @@ void  __attribute__((visibility("default"))) TS_SignedRawInvoice_free(uint32_t t
 	LDKSignedRawInvoice this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	SignedRawInvoice_free(this_obj_conv);
 }
 
@@ -28794,21 +35292,46 @@ jboolean  __attribute__((visibility("default"))) TS_SignedRawInvoice_eq(uint32_t
 	LDKSignedRawInvoice a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKSignedRawInvoice b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = SignedRawInvoice_eq(&a_conv, &b_conv);
 	return ret_val;
 }
 
+static inline uint64_t SignedRawInvoice_clone_ptr(LDKSignedRawInvoice *NONNULL_PTR arg) {
+	LDKSignedRawInvoice ret_var = SignedRawInvoice_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_SignedRawInvoice_clone_ptr(uint32_t arg) {
+	LDKSignedRawInvoice arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = SignedRawInvoice_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_SignedRawInvoice_clone(uint32_t orig) {
 	LDKSignedRawInvoice orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKSignedRawInvoice ret_var = SignedRawInvoice_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28820,6 +35343,7 @@ void  __attribute__((visibility("default"))) TS_RawInvoice_free(uint32_t this_ob
 	LDKRawInvoice this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	RawInvoice_free(this_obj_conv);
 }
 
@@ -28827,10 +35351,12 @@ uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_get_data(uint32_t
 	LDKRawInvoice this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRawDataPart ret_var = RawInvoice_get_data(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28842,9 +35368,11 @@ void  __attribute__((visibility("default"))) TS_RawInvoice_set_data(uint32_t thi
 	LDKRawInvoice this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRawDataPart val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = RawDataPart_clone(&val_conv);
 	RawInvoice_set_data(&this_ptr_conv, val_conv);
 }
@@ -28853,21 +35381,46 @@ jboolean  __attribute__((visibility("default"))) TS_RawInvoice_eq(uint32_t a, ui
 	LDKRawInvoice a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKRawInvoice b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = RawInvoice_eq(&a_conv, &b_conv);
 	return ret_val;
 }
 
+static inline uint64_t RawInvoice_clone_ptr(LDKRawInvoice *NONNULL_PTR arg) {
+	LDKRawInvoice ret_var = RawInvoice_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_RawInvoice_clone_ptr(uint32_t arg) {
+	LDKRawInvoice arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = RawInvoice_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_clone(uint32_t orig) {
 	LDKRawInvoice orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRawInvoice ret_var = RawInvoice_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28879,6 +35432,7 @@ void  __attribute__((visibility("default"))) TS_RawDataPart_free(uint32_t this_o
 	LDKRawDataPart this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	RawDataPart_free(this_obj_conv);
 }
 
@@ -28886,10 +35440,12 @@ uint32_t  __attribute__((visibility("default"))) TS_RawDataPart_get_timestamp(ui
 	LDKRawDataPart this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPositiveTimestamp ret_var = RawDataPart_get_timestamp(&this_ptr_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28901,9 +35457,11 @@ void  __attribute__((visibility("default"))) TS_RawDataPart_set_timestamp(uint32
 	LDKRawDataPart this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPositiveTimestamp val_conv;
 	val_conv.inner = (void*)(val & (~1));
 	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = PositiveTimestamp_clone(&val_conv);
 	RawDataPart_set_timestamp(&this_ptr_conv, val_conv);
 }
@@ -28912,21 +35470,46 @@ jboolean  __attribute__((visibility("default"))) TS_RawDataPart_eq(uint32_t a, u
 	LDKRawDataPart a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKRawDataPart b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = RawDataPart_eq(&a_conv, &b_conv);
 	return ret_val;
 }
 
+static inline uint64_t RawDataPart_clone_ptr(LDKRawDataPart *NONNULL_PTR arg) {
+	LDKRawDataPart ret_var = RawDataPart_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_RawDataPart_clone_ptr(uint32_t arg) {
+	LDKRawDataPart arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = RawDataPart_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_RawDataPart_clone(uint32_t orig) {
 	LDKRawDataPart orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRawDataPart ret_var = RawDataPart_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -28938,6 +35521,7 @@ void  __attribute__((visibility("default"))) TS_PositiveTimestamp_free(uint32_t
 	LDKPositiveTimestamp this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	PositiveTimestamp_free(this_obj_conv);
 }
 
@@ -28945,21 +35529,46 @@ jboolean  __attribute__((visibility("default"))) TS_PositiveTimestamp_eq(uint32_
 	LDKPositiveTimestamp a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKPositiveTimestamp b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = PositiveTimestamp_eq(&a_conv, &b_conv);
 	return ret_val;
 }
 
+static inline uint64_t PositiveTimestamp_clone_ptr(LDKPositiveTimestamp *NONNULL_PTR arg) {
+	LDKPositiveTimestamp ret_var = PositiveTimestamp_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_PositiveTimestamp_clone_ptr(uint32_t arg) {
+	LDKPositiveTimestamp arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = PositiveTimestamp_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_PositiveTimestamp_clone(uint32_t orig) {
 	LDKPositiveTimestamp orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPositiveTimestamp ret_var = PositiveTimestamp_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29054,17 +35663,41 @@ void  __attribute__((visibility("default"))) TS_Sha256_free(uint32_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);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	Sha256_free(this_obj_conv);
 }
 
+static inline uint64_t Sha256_clone_ptr(LDKSha256 *NONNULL_PTR arg) {
+	LDKSha256 ret_var = Sha256_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Sha256_clone_ptr(uint32_t arg) {
+	LDKSha256 arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = Sha256_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Sha256_clone(uint32_t orig) {
 	LDKSha256 orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKSha256 ret_var = Sha256_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29076,6 +35709,7 @@ int64_t  __attribute__((visibility("default"))) TS_Sha256_hash(uint32_t o) {
 	LDKSha256 o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = Sha256_hash(&o_conv);
 	return ret_val;
 }
@@ -29084,9 +35718,11 @@ jboolean  __attribute__((visibility("default"))) TS_Sha256_eq(uint32_t a, uint32
 	LDKSha256 a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKSha256 b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = Sha256_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -29095,17 +35731,41 @@ void  __attribute__((visibility("default"))) TS_Description_free(uint32_t this_o
 	LDKDescription this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	Description_free(this_obj_conv);
 }
 
+static inline uint64_t Description_clone_ptr(LDKDescription *NONNULL_PTR arg) {
+	LDKDescription ret_var = Description_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Description_clone_ptr(uint32_t arg) {
+	LDKDescription arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = Description_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Description_clone(uint32_t orig) {
 	LDKDescription orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKDescription ret_var = Description_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29117,6 +35777,7 @@ int64_t  __attribute__((visibility("default"))) TS_Description_hash(uint32_t o)
 	LDKDescription o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = Description_hash(&o_conv);
 	return ret_val;
 }
@@ -29125,9 +35786,11 @@ jboolean  __attribute__((visibility("default"))) TS_Description_eq(uint32_t a, u
 	LDKDescription a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKDescription b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = Description_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -29136,6 +35799,7 @@ void  __attribute__((visibility("default"))) TS_PayeePubKey_free(uint32_t this_o
 	LDKPayeePubKey this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	PayeePubKey_free(this_obj_conv);
 }
 
@@ -29143,6 +35807,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_PayeePubKey_get_a(uint32_
 	LDKPayeePubKey this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), PayeePubKey_get_a(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
@@ -29152,6 +35817,7 @@ void  __attribute__((visibility("default"))) TS_PayeePubKey_set_a(uint32_t this_
 	LDKPayeePubKey this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPublicKey val_ref;
 	CHECK(*((uint32_t*)val) == 33);
 	memcpy(val_ref.compressed_form, (uint8_t*)(val + 4), 33);
@@ -29166,6 +35832,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PayeePubKey_new(int8_tArray
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29173,14 +35840,37 @@ uint32_t  __attribute__((visibility("default"))) TS_PayeePubKey_new(int8_tArray
 	return ret_ref;
 }
 
+static inline uint64_t PayeePubKey_clone_ptr(LDKPayeePubKey *NONNULL_PTR arg) {
+	LDKPayeePubKey ret_var = PayeePubKey_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_PayeePubKey_clone_ptr(uint32_t arg) {
+	LDKPayeePubKey arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = PayeePubKey_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_PayeePubKey_clone(uint32_t orig) {
 	LDKPayeePubKey orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPayeePubKey ret_var = PayeePubKey_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29192,6 +35882,7 @@ int64_t  __attribute__((visibility("default"))) TS_PayeePubKey_hash(uint32_t o)
 	LDKPayeePubKey o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = PayeePubKey_hash(&o_conv);
 	return ret_val;
 }
@@ -29200,9 +35891,11 @@ jboolean  __attribute__((visibility("default"))) TS_PayeePubKey_eq(uint32_t a, u
 	LDKPayeePubKey a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKPayeePubKey b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = PayeePubKey_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -29211,17 +35904,41 @@ void  __attribute__((visibility("default"))) TS_ExpiryTime_free(uint32_t this_ob
 	LDKExpiryTime this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	ExpiryTime_free(this_obj_conv);
 }
 
+static inline uint64_t ExpiryTime_clone_ptr(LDKExpiryTime *NONNULL_PTR arg) {
+	LDKExpiryTime ret_var = ExpiryTime_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_ExpiryTime_clone_ptr(uint32_t arg) {
+	LDKExpiryTime arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = ExpiryTime_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_ExpiryTime_clone(uint32_t orig) {
 	LDKExpiryTime orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKExpiryTime ret_var = ExpiryTime_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29233,6 +35950,7 @@ int64_t  __attribute__((visibility("default"))) TS_ExpiryTime_hash(uint32_t o) {
 	LDKExpiryTime o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = ExpiryTime_hash(&o_conv);
 	return ret_val;
 }
@@ -29241,9 +35959,11 @@ jboolean  __attribute__((visibility("default"))) TS_ExpiryTime_eq(uint32_t a, ui
 	LDKExpiryTime a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKExpiryTime b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = ExpiryTime_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -29252,6 +35972,7 @@ void  __attribute__((visibility("default"))) TS_MinFinalCltvExpiry_free(uint32_t
 	LDKMinFinalCltvExpiry this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	MinFinalCltvExpiry_free(this_obj_conv);
 }
 
@@ -29259,6 +35980,7 @@ int64_t  __attribute__((visibility("default"))) TS_MinFinalCltvExpiry_get_a(uint
 	LDKMinFinalCltvExpiry this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = MinFinalCltvExpiry_get_a(&this_ptr_conv);
 	return ret_val;
 }
@@ -29267,6 +35989,7 @@ void  __attribute__((visibility("default"))) TS_MinFinalCltvExpiry_set_a(uint32_
 	LDKMinFinalCltvExpiry this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	MinFinalCltvExpiry_set_a(&this_ptr_conv, val);
 }
 
@@ -29275,6 +35998,7 @@ uint32_t  __attribute__((visibility("default"))) TS_MinFinalCltvExpiry_new(int64
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29282,14 +36006,37 @@ uint32_t  __attribute__((visibility("default"))) TS_MinFinalCltvExpiry_new(int64
 	return ret_ref;
 }
 
+static inline uint64_t MinFinalCltvExpiry_clone_ptr(LDKMinFinalCltvExpiry *NONNULL_PTR arg) {
+	LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_MinFinalCltvExpiry_clone_ptr(uint32_t arg) {
+	LDKMinFinalCltvExpiry arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = MinFinalCltvExpiry_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_MinFinalCltvExpiry_clone(uint32_t orig) {
 	LDKMinFinalCltvExpiry orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29301,6 +36048,7 @@ int64_t  __attribute__((visibility("default"))) TS_MinFinalCltvExpiry_hash(uint3
 	LDKMinFinalCltvExpiry o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = MinFinalCltvExpiry_hash(&o_conv);
 	return ret_val;
 }
@@ -29309,9 +36057,11 @@ jboolean  __attribute__((visibility("default"))) TS_MinFinalCltvExpiry_eq(uint32
 	LDKMinFinalCltvExpiry a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKMinFinalCltvExpiry b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = MinFinalCltvExpiry_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -29325,6 +36075,18 @@ void  __attribute__((visibility("default"))) TS_Fallback_free(uint32_t this_ptr)
 	Fallback_free(this_ptr_conv);
 }
 
+static inline uint64_t Fallback_clone_ptr(LDKFallback *NONNULL_PTR arg) {
+	LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback");
+	*ret_copy = Fallback_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_Fallback_clone_ptr(uint32_t arg) {
+	LDKFallback* arg_conv = (LDKFallback*)arg;
+	int64_t ret_val = Fallback_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_Fallback_clone(uint32_t orig) {
 	LDKFallback* orig_conv = (LDKFallback*)orig;
 	LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback");
@@ -29382,17 +36144,41 @@ void  __attribute__((visibility("default"))) TS_InvoiceSignature_free(uint32_t t
 	LDKInvoiceSignature this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	InvoiceSignature_free(this_obj_conv);
 }
 
+static inline uint64_t InvoiceSignature_clone_ptr(LDKInvoiceSignature *NONNULL_PTR arg) {
+	LDKInvoiceSignature ret_var = InvoiceSignature_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_InvoiceSignature_clone_ptr(uint32_t arg) {
+	LDKInvoiceSignature arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = InvoiceSignature_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_InvoiceSignature_clone(uint32_t orig) {
 	LDKInvoiceSignature orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInvoiceSignature ret_var = InvoiceSignature_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29404,9 +36190,11 @@ jboolean  __attribute__((visibility("default"))) TS_InvoiceSignature_eq(uint32_t
 	LDKInvoiceSignature a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKInvoiceSignature b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = InvoiceSignature_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -29415,17 +36203,41 @@ void  __attribute__((visibility("default"))) TS_PrivateRoute_free(uint32_t this_
 	LDKPrivateRoute this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	PrivateRoute_free(this_obj_conv);
 }
 
+static inline uint64_t PrivateRoute_clone_ptr(LDKPrivateRoute *NONNULL_PTR arg) {
+	LDKPrivateRoute ret_var = PrivateRoute_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_PrivateRoute_clone_ptr(uint32_t arg) {
+	LDKPrivateRoute arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = PrivateRoute_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_PrivateRoute_clone(uint32_t orig) {
 	LDKPrivateRoute orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPrivateRoute ret_var = PrivateRoute_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29437,6 +36249,7 @@ int64_t  __attribute__((visibility("default"))) TS_PrivateRoute_hash(uint32_t o)
 	LDKPrivateRoute o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = PrivateRoute_hash(&o_conv);
 	return ret_val;
 }
@@ -29445,9 +36258,11 @@ jboolean  __attribute__((visibility("default"))) TS_PrivateRoute_eq(uint32_t a,
 	LDKPrivateRoute a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKPrivateRoute b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = PrivateRoute_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -29456,6 +36271,7 @@ uint32_t  __attribute__((visibility("default"))) TS_SignedRawInvoice_into_parts(
 	LDKSignedRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
+	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);
@@ -29466,10 +36282,12 @@ uint32_t  __attribute__((visibility("default"))) TS_SignedRawInvoice_raw_invoice
 	LDKSignedRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKRawInvoice ret_var = SignedRawInvoice_raw_invoice(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29481,6 +36299,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_SignedRawInvoice_hash(uin
 	LDKSignedRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *SignedRawInvoice_hash(&this_arg_conv), 32);
 	return ret_arr;
@@ -29490,10 +36309,12 @@ uint32_t  __attribute__((visibility("default"))) TS_SignedRawInvoice_signature(u
 	LDKSignedRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKInvoiceSignature ret_var = SignedRawInvoice_signature(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29505,6 +36326,7 @@ uint32_t  __attribute__((visibility("default"))) TS_SignedRawInvoice_recover_pay
 	LDKSignedRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ");
 	*ret_conv = SignedRawInvoice_recover_payee_pub_key(&this_arg_conv);
 	return (uint64_t)ret_conv;
@@ -29514,6 +36336,7 @@ jboolean  __attribute__((visibility("default"))) TS_SignedRawInvoice_check_signa
 	LDKSignedRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	jboolean ret_val = SignedRawInvoice_check_signature(&this_arg_conv);
 	return ret_val;
 }
@@ -29522,6 +36345,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RawInvoice_hash(uint32_t
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), RawInvoice_hash(&this_arg_conv).data, 32);
 	return ret_arr;
@@ -29531,11 +36355,13 @@ uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_payment_hash(uint
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKSha256 ret_var = RawInvoice_payment_hash(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -29548,11 +36374,13 @@ uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_description(uint3
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKDescription ret_var = RawInvoice_description(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -29565,11 +36393,13 @@ uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_payee_pub_key(uin
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKPayeePubKey ret_var = RawInvoice_payee_pub_key(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -29582,11 +36412,13 @@ uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_description_hash(
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKSha256 ret_var = RawInvoice_description_hash(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -29599,11 +36431,13 @@ uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_expiry_time(uint3
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKExpiryTime ret_var = RawInvoice_expiry_time(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -29616,11 +36450,13 @@ uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_min_final_cltv_ex
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKMinFinalCltvExpiry ret_var = RawInvoice_min_final_cltv_expiry(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -29633,6 +36469,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_RawInvoice_payment_secret
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), RawInvoice_payment_secret(&this_arg_conv).data, 32);
 	return ret_arr;
@@ -29642,11 +36479,13 @@ uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_features(uint32_t
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKInvoiceFeatures ret_var = RawInvoice_features(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -29659,6 +36498,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_RawInvoice_private_rout
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_PrivateRouteZ ret_var = RawInvoice_private_routes(&this_arg_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -29668,6 +36508,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_RawInvoice_private_rout
 		uint64_t ret_conv_14_ref = 0;
 		CHECK((((uint64_t)ret_conv_14_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_14_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var);
 		ret_conv_14_ref = (uint64_t)ret_conv_14_var.inner;
 		if (ret_conv_14_var.is_owned) {
 			ret_conv_14_ref |= 1;
@@ -29683,6 +36524,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_amount_pico_btc(u
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = RawInvoice_amount_pico_btc(&this_arg_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -29693,6 +36535,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RawInvoice_currency(uint32_t
 	LDKRawInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	uint32_t ret_conv = LDKCurrency_to_js(RawInvoice_currency(&this_arg_conv));
 	return ret_conv;
 }
@@ -29713,6 +36556,7 @@ int64_t  __attribute__((visibility("default"))) TS_PositiveTimestamp_as_unix_tim
 	LDKPositiveTimestamp this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = PositiveTimestamp_as_unix_timestamp(&this_arg_conv);
 	return ret_val;
 }
@@ -29721,6 +36565,7 @@ int64_t  __attribute__((visibility("default"))) TS_PositiveTimestamp_as_time(uin
 	LDKPositiveTimestamp this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = PositiveTimestamp_as_time(&this_arg_conv);
 	return ret_val;
 }
@@ -29729,11 +36574,13 @@ uint32_t  __attribute__((visibility("default"))) TS_Invoice_into_signed_raw(uint
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
+	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);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -29745,6 +36592,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Invoice_check_signature(uint
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ");
 	*ret_conv = Invoice_check_signature(&this_arg_conv);
 	return (uint64_t)ret_conv;
@@ -29754,6 +36602,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Invoice_from_signed(uint32_t
 	LDKSignedRawInvoice signed_invoice_conv;
 	signed_invoice_conv.inner = (void*)(signed_invoice & (~1));
 	signed_invoice_conv.is_owned = (signed_invoice & 1) || (signed_invoice == 0);
+	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);
@@ -29764,6 +36613,7 @@ int64_t  __attribute__((visibility("default"))) TS_Invoice_timestamp(uint32_t th
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = Invoice_timestamp(&this_arg_conv);
 	return ret_val;
 }
@@ -29772,6 +36622,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Invoice_payment_hash(uint
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *Invoice_payment_hash(&this_arg_conv), 32);
 	return ret_arr;
@@ -29781,6 +36632,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Invoice_payee_pub_key(uin
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), Invoice_payee_pub_key(&this_arg_conv).compressed_form, 33);
 	return ret_arr;
@@ -29790,6 +36642,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Invoice_payment_secret(ui
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(32, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), *Invoice_payment_secret(&this_arg_conv), 32);
 	return ret_arr;
@@ -29799,11 +36652,13 @@ uint32_t  __attribute__((visibility("default"))) TS_Invoice_features(uint32_t th
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKInvoiceFeatures ret_var = Invoice_features(&this_arg_conv);
 	uint64_t ret_ref = 0;
 	if ((uint64_t)ret_var.inner > 4096) {
 		CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 		ret_ref = (uint64_t)ret_var.inner;
 		if (ret_var.is_owned) {
 			ret_ref |= 1;
@@ -29816,6 +36671,7 @@ int8_tArray  __attribute__((visibility("default"))) TS_Invoice_recover_payee_pub
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int8_tArray ret_arr = init_arr(33, sizeof(uint8_t), "Native int8_tArray Bytes");
 	memcpy((uint8_t*)(ret_arr + 4), Invoice_recover_payee_pub_key(&this_arg_conv).compressed_form, 33);
 	return ret_arr;
@@ -29825,6 +36681,7 @@ int64_t  __attribute__((visibility("default"))) TS_Invoice_expiry_time(uint32_t
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = Invoice_expiry_time(&this_arg_conv);
 	return ret_val;
 }
@@ -29833,6 +36690,7 @@ jboolean  __attribute__((visibility("default"))) TS_Invoice_is_expired(uint32_t
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	jboolean ret_val = Invoice_is_expired(&this_arg_conv);
 	return ret_val;
 }
@@ -29841,6 +36699,7 @@ int64_t  __attribute__((visibility("default"))) TS_Invoice_min_final_cltv_expiry
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = Invoice_min_final_cltv_expiry(&this_arg_conv);
 	return ret_val;
 }
@@ -29849,6 +36708,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_Invoice_private_routes(
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_PrivateRouteZ ret_var = Invoice_private_routes(&this_arg_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -29858,6 +36718,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_Invoice_private_routes(
 		uint64_t ret_conv_14_ref = 0;
 		CHECK((((uint64_t)ret_conv_14_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_14_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var);
 		ret_conv_14_ref = (uint64_t)ret_conv_14_var.inner;
 		if (ret_conv_14_var.is_owned) {
 			ret_conv_14_ref |= 1;
@@ -29873,6 +36734,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_Invoice_route_hints(uin
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCVec_RouteHintZ ret_var = Invoice_route_hints(&this_arg_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_arr(ret_var.datalen, sizeof(uint32_t), "Native uint32_tArray Bytes");
@@ -29882,6 +36744,7 @@ uint32_tArray  __attribute__((visibility("default"))) TS_Invoice_route_hints(uin
 		uint64_t ret_conv_11_ref = 0;
 		CHECK((((uint64_t)ret_conv_11_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uint64_t)&ret_conv_11_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_11_var);
 		ret_conv_11_ref = (uint64_t)ret_conv_11_var.inner;
 		if (ret_conv_11_var.is_owned) {
 			ret_conv_11_ref |= 1;
@@ -29897,6 +36760,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Invoice_currency(uint32_t th
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	uint32_t ret_conv = LDKCurrency_to_js(Invoice_currency(&this_arg_conv));
 	return ret_conv;
 }
@@ -29905,6 +36769,7 @@ uint32_t  __attribute__((visibility("default"))) TS_Invoice_amount_milli_satoshi
 	LDKInvoice this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = Invoice_amount_milli_satoshis(&this_arg_conv);
 	uint64_t ret_ref = (uint64_t)ret_copy;
@@ -29922,6 +36787,7 @@ jstring  __attribute__((visibility("default"))) TS_Description_into_inner(uint32
 	LDKDescription this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
+	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);
 	jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len);
@@ -29945,6 +36811,7 @@ int64_t  __attribute__((visibility("default"))) TS_ExpiryTime_as_seconds(uint32_
 	LDKExpiryTime this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = ExpiryTime_as_seconds(&this_arg_conv);
 	return ret_val;
 }
@@ -29953,6 +36820,7 @@ int64_t  __attribute__((visibility("default"))) TS_ExpiryTime_as_duration(uint32
 	LDKExpiryTime this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	int64_t ret_val = ExpiryTime_as_duration(&this_arg_conv);
 	return ret_val;
 }
@@ -29961,6 +36829,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PrivateRoute_new(uint32_t ho
 	LDKRouteHint hops_conv;
 	hops_conv.inner = (void*)(hops & (~1));
 	hops_conv.is_owned = (hops & 1) || (hops == 0);
+	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);
@@ -29971,11 +36840,13 @@ uint32_t  __attribute__((visibility("default"))) TS_PrivateRoute_into_inner(uint
 	LDKPrivateRoute this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = (this_arg & 1) || (this_arg == 0);
+	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);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -30009,6 +36880,11 @@ uint32_t  __attribute__((visibility("default"))) TS_CreationError_expiry_time_ou
 	return ret_conv;
 }
 
+uint32_t  __attribute__((visibility("default"))) TS_CreationError_invalid_amount() {
+	uint32_t ret_conv = LDKCreationError_to_js(CreationError_invalid_amount());
+	return ret_conv;
+}
+
 jboolean  __attribute__((visibility("default"))) TS_CreationError_eq(uint32_t a, uint32_t b) {
 	LDKCreationError* a_conv = (LDKCreationError*)(a & ~1);
 	LDKCreationError* b_conv = (LDKCreationError*)(b & ~1);
@@ -30104,6 +36980,18 @@ void  __attribute__((visibility("default"))) TS_SignOrCreationError_free(uint32_
 	SignOrCreationError_free(this_ptr_conv);
 }
 
+static inline uint64_t SignOrCreationError_clone_ptr(LDKSignOrCreationError *NONNULL_PTR arg) {
+	LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError");
+	*ret_copy = SignOrCreationError_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_SignOrCreationError_clone_ptr(uint32_t arg) {
+	LDKSignOrCreationError* arg_conv = (LDKSignOrCreationError*)arg;
+	int64_t ret_val = SignOrCreationError_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_SignOrCreationError_clone(uint32_t orig) {
 	LDKSignOrCreationError* orig_conv = (LDKSignOrCreationError*)orig;
 	LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError");
@@ -30146,6 +37034,7 @@ void  __attribute__((visibility("default"))) TS_InvoicePayer_free(uint32_t this_
 	LDKInvoicePayer this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	InvoicePayer_free(this_obj_conv);
 }
 
@@ -30171,6 +37060,7 @@ void  __attribute__((visibility("default"))) TS_RetryAttempts_free(uint32_t this
 	LDKRetryAttempts this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	RetryAttempts_free(this_obj_conv);
 }
 
@@ -30178,6 +37068,7 @@ int64_t  __attribute__((visibility("default"))) TS_RetryAttempts_get_a(uint32_t
 	LDKRetryAttempts this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int64_t ret_val = RetryAttempts_get_a(&this_ptr_conv);
 	return ret_val;
 }
@@ -30186,6 +37077,7 @@ void  __attribute__((visibility("default"))) TS_RetryAttempts_set_a(uint32_t thi
 	LDKRetryAttempts this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	RetryAttempts_set_a(&this_ptr_conv, val);
 }
 
@@ -30194,6 +37086,7 @@ uint32_t  __attribute__((visibility("default"))) TS_RetryAttempts_new(int64_t a_
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -30201,14 +37094,37 @@ uint32_t  __attribute__((visibility("default"))) TS_RetryAttempts_new(int64_t a_
 	return ret_ref;
 }
 
+static inline uint64_t RetryAttempts_clone_ptr(LDKRetryAttempts *NONNULL_PTR arg) {
+	LDKRetryAttempts ret_var = RetryAttempts_clone(arg);
+uint64_t ret_ref = 0;
+CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uint64_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_RetryAttempts_clone_ptr(uint32_t arg) {
+	LDKRetryAttempts arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	int64_t ret_val = RetryAttempts_clone_ptr(&arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_RetryAttempts_clone(uint32_t orig) {
 	LDKRetryAttempts orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRetryAttempts ret_var = RetryAttempts_clone(&orig_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -30220,9 +37136,11 @@ jboolean  __attribute__((visibility("default"))) TS_RetryAttempts_eq(uint32_t a,
 	LDKRetryAttempts a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(a_conv);
 	LDKRetryAttempts b_conv;
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
 	jboolean ret_val = RetryAttempts_eq(&a_conv, &b_conv);
 	return ret_val;
 }
@@ -30231,6 +37149,7 @@ int64_t  __attribute__((visibility("default"))) TS_RetryAttempts_hash(uint32_t o
 	LDKRetryAttempts o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	int64_t ret_val = RetryAttempts_hash(&o_conv);
 	return ret_val;
 }
@@ -30244,6 +37163,18 @@ void  __attribute__((visibility("default"))) TS_PaymentError_free(uint32_t this_
 	PaymentError_free(this_ptr_conv);
 }
 
+static inline uint64_t PaymentError_clone_ptr(LDKPaymentError *NONNULL_PTR arg) {
+	LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError");
+	*ret_copy = PaymentError_clone(arg);
+uint64_t ret_ref = (uint64_t)ret_copy;
+	return ret_ref;
+}
+int64_t  __attribute__((visibility("default"))) TS_PaymentError_clone_ptr(uint32_t arg) {
+	LDKPaymentError* arg_conv = (LDKPaymentError*)arg;
+	int64_t ret_val = PaymentError_clone_ptr(arg_conv);
+	return ret_val;
+}
+
 uint32_t  __attribute__((visibility("default"))) TS_PaymentError_clone(uint32_t orig) {
 	LDKPaymentError* orig_conv = (LDKPaymentError*)orig;
 	LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError");
@@ -30264,6 +37195,7 @@ uint32_t  __attribute__((visibility("default"))) TS_PaymentError_routing(uint32_
 	LDKLightningError a_conv;
 	a_conv.inner = (void*)(a & (~1));
 	a_conv.is_owned = (a & 1) || (a == 0);
+	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);
@@ -30289,9 +37221,10 @@ uint32_t  __attribute__((visibility("default"))) TS_InvoicePayer_new(uint32_t pa
 	void* router_ptr = (void*)(((uint64_t)router) & ~1);
 	CHECK_ACCESS(router_ptr);
 	LDKRouter router_conv = *(LDKRouter*)(router_ptr);
-	LDKLockableScore scorer_conv;
+	LDKMultiThreadedLockableScore scorer_conv;
 	scorer_conv.inner = (void*)(scorer & (~1));
 	scorer_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(scorer_conv);
 	void* logger_ptr = (void*)(((uint64_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
@@ -30301,11 +37234,13 @@ uint32_t  __attribute__((visibility("default"))) TS_InvoicePayer_new(uint32_t pa
 	LDKRetryAttempts retry_attempts_conv;
 	retry_attempts_conv.inner = (void*)(retry_attempts & (~1));
 	retry_attempts_conv.is_owned = (retry_attempts & 1) || (retry_attempts == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(retry_attempts_conv);
 	retry_attempts_conv = RetryAttempts_clone(&retry_attempts_conv);
 	LDKInvoicePayer ret_var = InvoicePayer_new(payer_conv, router_conv, &scorer_conv, logger_conv, event_handler_conv, retry_attempts_conv);
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -30317,9 +37252,11 @@ uint32_t  __attribute__((visibility("default"))) TS_InvoicePayer_pay_invoice(uin
 	LDKInvoicePayer this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKInvoice invoice_conv;
 	invoice_conv.inner = (void*)(invoice & (~1));
 	invoice_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(invoice_conv);
 	LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ");
 	*ret_conv = InvoicePayer_pay_invoice(&this_arg_conv, &invoice_conv);
 	return (uint64_t)ret_conv;
@@ -30329,18 +37266,37 @@ uint32_t  __attribute__((visibility("default"))) TS_InvoicePayer_pay_zero_value_
 	LDKInvoicePayer this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKInvoice invoice_conv;
 	invoice_conv.inner = (void*)(invoice & (~1));
 	invoice_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(invoice_conv);
 	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 (uint64_t)ret_conv;
 }
 
+uint32_t  __attribute__((visibility("default"))) 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) {
+	LDKInvoicePayer this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	LDKPublicKey pubkey_ref;
+	CHECK(*((uint32_t*)pubkey) == 33);
+	memcpy(pubkey_ref.compressed_form, (uint8_t*)(pubkey + 4), 33);
+	LDKThirtyTwoBytes payment_preimage_ref;
+	CHECK(*((uint32_t*)payment_preimage) == 32);
+	memcpy(payment_preimage_ref.data, (uint8_t*)(payment_preimage + 4), 32);
+	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 (uint64_t)ret_conv;
+}
+
 void  __attribute__((visibility("default"))) TS_InvoicePayer_remove_cached_payment(uint32_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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	unsigned char payment_hash_arr[32];
 	CHECK(*((uint32_t*)payment_hash) == 32);
 	memcpy(payment_hash_arr, (uint8_t*)(payment_hash + 4), 32);
@@ -30352,6 +37308,7 @@ uint32_t  __attribute__((visibility("default"))) TS_InvoicePayer_as_EventHandler
 	LDKInvoicePayer this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKEventHandler* ret_ret = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler");
 	*ret_ret = InvoicePayer_as_EventHandler(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -30361,6 +37318,7 @@ uint32_t  __attribute__((visibility("default"))) TS_create_invoice_from_channelm
 	LDKChannelManager channelmanager_conv;
 	channelmanager_conv.inner = (void*)(channelmanager & (~1));
 	channelmanager_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channelmanager_conv);
 	void* keys_manager_ptr = (void*)(((uint64_t)keys_manager) & ~1);
 	CHECK_ACCESS(keys_manager_ptr);
 	LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr);
@@ -30379,6 +37337,7 @@ void  __attribute__((visibility("default"))) TS_DefaultRouter_free(uint32_t this
 	LDKDefaultRouter this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
 	DefaultRouter_free(this_obj_conv);
 }
 
@@ -30386,6 +37345,7 @@ uint32_t  __attribute__((visibility("default"))) TS_DefaultRouter_new(uint32_t n
 	LDKNetworkGraph network_graph_conv;
 	network_graph_conv.inner = (void*)(network_graph & (~1));
 	network_graph_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv);
 	void* logger_ptr = (void*)(((uint64_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
@@ -30393,6 +37353,7 @@ uint32_t  __attribute__((visibility("default"))) TS_DefaultRouter_new(uint32_t n
 	uint64_t ret_ref = 0;
 	CHECK((((uint64_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uint64_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
 	ret_ref = (uint64_t)ret_var.inner;
 	if (ret_var.is_owned) {
 		ret_ref |= 1;
@@ -30404,6 +37365,7 @@ uint32_t  __attribute__((visibility("default"))) TS_DefaultRouter_as_Router(uint
 	LDKDefaultRouter this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKRouter* ret_ret = MALLOC(sizeof(LDKRouter), "LDKRouter");
 	*ret_ret = DefaultRouter_as_Router(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -30413,6 +37375,7 @@ uint32_t  __attribute__((visibility("default"))) TS_ChannelManager_as_Payer(uint
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKPayer* ret_ret = MALLOC(sizeof(LDKPayer), "LDKPayer");
 	*ret_ret = ChannelManager_as_Payer(&this_arg_conv);
 	return (uint64_t)ret_ret;
@@ -30443,6 +37406,7 @@ jstring  __attribute__((visibility("default"))) TS_Invoice_to_str(uint32_t o) {
 	LDKInvoice o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	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);
@@ -30453,6 +37417,7 @@ jstring  __attribute__((visibility("default"))) TS_SignedRawInvoice_to_str(uint3
 	LDKSignedRawInvoice o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
 	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);