X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=inline;f=ts%2Fbindings.c.body;h=b6f6051c090f6c4c781515ab081a14fafb66d8b1;hb=711bc9cabbf2a733bd86133f86128348f338bf34;hp=fc95d8c363883f039ed31130aa3d64b8dfbd43f8;hpb=d941cc4e66ea53ce81912a04d35b164344f3a7ee;p=ldk-java

diff --git a/ts/bindings.c.body b/ts/bindings.c.body
index fc95d8c3..b6f6051c 100644
--- a/ts/bindings.c.body
+++ b/ts/bindings.c.body
@@ -190,6 +190,52 @@ static inline int32_t LDKCurrency_to_js(LDKCurrency val) {
 		default: abort();
 	}
 }
+static inline LDKIOError LDKIOError_from_js(int32_t ord) {
+	switch (ord) {
+		case 0: return LDKIOError_NotFound;
+		case 1: return LDKIOError_PermissionDenied;
+		case 2: return LDKIOError_ConnectionRefused;
+		case 3: return LDKIOError_ConnectionReset;
+		case 4: return LDKIOError_ConnectionAborted;
+		case 5: return LDKIOError_NotConnected;
+		case 6: return LDKIOError_AddrInUse;
+		case 7: return LDKIOError_AddrNotAvailable;
+		case 8: return LDKIOError_BrokenPipe;
+		case 9: return LDKIOError_AlreadyExists;
+		case 10: return LDKIOError_WouldBlock;
+		case 11: return LDKIOError_InvalidInput;
+		case 12: return LDKIOError_InvalidData;
+		case 13: return LDKIOError_TimedOut;
+		case 14: return LDKIOError_WriteZero;
+		case 15: return LDKIOError_Interrupted;
+		case 16: return LDKIOError_Other;
+		case 17: return LDKIOError_UnexpectedEof;
+	}
+	abort();
+}
+static inline int32_t LDKIOError_to_js(LDKIOError val) {
+	switch (val) {
+		case LDKIOError_NotFound: return 0;
+		case LDKIOError_PermissionDenied: return 1;
+		case LDKIOError_ConnectionRefused: return 2;
+		case LDKIOError_ConnectionReset: return 3;
+		case LDKIOError_ConnectionAborted: return 4;
+		case LDKIOError_NotConnected: return 5;
+		case LDKIOError_AddrInUse: return 6;
+		case LDKIOError_AddrNotAvailable: return 7;
+		case LDKIOError_BrokenPipe: return 8;
+		case LDKIOError_AlreadyExists: return 9;
+		case LDKIOError_WouldBlock: return 10;
+		case LDKIOError_InvalidInput: return 11;
+		case LDKIOError_InvalidData: return 12;
+		case LDKIOError_TimedOut: return 13;
+		case LDKIOError_WriteZero: return 14;
+		case LDKIOError_Interrupted: return 15;
+		case LDKIOError_Other: return 16;
+		case LDKIOError_UnexpectedEof: return 17;
+		default: abort();
+	}
+}
 static inline LDKLevel LDKLevel_from_js(int32_t ord) {
 	switch (ord) {
 		case 0: return LDKLevel_Gossip;
@@ -251,10 +297,12 @@ static inline LDKSecp256k1Error LDKSecp256k1Error_from_js(int32_t ord) {
 		case 2: return LDKSecp256k1Error_InvalidPublicKey;
 		case 3: return LDKSecp256k1Error_InvalidSignature;
 		case 4: return LDKSecp256k1Error_InvalidSecretKey;
-		case 5: return LDKSecp256k1Error_InvalidRecoveryId;
-		case 6: return LDKSecp256k1Error_InvalidTweak;
-		case 7: return LDKSecp256k1Error_TweakCheckFailed;
+		case 5: return LDKSecp256k1Error_InvalidSharedSecret;
+		case 6: return LDKSecp256k1Error_InvalidRecoveryId;
+		case 7: return LDKSecp256k1Error_InvalidTweak;
 		case 8: return LDKSecp256k1Error_NotEnoughMemory;
+		case 9: return LDKSecp256k1Error_InvalidPublicKeySum;
+		case 10: return LDKSecp256k1Error_InvalidParityValue;
 	}
 	abort();
 }
@@ -265,10 +313,12 @@ static inline int32_t LDKSecp256k1Error_to_js(LDKSecp256k1Error val) {
 		case LDKSecp256k1Error_InvalidPublicKey: return 2;
 		case LDKSecp256k1Error_InvalidSignature: return 3;
 		case LDKSecp256k1Error_InvalidSecretKey: return 4;
-		case LDKSecp256k1Error_InvalidRecoveryId: return 5;
-		case LDKSecp256k1Error_InvalidTweak: return 6;
-		case LDKSecp256k1Error_TweakCheckFailed: return 7;
+		case LDKSecp256k1Error_InvalidSharedSecret: return 5;
+		case LDKSecp256k1Error_InvalidRecoveryId: return 6;
+		case LDKSecp256k1Error_InvalidTweak: return 7;
 		case LDKSecp256k1Error_NotEnoughMemory: return 8;
+		case LDKSecp256k1Error_InvalidPublicKeySum: return 9;
+		case LDKSecp256k1Error_InvalidParityValue: return 10;
 		default: abort();
 	}
 }
@@ -320,6 +370,31 @@ static inline int32_t LDKSiPrefix_to_js(LDKSiPrefix val) {
 		default: abort();
 	}
 }
+uint32_t __attribute__((export_name("TS_LDKBech32Error_ty_from_ptr"))) TS_LDKBech32Error_ty_from_ptr(uint32_t ptr) {
+	LDKBech32Error *obj = (LDKBech32Error*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKBech32Error_MissingSeparator: return 0;
+		case LDKBech32Error_InvalidChecksum: return 1;
+		case LDKBech32Error_InvalidLength: return 2;
+		case LDKBech32Error_InvalidChar: return 3;
+		case LDKBech32Error_InvalidData: return 4;
+		case LDKBech32Error_InvalidPadding: return 5;
+		case LDKBech32Error_MixedCase: return 6;
+		default: abort();
+	}
+}
+int32_t __attribute__((export_name("TS_LDKBech32Error_InvalidChar_get_invalid_char"))) TS_LDKBech32Error_InvalidChar_get_invalid_char(uint32_t ptr) {
+	LDKBech32Error *obj = (LDKBech32Error*)(ptr & ~1);
+	assert(obj->tag == LDKBech32Error_InvalidChar);
+			int32_t invalid_char_conv = obj->invalid_char;
+	return invalid_char_conv;
+}
+int8_t __attribute__((export_name("TS_LDKBech32Error_InvalidData_get_invalid_data"))) TS_LDKBech32Error_InvalidData_get_invalid_data(uint32_t ptr) {
+	LDKBech32Error *obj = (LDKBech32Error*)(ptr & ~1);
+	assert(obj->tag == LDKBech32Error_InvalidData);
+			int8_t invalid_data_conv = obj->invalid_data;
+	return invalid_data_conv;
+}
 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);
@@ -336,8 +411,8 @@ struct LDKCVec_u8Z TxOut_get_script_pubkey (struct LDKTxOut* thing) {	return CVe
 
 uint64_t TxOut_get_value (struct LDKTxOut* thing) {	return thing->value;}int64_t  __attribute__((export_name("TS_TxOut_get_value"))) TS_TxOut_get_value(uint32_t thing) {
 	LDKTxOut* thing_conv = (LDKTxOut*)(thing & ~1);
-	int64_t ret_val = TxOut_get_value(thing_conv);
-	return ret_val;
+	int64_t ret_conv = TxOut_get_value(thing_conv);
+	return ret_conv;
 }
 
 static inline void CResult_NoneNoneZ_get_ok(LDKCResult_NoneNoneZ *NONNULL_PTR owner){
@@ -365,7 +440,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(owner & ~1);
 	LDKCounterpartyCommitmentSecrets ret_var = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -383,7 +458,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -443,7 +518,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_get_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_TxCreationKeysDecodeErrorZ* owner_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(owner & ~1);
 	LDKTxCreationKeys ret_var = CResult_TxCreationKeysDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -461,7 +536,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_get_err"))) TS_CResult_TxCreationKeysDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_TxCreationKeysDecodeErrorZ* owner_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_TxCreationKeysDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -479,7 +554,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_get_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* owner_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(owner & ~1);
 	LDKChannelPublicKeys ret_var = CResult_ChannelPublicKeysDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -497,7 +572,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_get_err"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* owner_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ChannelPublicKeysDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -515,7 +590,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_get_ok"))) TS_CResult_TxCreationKeysErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_TxCreationKeysErrorZ* owner_conv = (LDKCResult_TxCreationKeysErrorZ*)(owner & ~1);
 	LDKTxCreationKeys ret_var = CResult_TxCreationKeysErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -547,7 +622,8 @@ uint32_t __attribute__((export_name("TS_LDKCOption_u32Z_ty_from_ptr"))) TS_LDKCO
 int32_t __attribute__((export_name("TS_LDKCOption_u32Z_Some_get_some"))) TS_LDKCOption_u32Z_Some_get_some(uint32_t ptr) {
 	LDKCOption_u32Z *obj = (LDKCOption_u32Z*)(ptr & ~1);
 	assert(obj->tag == LDKCOption_u32Z_Some);
-	return obj->some;
+			int32_t some_conv = obj->some;
+	return some_conv;
 }
 static inline struct LDKHTLCOutputInCommitment CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
@@ -556,7 +632,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* owner_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(owner & ~1);
 	LDKHTLCOutputInCommitment ret_var = CResult_HTLCOutputInCommitmentDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -574,7 +650,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* owner_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_HTLCOutputInCommitmentDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -592,7 +668,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(owner & ~1);
 	LDKCounterpartyChannelTransactionParameters ret_var = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -610,7 +686,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -628,7 +704,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(owner & ~1);
 	LDKChannelTransactionParameters ret_var = CResult_ChannelTransactionParametersDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -646,7 +722,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_err"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* owner_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ChannelTransactionParametersDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -664,7 +740,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(owner & ~1);
 	LDKHolderCommitmentTransaction ret_var = CResult_HolderCommitmentTransactionDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -682,7 +758,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_HolderCommitmentTransactionDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -700,7 +776,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(owner & ~1);
 	LDKBuiltCommitmentTransaction ret_var = CResult_BuiltCommitmentTransactionDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -718,7 +794,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_BuiltCommitmentTransactionDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -736,7 +812,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_get_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_get_ok(uint32_t owner) {
 	LDKCResult_TrustedClosingTransactionNoneZ* owner_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)(owner & ~1);
 	LDKTrustedClosingTransaction ret_var = *CResult_TrustedClosingTransactionNoneZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -760,7 +836,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_get_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_CommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(owner & ~1);
 	LDKCommitmentTransaction ret_var = CResult_CommitmentTransactionDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -778,7 +854,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_get_err"))) TS_CResult_CommitmentTransactionDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_CommitmentTransactionDecodeErrorZ* owner_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_CommitmentTransactionDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -796,7 +872,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_get_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_get_ok(uint32_t owner) {
 	LDKCResult_TrustedCommitmentTransactionNoneZ* owner_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(owner & ~1);
 	LDKTrustedCommitmentTransaction ret_var = *CResult_TrustedCommitmentTransactionNoneZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -848,7 +924,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_get_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ShutdownScriptDecodeErrorZ* owner_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(owner & ~1);
 	LDKShutdownScript ret_var = CResult_ShutdownScriptDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -866,7 +942,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_get_err"))) TS_CResult_ShutdownScriptDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ShutdownScriptDecodeErrorZ* owner_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ShutdownScriptDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -884,7 +960,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(uint32_t owner) {
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* owner_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(owner & ~1);
 	LDKShutdownScript ret_var = CResult_ShutdownScriptInvalidShutdownScriptZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -902,7 +978,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_err"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(uint32_t owner) {
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* owner_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(owner & ~1);
 	LDKInvalidShutdownScript ret_var = CResult_ShutdownScriptInvalidShutdownScriptZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -920,7 +996,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_get_ok"))) TS_CResult_RouteHopDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_RouteHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHopDecodeErrorZ*)(owner & ~1);
 	LDKRouteHop ret_var = CResult_RouteHopDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -938,7 +1014,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_get_err"))) TS_CResult_RouteHopDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_RouteHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHopDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_RouteHopDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -970,7 +1046,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_get_ok"))) TS_CResult_RouteDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_RouteDecodeErrorZ* owner_conv = (LDKCResult_RouteDecodeErrorZ*)(owner & ~1);
 	LDKRoute ret_var = CResult_RouteDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -988,7 +1064,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_get_err"))) TS_CResult_RouteDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_RouteDecodeErrorZ* owner_conv = (LDKCResult_RouteDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_RouteDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1006,7 +1082,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_get_ok"))) TS_CResult_RouteParametersDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_RouteParametersDecodeErrorZ* owner_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(owner & ~1);
 	LDKRouteParameters ret_var = CResult_RouteParametersDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1024,7 +1100,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_get_err"))) TS_CResult_RouteParametersDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_RouteParametersDecodeErrorZ* owner_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_RouteParametersDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1053,7 +1129,8 @@ uint32_t __attribute__((export_name("TS_LDKCOption_u64Z_ty_from_ptr"))) TS_LDKCO
 int64_t __attribute__((export_name("TS_LDKCOption_u64Z_Some_get_some"))) TS_LDKCOption_u64Z_Some_get_some(uint32_t ptr) {
 	LDKCOption_u64Z *obj = (LDKCOption_u64Z*)(ptr & ~1);
 	assert(obj->tag == LDKCOption_u64Z_Some);
-	return obj->some;
+			int64_t some_conv = obj->some;
+	return some_conv;
 }
 static inline struct LDKPaymentParameters CResult_PaymentParametersDecodeErrorZ_get_ok(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
@@ -1062,7 +1139,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_get_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_PaymentParametersDecodeErrorZ* owner_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(owner & ~1);
 	LDKPaymentParameters ret_var = CResult_PaymentParametersDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1080,7 +1157,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_get_err"))) TS_CResult_PaymentParametersDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_PaymentParametersDecodeErrorZ* owner_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_PaymentParametersDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1105,7 +1182,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_get_ok"))) TS_CResult_RouteHintDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_RouteHintDecodeErrorZ* owner_conv = (LDKCResult_RouteHintDecodeErrorZ*)(owner & ~1);
 	LDKRouteHint ret_var = CResult_RouteHintDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1123,7 +1200,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_get_err"))) TS_CResult_RouteHintDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_RouteHintDecodeErrorZ* owner_conv = (LDKCResult_RouteHintDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_RouteHintDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1141,7 +1218,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_get_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_RouteHintHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(owner & ~1);
 	LDKRouteHintHop ret_var = CResult_RouteHintHopDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1159,7 +1236,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_get_err"))) TS_CResult_RouteHintHopDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_RouteHintHopDecodeErrorZ* owner_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_RouteHintHopDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1184,7 +1261,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_get_ok"))) TS_CResult_RouteLightningErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_RouteLightningErrorZ* owner_conv = (LDKCResult_RouteLightningErrorZ*)(owner & ~1);
 	LDKRoute ret_var = CResult_RouteLightningErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1202,7 +1279,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_get_err"))) TS_CResult_RouteLightningErrorZ_get_err(uint32_t owner) {
 	LDKCResult_RouteLightningErrorZ* owner_conv = (LDKCResult_RouteLightningErrorZ*)(owner & ~1);
 	LDKLightningError ret_var = CResult_RouteLightningErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1213,162 +1290,65 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_get_err"))
 	return ret_ref;
 }
 
-static inline struct LDKTxOut CResult_TxOutAccessErrorZ_get_ok(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return TxOut_clone(&*owner->contents.result);
-}
-uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_ok"))) TS_CResult_TxOutAccessErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)(owner & ~1);
-	LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut");
-	*ret_ref = CResult_TxOutAccessErrorZ_get_ok(owner_conv);
-	return (uintptr_t)ret_ref;
-}
-
-static inline enum LDKAccessError CResult_TxOutAccessErrorZ_get_err(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return AccessError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_err"))) TS_CResult_TxOutAccessErrorZ_get_err(uint32_t owner) {
-	LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)(owner & ~1);
-	uint32_t ret_conv = LDKAccessError_to_js(CResult_TxOutAccessErrorZ_get_err(owner_conv));
-	return ret_conv;
-}
-
-static inline uintptr_t C2Tuple_usizeTransactionZ_get_a(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner){
-	return owner->a;
-}
-intptr_t  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_a"))) TS_C2Tuple_usizeTransactionZ_get_a(uint32_t owner) {
-	LDKC2Tuple_usizeTransactionZ* owner_conv = (LDKC2Tuple_usizeTransactionZ*)(owner & ~1);
-	intptr_t ret_val = C2Tuple_usizeTransactionZ_get_a(owner_conv);
-	return ret_val;
-}
-
-static inline struct LDKTransaction C2Tuple_usizeTransactionZ_get_b(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner){
-	return owner->b;
-}
-int8_tArray  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_b"))) TS_C2Tuple_usizeTransactionZ_get_b(uint32_t owner) {
-	LDKC2Tuple_usizeTransactionZ* owner_conv = (LDKC2Tuple_usizeTransactionZ*)(owner & ~1);
-	LDKTransaction ret_var = C2Tuple_usizeTransactionZ_get_b(owner_conv);
-	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
-	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
-	return ret_arr;
-}
-
-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++) {
-		ret.data[i] = C2Tuple_usizeTransactionZ_clone(&orig->data[i]);
-	}
-	return ret;
-}
-static inline LDKCVec_TxidZ CVec_TxidZ_clone(const LDKCVec_TxidZ *orig) {
-	LDKCVec_TxidZ ret = { .data = MALLOC(sizeof(LDKThirtyTwoBytes) * orig->datalen, "LDKCVec_TxidZ clone bytes"), .datalen = orig->datalen };
-	for (size_t i = 0; i < ret.datalen; i++) {
-		ret.data[i] = ThirtyTwoBytes_clone(&orig->data[i]);
-	}
-	return ret;
-}
-static inline void CResult_NoneChannelMonitorUpdateErrZ_get_ok(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return *owner->contents.result;
-}
-void  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok(uint32_t owner) {
-	LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(owner & ~1);
-	CResult_NoneChannelMonitorUpdateErrZ_get_ok(owner_conv);
-}
-
-static inline enum LDKChannelMonitorUpdateErr CResult_NoneChannelMonitorUpdateErrZ_get_err(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return ChannelMonitorUpdateErr_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_err(uint32_t owner) {
-	LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(owner & ~1);
-	uint32_t ret_conv = LDKChannelMonitorUpdateErr_to_js(CResult_NoneChannelMonitorUpdateErrZ_get_err(owner_conv));
-	return ret_conv;
-}
-
-uint32_t __attribute__((export_name("TS_LDKMonitorEvent_ty_from_ptr"))) TS_LDKMonitorEvent_ty_from_ptr(uint32_t ptr) {
-	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
+uint32_t __attribute__((export_name("TS_LDKPaymentPurpose_ty_from_ptr"))) TS_LDKPaymentPurpose_ty_from_ptr(uint32_t ptr) {
+	LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1);
 	switch(obj->tag) {
-		case LDKMonitorEvent_HTLCEvent: return 0;
-		case LDKMonitorEvent_CommitmentTxConfirmed: return 1;
-		case LDKMonitorEvent_UpdateCompleted: return 2;
-		case LDKMonitorEvent_UpdateFailed: return 3;
+		case LDKPaymentPurpose_InvoicePayment: return 0;
+		case LDKPaymentPurpose_SpontaneousPayment: return 1;
 		default: abort();
 	}
 }
-uint32_t __attribute__((export_name("TS_LDKMonitorEvent_HTLCEvent_get_htlc_event"))) TS_LDKMonitorEvent_HTLCEvent_get_htlc_event(uint32_t ptr) {
-	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
-	assert(obj->tag == LDKMonitorEvent_HTLCEvent);
-			LDKHTLCUpdate htlc_event_var = obj->htlc_event;
-			uintptr_t htlc_event_ref = 0;
-			CHECK((((uintptr_t)htlc_event_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-			CHECK((((uintptr_t)&htlc_event_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-			CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_event_var);
-			htlc_event_ref = (uintptr_t)htlc_event_var.inner & ~1;
-	return htlc_event_ref;
+int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_InvoicePayment_get_payment_preimage"))) TS_LDKPaymentPurpose_InvoicePayment_get_payment_preimage(uint32_t ptr) {
+	LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1);
+	assert(obj->tag == LDKPaymentPurpose_InvoicePayment);
+			int8_tArray payment_preimage_arr = init_int8_tArray(32, __LINE__);
+			memcpy(payment_preimage_arr->elems, obj->invoice_payment.payment_preimage.data, 32);
+	return payment_preimage_arr;
 }
-uint32_t __attribute__((export_name("TS_LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed"))) TS_LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed(uint32_t ptr) {
-	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
-	assert(obj->tag == LDKMonitorEvent_CommitmentTxConfirmed);
-			LDKOutPoint commitment_tx_confirmed_var = obj->commitment_tx_confirmed;
-			uintptr_t commitment_tx_confirmed_ref = 0;
-			CHECK((((uintptr_t)commitment_tx_confirmed_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-			CHECK((((uintptr_t)&commitment_tx_confirmed_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-			CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_confirmed_var);
-			commitment_tx_confirmed_ref = (uintptr_t)commitment_tx_confirmed_var.inner & ~1;
-	return commitment_tx_confirmed_ref;
+int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_InvoicePayment_get_payment_secret"))) TS_LDKPaymentPurpose_InvoicePayment_get_payment_secret(uint32_t ptr) {
+	LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1);
+	assert(obj->tag == LDKPaymentPurpose_InvoicePayment);
+			int8_tArray payment_secret_arr = init_int8_tArray(32, __LINE__);
+			memcpy(payment_secret_arr->elems, obj->invoice_payment.payment_secret.data, 32);
+	return payment_secret_arr;
 }
-uint32_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateCompleted_get_funding_txo"))) TS_LDKMonitorEvent_UpdateCompleted_get_funding_txo(uint32_t ptr) {
-	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
-	assert(obj->tag == LDKMonitorEvent_UpdateCompleted);
-			LDKOutPoint funding_txo_var = obj->update_completed.funding_txo;
-			uintptr_t funding_txo_ref = 0;
-			CHECK((((uintptr_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-			CHECK((((uintptr_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-			CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var);
-			funding_txo_ref = (uintptr_t)funding_txo_var.inner & ~1;
-	return funding_txo_ref;
+int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment"))) TS_LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment(uint32_t ptr) {
+	LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1);
+	assert(obj->tag == LDKPaymentPurpose_SpontaneousPayment);
+			int8_tArray spontaneous_payment_arr = init_int8_tArray(32, __LINE__);
+			memcpy(spontaneous_payment_arr->elems, obj->spontaneous_payment.data, 32);
+	return spontaneous_payment_arr;
 }
-int64_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateCompleted_get_monitor_update_id"))) TS_LDKMonitorEvent_UpdateCompleted_get_monitor_update_id(uint32_t ptr) {
-	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
-	assert(obj->tag == LDKMonitorEvent_UpdateCompleted);
-	return obj->update_completed.monitor_update_id;
+static inline struct LDKPaymentPurpose CResult_PaymentPurposeDecodeErrorZ_get_ok(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return PaymentPurpose_clone(&*owner->contents.result);
 }
-uint32_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateFailed_get_update_failed"))) TS_LDKMonitorEvent_UpdateFailed_get_update_failed(uint32_t ptr) {
-	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
-	assert(obj->tag == LDKMonitorEvent_UpdateFailed);
-			LDKOutPoint update_failed_var = obj->update_failed;
-			uintptr_t update_failed_ref = 0;
-			CHECK((((uintptr_t)update_failed_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-			CHECK((((uintptr_t)&update_failed_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-			CHECK_INNER_FIELD_ACCESS_OR_NULL(update_failed_var);
-			update_failed_ref = (uintptr_t)update_failed_var.inner & ~1;
-	return update_failed_ref;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_get_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_PaymentPurposeDecodeErrorZ* owner_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(owner & ~1);
+	LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose");
+	*ret_copy = CResult_PaymentPurposeDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
-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++) {
-		ret.data[i] = MonitorEvent_clone(&orig->data[i]);
-	}
-	return ret;
+
+static inline struct LDKDecodeError CResult_PaymentPurposeDecodeErrorZ_get_err(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr(uint32_t ptr) {
-	LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)(ptr & ~1);
-	switch(obj->tag) {
-		case LDKCOption_C2Tuple_usizeTransactionZZ_Some: return 0;
-		case LDKCOption_C2Tuple_usizeTransactionZZ_None: return 1;
-		default: abort();
+uint32_t  __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_get_err"))) TS_CResult_PaymentPurposeDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_PaymentPurposeDecodeErrorZ* owner_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_PaymentPurposeDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
 	}
+	return ret_ref;
 }
-uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(uint32_t ptr) {
-	LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)(ptr & ~1);
-	assert(obj->tag == LDKCOption_C2Tuple_usizeTransactionZZ_Some);
-			LDKC2Tuple_usizeTransactionZ* some_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ");
-			*some_conv = obj->some;
-			*some_conv = C2Tuple_usizeTransactionZ_clone(some_conv);
-	return ((uintptr_t)some_conv);
-}
+
 uint32_t __attribute__((export_name("TS_LDKClosureReason_ty_from_ptr"))) TS_LDKClosureReason_ty_from_ptr(uint32_t ptr) {
 	LDKClosureReason *obj = (LDKClosureReason*)(ptr & ~1);
 	switch(obj->tag) {
@@ -1408,7 +1388,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_ClosureReasonZ_ty_from_ptr"))
 uint32_t __attribute__((export_name("TS_LDKCOption_ClosureReasonZ_Some_get_some"))) TS_LDKCOption_ClosureReasonZ_Some_get_some(uint32_t ptr) {
 	LDKCOption_ClosureReasonZ *obj = (LDKCOption_ClosureReasonZ*)(ptr & ~1);
 	assert(obj->tag == LDKCOption_ClosureReasonZ_Some);
-			uintptr_t some_ref = ((uintptr_t)&obj->some) | 1;
+			uint32_t some_ref = ((uintptr_t)&obj->some) | 1;
 	return some_ref;
 }
 static inline struct LDKCOption_ClosureReasonZ CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR owner){
@@ -1419,7 +1399,7 @@ uint32_t  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErr
 	LDKCResult_COption_ClosureReasonZDecodeErrorZ* owner_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(owner & ~1);
 	LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ");
 	*ret_copy = CResult_COption_ClosureReasonZDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -1430,7 +1410,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_err"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_COption_ClosureReasonZDecodeErrorZ* owner_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_COption_ClosureReasonZDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1445,7 +1425,7 @@ uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ty_from_ptr"))) TS_LDKN
 	LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1);
 	switch(obj->tag) {
 		case LDKNetworkUpdate_ChannelUpdateMessage: return 0;
-		case LDKNetworkUpdate_ChannelClosed: return 1;
+		case LDKNetworkUpdate_ChannelFailure: return 1;
 		case LDKNetworkUpdate_NodeFailure: return 2;
 		default: abort();
 	}
@@ -1454,22 +1434,24 @@ uint32_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelUpdateMessage_ge
 	LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1);
 	assert(obj->tag == LDKNetworkUpdate_ChannelUpdateMessage);
 			LDKChannelUpdate msg_var = obj->channel_update_message.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uintptr_t)msg_var.inner & ~1;
 	return msg_ref;
 }
-int64_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelClosed_get_short_channel_id"))) TS_LDKNetworkUpdate_ChannelClosed_get_short_channel_id(uint32_t ptr) {
+int64_t __attribute__((export_name("TS_LDKNetworkUpdate_ChannelFailure_get_short_channel_id"))) TS_LDKNetworkUpdate_ChannelFailure_get_short_channel_id(uint32_t ptr) {
 	LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1);
-	assert(obj->tag == LDKNetworkUpdate_ChannelClosed);
-	return obj->channel_closed.short_channel_id;
+	assert(obj->tag == LDKNetworkUpdate_ChannelFailure);
+			int64_t short_channel_id_conv = obj->channel_failure.short_channel_id;
+	return short_channel_id_conv;
 }
-jboolean __attribute__((export_name("TS_LDKNetworkUpdate_ChannelClosed_get_is_permanent"))) TS_LDKNetworkUpdate_ChannelClosed_get_is_permanent(uint32_t ptr) {
+jboolean __attribute__((export_name("TS_LDKNetworkUpdate_ChannelFailure_get_is_permanent"))) TS_LDKNetworkUpdate_ChannelFailure_get_is_permanent(uint32_t ptr) {
 	LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1);
-	assert(obj->tag == LDKNetworkUpdate_ChannelClosed);
-	return obj->channel_closed.is_permanent;
+	assert(obj->tag == LDKNetworkUpdate_ChannelFailure);
+			jboolean is_permanent_conv = obj->channel_failure.is_permanent;
+	return is_permanent_conv;
 }
 int8_tArray __attribute__((export_name("TS_LDKNetworkUpdate_NodeFailure_get_node_id"))) TS_LDKNetworkUpdate_NodeFailure_get_node_id(uint32_t ptr) {
 	LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1);
@@ -1481,7 +1463,8 @@ int8_tArray __attribute__((export_name("TS_LDKNetworkUpdate_NodeFailure_get_node
 jboolean __attribute__((export_name("TS_LDKNetworkUpdate_NodeFailure_get_is_permanent"))) TS_LDKNetworkUpdate_NodeFailure_get_is_permanent(uint32_t ptr) {
 	LDKNetworkUpdate *obj = (LDKNetworkUpdate*)(ptr & ~1);
 	assert(obj->tag == LDKNetworkUpdate_NodeFailure);
-	return obj->node_failure.is_permanent;
+			jboolean is_permanent_conv = obj->node_failure.is_permanent;
+	return is_permanent_conv;
 }
 uint32_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_ty_from_ptr"))) TS_LDKCOption_NetworkUpdateZ_ty_from_ptr(uint32_t ptr) {
 	LDKCOption_NetworkUpdateZ *obj = (LDKCOption_NetworkUpdateZ*)(ptr & ~1);
@@ -1494,7 +1477,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_ty_from_ptr"))
 uint32_t __attribute__((export_name("TS_LDKCOption_NetworkUpdateZ_Some_get_some"))) TS_LDKCOption_NetworkUpdateZ_Some_get_some(uint32_t ptr) {
 	LDKCOption_NetworkUpdateZ *obj = (LDKCOption_NetworkUpdateZ*)(ptr & ~1);
 	assert(obj->tag == LDKCOption_NetworkUpdateZ_Some);
-			uintptr_t some_ref = ((uintptr_t)&obj->some) | 1;
+			uint32_t some_ref = ((uintptr_t)&obj->some) | 1;
 	return some_ref;
 }
 uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_ty_from_ptr"))) TS_LDKSpendableOutputDescriptor_ty_from_ptr(uint32_t ptr) {
@@ -1510,7 +1493,7 @@ uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutpu
 	LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1);
 	assert(obj->tag == LDKSpendableOutputDescriptor_StaticOutput);
 			LDKOutPoint outpoint_var = obj->static_output.outpoint;
-			uintptr_t outpoint_ref = 0;
+			uint32_t outpoint_ref = 0;
 			CHECK((((uintptr_t)outpoint_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&outpoint_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(outpoint_var);
@@ -1520,14 +1503,14 @@ uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutpu
 uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticOutput_get_output"))) TS_LDKSpendableOutputDescriptor_StaticOutput_get_output(uint32_t ptr) {
 	LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1);
 	assert(obj->tag == LDKSpendableOutputDescriptor_StaticOutput);
-			uintptr_t output_ref = ((uintptr_t)&obj->static_output.output) | 1;
-	return (uintptr_t)output_ref;
+			uint32_t output_ref = ((uintptr_t)&obj->static_output.output) | 1;
+	return (uint32_t)output_ref;
 }
 uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output"))) TS_LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output(uint32_t ptr) {
 	LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1);
 	assert(obj->tag == LDKSpendableOutputDescriptor_DelayedPaymentOutput);
 			LDKDelayedPaymentOutputDescriptor delayed_payment_output_var = obj->delayed_payment_output;
-			uintptr_t delayed_payment_output_ref = 0;
+			uint32_t delayed_payment_output_ref = 0;
 			CHECK((((uintptr_t)delayed_payment_output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&delayed_payment_output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(delayed_payment_output_var);
@@ -1538,7 +1521,7 @@ uint32_t __attribute__((export_name("TS_LDKSpendableOutputDescriptor_StaticPayme
 	LDKSpendableOutputDescriptor *obj = (LDKSpendableOutputDescriptor*)(ptr & ~1);
 	assert(obj->tag == LDKSpendableOutputDescriptor_StaticPaymentOutput);
 			LDKStaticPaymentOutputDescriptor static_payment_output_var = obj->static_payment_output;
-			uintptr_t static_payment_output_ref = 0;
+			uint32_t static_payment_output_ref = 0;
 			CHECK((((uintptr_t)static_payment_output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&static_payment_output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(static_payment_output_var);
@@ -1552,50 +1535,22 @@ static inline LDKCVec_SpendableOutputDescriptorZ CVec_SpendableOutputDescriptorZ
 	}
 	return ret;
 }
-uint32_t __attribute__((export_name("TS_LDKPaymentPurpose_ty_from_ptr"))) TS_LDKPaymentPurpose_ty_from_ptr(uint32_t ptr) {
-	LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1);
-	switch(obj->tag) {
-		case LDKPaymentPurpose_InvoicePayment: return 0;
-		case LDKPaymentPurpose_SpontaneousPayment: return 1;
-		default: abort();
-	}
-}
-int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_InvoicePayment_get_payment_preimage"))) TS_LDKPaymentPurpose_InvoicePayment_get_payment_preimage(uint32_t ptr) {
-	LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1);
-	assert(obj->tag == LDKPaymentPurpose_InvoicePayment);
-			int8_tArray payment_preimage_arr = init_int8_tArray(32, __LINE__);
-			memcpy(payment_preimage_arr->elems, obj->invoice_payment.payment_preimage.data, 32);
-	return payment_preimage_arr;
-}
-int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_InvoicePayment_get_payment_secret"))) TS_LDKPaymentPurpose_InvoicePayment_get_payment_secret(uint32_t ptr) {
-	LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1);
-	assert(obj->tag == LDKPaymentPurpose_InvoicePayment);
-			int8_tArray payment_secret_arr = init_int8_tArray(32, __LINE__);
-			memcpy(payment_secret_arr->elems, obj->invoice_payment.payment_secret.data, 32);
-	return payment_secret_arr;
-}
-int8_tArray __attribute__((export_name("TS_LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment"))) TS_LDKPaymentPurpose_SpontaneousPayment_get_spontaneous_payment(uint32_t ptr) {
-	LDKPaymentPurpose *obj = (LDKPaymentPurpose*)(ptr & ~1);
-	assert(obj->tag == LDKPaymentPurpose_SpontaneousPayment);
-			int8_tArray spontaneous_payment_arr = init_int8_tArray(32, __LINE__);
-			memcpy(spontaneous_payment_arr->elems, obj->spontaneous_payment.data, 32);
-	return spontaneous_payment_arr;
-}
 uint32_t __attribute__((export_name("TS_LDKEvent_ty_from_ptr"))) TS_LDKEvent_ty_from_ptr(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	switch(obj->tag) {
 		case LDKEvent_FundingGenerationReady: return 0;
 		case LDKEvent_PaymentReceived: return 1;
-		case LDKEvent_PaymentSent: return 2;
-		case LDKEvent_PaymentPathFailed: return 3;
+		case LDKEvent_PaymentClaimed: return 2;
+		case LDKEvent_PaymentSent: return 3;
 		case LDKEvent_PaymentFailed: return 4;
-		case LDKEvent_PendingHTLCsForwardable: return 5;
-		case LDKEvent_SpendableOutputs: return 6;
-		case LDKEvent_PaymentForwarded: return 7;
-		case LDKEvent_ChannelClosed: return 8;
-		case LDKEvent_DiscardFunding: return 9;
-		case LDKEvent_PaymentPathSuccessful: return 10;
-		case LDKEvent_OpenChannelRequest: return 11;
+		case LDKEvent_PaymentPathSuccessful: return 5;
+		case LDKEvent_PaymentPathFailed: return 6;
+		case LDKEvent_PendingHTLCsForwardable: return 7;
+		case LDKEvent_SpendableOutputs: return 8;
+		case LDKEvent_PaymentForwarded: return 9;
+		case LDKEvent_ChannelClosed: return 10;
+		case LDKEvent_DiscardFunding: return 11;
+		case LDKEvent_OpenChannelRequest: return 12;
 		default: abort();
 	}
 }
@@ -1606,10 +1561,18 @@ int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_t
 			memcpy(temporary_channel_id_arr->elems, obj->funding_generation_ready.temporary_channel_id.data, 32);
 	return temporary_channel_id_arr;
 }
+int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_counterparty_node_id"))) TS_LDKEvent_FundingGenerationReady_get_counterparty_node_id(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_FundingGenerationReady);
+			int8_tArray counterparty_node_id_arr = init_int8_tArray(33, __LINE__);
+			memcpy(counterparty_node_id_arr->elems, obj->funding_generation_ready.counterparty_node_id.compressed_form, 33);
+	return counterparty_node_id_arr;
+}
 int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_channel_value_satoshis"))) TS_LDKEvent_FundingGenerationReady_get_channel_value_satoshis(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_FundingGenerationReady);
-	return obj->funding_generation_ready.channel_value_satoshis;
+			int64_t channel_value_satoshis_conv = obj->funding_generation_ready.channel_value_satoshis;
+	return channel_value_satoshis_conv;
 }
 int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_output_script"))) TS_LDKEvent_FundingGenerationReady_get_output_script(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
@@ -1622,7 +1585,8 @@ int8_tArray __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_o
 int64_t __attribute__((export_name("TS_LDKEvent_FundingGenerationReady_get_user_channel_id"))) TS_LDKEvent_FundingGenerationReady_get_user_channel_id(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_FundingGenerationReady);
-	return obj->funding_generation_ready.user_channel_id;
+			int64_t user_channel_id_conv = obj->funding_generation_ready.user_channel_id;
+	return user_channel_id_conv;
 }
 int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_payment_hash"))) TS_LDKEvent_PaymentReceived_get_payment_hash(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
@@ -1631,15 +1595,35 @@ int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_payment_
 			memcpy(payment_hash_arr->elems, obj->payment_received.payment_hash.data, 32);
 	return payment_hash_arr;
 }
-int64_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_amt"))) TS_LDKEvent_PaymentReceived_get_amt(uint32_t ptr) {
+int64_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_amount_msat"))) TS_LDKEvent_PaymentReceived_get_amount_msat(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentReceived);
-	return obj->payment_received.amt;
+			int64_t amount_msat_conv = obj->payment_received.amount_msat;
+	return amount_msat_conv;
 }
 uint32_t __attribute__((export_name("TS_LDKEvent_PaymentReceived_get_purpose"))) TS_LDKEvent_PaymentReceived_get_purpose(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentReceived);
-			uintptr_t purpose_ref = ((uintptr_t)&obj->payment_received.purpose) | 1;
+			uint32_t purpose_ref = ((uintptr_t)&obj->payment_received.purpose) | 1;
+	return purpose_ref;
+}
+int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_payment_hash"))) TS_LDKEvent_PaymentClaimed_get_payment_hash(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_PaymentClaimed);
+			int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__);
+			memcpy(payment_hash_arr->elems, obj->payment_claimed.payment_hash.data, 32);
+	return payment_hash_arr;
+}
+int64_t __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_amount_msat"))) TS_LDKEvent_PaymentClaimed_get_amount_msat(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_PaymentClaimed);
+			int64_t amount_msat_conv = obj->payment_claimed.amount_msat;
+	return amount_msat_conv;
+}
+uint32_t __attribute__((export_name("TS_LDKEvent_PaymentClaimed_get_purpose"))) TS_LDKEvent_PaymentClaimed_get_purpose(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_PaymentClaimed);
+			uint32_t purpose_ref = ((uintptr_t)&obj->payment_claimed.purpose) | 1;
 	return purpose_ref;
 }
 int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_id"))) TS_LDKEvent_PaymentSent_get_payment_id(uint32_t ptr) {
@@ -1666,9 +1650,56 @@ int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentSent_get_payment_hash
 uint32_t __attribute__((export_name("TS_LDKEvent_PaymentSent_get_fee_paid_msat"))) TS_LDKEvent_PaymentSent_get_fee_paid_msat(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentSent);
-			uintptr_t fee_paid_msat_ref = ((uintptr_t)&obj->payment_sent.fee_paid_msat) | 1;
+			uint32_t fee_paid_msat_ref = ((uintptr_t)&obj->payment_sent.fee_paid_msat) | 1;
 	return fee_paid_msat_ref;
 }
+int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentFailed_get_payment_id"))) TS_LDKEvent_PaymentFailed_get_payment_id(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_PaymentFailed);
+			int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__);
+			memcpy(payment_id_arr->elems, obj->payment_failed.payment_id.data, 32);
+	return payment_id_arr;
+}
+int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentFailed_get_payment_hash"))) TS_LDKEvent_PaymentFailed_get_payment_hash(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_PaymentFailed);
+			int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__);
+			memcpy(payment_hash_arr->elems, obj->payment_failed.payment_hash.data, 32);
+	return payment_hash_arr;
+}
+int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_payment_id"))) TS_LDKEvent_PaymentPathSuccessful_get_payment_id(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_PaymentPathSuccessful);
+			int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__);
+			memcpy(payment_id_arr->elems, obj->payment_path_successful.payment_id.data, 32);
+	return payment_id_arr;
+}
+int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_payment_hash"))) TS_LDKEvent_PaymentPathSuccessful_get_payment_hash(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_PaymentPathSuccessful);
+			int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__);
+			memcpy(payment_hash_arr->elems, obj->payment_path_successful.payment_hash.data, 32);
+	return payment_hash_arr;
+}
+uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_path"))) TS_LDKEvent_PaymentPathSuccessful_get_path(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_PaymentPathSuccessful);
+			LDKCVec_RouteHopZ path_var = obj->payment_path_successful.path;
+			uint32_tArray path_arr = NULL;
+			path_arr = init_uint32_tArray(path_var.datalen, __LINE__);
+			uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4);
+			for (size_t k = 0; k < path_var.datalen; k++) {
+				LDKRouteHop path_conv_10_var = path_var.data[k];
+				uint32_t path_conv_10_ref = 0;
+				CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+				CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+				CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
+				path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1;
+				path_arr_ptr[k] = path_conv_10_ref;
+			}
+			
+	return path_arr;
+}
 int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_payment_id"))) TS_LDKEvent_PaymentPathFailed_get_payment_id(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentPathFailed);
@@ -1686,18 +1717,20 @@ int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_paymen
 jboolean __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_rejected_by_dest"))) TS_LDKEvent_PaymentPathFailed_get_rejected_by_dest(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentPathFailed);
-	return obj->payment_path_failed.rejected_by_dest;
+			jboolean rejected_by_dest_conv = obj->payment_path_failed.rejected_by_dest;
+	return rejected_by_dest_conv;
 }
 uint32_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_network_update"))) TS_LDKEvent_PaymentPathFailed_get_network_update(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentPathFailed);
-			uintptr_t network_update_ref = ((uintptr_t)&obj->payment_path_failed.network_update) | 1;
+			uint32_t network_update_ref = ((uintptr_t)&obj->payment_path_failed.network_update) | 1;
 	return network_update_ref;
 }
 jboolean __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_all_paths_failed"))) TS_LDKEvent_PaymentPathFailed_get_all_paths_failed(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentPathFailed);
-	return obj->payment_path_failed.all_paths_failed;
+			jboolean all_paths_failed_conv = obj->payment_path_failed.all_paths_failed;
+	return all_paths_failed_conv;
 }
 uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_path"))) TS_LDKEvent_PaymentPathFailed_get_path(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
@@ -1708,7 +1741,7 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_path
 			uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4);
 			for (size_t k = 0; k < path_var.datalen; k++) {
 				LDKRouteHop path_conv_10_var = path_var.data[k];
-				uintptr_t path_conv_10_ref = 0;
+				uint32_t path_conv_10_ref = 0;
 				CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 				CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 				CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
@@ -1721,14 +1754,14 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_path
 uint32_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_short_channel_id"))) TS_LDKEvent_PaymentPathFailed_get_short_channel_id(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentPathFailed);
-			uintptr_t short_channel_id_ref = ((uintptr_t)&obj->payment_path_failed.short_channel_id) | 1;
+			uint32_t short_channel_id_ref = ((uintptr_t)&obj->payment_path_failed.short_channel_id) | 1;
 	return short_channel_id_ref;
 }
 uint32_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_retry"))) TS_LDKEvent_PaymentPathFailed_get_retry(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentPathFailed);
 			LDKRouteParameters retry_var = obj->payment_path_failed.retry;
-			uintptr_t retry_ref = 0;
+			uint32_t retry_ref = 0;
 			if ((uintptr_t)retry_var.inner > 4096) {
 				CHECK((((uintptr_t)retry_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 				CHECK((((uintptr_t)&retry_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -1737,24 +1770,11 @@ uint32_t __attribute__((export_name("TS_LDKEvent_PaymentPathFailed_get_retry")))
 			}
 	return retry_ref;
 }
-int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentFailed_get_payment_id"))) TS_LDKEvent_PaymentFailed_get_payment_id(uint32_t ptr) {
-	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
-	assert(obj->tag == LDKEvent_PaymentFailed);
-			int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__);
-			memcpy(payment_id_arr->elems, obj->payment_failed.payment_id.data, 32);
-	return payment_id_arr;
-}
-int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentFailed_get_payment_hash"))) TS_LDKEvent_PaymentFailed_get_payment_hash(uint32_t ptr) {
-	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
-	assert(obj->tag == LDKEvent_PaymentFailed);
-			int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__);
-			memcpy(payment_hash_arr->elems, obj->payment_failed.payment_hash.data, 32);
-	return payment_hash_arr;
-}
 int64_t __attribute__((export_name("TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable"))) TS_LDKEvent_PendingHTLCsForwardable_get_time_forwardable(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PendingHTLCsForwardable);
-	return obj->pending_htl_cs_forwardable.time_forwardable;
+			int64_t time_forwardable_conv = obj->pending_htl_cs_forwardable.time_forwardable;
+	return time_forwardable_conv;
 }
 uint32_tArray __attribute__((export_name("TS_LDKEvent_SpendableOutputs_get_outputs"))) TS_LDKEvent_SpendableOutputs_get_outputs(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
@@ -1764,22 +1784,37 @@ uint32_tArray __attribute__((export_name("TS_LDKEvent_SpendableOutputs_get_outpu
 			outputs_arr = init_uint32_tArray(outputs_var.datalen, __LINE__);
 			uint32_t *outputs_arr_ptr = (uint32_t*)(((uint8_t*)outputs_arr) + 4);
 			for (size_t b = 0; b < outputs_var.datalen; b++) {
-				uintptr_t outputs_conv_27_ref = ((uintptr_t)&outputs_var.data[b]) | 1;
+				uint32_t outputs_conv_27_ref = ((uintptr_t)&outputs_var.data[b]) | 1;
 				outputs_arr_ptr[b] = outputs_conv_27_ref;
 			}
 			
 	return outputs_arr;
 }
+int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_prev_channel_id"))) TS_LDKEvent_PaymentForwarded_get_prev_channel_id(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_PaymentForwarded);
+			int8_tArray prev_channel_id_arr = init_int8_tArray(32, __LINE__);
+			memcpy(prev_channel_id_arr->elems, obj->payment_forwarded.prev_channel_id.data, 32);
+	return prev_channel_id_arr;
+}
+int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_next_channel_id"))) TS_LDKEvent_PaymentForwarded_get_next_channel_id(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_PaymentForwarded);
+			int8_tArray next_channel_id_arr = init_int8_tArray(32, __LINE__);
+			memcpy(next_channel_id_arr->elems, obj->payment_forwarded.next_channel_id.data, 32);
+	return next_channel_id_arr;
+}
 uint32_t __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_fee_earned_msat"))) TS_LDKEvent_PaymentForwarded_get_fee_earned_msat(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentForwarded);
-			uintptr_t fee_earned_msat_ref = ((uintptr_t)&obj->payment_forwarded.fee_earned_msat) | 1;
+			uint32_t fee_earned_msat_ref = ((uintptr_t)&obj->payment_forwarded.fee_earned_msat) | 1;
 	return fee_earned_msat_ref;
 }
 jboolean __attribute__((export_name("TS_LDKEvent_PaymentForwarded_get_claim_from_onchain_tx"))) TS_LDKEvent_PaymentForwarded_get_claim_from_onchain_tx(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_PaymentForwarded);
-	return obj->payment_forwarded.claim_from_onchain_tx;
+			jboolean claim_from_onchain_tx_conv = obj->payment_forwarded.claim_from_onchain_tx;
+	return claim_from_onchain_tx_conv;
 }
 int8_tArray __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_channel_id"))) TS_LDKEvent_ChannelClosed_get_channel_id(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
@@ -1791,12 +1826,13 @@ int8_tArray __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_channel_id
 int64_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_user_channel_id"))) TS_LDKEvent_ChannelClosed_get_user_channel_id(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_ChannelClosed);
-	return obj->channel_closed.user_channel_id;
+			int64_t user_channel_id_conv = obj->channel_closed.user_channel_id;
+	return user_channel_id_conv;
 }
 uint32_t __attribute__((export_name("TS_LDKEvent_ChannelClosed_get_reason"))) TS_LDKEvent_ChannelClosed_get_reason(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_ChannelClosed);
-			uintptr_t reason_ref = ((uintptr_t)&obj->channel_closed.reason) | 1;
+			uint32_t reason_ref = ((uintptr_t)&obj->channel_closed.reason) | 1;
 	return reason_ref;
 }
 int8_tArray __attribute__((export_name("TS_LDKEvent_DiscardFunding_get_channel_id"))) TS_LDKEvent_DiscardFunding_get_channel_id(uint32_t ptr) {
@@ -1814,39 +1850,6 @@ int8_tArray __attribute__((export_name("TS_LDKEvent_DiscardFunding_get_transacti
 			memcpy(transaction_arr->elems, transaction_var.data, transaction_var.datalen);
 	return transaction_arr;
 }
-int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_payment_id"))) TS_LDKEvent_PaymentPathSuccessful_get_payment_id(uint32_t ptr) {
-	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
-	assert(obj->tag == LDKEvent_PaymentPathSuccessful);
-			int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__);
-			memcpy(payment_id_arr->elems, obj->payment_path_successful.payment_id.data, 32);
-	return payment_id_arr;
-}
-int8_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_payment_hash"))) TS_LDKEvent_PaymentPathSuccessful_get_payment_hash(uint32_t ptr) {
-	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
-	assert(obj->tag == LDKEvent_PaymentPathSuccessful);
-			int8_tArray payment_hash_arr = init_int8_tArray(32, __LINE__);
-			memcpy(payment_hash_arr->elems, obj->payment_path_successful.payment_hash.data, 32);
-	return payment_hash_arr;
-}
-uint32_tArray __attribute__((export_name("TS_LDKEvent_PaymentPathSuccessful_get_path"))) TS_LDKEvent_PaymentPathSuccessful_get_path(uint32_t ptr) {
-	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
-	assert(obj->tag == LDKEvent_PaymentPathSuccessful);
-			LDKCVec_RouteHopZ path_var = obj->payment_path_successful.path;
-			uint32_tArray path_arr = NULL;
-			path_arr = init_uint32_tArray(path_var.datalen, __LINE__);
-			uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4);
-			for (size_t k = 0; k < path_var.datalen; k++) {
-				LDKRouteHop path_conv_10_var = path_var.data[k];
-				uintptr_t path_conv_10_ref = 0;
-				CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-				CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-				CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
-				path_conv_10_ref = (uintptr_t)path_conv_10_var.inner & ~1;
-				path_arr_ptr[k] = path_conv_10_ref;
-			}
-			
-	return path_arr;
-}
 int8_tArray __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_temporary_channel_id"))) TS_LDKEvent_OpenChannelRequest_get_temporary_channel_id(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_OpenChannelRequest);
@@ -1864,12 +1867,25 @@ int8_tArray __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_count
 int64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_funding_satoshis"))) TS_LDKEvent_OpenChannelRequest_get_funding_satoshis(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_OpenChannelRequest);
-	return obj->open_channel_request.funding_satoshis;
+			int64_t funding_satoshis_conv = obj->open_channel_request.funding_satoshis;
+	return funding_satoshis_conv;
 }
 int64_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_push_msat"))) TS_LDKEvent_OpenChannelRequest_get_push_msat(uint32_t ptr) {
 	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
 	assert(obj->tag == LDKEvent_OpenChannelRequest);
-	return obj->open_channel_request.push_msat;
+			int64_t push_msat_conv = obj->open_channel_request.push_msat;
+	return push_msat_conv;
+}
+uint32_t __attribute__((export_name("TS_LDKEvent_OpenChannelRequest_get_channel_type"))) TS_LDKEvent_OpenChannelRequest_get_channel_type(uint32_t ptr) {
+	LDKEvent *obj = (LDKEvent*)(ptr & ~1);
+	assert(obj->tag == LDKEvent_OpenChannelRequest);
+			LDKChannelTypeFeatures channel_type_var = obj->open_channel_request.channel_type;
+			uint32_t channel_type_ref = 0;
+			CHECK((((uintptr_t)channel_type_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+			CHECK((((uintptr_t)&channel_type_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_type_var);
+			channel_type_ref = (uintptr_t)channel_type_var.inner & ~1;
+	return channel_type_ref;
 }
 uint32_t __attribute__((export_name("TS_LDKCOption_EventZ_ty_from_ptr"))) TS_LDKCOption_EventZ_ty_from_ptr(uint32_t ptr) {
 	LDKCOption_EventZ *obj = (LDKCOption_EventZ*)(ptr & ~1);
@@ -1882,7 +1898,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_EventZ_ty_from_ptr"))) TS_LDK
 uint32_t __attribute__((export_name("TS_LDKCOption_EventZ_Some_get_some"))) TS_LDKCOption_EventZ_Some_get_some(uint32_t ptr) {
 	LDKCOption_EventZ *obj = (LDKCOption_EventZ*)(ptr & ~1);
 	assert(obj->tag == LDKCOption_EventZ_Some);
-			uintptr_t some_ref = ((uintptr_t)&obj->some) | 1;
+			uint32_t some_ref = ((uintptr_t)&obj->some) | 1;
 	return some_ref;
 }
 static inline struct LDKCOption_EventZ CResult_COption_EventZDecodeErrorZ_get_ok(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR owner){
@@ -1893,7 +1909,7 @@ uint32_t  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_get_
 	LDKCResult_COption_EventZDecodeErrorZ* owner_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(owner & ~1);
 	LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ");
 	*ret_copy = CResult_COption_EventZDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -1904,7 +1920,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_get_err"))) TS_CResult_COption_EventZDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_COption_EventZDecodeErrorZ* owner_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_COption_EventZDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -1931,7 +1947,7 @@ uint32_t __attribute__((export_name("TS_LDKErrorAction_DisconnectPeer_get_msg"))
 	LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1);
 	assert(obj->tag == LDKErrorAction_DisconnectPeer);
 			LDKErrorMessage msg_var = obj->disconnect_peer.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			if ((uintptr_t)msg_var.inner > 4096) {
 				CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 				CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -1950,7 +1966,7 @@ uint32_t __attribute__((export_name("TS_LDKErrorAction_SendErrorMessage_get_msg"
 	LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1);
 	assert(obj->tag == LDKErrorAction_SendErrorMessage);
 			LDKErrorMessage msg_var = obj->send_error_message.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -1961,7 +1977,7 @@ uint32_t __attribute__((export_name("TS_LDKErrorAction_SendWarningMessage_get_ms
 	LDKErrorAction *obj = (LDKErrorAction*)(ptr & ~1);
 	assert(obj->tag == LDKErrorAction_SendWarningMessage);
 			LDKWarningMessage msg_var = obj->send_warning_message.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -1981,7 +1997,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_ty_from_ptr"))) TS_L
 		case LDKMessageSendEvent_SendOpenChannel: return 1;
 		case LDKMessageSendEvent_SendFundingCreated: return 2;
 		case LDKMessageSendEvent_SendFundingSigned: return 3;
-		case LDKMessageSendEvent_SendFundingLocked: return 4;
+		case LDKMessageSendEvent_SendChannelReady: return 4;
 		case LDKMessageSendEvent_SendAnnouncementSignatures: return 5;
 		case LDKMessageSendEvent_UpdateHTLCs: return 6;
 		case LDKMessageSendEvent_SendRevokeAndACK: return 7;
@@ -1996,6 +2012,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_ty_from_ptr"))) TS_L
 		case LDKMessageSendEvent_SendChannelRangeQuery: return 16;
 		case LDKMessageSendEvent_SendShortIdsQuery: return 17;
 		case LDKMessageSendEvent_SendReplyChannelRange: return 18;
+		case LDKMessageSendEvent_SendGossipTimestampFilter: return 19;
 		default: abort();
 	}
 }
@@ -2010,7 +2027,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAcceptChannel_ge
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendAcceptChannel);
 			LDKAcceptChannel msg_var = obj->send_accept_channel.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2028,7 +2045,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendOpenChannel_get_
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendOpenChannel);
 			LDKOpenChannel msg_var = obj->send_open_channel.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2046,7 +2063,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingCreated_g
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendFundingCreated);
 			LDKFundingCreated msg_var = obj->send_funding_created.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2064,25 +2081,25 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingSigned_ge
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendFundingSigned);
 			LDKFundingSigned msg_var = obj->send_funding_signed.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
 			msg_ref = (uintptr_t)msg_var.inner & ~1;
 	return msg_ref;
 }
-int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingLocked_get_node_id"))) TS_LDKMessageSendEvent_SendFundingLocked_get_node_id(uint32_t ptr) {
+int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReady_get_node_id"))) TS_LDKMessageSendEvent_SendChannelReady_get_node_id(uint32_t ptr) {
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
-	assert(obj->tag == LDKMessageSendEvent_SendFundingLocked);
+	assert(obj->tag == LDKMessageSendEvent_SendChannelReady);
 			int8_tArray node_id_arr = init_int8_tArray(33, __LINE__);
-			memcpy(node_id_arr->elems, obj->send_funding_locked.node_id.compressed_form, 33);
+			memcpy(node_id_arr->elems, obj->send_channel_ready.node_id.compressed_form, 33);
 	return node_id_arr;
 }
-uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendFundingLocked_get_msg"))) TS_LDKMessageSendEvent_SendFundingLocked_get_msg(uint32_t ptr) {
+uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReady_get_msg"))) TS_LDKMessageSendEvent_SendChannelReady_get_msg(uint32_t ptr) {
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
-	assert(obj->tag == LDKMessageSendEvent_SendFundingLocked);
-			LDKFundingLocked msg_var = obj->send_funding_locked.msg;
-			uintptr_t msg_ref = 0;
+	assert(obj->tag == LDKMessageSendEvent_SendChannelReady);
+			LDKChannelReady msg_var = obj->send_channel_ready.msg;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2100,7 +2117,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendAnnouncementSign
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendAnnouncementSignatures);
 			LDKAnnouncementSignatures msg_var = obj->send_announcement_signatures.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2118,7 +2135,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_UpdateHTLCs_get_upda
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_UpdateHTLCs);
 			LDKCommitmentUpdate updates_var = obj->update_htl_cs.updates;
-			uintptr_t updates_ref = 0;
+			uint32_t updates_ref = 0;
 			CHECK((((uintptr_t)updates_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&updates_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(updates_var);
@@ -2136,7 +2153,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendRevokeAndACK_get
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendRevokeAndACK);
 			LDKRevokeAndACK msg_var = obj->send_revoke_and_ack.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2154,7 +2171,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendClosingSigned_ge
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendClosingSigned);
 			LDKClosingSigned msg_var = obj->send_closing_signed.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2172,7 +2189,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShutdown_get_msg
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendShutdown);
 			LDKShutdown msg_var = obj->send_shutdown.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2190,7 +2207,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelReestabli
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendChannelReestablish);
 			LDKChannelReestablish msg_var = obj->send_channel_reestablish.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2201,7 +2218,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelAnno
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_BroadcastChannelAnnouncement);
 			LDKChannelAnnouncement msg_var = obj->broadcast_channel_announcement.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2212,7 +2229,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelAnno
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_BroadcastChannelAnnouncement);
 			LDKChannelUpdate update_msg_var = obj->broadcast_channel_announcement.update_msg;
-			uintptr_t update_msg_ref = 0;
+			uint32_t update_msg_ref = 0;
 			CHECK((((uintptr_t)update_msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&update_msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(update_msg_var);
@@ -2223,7 +2240,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastNodeAnnounc
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_BroadcastNodeAnnouncement);
 			LDKNodeAnnouncement msg_var = obj->broadcast_node_announcement.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2234,7 +2251,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_BroadcastChannelUpda
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_BroadcastChannelUpdate);
 			LDKChannelUpdate msg_var = obj->broadcast_channel_update.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2252,7 +2269,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelUpdate_ge
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendChannelUpdate);
 			LDKChannelUpdate msg_var = obj->send_channel_update.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2269,7 +2286,7 @@ int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_HandleError_get_n
 uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_HandleError_get_action"))) TS_LDKMessageSendEvent_HandleError_get_action(uint32_t ptr) {
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_HandleError);
-			uintptr_t action_ref = ((uintptr_t)&obj->handle_error.action) | 1;
+			uint32_t action_ref = ((uintptr_t)&obj->handle_error.action) | 1;
 	return action_ref;
 }
 int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelRangeQuery_get_node_id"))) TS_LDKMessageSendEvent_SendChannelRangeQuery_get_node_id(uint32_t ptr) {
@@ -2283,7 +2300,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendChannelRangeQuer
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendChannelRangeQuery);
 			LDKQueryChannelRange msg_var = obj->send_channel_range_query.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2301,7 +2318,7 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendShortIdsQuery_ge
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendShortIdsQuery);
 			LDKQueryShortChannelIds msg_var = obj->send_short_ids_query.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2319,7 +2336,25 @@ uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendReplyChannelRang
 	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
 	assert(obj->tag == LDKMessageSendEvent_SendReplyChannelRange);
 			LDKReplyChannelRange msg_var = obj->send_reply_channel_range.msg;
-			uintptr_t msg_ref = 0;
+			uint32_t msg_ref = 0;
+			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
+			msg_ref = (uintptr_t)msg_var.inner & ~1;
+	return msg_ref;
+}
+int8_tArray __attribute__((export_name("TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id"))) TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_node_id(uint32_t ptr) {
+	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
+	assert(obj->tag == LDKMessageSendEvent_SendGossipTimestampFilter);
+			int8_tArray node_id_arr = init_int8_tArray(33, __LINE__);
+			memcpy(node_id_arr->elems, obj->send_gossip_timestamp_filter.node_id.compressed_form, 33);
+	return node_id_arr;
+}
+uint32_t __attribute__((export_name("TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_msg"))) TS_LDKMessageSendEvent_SendGossipTimestampFilter_get_msg(uint32_t ptr) {
+	LDKMessageSendEvent *obj = (LDKMessageSendEvent*)(ptr & ~1);
+	assert(obj->tag == LDKMessageSendEvent_SendGossipTimestampFilter);
+			LDKGossipTimestampFilter msg_var = obj->send_gossip_timestamp_filter.msg;
+			uint32_t msg_ref = 0;
 			CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -2333,32 +2368,154 @@ static inline LDKCVec_MessageSendEventZ CVec_MessageSendEventZ_clone(const LDKCV
 	}
 	return ret;
 }
-static inline struct LDKFixedPenaltyScorer CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKTxOut CResult_TxOutAccessErrorZ_get_ok(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return FixedPenaltyScorer_clone(&*owner->contents.result);
+	return TxOut_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(owner & ~1);
-	LDKFixedPenaltyScorer ret_var = CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
+uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_ok"))) TS_CResult_TxOutAccessErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)(owner & ~1);
+	LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut");
+	*ret_ref = CResult_TxOutAccessErrorZ_get_ok(owner_conv);
+	return (uint32_t)ret_ref;
+}
+
+static inline enum LDKAccessError CResult_TxOutAccessErrorZ_get_err(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return AccessError_clone(&*owner->contents.err);
+}
+uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_get_err"))) TS_CResult_TxOutAccessErrorZ_get_err(uint32_t owner) {
+	LDKCResult_TxOutAccessErrorZ* owner_conv = (LDKCResult_TxOutAccessErrorZ*)(owner & ~1);
+	uint32_t ret_conv = LDKAccessError_to_js(CResult_TxOutAccessErrorZ_get_err(owner_conv));
+	return ret_conv;
+}
+
+static inline uintptr_t C2Tuple_usizeTransactionZ_get_a(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner){
+	return owner->a;
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_a"))) TS_C2Tuple_usizeTransactionZ_get_a(uint32_t owner) {
+	LDKC2Tuple_usizeTransactionZ* owner_conv = (LDKC2Tuple_usizeTransactionZ*)(owner & ~1);
+	uint32_t ret_conv = C2Tuple_usizeTransactionZ_get_a(owner_conv);
+	return ret_conv;
+}
+
+static inline struct LDKTransaction C2Tuple_usizeTransactionZ_get_b(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR owner){
+	return owner->b;
+}
+int8_tArray  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_get_b"))) TS_C2Tuple_usizeTransactionZ_get_b(uint32_t owner) {
+	LDKC2Tuple_usizeTransactionZ* owner_conv = (LDKC2Tuple_usizeTransactionZ*)(owner & ~1);
+	LDKTransaction ret_var = C2Tuple_usizeTransactionZ_get_b(owner_conv);
+	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	return ret_arr;
+}
+
+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++) {
+		ret.data[i] = C2Tuple_usizeTransactionZ_clone(&orig->data[i]);
 	}
-	return ret_ref;
+	return ret;
+}
+static inline LDKCVec_TxidZ CVec_TxidZ_clone(const LDKCVec_TxidZ *orig) {
+	LDKCVec_TxidZ ret = { .data = MALLOC(sizeof(LDKThirtyTwoBytes) * orig->datalen, "LDKCVec_TxidZ clone bytes"), .datalen = orig->datalen };
+	for (size_t i = 0; i < ret.datalen; i++) {
+		ret.data[i] = ThirtyTwoBytes_clone(&orig->data[i]);
+	}
+	return ret;
+}
+static inline void CResult_NoneChannelMonitorUpdateErrZ_get_ok(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return *owner->contents.result;
+}
+void  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_ok(uint32_t owner) {
+	LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(owner & ~1);
+	CResult_NoneChannelMonitorUpdateErrZ_get_ok(owner_conv);
 }
 
-static inline struct LDKDecodeError CResult_FixedPenaltyScorerDecodeErrorZ_get_err(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR owner){
+static inline enum LDKChannelMonitorUpdateErr CResult_NoneChannelMonitorUpdateErrZ_get_err(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
+	return ChannelMonitorUpdateErr_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_FixedPenaltyScorerDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_get_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_get_err(uint32_t owner) {
+	LDKCResult_NoneChannelMonitorUpdateErrZ* owner_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(owner & ~1);
+	uint32_t ret_conv = LDKChannelMonitorUpdateErr_to_js(CResult_NoneChannelMonitorUpdateErrZ_get_err(owner_conv));
+	return ret_conv;
+}
+
+uint32_t __attribute__((export_name("TS_LDKMonitorEvent_ty_from_ptr"))) TS_LDKMonitorEvent_ty_from_ptr(uint32_t ptr) {
+	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKMonitorEvent_HTLCEvent: return 0;
+		case LDKMonitorEvent_CommitmentTxConfirmed: return 1;
+		case LDKMonitorEvent_UpdateCompleted: return 2;
+		case LDKMonitorEvent_UpdateFailed: return 3;
+		default: abort();
+	}
+}
+uint32_t __attribute__((export_name("TS_LDKMonitorEvent_HTLCEvent_get_htlc_event"))) TS_LDKMonitorEvent_HTLCEvent_get_htlc_event(uint32_t ptr) {
+	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
+	assert(obj->tag == LDKMonitorEvent_HTLCEvent);
+			LDKHTLCUpdate htlc_event_var = obj->htlc_event;
+			uint32_t htlc_event_ref = 0;
+			CHECK((((uintptr_t)htlc_event_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+			CHECK((((uintptr_t)&htlc_event_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_event_var);
+			htlc_event_ref = (uintptr_t)htlc_event_var.inner & ~1;
+	return htlc_event_ref;
+}
+uint32_t __attribute__((export_name("TS_LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed"))) TS_LDKMonitorEvent_CommitmentTxConfirmed_get_commitment_tx_confirmed(uint32_t ptr) {
+	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
+	assert(obj->tag == LDKMonitorEvent_CommitmentTxConfirmed);
+			LDKOutPoint commitment_tx_confirmed_var = obj->commitment_tx_confirmed;
+			uint32_t commitment_tx_confirmed_ref = 0;
+			CHECK((((uintptr_t)commitment_tx_confirmed_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+			CHECK((((uintptr_t)&commitment_tx_confirmed_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_confirmed_var);
+			commitment_tx_confirmed_ref = (uintptr_t)commitment_tx_confirmed_var.inner & ~1;
+	return commitment_tx_confirmed_ref;
+}
+uint32_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateCompleted_get_funding_txo"))) TS_LDKMonitorEvent_UpdateCompleted_get_funding_txo(uint32_t ptr) {
+	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
+	assert(obj->tag == LDKMonitorEvent_UpdateCompleted);
+			LDKOutPoint funding_txo_var = obj->update_completed.funding_txo;
+			uint32_t funding_txo_ref = 0;
+			CHECK((((uintptr_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+			CHECK((((uintptr_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var);
+			funding_txo_ref = (uintptr_t)funding_txo_var.inner & ~1;
+	return funding_txo_ref;
+}
+int64_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateCompleted_get_monitor_update_id"))) TS_LDKMonitorEvent_UpdateCompleted_get_monitor_update_id(uint32_t ptr) {
+	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
+	assert(obj->tag == LDKMonitorEvent_UpdateCompleted);
+			int64_t monitor_update_id_conv = obj->update_completed.monitor_update_id;
+	return monitor_update_id_conv;
+}
+uint32_t __attribute__((export_name("TS_LDKMonitorEvent_UpdateFailed_get_update_failed"))) TS_LDKMonitorEvent_UpdateFailed_get_update_failed(uint32_t ptr) {
+	LDKMonitorEvent *obj = (LDKMonitorEvent*)(ptr & ~1);
+	assert(obj->tag == LDKMonitorEvent_UpdateFailed);
+			LDKOutPoint update_failed_var = obj->update_failed;
+			uint32_t update_failed_ref = 0;
+			CHECK((((uintptr_t)update_failed_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+			CHECK((((uintptr_t)&update_failed_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+			CHECK_INNER_FIELD_ACCESS_OR_NULL(update_failed_var);
+			update_failed_ref = (uintptr_t)update_failed_var.inner & ~1;
+	return update_failed_ref;
+}
+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++) {
+		ret.data[i] = MonitorEvent_clone(&orig->data[i]);
+	}
+	return ret;
+}
+static inline struct LDKOutPoint C2Tuple_OutPointCVec_MonitorEventZZ_get_a(LDKC2Tuple_OutPointCVec_MonitorEventZZ *NONNULL_PTR owner){
+	return OutPoint_clone(&owner->a);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_get_a"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_get_a(uint32_t owner) {
+	LDKC2Tuple_OutPointCVec_MonitorEventZZ* owner_conv = (LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(owner & ~1);
+	LDKOutPoint ret_var = C2Tuple_OutPointCVec_MonitorEventZZ_get_a(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2369,14 +2526,57 @@ uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_
 	return ret_ref;
 }
 
-static inline struct LDKScoringParameters CResult_ScoringParametersDecodeErrorZ_get_ok(LDKCResult_ScoringParametersDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKCVec_MonitorEventZ C2Tuple_OutPointCVec_MonitorEventZZ_get_b(LDKC2Tuple_OutPointCVec_MonitorEventZZ *NONNULL_PTR owner){
+	return CVec_MonitorEventZ_clone(&owner->b);
+}
+uint32_tArray  __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_get_b"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_get_b(uint32_t owner) {
+	LDKC2Tuple_OutPointCVec_MonitorEventZZ* owner_conv = (LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(owner & ~1);
+	LDKCVec_MonitorEventZ ret_var = C2Tuple_OutPointCVec_MonitorEventZZ_get_b(owner_conv);
+	uint32_tArray ret_arr = NULL;
+	ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__);
+	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
+	for (size_t o = 0; o < ret_var.datalen; o++) {
+		LDKMonitorEvent *ret_conv_14_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
+		*ret_conv_14_copy = ret_var.data[o];
+		uint32_t ret_conv_14_ref = (uintptr_t)ret_conv_14_copy;
+		ret_arr_ptr[o] = ret_conv_14_ref;
+	}
+	
+	FREE(ret_var.data);
+	return ret_arr;
+}
+
+static inline LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ CVec_C2Tuple_OutPointCVec_MonitorEventZZZ_clone(const LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ *orig) {
+	LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ ret = { .data = MALLOC(sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ) * orig->datalen, "LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ clone bytes"), .datalen = orig->datalen };
+	for (size_t i = 0; i < ret.datalen; i++) {
+		ret.data[i] = C2Tuple_OutPointCVec_MonitorEventZZ_clone(&orig->data[i]);
+	}
+	return ret;
+}
+uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_ty_from_ptr(uint32_t ptr) {
+	LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKCOption_C2Tuple_usizeTransactionZZ_Some: return 0;
+		case LDKCOption_C2Tuple_usizeTransactionZZ_None: return 1;
+		default: abort();
+	}
+}
+uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_usizeTransactionZZ_Some_get_some(uint32_t ptr) {
+	LDKCOption_C2Tuple_usizeTransactionZZ *obj = (LDKCOption_C2Tuple_usizeTransactionZZ*)(ptr & ~1);
+	assert(obj->tag == LDKCOption_C2Tuple_usizeTransactionZZ_Some);
+			LDKC2Tuple_usizeTransactionZ* some_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ");
+			*some_conv = obj->some;
+			*some_conv = C2Tuple_usizeTransactionZ_clone(some_conv);
+	return ((uint32_t)some_conv);
+}
+static inline struct LDKFixedPenaltyScorer CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return ScoringParameters_clone(&*owner->contents.result);
+	return FixedPenaltyScorer_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_get_ok"))) TS_CResult_ScoringParametersDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_ScoringParametersDecodeErrorZ* owner_conv = (LDKCResult_ScoringParametersDecodeErrorZ*)(owner & ~1);
-	LDKScoringParameters ret_var = CResult_ScoringParametersDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(owner & ~1);
+	LDKFixedPenaltyScorer ret_var = CResult_FixedPenaltyScorerDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2387,14 +2587,14 @@ uint32_t  __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_g
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_ScoringParametersDecodeErrorZ_get_err(LDKCResult_ScoringParametersDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_FixedPenaltyScorerDecodeErrorZ_get_err(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_get_err"))) TS_CResult_ScoringParametersDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_ScoringParametersDecodeErrorZ* owner_conv = (LDKCResult_ScoringParametersDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_ScoringParametersDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_FixedPenaltyScorerDecodeErrorZ* owner_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_FixedPenaltyScorerDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2405,14 +2605,100 @@ uint32_t  __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_g
 	return ret_ref;
 }
 
-static inline struct LDKScorer *CResult_ScorerDecodeErrorZ_get_ok(LDKCResult_ScorerDecodeErrorZ *NONNULL_PTR owner){
+static inline uint64_t C2Tuple_u64u64Z_get_a(LDKC2Tuple_u64u64Z *NONNULL_PTR owner){
+	return owner->a;
+}
+int64_t  __attribute__((export_name("TS_C2Tuple_u64u64Z_get_a"))) TS_C2Tuple_u64u64Z_get_a(uint32_t owner) {
+	LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)(owner & ~1);
+	int64_t ret_conv = C2Tuple_u64u64Z_get_a(owner_conv);
+	return ret_conv;
+}
+
+static inline uint64_t C2Tuple_u64u64Z_get_b(LDKC2Tuple_u64u64Z *NONNULL_PTR owner){
+	return owner->b;
+}
+int64_t  __attribute__((export_name("TS_C2Tuple_u64u64Z_get_b"))) TS_C2Tuple_u64u64Z_get_b(uint32_t owner) {
+	LDKC2Tuple_u64u64Z* owner_conv = (LDKC2Tuple_u64u64Z*)(owner & ~1);
+	int64_t ret_conv = C2Tuple_u64u64Z_get_b(owner_conv);
+	return ret_conv;
+}
+
+uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr"))) TS_LDKCOption_C2Tuple_u64u64ZZ_ty_from_ptr(uint32_t ptr) {
+	LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKCOption_C2Tuple_u64u64ZZ_Some: return 0;
+		case LDKCOption_C2Tuple_u64u64ZZ_None: return 1;
+		default: abort();
+	}
+}
+uint32_t __attribute__((export_name("TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some"))) TS_LDKCOption_C2Tuple_u64u64ZZ_Some_get_some(uint32_t ptr) {
+	LDKCOption_C2Tuple_u64u64ZZ *obj = (LDKCOption_C2Tuple_u64u64ZZ*)(ptr & ~1);
+	assert(obj->tag == LDKCOption_C2Tuple_u64u64ZZ_Some);
+			LDKC2Tuple_u64u64Z* some_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z");
+			*some_conv = obj->some;
+			*some_conv = C2Tuple_u64u64Z_clone(some_conv);
+	return ((uint32_t)some_conv);
+}
+static inline LDKCVec_NodeIdZ CVec_NodeIdZ_clone(const LDKCVec_NodeIdZ *orig) {
+	LDKCVec_NodeIdZ ret = { .data = MALLOC(sizeof(LDKNodeId) * orig->datalen, "LDKCVec_NodeIdZ clone bytes"), .datalen = orig->datalen };
+	for (size_t i = 0; i < ret.datalen; i++) {
+		ret.data[i] = NodeId_clone(&orig->data[i]);
+	}
+	return ret;
+}
+typedef struct LDKLogger_JCalls {
+	atomic_size_t refcnt;
+	uint32_t instance_ptr;
+} LDKLogger_JCalls;
+static void LDKLogger_JCalls_free(void* this_arg) {
+	LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) this_arg;
+	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
+		FREE(j_calls);
+	}
+}
+void log_LDKLogger_jcall(const void* this_arg, const LDKRecord * record) {
+	LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) this_arg;
+	LDKRecord record_var = *record;
+	uint32_t record_ref = 0;
+	record_var = Record_clone(&record_var);
+	CHECK((((uintptr_t)record_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&record_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(record_var);
+	record_ref = (uintptr_t)record_var.inner;
+	if (record_var.is_owned) {
+		record_ref |= 1;
+	}
+	js_invoke_function_u_u(j_calls->instance_ptr, 0, (uint32_t)record_ref);
+}
+static void LDKLogger_JCalls_cloned(LDKLogger* new_obj) {
+	LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) new_obj->this_arg;
+	atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);
+}
+static inline LDKLogger LDKLogger_init (JSValue o) {
+	LDKLogger_JCalls *calls = MALLOC(sizeof(LDKLogger_JCalls), "LDKLogger_JCalls");
+	atomic_init(&calls->refcnt, 1);
+	calls->instance_ptr = o;
+
+	LDKLogger ret = {
+		.this_arg = (void*) calls,
+		.log = log_LDKLogger_jcall,
+		.free = LDKLogger_JCalls_free,
+	};
+	return ret;
+}
+long  __attribute__((export_name("TS_LDKLogger_new"))) TS_LDKLogger_new(JSValue o) {
+	LDKLogger *res_ptr = MALLOC(sizeof(LDKLogger), "LDKLogger");
+	*res_ptr = LDKLogger_init(o);
+	return (long)res_ptr;
+}
+static inline struct LDKProbabilisticScorer *CResult_ProbabilisticScorerDecodeErrorZ_get_ok(LDKCResult_ProbabilisticScorerDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
 	return &*owner->contents.result;
 }
-uint32_t  __attribute__((export_name("TS_CResult_ScorerDecodeErrorZ_get_ok"))) TS_CResult_ScorerDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_ScorerDecodeErrorZ* owner_conv = (LDKCResult_ScorerDecodeErrorZ*)(owner & ~1);
-	LDKScorer ret_var = *CResult_ScorerDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_get_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_ProbabilisticScorerDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)(owner & ~1);
+	LDKProbabilisticScorer ret_var = *CResult_ProbabilisticScorerDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2420,50 +2706,14 @@ uint32_t  __attribute__((export_name("TS_CResult_ScorerDecodeErrorZ_get_ok"))) T
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_ScorerDecodeErrorZ_get_err(LDKCResult_ScorerDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_ProbabilisticScorerDecodeErrorZ_get_err(LDKCResult_ProbabilisticScorerDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_ScorerDecodeErrorZ_get_err"))) TS_CResult_ScorerDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_ScorerDecodeErrorZ* owner_conv = (LDKCResult_ScorerDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_ScorerDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKProbabilisticScoringParameters CResult_ProbabilisticScoringParametersDecodeErrorZ_get_ok(LDKCResult_ProbabilisticScoringParametersDecodeErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return ProbabilisticScoringParameters_clone(&*owner->contents.result);
-}
-uint32_t  __attribute__((export_name("TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_get_ok"))) TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_ProbabilisticScoringParametersDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScoringParametersDecodeErrorZ*)(owner & ~1);
-	LDKProbabilisticScoringParameters ret_var = CResult_ProbabilisticScoringParametersDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKDecodeError CResult_ProbabilisticScoringParametersDecodeErrorZ_get_err(LDKCResult_ProbabilisticScoringParametersDecodeErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_get_err"))) TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_ProbabilisticScoringParametersDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScoringParametersDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_ProbabilisticScoringParametersDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_get_err"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_ProbabilisticScorerDecodeErrorZ* owner_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_ProbabilisticScorerDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2481,7 +2731,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_get_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_InitFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(owner & ~1);
 	LDKInitFeatures ret_var = CResult_InitFeaturesDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2499,7 +2749,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_get_err"))) TS_CResult_InitFeaturesDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_InitFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_InitFeaturesDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2517,7 +2767,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_get_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ChannelFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(owner & ~1);
 	LDKChannelFeatures ret_var = CResult_ChannelFeaturesDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2535,7 +2785,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_get_err"))) TS_CResult_ChannelFeaturesDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ChannelFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ChannelFeaturesDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2553,7 +2803,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_get_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_NodeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(owner & ~1);
 	LDKNodeFeatures ret_var = CResult_NodeFeaturesDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2571,7 +2821,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_get_err"))) TS_CResult_NodeFeaturesDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_NodeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_NodeFeaturesDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2589,7 +2839,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_get_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_InvoiceFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(owner & ~1);
 	LDKInvoiceFeatures ret_var = CResult_InvoiceFeaturesDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2607,7 +2857,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_get_err"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_InvoiceFeaturesDecodeErrorZ* owner_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_InvoiceFeaturesDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2625,7 +2875,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(owner & ~1);
 	LDKChannelTypeFeatures ret_var = CResult_ChannelTypeFeaturesDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2643,7 +2893,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_err"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* owner_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ChannelTypeFeaturesDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2654,14 +2904,14 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ
 	return ret_ref;
 }
 
-static inline struct LDKDelayedPaymentOutputDescriptor CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKNodeId CResult_NodeIdDecodeErrorZ_get_ok(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return DelayedPaymentOutputDescriptor_clone(&*owner->contents.result);
+	return NodeId_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1);
-	LDKDelayedPaymentOutputDescriptor ret_var = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_get_ok"))) TS_CResult_NodeIdDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_NodeIdDecodeErrorZ* owner_conv = (LDKCResult_NodeIdDecodeErrorZ*)(owner & ~1);
+	LDKNodeId ret_var = CResult_NodeIdDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2672,14 +2922,14 @@ uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorD
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_NodeIdDecodeErrorZ_get_err(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_get_err"))) TS_CResult_NodeIdDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_NodeIdDecodeErrorZ* owner_conv = (LDKCResult_NodeIdDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_NodeIdDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2690,14 +2940,26 @@ uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorD
 	return ret_ref;
 }
 
-static inline struct LDKStaticPaymentOutputDescriptor CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKCOption_NetworkUpdateZ CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return StaticPaymentOutputDescriptor_clone(&*owner->contents.result);
+	return COption_NetworkUpdateZ_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1);
-	LDKStaticPaymentOutputDescriptor ret_var = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(owner & ~1);
+	LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ");
+	*ret_copy = CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+static inline struct LDKDecodeError CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return DecodeError_clone(&*owner->contents.err);
+}
+uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2708,14 +2970,100 @@ uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDe
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
+typedef struct LDKAccess_JCalls {
+	atomic_size_t refcnt;
+	uint32_t instance_ptr;
+} LDKAccess_JCalls;
+static void LDKAccess_JCalls_free(void* this_arg) {
+	LDKAccess_JCalls *j_calls = (LDKAccess_JCalls*) this_arg;
+	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
+		FREE(j_calls);
+	}
+}
+LDKCResult_TxOutAccessErrorZ get_utxo_LDKAccess_jcall(const void* this_arg, const uint8_t (* genesis_hash)[32], uint64_t short_channel_id) {
+	LDKAccess_JCalls *j_calls = (LDKAccess_JCalls*) this_arg;
+	int8_tArray genesis_hash_arr = init_int8_tArray(32, __LINE__);
+	memcpy(genesis_hash_arr->elems, *genesis_hash, 32);
+	int64_t short_channel_id_conv = short_channel_id;
+	uint32_t ret = js_invoke_function_u_bb(j_calls->instance_ptr, 1, (uint32_t)genesis_hash_arr, (uint32_t)short_channel_id_conv);
+	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
+	CHECK_ACCESS(ret_ptr);
+	LDKCResult_TxOutAccessErrorZ ret_conv = *(LDKCResult_TxOutAccessErrorZ*)(ret_ptr);
+	FREE((void*)ret);
+	return ret_conv;
+}
+static void LDKAccess_JCalls_cloned(LDKAccess* new_obj) {
+	LDKAccess_JCalls *j_calls = (LDKAccess_JCalls*) new_obj->this_arg;
+	atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);
+}
+static inline LDKAccess LDKAccess_init (JSValue o) {
+	LDKAccess_JCalls *calls = MALLOC(sizeof(LDKAccess_JCalls), "LDKAccess_JCalls");
+	atomic_init(&calls->refcnt, 1);
+	calls->instance_ptr = o;
+
+	LDKAccess ret = {
+		.this_arg = (void*) calls,
+		.get_utxo = get_utxo_LDKAccess_jcall,
+		.free = LDKAccess_JCalls_free,
+	};
+	return ret;
+}
+long  __attribute__((export_name("TS_LDKAccess_new"))) TS_LDKAccess_new(JSValue o) {
+	LDKAccess *res_ptr = MALLOC(sizeof(LDKAccess), "LDKAccess");
+	*res_ptr = LDKAccess_init(o);
+	return (long)res_ptr;
+}
+uint32_t  __attribute__((export_name("TS_Access_get_utxo"))) TS_Access_get_utxo(uint32_t this_arg, int8_tArray genesis_hash, int64_t short_channel_id) {
+	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKAccess* this_arg_conv = (LDKAccess*)this_arg_ptr;
+	unsigned char genesis_hash_arr[32];
+	CHECK(genesis_hash->arr_len == 32);
+	memcpy(genesis_hash_arr, genesis_hash->elems, 32); FREE(genesis_hash);
+	unsigned char (*genesis_hash_ref)[32] = &genesis_hash_arr;
+	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
+	*ret_conv = (this_arg_conv->get_utxo)(this_arg_conv->this_arg, genesis_hash_ref, short_channel_id);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_ty_from_ptr"))) TS_LDKCOption_AccessZ_ty_from_ptr(uint32_t ptr) {
+	LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKCOption_AccessZ_Some: return 0;
+		case LDKCOption_AccessZ_None: return 1;
+		default: abort();
+	}
+}
+uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_Some_get_some"))) TS_LDKCOption_AccessZ_Some_get_some(uint32_t ptr) {
+	LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)(ptr & ~1);
+	assert(obj->tag == LDKCOption_AccessZ_Some);
+			LDKAccess* some_ret = MALLOC(sizeof(LDKAccess), "LDKAccess");
+			*some_ret = obj->some;
+			// WARNING: We likely need to clone here, but no clone is available, so we just do it for Java instances
+			if ((*some_ret).free == LDKAccess_JCalls_free) {
+				// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+				LDKAccess_JCalls_cloned(&(*some_ret));
+			}
+	return (uint32_t)some_ret;
+}
+static inline bool CResult_boolLightningErrorZ_get_ok(LDKCResult_boolLightningErrorZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return *owner->contents.result;
+}
+jboolean  __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_ok"))) TS_CResult_boolLightningErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)(owner & ~1);
+	jboolean ret_conv = CResult_boolLightningErrorZ_get_ok(owner_conv);
+	return ret_conv;
+}
+
+static inline struct LDKLightningError CResult_boolLightningErrorZ_get_err(LDKCResult_boolLightningErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
+	return LightningError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_err"))) TS_CResult_boolLightningErrorZ_get_err(uint32_t owner) {
+	LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)(owner & ~1);
+	LDKLightningError ret_var = CResult_boolLightningErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2726,26 +3074,30 @@ uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDe
 	return ret_ref;
 }
 
-static inline struct LDKSpendableOutputDescriptor CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return SpendableOutputDescriptor_clone(&*owner->contents.result);
+static inline struct LDKChannelAnnouncement C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){
+	return ChannelAnnouncement_clone(&owner->a);
 }
-uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(owner & ~1);
-	LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor");
-	*ret_copy = CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(uint32_t owner) {
+	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(owner & ~1);
+	LDKChannelAnnouncement ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
+static inline struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){
+	return ChannelUpdate_clone(&owner->b);
 }
-uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(uint32_t owner) {
+	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(owner & ~1);
+	LDKChannelUpdate ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -2756,154 +3108,666 @@ uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecode
 	return ret_ref;
 }
 
-static inline LDKCVec_PaymentPreimageZ CVec_PaymentPreimageZ_clone(const LDKCVec_PaymentPreimageZ *orig) {
-	LDKCVec_PaymentPreimageZ ret = { .data = MALLOC(sizeof(LDKThirtyTwoBytes) * orig->datalen, "LDKCVec_PaymentPreimageZ clone bytes"), .datalen = orig->datalen };
+static inline struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){
+	return ChannelUpdate_clone(&owner->c);
+}
+uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(uint32_t owner) {
+	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(owner & ~1);
+	LDKChannelUpdate ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_clone(const LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ *orig) {
+	LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret = { .data = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ) * orig->datalen, "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
-		ret.data[i] = ThirtyTwoBytes_clone(&orig->data[i]);
+		ret.data[i] = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(&orig->data[i]);
 	}
 	return ret;
 }
-static inline struct LDKSignature C2Tuple_SignatureCVec_SignatureZZ_get_a(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR owner){
-	return owner->a;
+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++) {
+		ret.data[i] = NodeAnnouncement_clone(&orig->data[i]);
+	}
+	return ret;
 }
-int8_tArray  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_a"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_a(uint32_t owner) {
-	LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(owner & ~1);
-	int8_tArray ret_arr = init_int8_tArray(64, __LINE__);
-	memcpy(ret_arr->elems, C2Tuple_SignatureCVec_SignatureZZ_get_a(owner_conv).compact_form, 64);
-	return ret_arr;
+static inline void CResult_NoneLightningErrorZ_get_ok(LDKCResult_NoneLightningErrorZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return *owner->contents.result;
+}
+void  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_ok"))) TS_CResult_NoneLightningErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)(owner & ~1);
+	CResult_NoneLightningErrorZ_get_ok(owner_conv);
 }
 
-static inline struct LDKCVec_SignatureZ C2Tuple_SignatureCVec_SignatureZZ_get_b(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR owner){
-	return owner->b;
+static inline struct LDKLightningError CResult_NoneLightningErrorZ_get_err(LDKCResult_NoneLightningErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return LightningError_clone(&*owner->contents.err);
 }
-ptrArray  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_b"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_b(uint32_t owner) {
-	LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(owner & ~1);
-	LDKCVec_SignatureZ ret_var = C2Tuple_SignatureCVec_SignatureZZ_get_b(owner_conv);
-	ptrArray ret_arr = NULL;
-	ret_arr = init_ptrArray(ret_var.datalen, __LINE__);
-	int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4);
-	for (size_t m = 0; m < ret_var.datalen; m++) {
-		int8_tArray ret_conv_12_arr = init_int8_tArray(64, __LINE__);
-		memcpy(ret_conv_12_arr->elems, ret_var.data[m].compact_form, 64);
-		ret_arr_ptr[m] = ret_conv_12_arr;
+uint32_t  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_err"))) TS_CResult_NoneLightningErrorZ_get_err(uint32_t owner) {
+	LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)(owner & ~1);
+	LDKLightningError ret_var = CResult_NoneLightningErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
 	}
-	
-	return ret_arr;
+	return ret_ref;
 }
 
-static inline struct LDKC2Tuple_SignatureCVec_SignatureZZ CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR owner){
+static inline struct LDKChannelUpdateInfo CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return C2Tuple_SignatureCVec_SignatureZZ_clone(&*owner->contents.result);
+	return ChannelUpdateInfo_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(uint32_t owner) {
-	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(owner & ~1);
-	LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ");
-	*ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(owner_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(owner & ~1);
+	LDKChannelUpdateInfo ret_var = CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-static inline void CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_ChannelUpdateInfoDecodeErrorZ_get_err(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
-	return *owner->contents.err;
+	return DecodeError_clone(&*owner->contents.err);
 }
-void  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(uint32_t owner) {
-	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(owner & ~1);
-	CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(owner_conv);
+uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_ChannelUpdateInfoDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-static inline struct LDKSignature CResult_SignatureNoneZ_get_ok(LDKCResult_SignatureNoneZ *NONNULL_PTR owner){
+static inline struct LDKChannelInfo CResult_ChannelInfoDecodeErrorZ_get_ok(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return *owner->contents.result;
+	return ChannelInfo_clone(&*owner->contents.result);
 }
-int8_tArray  __attribute__((export_name("TS_CResult_SignatureNoneZ_get_ok"))) TS_CResult_SignatureNoneZ_get_ok(uint32_t owner) {
-	LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)(owner & ~1);
-	int8_tArray ret_arr = init_int8_tArray(64, __LINE__);
-	memcpy(ret_arr->elems, CResult_SignatureNoneZ_get_ok(owner_conv).compact_form, 64);
-	return ret_arr;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_ChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(owner & ~1);
+	LDKChannelInfo ret_var = CResult_ChannelInfoDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-static inline void CResult_SignatureNoneZ_get_err(LDKCResult_SignatureNoneZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_ChannelInfoDecodeErrorZ_get_err(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
-	return *owner->contents.err;
+	return DecodeError_clone(&*owner->contents.err);
 }
-void  __attribute__((export_name("TS_CResult_SignatureNoneZ_get_err"))) TS_CResult_SignatureNoneZ_get_err(uint32_t owner) {
-	LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)(owner & ~1);
-	CResult_SignatureNoneZ_get_err(owner_conv);
+uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelInfoDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_ChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_ChannelInfoDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-static inline struct LDKSignature C2Tuple_SignatureSignatureZ_get_a(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR owner){
-	return owner->a;
+static inline struct LDKRoutingFees CResult_RoutingFeesDecodeErrorZ_get_ok(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return RoutingFees_clone(&*owner->contents.result);
 }
-int8_tArray  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_a"))) TS_C2Tuple_SignatureSignatureZ_get_a(uint32_t owner) {
-	LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)(owner & ~1);
-	int8_tArray ret_arr = init_int8_tArray(64, __LINE__);
-	memcpy(ret_arr->elems, C2Tuple_SignatureSignatureZ_get_a(owner_conv).compact_form, 64);
-	return ret_arr;
+uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_RoutingFeesDecodeErrorZ* owner_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(owner & ~1);
+	LDKRoutingFees ret_var = CResult_RoutingFeesDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-static inline struct LDKSignature C2Tuple_SignatureSignatureZ_get_b(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR owner){
-	return owner->b;
+static inline struct LDKDecodeError CResult_RoutingFeesDecodeErrorZ_get_err(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return DecodeError_clone(&*owner->contents.err);
 }
-int8_tArray  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_b"))) TS_C2Tuple_SignatureSignatureZ_get_b(uint32_t owner) {
-	LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)(owner & ~1);
-	int8_tArray ret_arr = init_int8_tArray(64, __LINE__);
-	memcpy(ret_arr->elems, C2Tuple_SignatureSignatureZ_get_b(owner_conv).compact_form, 64);
-	return ret_arr;
+uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_err"))) TS_CResult_RoutingFeesDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_RoutingFeesDecodeErrorZ* owner_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_RoutingFeesDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-static inline struct LDKC2Tuple_SignatureSignatureZ CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR owner){
+uint32_t __attribute__((export_name("TS_LDKNetAddress_ty_from_ptr"))) TS_LDKNetAddress_ty_from_ptr(uint32_t ptr) {
+	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKNetAddress_IPv4: return 0;
+		case LDKNetAddress_IPv6: return 1;
+		case LDKNetAddress_OnionV2: return 2;
+		case LDKNetAddress_OnionV3: return 3;
+		default: abort();
+	}
+}
+int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv4_get_addr"))) TS_LDKNetAddress_IPv4_get_addr(uint32_t ptr) {
+	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
+	assert(obj->tag == LDKNetAddress_IPv4);
+			int8_tArray addr_arr = init_int8_tArray(4, __LINE__);
+			memcpy(addr_arr->elems, obj->i_pv4.addr.data, 4);
+	return addr_arr;
+}
+int16_t __attribute__((export_name("TS_LDKNetAddress_IPv4_get_port"))) TS_LDKNetAddress_IPv4_get_port(uint32_t ptr) {
+	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
+	assert(obj->tag == LDKNetAddress_IPv4);
+			int16_t port_conv = obj->i_pv4.port;
+	return port_conv;
+}
+int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv6_get_addr"))) TS_LDKNetAddress_IPv6_get_addr(uint32_t ptr) {
+	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
+	assert(obj->tag == LDKNetAddress_IPv6);
+			int8_tArray addr_arr = init_int8_tArray(16, __LINE__);
+			memcpy(addr_arr->elems, obj->i_pv6.addr.data, 16);
+	return addr_arr;
+}
+int16_t __attribute__((export_name("TS_LDKNetAddress_IPv6_get_port"))) TS_LDKNetAddress_IPv6_get_port(uint32_t ptr) {
+	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
+	assert(obj->tag == LDKNetAddress_IPv6);
+			int16_t port_conv = obj->i_pv6.port;
+	return port_conv;
+}
+int8_tArray __attribute__((export_name("TS_LDKNetAddress_OnionV2_get_onion_v2"))) TS_LDKNetAddress_OnionV2_get_onion_v2(uint32_t ptr) {
+	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
+	assert(obj->tag == LDKNetAddress_OnionV2);
+			int8_tArray onion_v2_arr = init_int8_tArray(12, __LINE__);
+			memcpy(onion_v2_arr->elems, obj->onion_v2.data, 12);
+	return onion_v2_arr;
+}
+int8_tArray __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_ed25519_pubkey"))) TS_LDKNetAddress_OnionV3_get_ed25519_pubkey(uint32_t ptr) {
+	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
+	assert(obj->tag == LDKNetAddress_OnionV3);
+			int8_tArray ed25519_pubkey_arr = init_int8_tArray(32, __LINE__);
+			memcpy(ed25519_pubkey_arr->elems, obj->onion_v3.ed25519_pubkey.data, 32);
+	return ed25519_pubkey_arr;
+}
+int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_checksum"))) TS_LDKNetAddress_OnionV3_get_checksum(uint32_t ptr) {
+	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
+	assert(obj->tag == LDKNetAddress_OnionV3);
+			int16_t checksum_conv = obj->onion_v3.checksum;
+	return checksum_conv;
+}
+int8_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_version"))) TS_LDKNetAddress_OnionV3_get_version(uint32_t ptr) {
+	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
+	assert(obj->tag == LDKNetAddress_OnionV3);
+			int8_t version_conv = obj->onion_v3.version;
+	return version_conv;
+}
+int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_port"))) TS_LDKNetAddress_OnionV3_get_port(uint32_t ptr) {
+	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
+	assert(obj->tag == LDKNetAddress_OnionV3);
+			int16_t port_conv = obj->onion_v3.port;
+	return port_conv;
+}
+static inline LDKCVec_NetAddressZ CVec_NetAddressZ_clone(const LDKCVec_NetAddressZ *orig) {
+	LDKCVec_NetAddressZ ret = { .data = MALLOC(sizeof(LDKNetAddress) * orig->datalen, "LDKCVec_NetAddressZ clone bytes"), .datalen = orig->datalen };
+	for (size_t i = 0; i < ret.datalen; i++) {
+		ret.data[i] = NetAddress_clone(&orig->data[i]);
+	}
+	return ret;
+}
+static inline struct LDKNodeAnnouncementInfo CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return C2Tuple_SignatureSignatureZ_clone(&*owner->contents.result);
+	return NodeAnnouncementInfo_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(uint32_t owner) {
-	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(owner & ~1);
-	LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ");
-	*ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(owner_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(owner & ~1);
+	LDKNodeAnnouncementInfo ret_var = CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-static inline void CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
-	return *owner->contents.err;
+	return DecodeError_clone(&*owner->contents.err);
 }
-void  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(uint32_t owner) {
-	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(owner & ~1);
-	CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(owner_conv);
+uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-static inline struct LDKSecretKey CResult_SecretKeyNoneZ_get_ok(LDKCResult_SecretKeyNoneZ *NONNULL_PTR owner){
+static inline struct LDKNodeAlias CResult_NodeAliasDecodeErrorZ_get_ok(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return *owner->contents.result;
+	return NodeAlias_clone(&*owner->contents.result);
 }
-int8_tArray  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_ok"))) TS_CResult_SecretKeyNoneZ_get_ok(uint32_t owner) {
-	LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)(owner & ~1);
-	int8_tArray ret_arr = init_int8_tArray(32, __LINE__);
-	memcpy(ret_arr->elems, CResult_SecretKeyNoneZ_get_ok(owner_conv).bytes, 32);
-	return ret_arr;
+uint32_t  __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_ok"))) TS_CResult_NodeAliasDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(owner & ~1);
+	LDKNodeAlias ret_var = CResult_NodeAliasDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-static inline void CResult_SecretKeyNoneZ_get_err(LDKCResult_SecretKeyNoneZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_NodeAliasDecodeErrorZ_get_err(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
-	return *owner->contents.err;
+	return DecodeError_clone(&*owner->contents.err);
 }
-void  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_err"))) TS_CResult_SecretKeyNoneZ_get_err(uint32_t owner) {
-	LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)(owner & ~1);
-	CResult_SecretKeyNoneZ_get_err(owner_conv);
+uint32_t  __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_get_err"))) TS_CResult_NodeAliasDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_NodeAliasDecodeErrorZ* owner_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_NodeAliasDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-typedef struct LDKBaseSign_JCalls {
-	atomic_size_t refcnt;
-	uint32_t instance_ptr;
-} LDKBaseSign_JCalls;
-static void LDKBaseSign_JCalls_free(void* this_arg) {
-	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
-	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
-		FREE(j_calls);
-	}
+static inline LDKCVec_u64Z CVec_u64Z_clone(const LDKCVec_u64Z *orig) {
+	LDKCVec_u64Z ret = { .data = MALLOC(sizeof(int64_t) * orig->datalen, "LDKCVec_u64Z clone bytes"), .datalen = orig->datalen };
+	memcpy(ret.data, orig->data, sizeof(int64_t) * ret.datalen);
+	return ret;
+}
+static inline struct LDKNodeInfo CResult_NodeInfoDecodeErrorZ_get_ok(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return NodeInfo_clone(&*owner->contents.result);
+}
+uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_ok"))) TS_CResult_NodeInfoDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_NodeInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(owner & ~1);
+	LDKNodeInfo ret_var = CResult_NodeInfoDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline struct LDKDecodeError CResult_NodeInfoDecodeErrorZ_get_err(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return DecodeError_clone(&*owner->contents.err);
+}
+uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_err"))) TS_CResult_NodeInfoDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_NodeInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_NodeInfoDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline struct LDKNetworkGraph *CResult_NetworkGraphDecodeErrorZ_get_ok(LDKCResult_NetworkGraphDecodeErrorZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return &*owner->contents.result;
+}
+uint32_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_NetworkGraphDecodeErrorZ* owner_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(owner & ~1);
+	LDKNetworkGraph ret_var = *CResult_NetworkGraphDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner & ~1;
+	return ret_ref;
+}
+
+static inline struct LDKDecodeError CResult_NetworkGraphDecodeErrorZ_get_err(LDKCResult_NetworkGraphDecodeErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return DecodeError_clone(&*owner->contents.err);
+}
+uint32_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_err"))) TS_CResult_NetworkGraphDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_NetworkGraphDecodeErrorZ* owner_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_NetworkGraphDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+uint32_t __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr"))) TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr(uint32_t ptr) {
+	LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKCOption_CVec_NetAddressZZ_Some: return 0;
+		case LDKCOption_CVec_NetAddressZZ_None: return 1;
+		default: abort();
+	}
+}
+uint32_tArray __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_Some_get_some"))) TS_LDKCOption_CVec_NetAddressZZ_Some_get_some(uint32_t ptr) {
+	LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)(ptr & ~1);
+	assert(obj->tag == LDKCOption_CVec_NetAddressZZ_Some);
+			LDKCVec_NetAddressZ some_var = obj->some;
+			uint32_tArray some_arr = NULL;
+			some_arr = init_uint32_tArray(some_var.datalen, __LINE__);
+			uint32_t *some_arr_ptr = (uint32_t*)(((uint8_t*)some_arr) + 4);
+			for (size_t m = 0; m < some_var.datalen; m++) {
+				uint32_t some_conv_12_ref = ((uintptr_t)&some_var.data[m]) | 1;
+				some_arr_ptr[m] = some_conv_12_ref;
+			}
+			
+	return some_arr;
+}
+static inline struct LDKDelayedPaymentOutputDescriptor CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return DelayedPaymentOutputDescriptor_clone(&*owner->contents.result);
+}
+uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1);
+	LDKDelayedPaymentOutputDescriptor ret_var = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline struct LDKDecodeError CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return DecodeError_clone(&*owner->contents.err);
+}
+uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline struct LDKStaticPaymentOutputDescriptor CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return StaticPaymentOutputDescriptor_clone(&*owner->contents.result);
+}
+uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1);
+	LDKStaticPaymentOutputDescriptor ret_var = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline struct LDKDecodeError CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return DecodeError_clone(&*owner->contents.err);
+}
+uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline struct LDKSpendableOutputDescriptor CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return SpendableOutputDescriptor_clone(&*owner->contents.result);
+}
+uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(owner & ~1);
+	LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor");
+	*ret_copy = CResult_SpendableOutputDescriptorDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+static inline struct LDKDecodeError CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return DecodeError_clone(&*owner->contents.err);
+}
+uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* owner_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_SpendableOutputDescriptorDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline LDKCVec_PaymentPreimageZ CVec_PaymentPreimageZ_clone(const LDKCVec_PaymentPreimageZ *orig) {
+	LDKCVec_PaymentPreimageZ ret = { .data = MALLOC(sizeof(LDKThirtyTwoBytes) * orig->datalen, "LDKCVec_PaymentPreimageZ clone bytes"), .datalen = orig->datalen };
+	for (size_t i = 0; i < ret.datalen; i++) {
+		ret.data[i] = ThirtyTwoBytes_clone(&orig->data[i]);
+	}
+	return ret;
+}
+static inline struct LDKSignature C2Tuple_SignatureCVec_SignatureZZ_get_a(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR owner){
+	return owner->a;
+}
+int8_tArray  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_a"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_a(uint32_t owner) {
+	LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(owner & ~1);
+	int8_tArray ret_arr = init_int8_tArray(64, __LINE__);
+	memcpy(ret_arr->elems, C2Tuple_SignatureCVec_SignatureZZ_get_a(owner_conv).compact_form, 64);
+	return ret_arr;
+}
+
+static inline struct LDKCVec_SignatureZ C2Tuple_SignatureCVec_SignatureZZ_get_b(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR owner){
+	return owner->b;
+}
+ptrArray  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_get_b"))) TS_C2Tuple_SignatureCVec_SignatureZZ_get_b(uint32_t owner) {
+	LDKC2Tuple_SignatureCVec_SignatureZZ* owner_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(owner & ~1);
+	LDKCVec_SignatureZ ret_var = C2Tuple_SignatureCVec_SignatureZZ_get_b(owner_conv);
+	ptrArray ret_arr = NULL;
+	ret_arr = init_ptrArray(ret_var.datalen, __LINE__);
+	int8_tArray *ret_arr_ptr = (int8_tArray*)(((uint8_t*)ret_arr) + 4);
+	for (size_t m = 0; m < ret_var.datalen; m++) {
+		int8_tArray ret_conv_12_arr = init_int8_tArray(64, __LINE__);
+		memcpy(ret_conv_12_arr->elems, ret_var.data[m].compact_form, 64);
+		ret_arr_ptr[m] = ret_conv_12_arr;
+	}
+	
+	return ret_arr;
+}
+
+static inline struct LDKC2Tuple_SignatureCVec_SignatureZZ CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return C2Tuple_SignatureCVec_SignatureZZ_clone(&*owner->contents.result);
+}
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(uint32_t owner) {
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(owner & ~1);
+	LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ");
+	*ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_ok(owner_conv);
+	return ((uint32_t)ret_conv);
+}
+
+static inline void CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return *owner->contents.err;
+}
+void  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(uint32_t owner) {
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(owner & ~1);
+	CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_get_err(owner_conv);
+}
+
+static inline struct LDKSignature CResult_SignatureNoneZ_get_ok(LDKCResult_SignatureNoneZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return *owner->contents.result;
+}
+int8_tArray  __attribute__((export_name("TS_CResult_SignatureNoneZ_get_ok"))) TS_CResult_SignatureNoneZ_get_ok(uint32_t owner) {
+	LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)(owner & ~1);
+	int8_tArray ret_arr = init_int8_tArray(64, __LINE__);
+	memcpy(ret_arr->elems, CResult_SignatureNoneZ_get_ok(owner_conv).compact_form, 64);
+	return ret_arr;
+}
+
+static inline void CResult_SignatureNoneZ_get_err(LDKCResult_SignatureNoneZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return *owner->contents.err;
+}
+void  __attribute__((export_name("TS_CResult_SignatureNoneZ_get_err"))) TS_CResult_SignatureNoneZ_get_err(uint32_t owner) {
+	LDKCResult_SignatureNoneZ* owner_conv = (LDKCResult_SignatureNoneZ*)(owner & ~1);
+	CResult_SignatureNoneZ_get_err(owner_conv);
+}
+
+static inline struct LDKSignature C2Tuple_SignatureSignatureZ_get_a(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR owner){
+	return owner->a;
+}
+int8_tArray  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_a"))) TS_C2Tuple_SignatureSignatureZ_get_a(uint32_t owner) {
+	LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)(owner & ~1);
+	int8_tArray ret_arr = init_int8_tArray(64, __LINE__);
+	memcpy(ret_arr->elems, C2Tuple_SignatureSignatureZ_get_a(owner_conv).compact_form, 64);
+	return ret_arr;
+}
+
+static inline struct LDKSignature C2Tuple_SignatureSignatureZ_get_b(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR owner){
+	return owner->b;
+}
+int8_tArray  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_get_b"))) TS_C2Tuple_SignatureSignatureZ_get_b(uint32_t owner) {
+	LDKC2Tuple_SignatureSignatureZ* owner_conv = (LDKC2Tuple_SignatureSignatureZ*)(owner & ~1);
+	int8_tArray ret_arr = init_int8_tArray(64, __LINE__);
+	memcpy(ret_arr->elems, C2Tuple_SignatureSignatureZ_get_b(owner_conv).compact_form, 64);
+	return ret_arr;
+}
+
+static inline struct LDKC2Tuple_SignatureSignatureZ CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return C2Tuple_SignatureSignatureZ_clone(&*owner->contents.result);
+}
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(uint32_t owner) {
+	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(owner & ~1);
+	LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ");
+	*ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_get_ok(owner_conv);
+	return ((uint32_t)ret_conv);
+}
+
+static inline void CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return *owner->contents.err;
+}
+void  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(uint32_t owner) {
+	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* owner_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(owner & ~1);
+	CResult_C2Tuple_SignatureSignatureZNoneZ_get_err(owner_conv);
+}
+
+static inline struct LDKSecretKey CResult_SecretKeyNoneZ_get_ok(LDKCResult_SecretKeyNoneZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return *owner->contents.result;
+}
+int8_tArray  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_ok"))) TS_CResult_SecretKeyNoneZ_get_ok(uint32_t owner) {
+	LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)(owner & ~1);
+	int8_tArray ret_arr = init_int8_tArray(32, __LINE__);
+	memcpy(ret_arr->elems, CResult_SecretKeyNoneZ_get_ok(owner_conv).bytes, 32);
+	return ret_arr;
+}
+
+static inline void CResult_SecretKeyNoneZ_get_err(LDKCResult_SecretKeyNoneZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return *owner->contents.err;
+}
+void  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_get_err"))) TS_CResult_SecretKeyNoneZ_get_err(uint32_t owner) {
+	LDKCResult_SecretKeyNoneZ* owner_conv = (LDKCResult_SecretKeyNoneZ*)(owner & ~1);
+	CResult_SecretKeyNoneZ_get_err(owner_conv);
+}
+
+typedef struct LDKBaseSign_JCalls {
+	atomic_size_t refcnt;
+	uint32_t instance_ptr;
+} LDKBaseSign_JCalls;
+static void LDKBaseSign_JCalls_free(void* this_arg) {
+	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
+	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
+		FREE(j_calls);
+	}
 }
 LDKPublicKey get_per_commitment_point_LDKBaseSign_jcall(const void* this_arg, uint64_t idx) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
-	int8_tArray ret = (int8_tArray)js_invoke_function_1(j_calls->instance_ptr, 0, (uint32_t)idx);
+	int64_t idx_conv = idx;
+	int8_tArray ret = (int8_tArray)js_invoke_function_u_b(j_calls->instance_ptr, 2, (uint32_t)idx_conv);
 	LDKPublicKey ret_ref;
 	CHECK(ret->arr_len == 33);
 	memcpy(ret_ref.compressed_form, ret->elems, 33); FREE(ret);
@@ -2911,7 +3775,8 @@ LDKPublicKey get_per_commitment_point_LDKBaseSign_jcall(const void* this_arg, ui
 }
 LDKThirtyTwoBytes release_commitment_secret_LDKBaseSign_jcall(const void* this_arg, uint64_t idx) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
-	int8_tArray ret = (int8_tArray)js_invoke_function_1(j_calls->instance_ptr, 1, (uint32_t)idx);
+	int64_t idx_conv = idx;
+	int8_tArray ret = (int8_tArray)js_invoke_function_u_b(j_calls->instance_ptr, 3, (uint32_t)idx_conv);
 	LDKThirtyTwoBytes ret_ref;
 	CHECK(ret->arr_len == 32);
 	memcpy(ret_ref.data, ret->elems, 32); FREE(ret);
@@ -2920,8 +3785,8 @@ LDKThirtyTwoBytes release_commitment_secret_LDKBaseSign_jcall(const void* this_a
 LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* this_arg, const LDKHolderCommitmentTransaction * holder_tx, LDKCVec_PaymentPreimageZ preimages) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
 	LDKHolderCommitmentTransaction holder_tx_var = *holder_tx;
-	uintptr_t holder_tx_ref = 0;
-	holder_tx_var = HolderCommitmentTransaction_clone(holder_tx);
+	uint32_t holder_tx_ref = 0;
+	holder_tx_var = HolderCommitmentTransaction_clone(&holder_tx_var);
 	CHECK((((uintptr_t)holder_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&holder_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(holder_tx_var);
@@ -2940,7 +3805,7 @@ LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* th
 	}
 	
 	FREE(preimages_var.data);
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 2, (uint32_t)holder_tx_ref, (uint32_t)preimages_arr);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 4, (uint32_t)holder_tx_ref, (uint32_t)preimages_arr);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr);
@@ -2949,7 +3814,7 @@ LDKCResult_NoneNoneZ validate_holder_commitment_LDKBaseSign_jcall(const void* th
 }
 LDKThirtyTwoBytes channel_keys_id_LDKBaseSign_jcall(const void* this_arg) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
-	int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 3);
+	int8_tArray ret = (int8_tArray)js_invoke_function_u_(j_calls->instance_ptr, 5);
 	LDKThirtyTwoBytes ret_ref;
 	CHECK(ret->arr_len == 32);
 	memcpy(ret_ref.data, ret->elems, 32); FREE(ret);
@@ -2958,8 +3823,8 @@ LDKThirtyTwoBytes channel_keys_id_LDKBaseSign_jcall(const void* this_arg) {
 LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_LDKBaseSign_jcall(const void* this_arg, const LDKCommitmentTransaction * commitment_tx, LDKCVec_PaymentPreimageZ preimages) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
 	LDKCommitmentTransaction commitment_tx_var = *commitment_tx;
-	uintptr_t commitment_tx_ref = 0;
-	commitment_tx_var = CommitmentTransaction_clone(commitment_tx);
+	uint32_t commitment_tx_ref = 0;
+	commitment_tx_var = CommitmentTransaction_clone(&commitment_tx_var);
 	CHECK((((uintptr_t)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_var);
@@ -2978,7 +3843,7 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_L
 	}
 	
 	FREE(preimages_var.data);
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 4, (uint32_t)commitment_tx_ref, (uint32_t)preimages_arr);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 6, (uint32_t)commitment_tx_ref, (uint32_t)preimages_arr);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr);
@@ -2987,9 +3852,10 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_counterparty_commitment_L
 }
 LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const void* this_arg, uint64_t idx, const uint8_t (* secret)[32]) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
+	int64_t idx_conv = idx;
 	int8_tArray secret_arr = init_int8_tArray(32, __LINE__);
 	memcpy(secret_arr->elems, *secret, 32);
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 5, (uint32_t)idx, (uint32_t)secret_arr);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 7, (uint32_t)idx_conv, (uint32_t)secret_arr);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneNoneZ ret_conv = *(LDKCResult_NoneNoneZ*)(ret_ptr);
@@ -2999,8 +3865,8 @@ LDKCResult_NoneNoneZ validate_counterparty_revocation_LDKBaseSign_jcall(const vo
 LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htlcs_LDKBaseSign_jcall(const void* this_arg, const LDKHolderCommitmentTransaction * commitment_tx) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
 	LDKHolderCommitmentTransaction commitment_tx_var = *commitment_tx;
-	uintptr_t commitment_tx_ref = 0;
-	commitment_tx_var = HolderCommitmentTransaction_clone(commitment_tx);
+	uint32_t commitment_tx_ref = 0;
+	commitment_tx_var = HolderCommitmentTransaction_clone(&commitment_tx_var);
 	CHECK((((uintptr_t)commitment_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&commitment_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_var);
@@ -3008,7 +3874,7 @@ LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ sign_holder_commitment_and_htl
 	if (commitment_tx_var.is_owned) {
 		commitment_tx_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 6, (uint32_t)commitment_tx_ref);
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 8, (uint32_t)commitment_tx_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(ret_ptr);
@@ -3021,9 +3887,11 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_output_LDKBaseSign_jcall(const vo
 	int8_tArray justice_tx_arr = init_int8_tArray(justice_tx_var.datalen, __LINE__);
 	memcpy(justice_tx_arr->elems, justice_tx_var.data, justice_tx_var.datalen);
 	Transaction_free(justice_tx_var);
+	uint32_t input_conv = input;
+	int64_t amount_conv = amount;
 	int8_tArray per_commitment_key_arr = init_int8_tArray(32, __LINE__);
 	memcpy(per_commitment_key_arr->elems, *per_commitment_key, 32);
-	uint32_t ret = js_invoke_function_4(j_calls->instance_ptr, 7, (uint32_t)justice_tx_arr, (uint32_t)input, (uint32_t)amount, (uint32_t)per_commitment_key_arr);
+	uint32_t ret = js_invoke_function_u_uuuu(j_calls->instance_ptr, 9, (uint32_t)justice_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_key_arr);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr);
@@ -3036,11 +3904,13 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_htlc_LDKBaseSign_jcall(const void
 	int8_tArray justice_tx_arr = init_int8_tArray(justice_tx_var.datalen, __LINE__);
 	memcpy(justice_tx_arr->elems, justice_tx_var.data, justice_tx_var.datalen);
 	Transaction_free(justice_tx_var);
+	uint32_t input_conv = input;
+	int64_t amount_conv = amount;
 	int8_tArray per_commitment_key_arr = init_int8_tArray(32, __LINE__);
 	memcpy(per_commitment_key_arr->elems, *per_commitment_key, 32);
 	LDKHTLCOutputInCommitment htlc_var = *htlc;
-	uintptr_t htlc_ref = 0;
-	htlc_var = HTLCOutputInCommitment_clone(htlc);
+	uint32_t htlc_ref = 0;
+	htlc_var = HTLCOutputInCommitment_clone(&htlc_var);
 	CHECK((((uintptr_t)htlc_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&htlc_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_var);
@@ -3048,7 +3918,7 @@ LDKCResult_SignatureNoneZ sign_justice_revoked_htlc_LDKBaseSign_jcall(const void
 	if (htlc_var.is_owned) {
 		htlc_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_5(j_calls->instance_ptr, 8, (uint32_t)justice_tx_arr, (uint32_t)input, (uint32_t)amount, (uint32_t)per_commitment_key_arr, (uint32_t)htlc_ref);
+	uint32_t ret = js_invoke_function_u_uuuuu(j_calls->instance_ptr, 10, (uint32_t)justice_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_key_arr, (uint32_t)htlc_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr);
@@ -3061,11 +3931,13 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_LDKBaseSign_jcall(c
 	int8_tArray htlc_tx_arr = init_int8_tArray(htlc_tx_var.datalen, __LINE__);
 	memcpy(htlc_tx_arr->elems, htlc_tx_var.data, htlc_tx_var.datalen);
 	Transaction_free(htlc_tx_var);
+	uint32_t input_conv = input;
+	int64_t amount_conv = amount;
 	int8_tArray per_commitment_point_arr = init_int8_tArray(33, __LINE__);
 	memcpy(per_commitment_point_arr->elems, per_commitment_point.compressed_form, 33);
 	LDKHTLCOutputInCommitment htlc_var = *htlc;
-	uintptr_t htlc_ref = 0;
-	htlc_var = HTLCOutputInCommitment_clone(htlc);
+	uint32_t htlc_ref = 0;
+	htlc_var = HTLCOutputInCommitment_clone(&htlc_var);
 	CHECK((((uintptr_t)htlc_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&htlc_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_var);
@@ -3073,7 +3945,7 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_LDKBaseSign_jcall(c
 	if (htlc_var.is_owned) {
 		htlc_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_5(j_calls->instance_ptr, 9, (uint32_t)htlc_tx_arr, (uint32_t)input, (uint32_t)amount, (uint32_t)per_commitment_point_arr, (uint32_t)htlc_ref);
+	uint32_t ret = js_invoke_function_u_uuuuu(j_calls->instance_ptr, 11, (uint32_t)htlc_tx_arr, (uint32_t)input_conv, (uint32_t)amount_conv, (uint32_t)per_commitment_point_arr, (uint32_t)htlc_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr);
@@ -3083,8 +3955,8 @@ LDKCResult_SignatureNoneZ sign_counterparty_htlc_transaction_LDKBaseSign_jcall(c
 LDKCResult_SignatureNoneZ sign_closing_transaction_LDKBaseSign_jcall(const void* this_arg, const LDKClosingTransaction * closing_tx) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
 	LDKClosingTransaction closing_tx_var = *closing_tx;
-	uintptr_t closing_tx_ref = 0;
-	closing_tx_var = ClosingTransaction_clone(closing_tx);
+	uint32_t closing_tx_ref = 0;
+	closing_tx_var = ClosingTransaction_clone(&closing_tx_var);
 	CHECK((((uintptr_t)closing_tx_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&closing_tx_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(closing_tx_var);
@@ -3092,7 +3964,7 @@ LDKCResult_SignatureNoneZ sign_closing_transaction_LDKBaseSign_jcall(const void*
 	if (closing_tx_var.is_owned) {
 		closing_tx_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 10, (uint32_t)closing_tx_ref);
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 12, (uint32_t)closing_tx_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignatureNoneZ ret_conv = *(LDKCResult_SignatureNoneZ*)(ret_ptr);
@@ -3102,8 +3974,8 @@ LDKCResult_SignatureNoneZ sign_closing_transaction_LDKBaseSign_jcall(const void*
 LDKCResult_C2Tuple_SignatureSignatureZNoneZ sign_channel_announcement_LDKBaseSign_jcall(const void* this_arg, const LDKUnsignedChannelAnnouncement * msg) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
 	LDKUnsignedChannelAnnouncement msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = UnsignedChannelAnnouncement_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = UnsignedChannelAnnouncement_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -3111,7 +3983,7 @@ LDKCResult_C2Tuple_SignatureSignatureZNoneZ sign_channel_announcement_LDKBaseSig
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 11, (uint32_t)msg_ref);
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 13, (uint32_t)msg_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_C2Tuple_SignatureSignatureZNoneZ ret_conv = *(LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(ret_ptr);
@@ -3121,8 +3993,8 @@ LDKCResult_C2Tuple_SignatureSignatureZNoneZ sign_channel_announcement_LDKBaseSig
 void ready_channel_LDKBaseSign_jcall(void* this_arg, const LDKChannelTransactionParameters * channel_parameters) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) this_arg;
 	LDKChannelTransactionParameters channel_parameters_var = *channel_parameters;
-	uintptr_t channel_parameters_ref = 0;
-	channel_parameters_var = ChannelTransactionParameters_clone(channel_parameters);
+	uint32_t channel_parameters_ref = 0;
+	channel_parameters_var = ChannelTransactionParameters_clone(&channel_parameters_var);
 	CHECK((((uintptr_t)channel_parameters_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&channel_parameters_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_var);
@@ -3130,7 +4002,7 @@ void ready_channel_LDKBaseSign_jcall(void* this_arg, const LDKChannelTransaction
 	if (channel_parameters_var.is_owned) {
 		channel_parameters_ref |= 1;
 	}
-	js_invoke_function_1(j_calls->instance_ptr, 12, (uint32_t)channel_parameters_ref);
+	js_invoke_function_u_u(j_calls->instance_ptr, 14, (uint32_t)channel_parameters_ref);
 }
 static void LDKBaseSign_JCalls_cloned(LDKBaseSign* new_obj) {
 	LDKBaseSign_JCalls *j_calls = (LDKBaseSign_JCalls*) new_obj->this_arg;
@@ -3204,7 +4076,7 @@ uint32_t  __attribute__((export_name("TS_BaseSign_validate_holder_commitment")))
 		preimages_constr.data = MALLOC(preimages_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_PaymentPreimageZ Elements");
 	else
 		preimages_constr.data = NULL;
-	int8_tArray* preimages_vals = (void*) preimages->elems /* XXX preimages leaks */;
+	int8_tArray* preimages_vals = (void*) preimages->elems;
 	for (size_t m = 0; m < preimages_constr.datalen; m++) {
 		int8_tArray preimages_conv_12 = preimages_vals[m];
 		LDKThirtyTwoBytes preimages_conv_12_ref;
@@ -3212,9 +4084,10 @@ uint32_t  __attribute__((export_name("TS_BaseSign_validate_holder_commitment")))
 		memcpy(preimages_conv_12_ref.data, preimages_conv_12->elems, 32); FREE(preimages_conv_12);
 		preimages_constr.data[m] = preimages_conv_12_ref;
 	}
+	FREE(preimages);
 	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
 	*ret_conv = (this_arg_conv->validate_holder_commitment)(this_arg_conv->this_arg, &holder_tx_conv, preimages_constr);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_BaseSign_channel_keys_id"))) TS_BaseSign_channel_keys_id(uint32_t this_arg) {
@@ -3240,7 +4113,7 @@ uint32_t  __attribute__((export_name("TS_BaseSign_sign_counterparty_commitment")
 		preimages_constr.data = MALLOC(preimages_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_PaymentPreimageZ Elements");
 	else
 		preimages_constr.data = NULL;
-	int8_tArray* preimages_vals = (void*) preimages->elems /* XXX preimages leaks */;
+	int8_tArray* preimages_vals = (void*) preimages->elems;
 	for (size_t m = 0; m < preimages_constr.datalen; m++) {
 		int8_tArray preimages_conv_12 = preimages_vals[m];
 		LDKThirtyTwoBytes preimages_conv_12_ref;
@@ -3248,9 +4121,10 @@ uint32_t  __attribute__((export_name("TS_BaseSign_sign_counterparty_commitment")
 		memcpy(preimages_conv_12_ref.data, preimages_conv_12->elems, 32); FREE(preimages_conv_12);
 		preimages_constr.data[m] = preimages_conv_12_ref;
 	}
+	FREE(preimages);
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
 	*ret_conv = (this_arg_conv->sign_counterparty_commitment)(this_arg_conv->this_arg, &commitment_tx_conv, preimages_constr);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_BaseSign_validate_counterparty_revocation"))) TS_BaseSign_validate_counterparty_revocation(uint32_t this_arg, int64_t idx, int8_tArray secret) {
@@ -3263,7 +4137,7 @@ uint32_t  __attribute__((export_name("TS_BaseSign_validate_counterparty_revocati
 	unsigned char (*secret_ref)[32] = &secret_arr;
 	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
 	*ret_conv = (this_arg_conv->validate_counterparty_revocation)(this_arg_conv->this_arg, idx, secret_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_BaseSign_sign_holder_commitment_and_htlcs"))) TS_BaseSign_sign_holder_commitment_and_htlcs(uint32_t this_arg, uint32_t commitment_tx) {
@@ -3276,10 +4150,10 @@ uint32_t  __attribute__((export_name("TS_BaseSign_sign_holder_commitment_and_htl
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_tx_conv);
 	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
 	*ret_conv = (this_arg_conv->sign_holder_commitment_and_htlcs)(this_arg_conv->this_arg, &commitment_tx_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_BaseSign_sign_justice_revoked_output"))) TS_BaseSign_sign_justice_revoked_output(uint32_t this_arg, int8_tArray justice_tx, intptr_t input, int64_t amount, int8_tArray per_commitment_key) {
+uint32_t  __attribute__((export_name("TS_BaseSign_sign_justice_revoked_output"))) TS_BaseSign_sign_justice_revoked_output(uint32_t this_arg, int8_tArray justice_tx, uint32_t input, int64_t amount, int8_tArray per_commitment_key) {
 	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr;
@@ -3294,10 +4168,10 @@ uint32_t  __attribute__((export_name("TS_BaseSign_sign_justice_revoked_output"))
 	unsigned char (*per_commitment_key_ref)[32] = &per_commitment_key_arr;
 	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
 	*ret_conv = (this_arg_conv->sign_justice_revoked_output)(this_arg_conv->this_arg, justice_tx_ref, input, amount, per_commitment_key_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_BaseSign_sign_justice_revoked_htlc"))) TS_BaseSign_sign_justice_revoked_htlc(uint32_t this_arg, int8_tArray justice_tx, intptr_t input, int64_t amount, int8_tArray per_commitment_key, uint32_t htlc) {
+uint32_t  __attribute__((export_name("TS_BaseSign_sign_justice_revoked_htlc"))) TS_BaseSign_sign_justice_revoked_htlc(uint32_t this_arg, int8_tArray justice_tx, uint32_t input, int64_t amount, int8_tArray per_commitment_key, uint32_t htlc) {
 	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr;
@@ -3316,10 +4190,10 @@ uint32_t  __attribute__((export_name("TS_BaseSign_sign_justice_revoked_htlc")))
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(htlc_conv);
 	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
 	*ret_conv = (this_arg_conv->sign_justice_revoked_htlc)(this_arg_conv->this_arg, justice_tx_ref, input, amount, per_commitment_key_ref, &htlc_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_BaseSign_sign_counterparty_htlc_transaction"))) TS_BaseSign_sign_counterparty_htlc_transaction(uint32_t this_arg, int8_tArray htlc_tx, intptr_t input, int64_t amount, int8_tArray per_commitment_point, uint32_t htlc) {
+uint32_t  __attribute__((export_name("TS_BaseSign_sign_counterparty_htlc_transaction"))) TS_BaseSign_sign_counterparty_htlc_transaction(uint32_t this_arg, int8_tArray htlc_tx, uint32_t input, int64_t amount, int8_tArray per_commitment_point, uint32_t htlc) {
 	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr;
@@ -3337,7 +4211,7 @@ uint32_t  __attribute__((export_name("TS_BaseSign_sign_counterparty_htlc_transac
 	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 (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_BaseSign_sign_closing_transaction"))) TS_BaseSign_sign_closing_transaction(uint32_t this_arg, uint32_t closing_tx) {
@@ -3350,7 +4224,7 @@ uint32_t  __attribute__((export_name("TS_BaseSign_sign_closing_transaction"))) T
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(closing_tx_conv);
 	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
 	*ret_conv = (this_arg_conv->sign_closing_transaction)(this_arg_conv->this_arg, &closing_tx_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_BaseSign_sign_channel_announcement"))) TS_BaseSign_sign_channel_announcement(uint32_t this_arg, uint32_t msg) {
@@ -3363,7 +4237,7 @@ uint32_t  __attribute__((export_name("TS_BaseSign_sign_channel_announcement")))
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ");
 	*ret_conv = (this_arg_conv->sign_channel_announcement)(this_arg_conv->this_arg, &msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_BaseSign_ready_channel"))) TS_BaseSign_ready_channel(uint32_t this_arg, uint32_t channel_parameters) {
@@ -3387,7 +4261,7 @@ uint32_t  __attribute__((export_name("TS_BaseSign_get_pubkeys"))) TS_BaseSign_ge
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKBaseSign* this_arg_conv = (LDKBaseSign*)this_arg_ptr;
 	LDKChannelPublicKeys ret_var = LDKBaseSign_set_get_pubkeys(this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -3411,7 +4285,7 @@ static void LDKSign_JCalls_free(void* this_arg) {
 }
 LDKCVec_u8Z write_LDKSign_jcall(const void* this_arg) {
 	LDKSign_JCalls *j_calls = (LDKSign_JCalls*) this_arg;
-	int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 13);
+	int8_tArray ret = (int8_tArray)js_invoke_function_u_(j_calls->instance_ptr, 15);
 	LDKCVec_u8Z ret_ref;
 	ret_ref.datalen = ret->arr_len;
 	ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes");
@@ -3467,7 +4341,7 @@ uint32_t  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_get_ok"))) TS_
 	LDKCResult_SignDecodeErrorZ* owner_conv = (LDKCResult_SignDecodeErrorZ*)(owner & ~1);
 	LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign");
 	*ret_ret = CResult_SignDecodeErrorZ_get_ok(owner_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 static inline struct LDKDecodeError CResult_SignDecodeErrorZ_get_err(LDKCResult_SignDecodeErrorZ *NONNULL_PTR owner){
@@ -3477,7 +4351,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_get_err"))) TS_CResult_SignDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_SignDecodeErrorZ* owner_conv = (LDKCResult_SignDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_SignDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -3553,7 +4427,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_get_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_InMemorySignerDecodeErrorZ* owner_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(owner & ~1);
 	LDKInMemorySigner ret_var = CResult_InMemorySignerDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -3571,7 +4445,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_get_err"))) TS_CResult_InMemorySignerDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_InMemorySignerDecodeErrorZ* owner_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_InMemorySignerDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -3621,7 +4495,8 @@ uint32_t __attribute__((export_name("TS_LDKCOption_u16Z_ty_from_ptr"))) TS_LDKCO
 int16_t __attribute__((export_name("TS_LDKCOption_u16Z_Some_get_some"))) TS_LDKCOption_u16Z_Some_get_some(uint32_t ptr) {
 	LDKCOption_u16Z *obj = (LDKCOption_u16Z*)(ptr & ~1);
 	assert(obj->tag == LDKCOption_u16Z_Some);
-	return obj->some;
+			int16_t some_conv = obj->some;
+	return some_conv;
 }
 uint32_t __attribute__((export_name("TS_LDKAPIError_ty_from_ptr"))) TS_LDKAPIError_ty_from_ptr(uint32_t ptr) {
 	LDKAPIError *obj = (LDKAPIError*)(ptr & ~1);
@@ -3652,7 +4527,8 @@ jstring __attribute__((export_name("TS_LDKAPIError_FeeRateTooHigh_get_err"))) TS
 int32_t __attribute__((export_name("TS_LDKAPIError_FeeRateTooHigh_get_feerate"))) TS_LDKAPIError_FeeRateTooHigh_get_feerate(uint32_t ptr) {
 	LDKAPIError *obj = (LDKAPIError*)(ptr & ~1);
 	assert(obj->tag == LDKAPIError_FeeRateTooHigh);
-	return obj->fee_rate_too_high.feerate;
+			int32_t feerate_conv = obj->fee_rate_too_high.feerate;
+	return feerate_conv;
 }
 jstring __attribute__((export_name("TS_LDKAPIError_RouteError_get_err"))) TS_LDKAPIError_RouteError_get_err(uint32_t ptr) {
 	LDKAPIError *obj = (LDKAPIError*)(ptr & ~1);
@@ -3672,7 +4548,7 @@ uint32_t __attribute__((export_name("TS_LDKAPIError_IncompatibleShutdownScript_g
 	LDKAPIError *obj = (LDKAPIError*)(ptr & ~1);
 	assert(obj->tag == LDKAPIError_IncompatibleShutdownScript);
 			LDKShutdownScript script_var = obj->incompatible_shutdown_script.script;
-			uintptr_t script_ref = 0;
+			uint32_t script_ref = 0;
 			CHECK((((uintptr_t)script_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&script_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(script_var);
@@ -3696,7 +4572,7 @@ uint32_t  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_get_err"))) TS_CR
 	LDKCResult_NoneAPIErrorZ* owner_conv = (LDKCResult_NoneAPIErrorZ*)(owner & ~1);
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = CResult_NoneAPIErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -3733,7 +4609,7 @@ uint32_t  __attribute__((export_name("TS_CResult__u832APIErrorZ_get_err"))) TS_C
 	LDKCResult__u832APIErrorZ* owner_conv = (LDKCResult__u832APIErrorZ*)(owner & ~1);
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = CResult__u832APIErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -3750,7 +4626,7 @@ uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_ty_from_ptr"))) TS
 uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_ParameterError_get_parameter_error"))) TS_LDKPaymentSendFailure_ParameterError_get_parameter_error(uint32_t ptr) {
 	LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1);
 	assert(obj->tag == LDKPaymentSendFailure_ParameterError);
-			uintptr_t parameter_error_ref = ((uintptr_t)&obj->parameter_error) | 1;
+			uint32_t parameter_error_ref = ((uintptr_t)&obj->parameter_error) | 1;
 	return parameter_error_ref;
 }
 uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PathParameterError_get_path_parameter_error"))) TS_LDKPaymentSendFailure_PathParameterError_get_path_parameter_error(uint32_t ptr) {
@@ -3764,7 +4640,7 @@ uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PathParameter
 				LDKCResult_NoneAPIErrorZ* path_parameter_error_conv_22_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
 				*path_parameter_error_conv_22_conv = path_parameter_error_var.data[w];
 				*path_parameter_error_conv_22_conv = CResult_NoneAPIErrorZ_clone(path_parameter_error_conv_22_conv);
-				path_parameter_error_arr_ptr[w] = (uintptr_t)path_parameter_error_conv_22_conv;
+				path_parameter_error_arr_ptr[w] = (uint32_t)path_parameter_error_conv_22_conv;
 			}
 			
 	return path_parameter_error_arr;
@@ -3777,7 +4653,7 @@ uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_AllFailedRetr
 			all_failed_retry_safe_arr = init_uint32_tArray(all_failed_retry_safe_var.datalen, __LINE__);
 			uint32_t *all_failed_retry_safe_arr_ptr = (uint32_t*)(((uint8_t*)all_failed_retry_safe_arr) + 4);
 			for (size_t k = 0; k < all_failed_retry_safe_var.datalen; k++) {
-				uintptr_t all_failed_retry_safe_conv_10_ref = ((uintptr_t)&all_failed_retry_safe_var.data[k]) | 1;
+				uint32_t all_failed_retry_safe_conv_10_ref = ((uintptr_t)&all_failed_retry_safe_var.data[k]) | 1;
 				all_failed_retry_safe_arr_ptr[k] = all_failed_retry_safe_conv_10_ref;
 			}
 			
@@ -3794,7 +4670,7 @@ uint32_tArray __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailur
 				LDKCResult_NoneAPIErrorZ* results_conv_22_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
 				*results_conv_22_conv = results_var.data[w];
 				*results_conv_22_conv = CResult_NoneAPIErrorZ_clone(results_conv_22_conv);
-				results_arr_ptr[w] = (uintptr_t)results_conv_22_conv;
+				results_arr_ptr[w] = (uint32_t)results_conv_22_conv;
 			}
 			
 	return results_arr;
@@ -3803,7 +4679,7 @@ uint32_t __attribute__((export_name("TS_LDKPaymentSendFailure_PartialFailure_get
 	LDKPaymentSendFailure *obj = (LDKPaymentSendFailure*)(ptr & ~1);
 	assert(obj->tag == LDKPaymentSendFailure_PartialFailure);
 			LDKRouteParameters failed_paths_retry_var = obj->partial_failure.failed_paths_retry;
-			uintptr_t failed_paths_retry_ref = 0;
+			uint32_t failed_paths_retry_ref = 0;
 			if ((uintptr_t)failed_paths_retry_var.inner > 4096) {
 				CHECK((((uintptr_t)failed_paths_retry_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 				CHECK((((uintptr_t)&failed_paths_retry_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -3838,7 +4714,7 @@ uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_ge
 	LDKCResult_PaymentIdPaymentSendFailureZ* owner_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(owner & ~1);
 	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
 	*ret_copy = CResult_PaymentIdPaymentSendFailureZ_get_err(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -3859,7 +4735,7 @@ uint32_t  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_get_err
 	LDKCResult_NonePaymentSendFailureZ* owner_conv = (LDKCResult_NonePaymentSendFailureZ*)(owner & ~1);
 	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
 	*ret_copy = CResult_NonePaymentSendFailureZ_get_err(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -3891,7 +4767,7 @@ uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPa
 	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(owner & ~1);
 	LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ");
 	*ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_ok(owner_conv);
-	return ((uintptr_t)ret_conv);
+	return ((uint32_t)ret_conv);
 }
 
 static inline struct LDKPaymentSendFailure CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR owner){
@@ -3902,77 +4778,14 @@ uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPa
 	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(owner & ~1);
 	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
 	*ret_copy = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_get_err(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-uint32_t __attribute__((export_name("TS_LDKNetAddress_ty_from_ptr"))) TS_LDKNetAddress_ty_from_ptr(uint32_t ptr) {
-	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
-	switch(obj->tag) {
-		case LDKNetAddress_IPv4: return 0;
-		case LDKNetAddress_IPv6: return 1;
-		case LDKNetAddress_OnionV2: return 2;
-		case LDKNetAddress_OnionV3: return 3;
-		default: abort();
-	}
-}
-int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv4_get_addr"))) TS_LDKNetAddress_IPv4_get_addr(uint32_t ptr) {
-	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
-	assert(obj->tag == LDKNetAddress_IPv4);
-			int8_tArray addr_arr = init_int8_tArray(4, __LINE__);
-			memcpy(addr_arr->elems, obj->i_pv4.addr.data, 4);
-	return addr_arr;
-}
-int16_t __attribute__((export_name("TS_LDKNetAddress_IPv4_get_port"))) TS_LDKNetAddress_IPv4_get_port(uint32_t ptr) {
-	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
-	assert(obj->tag == LDKNetAddress_IPv4);
-	return obj->i_pv4.port;
-}
-int8_tArray __attribute__((export_name("TS_LDKNetAddress_IPv6_get_addr"))) TS_LDKNetAddress_IPv6_get_addr(uint32_t ptr) {
-	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
-	assert(obj->tag == LDKNetAddress_IPv6);
-			int8_tArray addr_arr = init_int8_tArray(16, __LINE__);
-			memcpy(addr_arr->elems, obj->i_pv6.addr.data, 16);
-	return addr_arr;
-}
-int16_t __attribute__((export_name("TS_LDKNetAddress_IPv6_get_port"))) TS_LDKNetAddress_IPv6_get_port(uint32_t ptr) {
-	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
-	assert(obj->tag == LDKNetAddress_IPv6);
-	return obj->i_pv6.port;
-}
-int8_tArray __attribute__((export_name("TS_LDKNetAddress_OnionV2_get_onion_v2"))) TS_LDKNetAddress_OnionV2_get_onion_v2(uint32_t ptr) {
-	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
-	assert(obj->tag == LDKNetAddress_OnionV2);
-			int8_tArray onion_v2_arr = init_int8_tArray(12, __LINE__);
-			memcpy(onion_v2_arr->elems, obj->onion_v2.data, 12);
-	return onion_v2_arr;
-}
-int8_tArray __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_ed25519_pubkey"))) TS_LDKNetAddress_OnionV3_get_ed25519_pubkey(uint32_t ptr) {
-	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
-	assert(obj->tag == LDKNetAddress_OnionV3);
-			int8_tArray ed25519_pubkey_arr = init_int8_tArray(32, __LINE__);
-			memcpy(ed25519_pubkey_arr->elems, obj->onion_v3.ed25519_pubkey.data, 32);
-	return ed25519_pubkey_arr;
-}
-int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_checksum"))) TS_LDKNetAddress_OnionV3_get_checksum(uint32_t ptr) {
-	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
-	assert(obj->tag == LDKNetAddress_OnionV3);
-	return obj->onion_v3.checksum;
-}
-int8_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_version"))) TS_LDKNetAddress_OnionV3_get_version(uint32_t ptr) {
-	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
-	assert(obj->tag == LDKNetAddress_OnionV3);
-	return obj->onion_v3.version;
-}
-int16_t __attribute__((export_name("TS_LDKNetAddress_OnionV3_get_port"))) TS_LDKNetAddress_OnionV3_get_port(uint32_t ptr) {
-	LDKNetAddress *obj = (LDKNetAddress*)(ptr & ~1);
-	assert(obj->tag == LDKNetAddress_OnionV3);
-	return obj->onion_v3.port;
-}
-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 };
+static inline LDKCVec_ThirtyTwoBytesZ CVec_ThirtyTwoBytesZ_clone(const LDKCVec_ThirtyTwoBytesZ *orig) {
+	LDKCVec_ThirtyTwoBytesZ ret = { .data = MALLOC(sizeof(LDKThirtyTwoBytes) * orig->datalen, "LDKCVec_ThirtyTwoBytesZ clone bytes"), .datalen = orig->datalen };
 	for (size_t i = 0; i < ret.datalen; i++) {
-		ret.data[i] = NetAddress_clone(&orig->data[i]);
+		ret.data[i] = ThirtyTwoBytes_clone(&orig->data[i]);
 	}
 	return ret;
 }
@@ -4004,7 +4817,7 @@ uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecre
 	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(owner & ~1);
 	LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
 	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_ok(owner_conv);
-	return ((uintptr_t)ret_conv);
+	return ((uint32_t)ret_conv);
 }
 
 static inline void CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR owner){
@@ -4024,7 +4837,7 @@ uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecre
 	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(owner & ~1);
 	LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
 	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_ok(owner_conv);
-	return ((uintptr_t)ret_conv);
+	return ((uint32_t)ret_conv);
 }
 
 static inline struct LDKAPIError CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR owner){
@@ -4035,7 +4848,7 @@ uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecre
 	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* owner_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(owner & ~1);
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -4078,7 +4891,7 @@ uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_get_err"
 	LDKCResult_PaymentSecretAPIErrorZ* owner_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(owner & ~1);
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = CResult_PaymentSecretAPIErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -4101,7 +4914,7 @@ uint32_t  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_get_er
 	LDKCResult_PaymentPreimageAPIErrorZ* owner_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(owner & ~1);
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = CResult_PaymentPreimageAPIErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -4112,7 +4925,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(owner & ~1);
 	LDKCounterpartyForwardingInfo ret_var = CResult_CounterpartyForwardingInfoDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4130,7 +4943,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* owner_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_CounterpartyForwardingInfoDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4148,7 +4961,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_get_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ChannelCounterpartyDecodeErrorZ* owner_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(owner & ~1);
 	LDKChannelCounterparty ret_var = CResult_ChannelCounterpartyDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4166,7 +4979,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_get_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ChannelCounterpartyDecodeErrorZ* owner_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ChannelCounterpartyDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4184,7 +4997,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_get_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ChannelDetailsDecodeErrorZ* owner_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(owner & ~1);
 	LDKChannelDetails ret_var = CResult_ChannelDetailsDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4202,7 +5015,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_get_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ChannelDetailsDecodeErrorZ* owner_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ChannelDetailsDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4220,7 +5033,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_get_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_PhantomRouteHintsDecodeErrorZ* owner_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(owner & ~1);
 	LDKPhantomRouteHints ret_var = CResult_PhantomRouteHintsDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4238,7 +5051,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_get_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_PhantomRouteHintsDecodeErrorZ* owner_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_PhantomRouteHintsDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4269,7 +5082,7 @@ static void LDKWatch_JCalls_free(void* this_arg) {
 LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_LDKWatch_jcall(const void* this_arg, LDKOutPoint funding_txo, LDKChannelMonitor monitor) {
 	LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg;
 	LDKOutPoint funding_txo_var = funding_txo;
-	uintptr_t funding_txo_ref = 0;
+	uint32_t funding_txo_ref = 0;
 	CHECK((((uintptr_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var);
@@ -4278,7 +5091,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_LDKWatch_jcall(const void*
 		funding_txo_ref |= 1;
 	}
 	LDKChannelMonitor monitor_var = monitor;
-	uintptr_t monitor_ref = 0;
+	uint32_t monitor_ref = 0;
 	CHECK((((uintptr_t)monitor_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&monitor_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(monitor_var);
@@ -4286,7 +5099,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_LDKWatch_jcall(const void*
 	if (monitor_var.is_owned) {
 		monitor_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 14, (uint32_t)funding_txo_ref, (uint32_t)monitor_ref);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 16, (uint32_t)funding_txo_ref, (uint32_t)monitor_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr);
@@ -4296,7 +5109,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ watch_channel_LDKWatch_jcall(const void*
 LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_LDKWatch_jcall(const void* this_arg, LDKOutPoint funding_txo, LDKChannelMonitorUpdate update) {
 	LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg;
 	LDKOutPoint funding_txo_var = funding_txo;
-	uintptr_t funding_txo_ref = 0;
+	uint32_t funding_txo_ref = 0;
 	CHECK((((uintptr_t)funding_txo_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&funding_txo_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_var);
@@ -4305,7 +5118,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_LDKWatch_jcall(const void
 		funding_txo_ref |= 1;
 	}
 	LDKChannelMonitorUpdate update_var = update;
-	uintptr_t update_ref = 0;
+	uint32_t update_ref = 0;
 	CHECK((((uintptr_t)update_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&update_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(update_var);
@@ -4313,31 +5126,32 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_channel_LDKWatch_jcall(const void
 	if (update_var.is_owned) {
 		update_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 15, (uint32_t)funding_txo_ref, (uint32_t)update_ref);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 17, (uint32_t)funding_txo_ref, (uint32_t)update_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr);
 	FREE((void*)ret);
 	return ret_conv;
 }
-LDKCVec_MonitorEventZ release_pending_monitor_events_LDKWatch_jcall(const void* this_arg) {
+LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ release_pending_monitor_events_LDKWatch_jcall(const void* this_arg) {
 	LDKWatch_JCalls *j_calls = (LDKWatch_JCalls*) this_arg;
-	uint32_tArray ret = (uint32_tArray)js_invoke_function_0(j_calls->instance_ptr, 16);
-	LDKCVec_MonitorEventZ ret_constr;
+	uint32_tArray ret = (uint32_tArray)js_invoke_function_u_(j_calls->instance_ptr, 18);
+	LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ ret_constr;
 	ret_constr.datalen = ret->arr_len;
 	if (ret_constr.datalen > 0)
-		ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements");
+		ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ Elements");
 	else
 		ret_constr.data = NULL;
-	uint32_t* ret_vals = ret->elems /* XXX ret leaks */;
-	for (size_t o = 0; o < ret_constr.datalen; o++) {
-		uint32_t ret_conv_14 = ret_vals[o];
-		void* ret_conv_14_ptr = (void*)(((uintptr_t)ret_conv_14) & ~1);
-		CHECK_ACCESS(ret_conv_14_ptr);
-		LDKMonitorEvent ret_conv_14_conv = *(LDKMonitorEvent*)(ret_conv_14_ptr);
-		FREE((void*)ret_conv_14);
-		ret_constr.data[o] = ret_conv_14_conv;
-	}
+	uint32_t* ret_vals = ret->elems;
+	for (size_t m = 0; m < ret_constr.datalen; m++) {
+		uint32_t ret_conv_38 = ret_vals[m];
+		void* ret_conv_38_ptr = (void*)(((uintptr_t)ret_conv_38) & ~1);
+		CHECK_ACCESS(ret_conv_38_ptr);
+		LDKC2Tuple_OutPointCVec_MonitorEventZZ ret_conv_38_conv = *(LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(ret_conv_38_ptr);
+		FREE((void*)ret_conv_38);
+		ret_constr.data[m] = ret_conv_38_conv;
+	}
+	FREE(ret);
 	return ret_constr;
 }
 static void LDKWatch_JCalls_cloned(LDKWatch* new_obj) {
@@ -4379,7 +5193,7 @@ uint32_t  __attribute__((export_name("TS_Watch_watch_channel"))) TS_Watch_watch_
 	monitor_conv = ChannelMonitor_clone(&monitor_conv);
 	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
 	*ret_conv = (this_arg_conv->watch_channel)(this_arg_conv->this_arg, funding_txo_conv, monitor_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Watch_update_channel"))) TS_Watch_update_channel(uint32_t this_arg, uint32_t funding_txo, uint32_t update) {
@@ -4398,22 +5212,21 @@ uint32_t  __attribute__((export_name("TS_Watch_update_channel"))) TS_Watch_updat
 	update_conv = ChannelMonitorUpdate_clone(&update_conv);
 	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
 	*ret_conv = (this_arg_conv->update_channel)(this_arg_conv->this_arg, funding_txo_conv, update_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_tArray  __attribute__((export_name("TS_Watch_release_pending_monitor_events"))) TS_Watch_release_pending_monitor_events(uint32_t this_arg) {
 	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKWatch* this_arg_conv = (LDKWatch*)this_arg_ptr;
-	LDKCVec_MonitorEventZ ret_var = (this_arg_conv->release_pending_monitor_events)(this_arg_conv->this_arg);
+	LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ ret_var = (this_arg_conv->release_pending_monitor_events)(this_arg_conv->this_arg);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__);
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
-	for (size_t o = 0; o < ret_var.datalen; o++) {
-		LDKMonitorEvent *ret_conv_14_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
-		*ret_conv_14_copy = ret_var.data[o];
-		uintptr_t ret_conv_14_ref = (uintptr_t)ret_conv_14_copy;
-		ret_arr_ptr[o] = ret_conv_14_ref;
+	for (size_t m = 0; m < ret_var.datalen; m++) {
+		LDKC2Tuple_OutPointCVec_MonitorEventZZ* ret_conv_38_conv = MALLOC(sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKC2Tuple_OutPointCVec_MonitorEventZZ");
+		*ret_conv_38_conv = ret_var.data[m];
+		ret_arr_ptr[m] = ((uint32_t)ret_conv_38_conv);
 	}
 	
 	FREE(ret_var.data);
@@ -4436,7 +5249,7 @@ void broadcast_transaction_LDKBroadcasterInterface_jcall(const void* this_arg, L
 	int8_tArray tx_arr = init_int8_tArray(tx_var.datalen, __LINE__);
 	memcpy(tx_arr->elems, tx_var.data, tx_var.datalen);
 	Transaction_free(tx_var);
-	js_invoke_function_1(j_calls->instance_ptr, 17, (uint32_t)tx_arr);
+	js_invoke_function_u_u(j_calls->instance_ptr, 19, (uint32_t)tx_arr);
 }
 static void LDKBroadcasterInterface_JCalls_cloned(LDKBroadcasterInterface* new_obj) {
 	LDKBroadcasterInterface_JCalls *j_calls = (LDKBroadcasterInterface_JCalls*) new_obj->this_arg;
@@ -4484,7 +5297,7 @@ static void LDKKeysInterface_JCalls_free(void* this_arg) {
 LDKCResult_SecretKeyNoneZ get_node_secret_LDKKeysInterface_jcall(const void* this_arg, LDKRecipient recipient) {
 	LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg;
 	uint32_t recipient_conv = LDKRecipient_to_js(recipient);
-	uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 18, (uint32_t)recipient_conv);
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 20, (uint32_t)recipient_conv);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SecretKeyNoneZ ret_conv = *(LDKCResult_SecretKeyNoneZ*)(ret_ptr);
@@ -4493,7 +5306,7 @@ LDKCResult_SecretKeyNoneZ get_node_secret_LDKKeysInterface_jcall(const void* thi
 }
 LDKCVec_u8Z get_destination_script_LDKKeysInterface_jcall(const void* this_arg) {
 	LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg;
-	int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 19);
+	int8_tArray ret = (int8_tArray)js_invoke_function_u_(j_calls->instance_ptr, 21);
 	LDKCVec_u8Z ret_ref;
 	ret_ref.datalen = ret->arr_len;
 	ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes");
@@ -4502,7 +5315,7 @@ LDKCVec_u8Z get_destination_script_LDKKeysInterface_jcall(const void* this_arg)
 }
 LDKShutdownScript get_shutdown_scriptpubkey_LDKKeysInterface_jcall(const void* this_arg) {
 	LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg;
-	uint32_t ret = js_invoke_function_0(j_calls->instance_ptr, 20);
+	uint32_t ret = js_invoke_function_u_(j_calls->instance_ptr, 22);
 	LDKShutdownScript ret_conv;
 	ret_conv.inner = (void*)(ret & (~1));
 	ret_conv.is_owned = (ret & 1) || (ret == 0);
@@ -4511,7 +5324,9 @@ LDKShutdownScript get_shutdown_scriptpubkey_LDKKeysInterface_jcall(const void* t
 }
 LDKSign get_channel_signer_LDKKeysInterface_jcall(const void* this_arg, bool inbound, uint64_t channel_value_satoshis) {
 	LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg;
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 21, (uint32_t)inbound, (uint32_t)channel_value_satoshis);
+	jboolean inbound_conv = inbound;
+	int64_t channel_value_satoshis_conv = channel_value_satoshis;
+	uint32_t ret = js_invoke_function_u_bb(j_calls->instance_ptr, 23, (uint32_t)inbound_conv, (uint32_t)channel_value_satoshis_conv);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKSign ret_conv = *(LDKSign*)(ret_ptr);
@@ -4520,7 +5335,7 @@ LDKSign get_channel_signer_LDKKeysInterface_jcall(const void* this_arg, bool inb
 }
 LDKThirtyTwoBytes get_secure_random_bytes_LDKKeysInterface_jcall(const void* this_arg) {
 	LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg;
-	int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 22);
+	int8_tArray ret = (int8_tArray)js_invoke_function_u_(j_calls->instance_ptr, 24);
 	LDKThirtyTwoBytes ret_ref;
 	CHECK(ret->arr_len == 32);
 	memcpy(ret_ref.data, ret->elems, 32); FREE(ret);
@@ -4531,7 +5346,7 @@ LDKCResult_SignDecodeErrorZ read_chan_signer_LDKKeysInterface_jcall(const void*
 	LDKu8slice reader_var = reader;
 	int8_tArray reader_arr = init_int8_tArray(reader_var.datalen, __LINE__);
 	memcpy(reader_arr->elems, reader_var.data, reader_var.datalen);
-	uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 23, (uint32_t)reader_arr);
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 25, (uint32_t)reader_arr);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_SignDecodeErrorZ ret_conv = *(LDKCResult_SignDecodeErrorZ*)(ret_ptr);
@@ -4554,7 +5369,7 @@ LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const v
 	
 	FREE(invoice_data_var.data);
 	uint32_t receipient_conv = LDKRecipient_to_js(receipient);
-	uint32_t ret = js_invoke_function_3(j_calls->instance_ptr, 24, (uint32_t)hrp_bytes_arr, (uint32_t)invoice_data_arr, (uint32_t)receipient_conv);
+	uint32_t ret = js_invoke_function_u_uuu(j_calls->instance_ptr, 26, (uint32_t)hrp_bytes_arr, (uint32_t)invoice_data_arr, (uint32_t)receipient_conv);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_RecoverableSignatureNoneZ ret_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(ret_ptr);
@@ -4563,7 +5378,7 @@ LDKCResult_RecoverableSignatureNoneZ sign_invoice_LDKKeysInterface_jcall(const v
 }
 LDKThirtyTwoBytes get_inbound_payment_key_material_LDKKeysInterface_jcall(const void* this_arg) {
 	LDKKeysInterface_JCalls *j_calls = (LDKKeysInterface_JCalls*) this_arg;
-	int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 25);
+	int8_tArray ret = (int8_tArray)js_invoke_function_u_(j_calls->instance_ptr, 27);
 	LDKThirtyTwoBytes ret_ref;
 	CHECK(ret->arr_len == 32);
 	memcpy(ret_ref.data, ret->elems, 32); FREE(ret);
@@ -4604,7 +5419,7 @@ uint32_t  __attribute__((export_name("TS_KeysInterface_get_node_secret"))) TS_Ke
 	LDKRecipient recipient_conv = LDKRecipient_from_js(recipient);
 	LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ");
 	*ret_conv = (this_arg_conv->get_node_secret)(this_arg_conv->this_arg, recipient_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_KeysInterface_get_destination_script"))) TS_KeysInterface_get_destination_script(uint32_t this_arg) {
@@ -4623,7 +5438,7 @@ uint32_t  __attribute__((export_name("TS_KeysInterface_get_shutdown_scriptpubkey
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr;
 	LDKShutdownScript ret_var = (this_arg_conv->get_shutdown_scriptpubkey)(this_arg_conv->this_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4640,7 +5455,7 @@ uint32_t  __attribute__((export_name("TS_KeysInterface_get_channel_signer"))) TS
 	LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr;
 	LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign");
 	*ret_ret = (this_arg_conv->get_channel_signer)(this_arg_conv->this_arg, inbound, channel_value_satoshis);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 int8_tArray  __attribute__((export_name("TS_KeysInterface_get_secure_random_bytes"))) TS_KeysInterface_get_secure_random_bytes(uint32_t this_arg) {
@@ -4658,10 +5473,11 @@ uint32_t  __attribute__((export_name("TS_KeysInterface_read_chan_signer"))) TS_K
 	LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr;
 	LDKu8slice reader_ref;
 	reader_ref.datalen = reader->arr_len;
-	reader_ref.data = reader->elems /* XXX reader leaks */;
+	reader_ref.data = reader->elems;
 	LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ");
 	*ret_conv = (this_arg_conv->read_chan_signer)(this_arg_conv->this_arg, reader_ref);
-	return (uintptr_t)ret_conv;
+	FREE(reader);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_KeysInterface_sign_invoice"))) TS_KeysInterface_sign_invoice(uint32_t this_arg, int8_tArray hrp_bytes, ptrArray invoice_data, uint32_t receipient) {
@@ -4670,23 +5486,25 @@ uint32_t  __attribute__((export_name("TS_KeysInterface_sign_invoice"))) TS_KeysI
 	LDKKeysInterface* this_arg_conv = (LDKKeysInterface*)this_arg_ptr;
 	LDKu8slice hrp_bytes_ref;
 	hrp_bytes_ref.datalen = hrp_bytes->arr_len;
-	hrp_bytes_ref.data = hrp_bytes->elems /* XXX hrp_bytes leaks */;
+	hrp_bytes_ref.data = hrp_bytes->elems;
 	LDKCVec_u5Z invoice_data_constr;
 	invoice_data_constr.datalen = invoice_data->arr_len;
 	if (invoice_data_constr.datalen > 0)
 		invoice_data_constr.data = MALLOC(invoice_data_constr.datalen * sizeof(LDKu5), "LDKCVec_u5Z Elements");
 	else
 		invoice_data_constr.data = NULL;
-	int8_t* invoice_data_vals = (void*) invoice_data->elems /* XXX invoice_data leaks */;
+	int8_t* invoice_data_vals = (void*) invoice_data->elems;
 	for (size_t h = 0; h < invoice_data_constr.datalen; h++) {
 		int8_t invoice_data_conv_7 = invoice_data_vals[h];
 		
 		invoice_data_constr.data[h] = (LDKu5){ ._0 = invoice_data_conv_7 };
 	}
+	FREE(invoice_data);
 	LDKRecipient receipient_conv = LDKRecipient_from_js(receipient);
 	LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ");
 	*ret_conv = (this_arg_conv->sign_invoice)(this_arg_conv->this_arg, hrp_bytes_ref, invoice_data_constr, receipient_conv);
-	return (uintptr_t)ret_conv;
+	FREE(hrp_bytes);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_KeysInterface_get_inbound_payment_key_material"))) TS_KeysInterface_get_inbound_payment_key_material(uint32_t this_arg) {
@@ -4711,7 +5529,7 @@ static void LDKFeeEstimator_JCalls_free(void* this_arg) {
 uint32_t get_est_sat_per_1000_weight_LDKFeeEstimator_jcall(const void* this_arg, LDKConfirmationTarget confirmation_target) {
 	LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) this_arg;
 	uint32_t confirmation_target_conv = LDKConfirmationTarget_to_js(confirmation_target);
-	return js_invoke_function_1(j_calls->instance_ptr, 26, (uint32_t)confirmation_target_conv);
+	return js_invoke_function_u_u(j_calls->instance_ptr, 28, (uint32_t)confirmation_target_conv);
 }
 static void LDKFeeEstimator_JCalls_cloned(LDKFeeEstimator* new_obj) {
 	LDKFeeEstimator_JCalls *j_calls = (LDKFeeEstimator_JCalls*) new_obj->this_arg;
@@ -4739,55 +5557,10 @@ int32_t  __attribute__((export_name("TS_FeeEstimator_get_est_sat_per_1000_weight
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKFeeEstimator* this_arg_conv = (LDKFeeEstimator*)this_arg_ptr;
 	LDKConfirmationTarget confirmation_target_conv = LDKConfirmationTarget_from_js(confirmation_target);
-	int32_t ret_val = (this_arg_conv->get_est_sat_per_1000_weight)(this_arg_conv->this_arg, confirmation_target_conv);
-	return ret_val;
-}
-
-typedef struct LDKLogger_JCalls {
-	atomic_size_t refcnt;
-	uint32_t instance_ptr;
-} LDKLogger_JCalls;
-static void LDKLogger_JCalls_free(void* this_arg) {
-	LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) this_arg;
-	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
-		FREE(j_calls);
-	}
-}
-void log_LDKLogger_jcall(const void* this_arg, const LDKRecord * record) {
-	LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) this_arg;
-	LDKRecord record_var = *record;
-	uintptr_t record_ref = 0;
-	record_var = Record_clone(record);
-	CHECK((((uintptr_t)record_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&record_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(record_var);
-	record_ref = (uintptr_t)record_var.inner;
-	if (record_var.is_owned) {
-		record_ref |= 1;
-	}
-	js_invoke_function_1(j_calls->instance_ptr, 27, (uint32_t)record_ref);
-}
-static void LDKLogger_JCalls_cloned(LDKLogger* new_obj) {
-	LDKLogger_JCalls *j_calls = (LDKLogger_JCalls*) new_obj->this_arg;
-	atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);
+	int32_t ret_conv = (this_arg_conv->get_est_sat_per_1000_weight)(this_arg_conv->this_arg, confirmation_target_conv);
+	return ret_conv;
 }
-static inline LDKLogger LDKLogger_init (JSValue o) {
-	LDKLogger_JCalls *calls = MALLOC(sizeof(LDKLogger_JCalls), "LDKLogger_JCalls");
-	atomic_init(&calls->refcnt, 1);
-	calls->instance_ptr = o;
 
-	LDKLogger ret = {
-		.this_arg = (void*) calls,
-		.log = log_LDKLogger_jcall,
-		.free = LDKLogger_JCalls_free,
-	};
-	return ret;
-}
-long  __attribute__((export_name("TS_LDKLogger_new"))) TS_LDKLogger_new(JSValue o) {
-	LDKLogger *res_ptr = MALLOC(sizeof(LDKLogger), "LDKLogger");
-	*res_ptr = LDKLogger_init(o);
-	return (long)res_ptr;
-}
 static inline struct LDKThirtyTwoBytes C2Tuple_BlockHashChannelManagerZ_get_a(LDKC2Tuple_BlockHashChannelManagerZ *NONNULL_PTR owner){
 	return ThirtyTwoBytes_clone(&owner->a);
 }
@@ -4804,7 +5577,7 @@ static inline struct LDKChannelManager *C2Tuple_BlockHashChannelManagerZ_get_b(L
 uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_get_b"))) TS_C2Tuple_BlockHashChannelManagerZ_get_b(uint32_t owner) {
 	LDKC2Tuple_BlockHashChannelManagerZ* owner_conv = (LDKC2Tuple_BlockHashChannelManagerZ*)(owner & ~1);
 	LDKChannelManager ret_var = *C2Tuple_BlockHashChannelManagerZ_get_b(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4818,7 +5591,7 @@ CHECK(owner->result_ok);
 }
 uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(owner & ~1);
-	uintptr_t ret_ret = (uintptr_t)CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owner_conv) | 1;
+	uint32_t ret_ret = (uintptr_t)CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_ok(owner_conv) | 1;
 	return ret_ret;
 }
 
@@ -4829,7 +5602,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4847,7 +5620,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_get_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ChannelConfigDecodeErrorZ* owner_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(owner & ~1);
 	LDKChannelConfig ret_var = CResult_ChannelConfigDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4865,7 +5638,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_get_err"))) TS_CResult_ChannelConfigDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ChannelConfigDecodeErrorZ* owner_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ChannelConfigDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4883,7 +5656,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_get_ok"))) TS_CResult_OutPointDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_OutPointDecodeErrorZ* owner_conv = (LDKCResult_OutPointDecodeErrorZ*)(owner & ~1);
 	LDKOutPoint ret_var = CResult_OutPointDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4901,7 +5674,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_get_err"))) TS_CResult_OutPointDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_OutPointDecodeErrorZ* owner_conv = (LDKCResult_OutPointDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_OutPointDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -4924,17 +5697,17 @@ static void LDKType_JCalls_free(void* this_arg) {
 }
 uint16_t type_id_LDKType_jcall(const void* this_arg) {
 	LDKType_JCalls *j_calls = (LDKType_JCalls*) this_arg;
-	return js_invoke_function_0(j_calls->instance_ptr, 28);
+	return js_invoke_function_u_(j_calls->instance_ptr, 29);
 }
 LDKStr debug_str_LDKType_jcall(const void* this_arg) {
 	LDKType_JCalls *j_calls = (LDKType_JCalls*) this_arg;
-	jstring ret = (jstring)js_invoke_function_0(j_calls->instance_ptr, 29);
+	jstring ret = (jstring)js_invoke_function_u_(j_calls->instance_ptr, 30);
 	LDKStr ret_conv = str_ref_to_owned_c(ret);
 	return ret_conv;
 }
 LDKCVec_u8Z write_LDKType_jcall(const void* this_arg) {
 	LDKType_JCalls *j_calls = (LDKType_JCalls*) this_arg;
-	int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 30);
+	int8_tArray ret = (int8_tArray)js_invoke_function_u_(j_calls->instance_ptr, 31);
 	LDKCVec_u8Z ret_ref;
 	ret_ref.datalen = ret->arr_len;
 	ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes");
@@ -4969,8 +5742,8 @@ int16_t  __attribute__((export_name("TS_Type_type_id"))) TS_Type_type_id(uint32_
 	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKType* this_arg_conv = (LDKType*)this_arg_ptr;
-	int16_t ret_val = (this_arg_conv->type_id)(this_arg_conv->this_arg);
-	return ret_val;
+	int16_t ret_conv = (this_arg_conv->type_id)(this_arg_conv->this_arg);
+	return ret_conv;
 }
 
 jstring  __attribute__((export_name("TS_Type_debug_str"))) TS_Type_debug_str(uint32_t this_arg) {
@@ -5007,7 +5780,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_TypeZ_Some_get_some"))) TS_LD
 	assert(obj->tag == LDKCOption_TypeZ_Some);
 			LDKType* some_ret = MALLOC(sizeof(LDKType), "LDKType");
 			*some_ret = Type_clone(&obj->some);
-	return (uintptr_t)some_ret;
+	return (uint32_t)some_ret;
 }
 static inline struct LDKCOption_TypeZ CResult_COption_TypeZDecodeErrorZ_get_ok(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
@@ -5017,7 +5790,7 @@ uint32_t  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_get_o
 	LDKCResult_COption_TypeZDecodeErrorZ* owner_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(owner & ~1);
 	LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ");
 	*ret_copy = CResult_COption_TypeZDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -5028,7 +5801,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_get_err"))) TS_CResult_COption_TypeZDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_COption_TypeZDecodeErrorZ* owner_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_COption_TypeZDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5059,7 +5832,7 @@ uint32_t __attribute__((export_name("TS_LDKPaymentError_Routing_get_routing")))
 	LDKPaymentError *obj = (LDKPaymentError*)(ptr & ~1);
 	assert(obj->tag == LDKPaymentError_Routing);
 			LDKLightningError routing_var = obj->routing;
-			uintptr_t routing_ref = 0;
+			uint32_t routing_ref = 0;
 			CHECK((((uintptr_t)routing_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&routing_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(routing_var);
@@ -5069,7 +5842,7 @@ uint32_t __attribute__((export_name("TS_LDKPaymentError_Routing_get_routing")))
 uint32_t __attribute__((export_name("TS_LDKPaymentError_Sending_get_sending"))) TS_LDKPaymentError_Sending_get_sending(uint32_t ptr) {
 	LDKPaymentError *obj = (LDKPaymentError*)(ptr & ~1);
 	assert(obj->tag == LDKPaymentError_Sending);
-			uintptr_t sending_ref = ((uintptr_t)&obj->sending) | 1;
+			uint32_t sending_ref = ((uintptr_t)&obj->sending) | 1;
 	return sending_ref;
 }
 static inline struct LDKThirtyTwoBytes CResult_PaymentIdPaymentErrorZ_get_ok(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR owner){
@@ -5091,37 +5864,115 @@ uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_get_err"
 	LDKCResult_PaymentIdPaymentErrorZ* owner_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(owner & ~1);
 	LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError");
 	*ret_copy = CResult_PaymentIdPaymentErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-static inline enum LDKSiPrefix CResult_SiPrefixNoneZ_get_ok(LDKCResult_SiPrefixNoneZ *NONNULL_PTR owner){
+uint32_t __attribute__((export_name("TS_LDKParseError_ty_from_ptr"))) TS_LDKParseError_ty_from_ptr(uint32_t ptr) {
+	LDKParseError *obj = (LDKParseError*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKParseError_Bech32Error: return 0;
+		case LDKParseError_ParseAmountError: return 1;
+		case LDKParseError_MalformedSignature: return 2;
+		case LDKParseError_BadPrefix: return 3;
+		case LDKParseError_UnknownCurrency: return 4;
+		case LDKParseError_UnknownSiPrefix: return 5;
+		case LDKParseError_MalformedHRP: return 6;
+		case LDKParseError_TooShortDataPart: return 7;
+		case LDKParseError_UnexpectedEndOfTaggedFields: return 8;
+		case LDKParseError_DescriptionDecodeError: return 9;
+		case LDKParseError_PaddingError: return 10;
+		case LDKParseError_IntegerOverflowError: return 11;
+		case LDKParseError_InvalidSegWitProgramLength: return 12;
+		case LDKParseError_InvalidPubKeyHashLength: return 13;
+		case LDKParseError_InvalidScriptHashLength: return 14;
+		case LDKParseError_InvalidRecoveryId: return 15;
+		case LDKParseError_InvalidSliceLength: return 16;
+		case LDKParseError_Skip: return 17;
+		default: abort();
+	}
+}
+uint32_t __attribute__((export_name("TS_LDKParseError_Bech32Error_get_bech32_error"))) TS_LDKParseError_Bech32Error_get_bech32_error(uint32_t ptr) {
+	LDKParseError *obj = (LDKParseError*)(ptr & ~1);
+	assert(obj->tag == LDKParseError_Bech32Error);
+			uint32_t bech32_error_ref = ((uintptr_t)&obj->bech32_error) | 1;
+	return bech32_error_ref;
+}
+int32_t __attribute__((export_name("TS_LDKParseError_ParseAmountError_get_parse_amount_error"))) TS_LDKParseError_ParseAmountError_get_parse_amount_error(uint32_t ptr) {
+	LDKParseError *obj = (LDKParseError*)(ptr & ~1);
+	assert(obj->tag == LDKParseError_ParseAmountError);
+			/*obj->parse_amount_error*/
+	return 0;
+}
+uint32_t __attribute__((export_name("TS_LDKParseError_MalformedSignature_get_malformed_signature"))) TS_LDKParseError_MalformedSignature_get_malformed_signature(uint32_t ptr) {
+	LDKParseError *obj = (LDKParseError*)(ptr & ~1);
+	assert(obj->tag == LDKParseError_MalformedSignature);
+			uint32_t malformed_signature_conv = LDKSecp256k1Error_to_js(obj->malformed_signature);
+	return malformed_signature_conv;
+}
+int32_t __attribute__((export_name("TS_LDKParseError_DescriptionDecodeError_get_description_decode_error"))) TS_LDKParseError_DescriptionDecodeError_get_description_decode_error(uint32_t ptr) {
+	LDKParseError *obj = (LDKParseError*)(ptr & ~1);
+	assert(obj->tag == LDKParseError_DescriptionDecodeError);
+			/*obj->description_decode_error*/
+	return 0;
+}
+jstring __attribute__((export_name("TS_LDKParseError_InvalidSliceLength_get_invalid_slice_length"))) TS_LDKParseError_InvalidSliceLength_get_invalid_slice_length(uint32_t ptr) {
+	LDKParseError *obj = (LDKParseError*)(ptr & ~1);
+	assert(obj->tag == LDKParseError_InvalidSliceLength);
+			LDKStr invalid_slice_length_str = obj->invalid_slice_length;
+			jstring invalid_slice_length_conv = str_ref_to_ts(invalid_slice_length_str.chars, invalid_slice_length_str.len);
+	return invalid_slice_length_conv;
+}
+static inline enum LDKSiPrefix CResult_SiPrefixParseErrorZ_get_ok(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
 	return SiPrefix_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_SiPrefixNoneZ_get_ok"))) TS_CResult_SiPrefixNoneZ_get_ok(uint32_t owner) {
-	LDKCResult_SiPrefixNoneZ* owner_conv = (LDKCResult_SiPrefixNoneZ*)(owner & ~1);
-	uint32_t ret_conv = LDKSiPrefix_to_js(CResult_SiPrefixNoneZ_get_ok(owner_conv));
+uint32_t  __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_get_ok"))) TS_CResult_SiPrefixParseErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_SiPrefixParseErrorZ* owner_conv = (LDKCResult_SiPrefixParseErrorZ*)(owner & ~1);
+	uint32_t ret_conv = LDKSiPrefix_to_js(CResult_SiPrefixParseErrorZ_get_ok(owner_conv));
 	return ret_conv;
 }
 
-static inline void CResult_SiPrefixNoneZ_get_err(LDKCResult_SiPrefixNoneZ *NONNULL_PTR owner){
+static inline struct LDKParseError CResult_SiPrefixParseErrorZ_get_err(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
-	return *owner->contents.err;
+	return ParseError_clone(&*owner->contents.err);
 }
-void  __attribute__((export_name("TS_CResult_SiPrefixNoneZ_get_err"))) TS_CResult_SiPrefixNoneZ_get_err(uint32_t owner) {
-	LDKCResult_SiPrefixNoneZ* owner_conv = (LDKCResult_SiPrefixNoneZ*)(owner & ~1);
-	CResult_SiPrefixNoneZ_get_err(owner_conv);
+uint32_t  __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_get_err"))) TS_CResult_SiPrefixParseErrorZ_get_err(uint32_t owner) {
+	LDKCResult_SiPrefixParseErrorZ* owner_conv = (LDKCResult_SiPrefixParseErrorZ*)(owner & ~1);
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = CResult_SiPrefixParseErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-static inline struct LDKInvoice CResult_InvoiceNoneZ_get_ok(LDKCResult_InvoiceNoneZ *NONNULL_PTR owner){
+uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_ty_from_ptr"))) TS_LDKParseOrSemanticError_ty_from_ptr(uint32_t ptr) {
+	LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKParseOrSemanticError_ParseError: return 0;
+		case LDKParseOrSemanticError_SemanticError: return 1;
+		default: abort();
+	}
+}
+uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_ParseError_get_parse_error"))) TS_LDKParseOrSemanticError_ParseError_get_parse_error(uint32_t ptr) {
+	LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)(ptr & ~1);
+	assert(obj->tag == LDKParseOrSemanticError_ParseError);
+			uint32_t parse_error_ref = ((uintptr_t)&obj->parse_error) | 1;
+	return parse_error_ref;
+}
+uint32_t __attribute__((export_name("TS_LDKParseOrSemanticError_SemanticError_get_semantic_error"))) TS_LDKParseOrSemanticError_SemanticError_get_semantic_error(uint32_t ptr) {
+	LDKParseOrSemanticError *obj = (LDKParseOrSemanticError*)(ptr & ~1);
+	assert(obj->tag == LDKParseOrSemanticError_SemanticError);
+			uint32_t semantic_error_conv = LDKSemanticError_to_js(obj->semantic_error);
+	return semantic_error_conv;
+}
+static inline struct LDKInvoice CResult_InvoiceParseOrSemanticErrorZ_get_ok(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
 	return Invoice_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_InvoiceNoneZ_get_ok"))) TS_CResult_InvoiceNoneZ_get_ok(uint32_t owner) {
-	LDKCResult_InvoiceNoneZ* owner_conv = (LDKCResult_InvoiceNoneZ*)(owner & ~1);
-	LDKInvoice ret_var = CResult_InvoiceNoneZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_get_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_InvoiceParseOrSemanticErrorZ* owner_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(owner & ~1);
+	LDKInvoice ret_var = CResult_InvoiceParseOrSemanticErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5132,23 +5983,26 @@ uint32_t  __attribute__((export_name("TS_CResult_InvoiceNoneZ_get_ok"))) TS_CRes
 	return ret_ref;
 }
 
-static inline void CResult_InvoiceNoneZ_get_err(LDKCResult_InvoiceNoneZ *NONNULL_PTR owner){
+static inline struct LDKParseOrSemanticError CResult_InvoiceParseOrSemanticErrorZ_get_err(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
-	return *owner->contents.err;
+	return ParseOrSemanticError_clone(&*owner->contents.err);
 }
-void  __attribute__((export_name("TS_CResult_InvoiceNoneZ_get_err"))) TS_CResult_InvoiceNoneZ_get_err(uint32_t owner) {
-	LDKCResult_InvoiceNoneZ* owner_conv = (LDKCResult_InvoiceNoneZ*)(owner & ~1);
-	CResult_InvoiceNoneZ_get_err(owner_conv);
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_get_err"))) TS_CResult_InvoiceParseOrSemanticErrorZ_get_err(uint32_t owner) {
+	LDKCResult_InvoiceParseOrSemanticErrorZ* owner_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(owner & ~1);
+	LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError");
+	*ret_copy = CResult_InvoiceParseOrSemanticErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-static inline struct LDKSignedRawInvoice CResult_SignedRawInvoiceNoneZ_get_ok(LDKCResult_SignedRawInvoiceNoneZ *NONNULL_PTR owner){
+static inline struct LDKSignedRawInvoice CResult_SignedRawInvoiceParseErrorZ_get_ok(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
 	return SignedRawInvoice_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceNoneZ_get_ok"))) TS_CResult_SignedRawInvoiceNoneZ_get_ok(uint32_t owner) {
-	LDKCResult_SignedRawInvoiceNoneZ* owner_conv = (LDKCResult_SignedRawInvoiceNoneZ*)(owner & ~1);
-	LDKSignedRawInvoice ret_var = CResult_SignedRawInvoiceNoneZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_get_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_SignedRawInvoiceParseErrorZ* owner_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(owner & ~1);
+	LDKSignedRawInvoice ret_var = CResult_SignedRawInvoiceParseErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5159,13 +6013,16 @@ uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceNoneZ_get_ok"))
 	return ret_ref;
 }
 
-static inline void CResult_SignedRawInvoiceNoneZ_get_err(LDKCResult_SignedRawInvoiceNoneZ *NONNULL_PTR owner){
+static inline struct LDKParseError CResult_SignedRawInvoiceParseErrorZ_get_err(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
-	return *owner->contents.err;
+	return ParseError_clone(&*owner->contents.err);
 }
-void  __attribute__((export_name("TS_CResult_SignedRawInvoiceNoneZ_get_err"))) TS_CResult_SignedRawInvoiceNoneZ_get_err(uint32_t owner) {
-	LDKCResult_SignedRawInvoiceNoneZ* owner_conv = (LDKCResult_SignedRawInvoiceNoneZ*)(owner & ~1);
-	CResult_SignedRawInvoiceNoneZ_get_err(owner_conv);
+uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_get_err"))) TS_CResult_SignedRawInvoiceParseErrorZ_get_err(uint32_t owner) {
+	LDKCResult_SignedRawInvoiceParseErrorZ* owner_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(owner & ~1);
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = CResult_SignedRawInvoiceParseErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
 static inline struct LDKRawInvoice C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR owner){
@@ -5174,7 +6031,7 @@ static inline struct LDKRawInvoice C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_
 uint32_t  __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(uint32_t owner) {
 	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(owner & ~1);
 	LDKRawInvoice ret_var = C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_a(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5201,7 +6058,7 @@ static inline struct LDKInvoiceSignature C3Tuple_RawInvoice_u832InvoiceSignature
 uint32_t  __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(uint32_t owner) {
 	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* owner_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(owner & ~1);
 	LDKInvoiceSignature ret_var = C3Tuple_RawInvoice_u832InvoiceSignatureZ_get_c(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5219,7 +6076,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_get_ok"))) TS_CResult_PayeePubKeyErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_PayeePubKeyErrorZ* owner_conv = (LDKCResult_PayeePubKeyErrorZ*)(owner & ~1);
 	LDKPayeePubKey ret_var = CResult_PayeePubKeyErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5254,7 +6111,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_get_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_PositiveTimestampCreationErrorZ* owner_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(owner & ~1);
 	LDKPositiveTimestamp ret_var = CResult_PositiveTimestampCreationErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5301,7 +6158,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_get_ok"))) TS_CResult_InvoiceSemanticErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_InvoiceSemanticErrorZ* owner_conv = (LDKCResult_InvoiceSemanticErrorZ*)(owner & ~1);
 	LDKInvoice ret_var = CResult_InvoiceSemanticErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5329,7 +6186,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_get_ok"))) TS_CResult_DescriptionCreationErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_DescriptionCreationErrorZ* owner_conv = (LDKCResult_DescriptionCreationErrorZ*)(owner & ~1);
 	LDKDescription ret_var = CResult_DescriptionCreationErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5357,7 +6214,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_get_ok"))) TS_CResult_PrivateRouteCreationErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_PrivateRouteCreationErrorZ* owner_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(owner & ~1);
 	LDKPrivateRoute ret_var = CResult_PrivateRouteCreationErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5406,7 +6263,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(owner & ~1);
 	LDKChannelMonitorUpdate ret_var = CResult_ChannelMonitorUpdateDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5424,7 +6281,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ChannelMonitorUpdateDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5446,7 +6303,7 @@ uint32_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_ty_from_ptr")))
 uint32_t __attribute__((export_name("TS_LDKCOption_MonitorEventZ_Some_get_some"))) TS_LDKCOption_MonitorEventZ_Some_get_some(uint32_t ptr) {
 	LDKCOption_MonitorEventZ *obj = (LDKCOption_MonitorEventZ*)(ptr & ~1);
 	assert(obj->tag == LDKCOption_MonitorEventZ_Some);
-			uintptr_t some_ref = ((uintptr_t)&obj->some) | 1;
+			uint32_t some_ref = ((uintptr_t)&obj->some) | 1;
 	return some_ref;
 }
 static inline struct LDKCOption_MonitorEventZ CResult_COption_MonitorEventZDecodeErrorZ_get_ok(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR owner){
@@ -5457,7 +6314,7 @@ uint32_t  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErro
 	LDKCResult_COption_MonitorEventZDecodeErrorZ* owner_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(owner & ~1);
 	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
 	*ret_copy = CResult_COption_MonitorEventZDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -5468,7 +6325,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_get_err"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_COption_MonitorEventZDecodeErrorZ* owner_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_COption_MonitorEventZDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5486,7 +6343,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_get_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_HTLCUpdateDecodeErrorZ* owner_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(owner & ~1);
 	LDKHTLCUpdate ret_var = CResult_HTLCUpdateDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5504,7 +6361,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_get_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_HTLCUpdateDecodeErrorZ* owner_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_HTLCUpdateDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5521,7 +6378,7 @@ static inline struct LDKOutPoint C2Tuple_OutPointScriptZ_get_a(LDKC2Tuple_OutPoi
 uint32_t  __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_get_a"))) TS_C2Tuple_OutPointScriptZ_get_a(uint32_t owner) {
 	LDKC2Tuple_OutPointScriptZ* owner_conv = (LDKC2Tuple_OutPointScriptZ*)(owner & ~1);
 	LDKOutPoint ret_var = C2Tuple_OutPointScriptZ_get_a(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5549,8 +6406,8 @@ static inline uint32_t C2Tuple_u32ScriptZ_get_a(LDKC2Tuple_u32ScriptZ *NONNULL_P
 }
 int32_t  __attribute__((export_name("TS_C2Tuple_u32ScriptZ_get_a"))) TS_C2Tuple_u32ScriptZ_get_a(uint32_t owner) {
 	LDKC2Tuple_u32ScriptZ* owner_conv = (LDKC2Tuple_u32ScriptZ*)(owner & ~1);
-	int32_t ret_val = C2Tuple_u32ScriptZ_get_a(owner_conv);
-	return ret_val;
+	int32_t ret_conv = C2Tuple_u32ScriptZ_get_a(owner_conv);
+	return ret_conv;
 }
 
 static inline struct LDKCVec_u8Z C2Tuple_u32ScriptZ_get_b(LDKC2Tuple_u32ScriptZ *NONNULL_PTR owner){
@@ -5594,7 +6451,7 @@ uint32_tArray  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32Script
 	for (size_t v = 0; v < ret_var.datalen; v++) {
 		LDKC2Tuple_u32ScriptZ* ret_conv_21_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ");
 		*ret_conv_21_conv = ret_var.data[v];
-		ret_arr_ptr[v] = ((uintptr_t)ret_conv_21_conv);
+		ret_arr_ptr[v] = ((uint32_t)ret_conv_21_conv);
 	}
 	
 	FREE(ret_var.data);
@@ -5620,8 +6477,8 @@ static inline uint32_t C2Tuple_u32TxOutZ_get_a(LDKC2Tuple_u32TxOutZ *NONNULL_PTR
 }
 int32_t  __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_a"))) TS_C2Tuple_u32TxOutZ_get_a(uint32_t owner) {
 	LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)(owner & ~1);
-	int32_t ret_val = C2Tuple_u32TxOutZ_get_a(owner_conv);
-	return ret_val;
+	int32_t ret_conv = C2Tuple_u32TxOutZ_get_a(owner_conv);
+	return ret_conv;
 }
 
 static inline struct LDKTxOut C2Tuple_u32TxOutZ_get_b(LDKC2Tuple_u32TxOutZ *NONNULL_PTR owner){
@@ -5631,7 +6488,7 @@ uint32_t  __attribute__((export_name("TS_C2Tuple_u32TxOutZ_get_b"))) TS_C2Tuple_
 	LDKC2Tuple_u32TxOutZ* owner_conv = (LDKC2Tuple_u32TxOutZ*)(owner & ~1);
 	LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut");
 	*ret_ref = C2Tuple_u32TxOutZ_get_b(owner_conv);
-	return (uintptr_t)ret_ref;
+	return (uint32_t)ret_ref;
 }
 
 static inline LDKCVec_C2Tuple_u32TxOutZZ CVec_C2Tuple_u32TxOutZZ_clone(const LDKCVec_C2Tuple_u32TxOutZZ *orig) {
@@ -5663,7 +6520,7 @@ uint32_tArray  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZ
 	for (size_t u = 0; u < ret_var.datalen; u++) {
 		LDKC2Tuple_u32TxOutZ* ret_conv_20_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ");
 		*ret_conv_20_conv = ret_var.data[u];
-		ret_arr_ptr[u] = ((uintptr_t)ret_conv_20_conv);
+		ret_arr_ptr[u] = ((uint32_t)ret_conv_20_conv);
 	}
 	
 	FREE(ret_var.data);
@@ -5690,37 +6547,44 @@ uint32_t __attribute__((export_name("TS_LDKBalance_ty_from_ptr"))) TS_LDKBalance
 int64_t __attribute__((export_name("TS_LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis"))) TS_LDKBalance_ClaimableOnChannelClose_get_claimable_amount_satoshis(uint32_t ptr) {
 	LDKBalance *obj = (LDKBalance*)(ptr & ~1);
 	assert(obj->tag == LDKBalance_ClaimableOnChannelClose);
-	return obj->claimable_on_channel_close.claimable_amount_satoshis;
+			int64_t claimable_amount_satoshis_conv = obj->claimable_on_channel_close.claimable_amount_satoshis;
+	return claimable_amount_satoshis_conv;
 }
 int64_t __attribute__((export_name("TS_LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis"))) TS_LDKBalance_ClaimableAwaitingConfirmations_get_claimable_amount_satoshis(uint32_t ptr) {
 	LDKBalance *obj = (LDKBalance*)(ptr & ~1);
 	assert(obj->tag == LDKBalance_ClaimableAwaitingConfirmations);
-	return obj->claimable_awaiting_confirmations.claimable_amount_satoshis;
+			int64_t claimable_amount_satoshis_conv = obj->claimable_awaiting_confirmations.claimable_amount_satoshis;
+	return claimable_amount_satoshis_conv;
 }
 int32_t __attribute__((export_name("TS_LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height"))) TS_LDKBalance_ClaimableAwaitingConfirmations_get_confirmation_height(uint32_t ptr) {
 	LDKBalance *obj = (LDKBalance*)(ptr & ~1);
 	assert(obj->tag == LDKBalance_ClaimableAwaitingConfirmations);
-	return obj->claimable_awaiting_confirmations.confirmation_height;
+			int32_t confirmation_height_conv = obj->claimable_awaiting_confirmations.confirmation_height;
+	return confirmation_height_conv;
 }
 int64_t __attribute__((export_name("TS_LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis"))) TS_LDKBalance_ContentiousClaimable_get_claimable_amount_satoshis(uint32_t ptr) {
 	LDKBalance *obj = (LDKBalance*)(ptr & ~1);
 	assert(obj->tag == LDKBalance_ContentiousClaimable);
-	return obj->contentious_claimable.claimable_amount_satoshis;
+			int64_t claimable_amount_satoshis_conv = obj->contentious_claimable.claimable_amount_satoshis;
+	return claimable_amount_satoshis_conv;
 }
 int32_t __attribute__((export_name("TS_LDKBalance_ContentiousClaimable_get_timeout_height"))) TS_LDKBalance_ContentiousClaimable_get_timeout_height(uint32_t ptr) {
 	LDKBalance *obj = (LDKBalance*)(ptr & ~1);
 	assert(obj->tag == LDKBalance_ContentiousClaimable);
-	return obj->contentious_claimable.timeout_height;
+			int32_t timeout_height_conv = obj->contentious_claimable.timeout_height;
+	return timeout_height_conv;
 }
 int64_t __attribute__((export_name("TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis"))) TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_amount_satoshis(uint32_t ptr) {
 	LDKBalance *obj = (LDKBalance*)(ptr & ~1);
 	assert(obj->tag == LDKBalance_MaybeClaimableHTLCAwaitingTimeout);
-	return obj->maybe_claimable_htlc_awaiting_timeout.claimable_amount_satoshis;
+			int64_t claimable_amount_satoshis_conv = obj->maybe_claimable_htlc_awaiting_timeout.claimable_amount_satoshis;
+	return claimable_amount_satoshis_conv;
 }
 int32_t __attribute__((export_name("TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height"))) TS_LDKBalance_MaybeClaimableHTLCAwaitingTimeout_get_claimable_height(uint32_t ptr) {
 	LDKBalance *obj = (LDKBalance*)(ptr & ~1);
 	assert(obj->tag == LDKBalance_MaybeClaimableHTLCAwaitingTimeout);
-	return obj->maybe_claimable_htlc_awaiting_timeout.claimable_height;
+			int32_t claimable_height_conv = obj->maybe_claimable_htlc_awaiting_timeout.claimable_height;
+	return claimable_height_conv;
 }
 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 };
@@ -5745,7 +6609,7 @@ static inline struct LDKChannelMonitor C2Tuple_BlockHashChannelMonitorZ_get_b(LD
 uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_get_b"))) TS_C2Tuple_BlockHashChannelMonitorZ_get_b(uint32_t owner) {
 	LDKC2Tuple_BlockHashChannelMonitorZ* owner_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(owner & ~1);
 	LDKChannelMonitor ret_var = C2Tuple_BlockHashChannelMonitorZ_get_b(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5764,7 +6628,7 @@ uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitor
 	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(owner & ~1);
 	LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ");
 	*ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_ok(owner_conv);
-	return ((uintptr_t)ret_conv);
+	return ((uint32_t)ret_conv);
 }
 
 static inline struct LDKDecodeError CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR owner){
@@ -5774,34 +6638,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* owner_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline void CResult_NoneLightningErrorZ_get_ok(LDKCResult_NoneLightningErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return *owner->contents.result;
-}
-void  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_ok"))) TS_CResult_NoneLightningErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)(owner & ~1);
-	CResult_NoneLightningErrorZ_get_ok(owner_conv);
-}
-
-static inline struct LDKLightningError CResult_NoneLightningErrorZ_get_err(LDKCResult_NoneLightningErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return LightningError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_get_err"))) TS_CResult_NoneLightningErrorZ_get_err(uint32_t owner) {
-	LDKCResult_NoneLightningErrorZ* owner_conv = (LDKCResult_NoneLightningErrorZ*)(owner & ~1);
-	LDKLightningError ret_var = CResult_NoneLightningErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5829,7 +6666,7 @@ uint32_t  __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_get_b"))) TS_C2T
 	LDKC2Tuple_PublicKeyTypeZ* owner_conv = (LDKC2Tuple_PublicKeyTypeZ*)(owner & ~1);
 	LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType");
 	*ret_ret = C2Tuple_PublicKeyTypeZ_get_b(owner_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 static inline LDKCVec_C2Tuple_PublicKeyTypeZZ CVec_C2Tuple_PublicKeyTypeZZ_clone(const LDKCVec_C2Tuple_PublicKeyTypeZZ *orig) {
@@ -5839,98 +6676,19 @@ static inline LDKCVec_C2Tuple_PublicKeyTypeZZ CVec_C2Tuple_PublicKeyTypeZZ_clone
 	}
 	return ret;
 }
-static inline bool CResult_boolLightningErrorZ_get_ok(LDKCResult_boolLightningErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return *owner->contents.result;
-}
-jboolean  __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_ok"))) TS_CResult_boolLightningErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)(owner & ~1);
-	jboolean ret_val = CResult_boolLightningErrorZ_get_ok(owner_conv);
-	return ret_val;
-}
-
-static inline struct LDKLightningError CResult_boolLightningErrorZ_get_err(LDKCResult_boolLightningErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return LightningError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_boolLightningErrorZ_get_err"))) TS_CResult_boolLightningErrorZ_get_err(uint32_t owner) {
-	LDKCResult_boolLightningErrorZ* owner_conv = (LDKCResult_boolLightningErrorZ*)(owner & ~1);
-	LDKLightningError ret_var = CResult_boolLightningErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKChannelAnnouncement C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){
-	return ChannelAnnouncement_clone(&owner->a);
-}
-uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(uint32_t owner) {
-	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(owner & ~1);
-	LDKChannelAnnouncement ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_a(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){
-	return ChannelUpdate_clone(&owner->b);
-}
-uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(uint32_t owner) {
-	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(owner & ~1);
-	LDKChannelUpdate ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_b(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKChannelUpdate C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR owner){
-	return ChannelUpdate_clone(&owner->c);
-}
-uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(uint32_t owner) {
-	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* owner_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(owner & ~1);
-	LDKChannelUpdate ret_var = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_get_c(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_clone(const LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ *orig) {
-	LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret = { .data = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ) * orig->datalen, "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ clone bytes"), .datalen = orig->datalen };
-	for (size_t i = 0; i < ret.datalen; i++) {
-		ret.data[i] = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(&orig->data[i]);
+uint32_t __attribute__((export_name("TS_LDKCOption_NetAddressZ_ty_from_ptr"))) TS_LDKCOption_NetAddressZ_ty_from_ptr(uint32_t ptr) {
+	LDKCOption_NetAddressZ *obj = (LDKCOption_NetAddressZ*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKCOption_NetAddressZ_Some: return 0;
+		case LDKCOption_NetAddressZ_None: return 1;
+		default: abort();
 	}
-	return 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++) {
-		ret.data[i] = NodeAnnouncement_clone(&orig->data[i]);
-	}
-	return ret;
+uint32_t __attribute__((export_name("TS_LDKCOption_NetAddressZ_Some_get_some"))) TS_LDKCOption_NetAddressZ_Some_get_some(uint32_t ptr) {
+	LDKCOption_NetAddressZ *obj = (LDKCOption_NetAddressZ*)(ptr & ~1);
+	assert(obj->tag == LDKCOption_NetAddressZ_Some);
+			uint32_t some_ref = ((uintptr_t)&obj->some) | 1;
+	return some_ref;
 }
 static inline struct LDKCVec_u8Z CResult_CVec_u8ZPeerHandleErrorZ_get_ok(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
@@ -5952,7 +6710,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_get_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_get_err(uint32_t owner) {
 	LDKCResult_CVec_u8ZPeerHandleErrorZ* owner_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(owner & ~1);
 	LDKPeerHandleError ret_var = CResult_CVec_u8ZPeerHandleErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5979,7 +6737,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_get_err"))) TS_CResult_NonePeerHandleErrorZ_get_err(uint32_t owner) {
 	LDKCResult_NonePeerHandleErrorZ* owner_conv = (LDKCResult_NonePeerHandleErrorZ*)(owner & ~1);
 	LDKPeerHandleError ret_var = CResult_NonePeerHandleErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -5996,8 +6754,8 @@ CHECK(owner->result_ok);
 }
 jboolean  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_get_ok"))) TS_CResult_boolPeerHandleErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_boolPeerHandleErrorZ* owner_conv = (LDKCResult_boolPeerHandleErrorZ*)(owner & ~1);
-	jboolean ret_val = CResult_boolPeerHandleErrorZ_get_ok(owner_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_boolPeerHandleErrorZ_get_ok(owner_conv);
+	return ret_conv;
 }
 
 static inline struct LDKPeerHandleError CResult_boolPeerHandleErrorZ_get_err(LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR owner){
@@ -6007,7 +6765,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_get_err"))) TS_CResult_boolPeerHandleErrorZ_get_err(uint32_t owner) {
 	LDKCResult_boolPeerHandleErrorZ* owner_conv = (LDKCResult_boolPeerHandleErrorZ*)(owner & ~1);
 	LDKPeerHandleError ret_var = CResult_boolPeerHandleErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6018,62 +6776,45 @@ uint32_t  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_get_err"))
 	return ret_ref;
 }
 
-static inline struct LDKNodeId CResult_NodeIdDecodeErrorZ_get_ok(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR owner){
+static inline void CResult_NoneErrorZ_get_ok(LDKCResult_NoneErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return NodeId_clone(&*owner->contents.result);
+	return *owner->contents.result;
 }
-uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_get_ok"))) TS_CResult_NodeIdDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_NodeIdDecodeErrorZ* owner_conv = (LDKCResult_NodeIdDecodeErrorZ*)(owner & ~1);
-	LDKNodeId ret_var = CResult_NodeIdDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+void  __attribute__((export_name("TS_CResult_NoneErrorZ_get_ok"))) TS_CResult_NoneErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_NoneErrorZ* owner_conv = (LDKCResult_NoneErrorZ*)(owner & ~1);
+	CResult_NoneErrorZ_get_ok(owner_conv);
 }
 
-static inline struct LDKDecodeError CResult_NodeIdDecodeErrorZ_get_err(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR owner){
+static inline enum LDKIOError CResult_NoneErrorZ_get_err(LDKCResult_NoneErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
+	return *owner->contents.err;
 }
-uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_get_err"))) TS_CResult_NodeIdDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_NodeIdDecodeErrorZ* owner_conv = (LDKCResult_NodeIdDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_NodeIdDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_NoneErrorZ_get_err"))) TS_CResult_NoneErrorZ_get_err(uint32_t owner) {
+	LDKCResult_NoneErrorZ* owner_conv = (LDKCResult_NoneErrorZ*)(owner & ~1);
+	uint32_t ret_conv = LDKIOError_to_js(CResult_NoneErrorZ_get_err(owner_conv));
+	return ret_conv;
 }
 
-static inline struct LDKCOption_NetworkUpdateZ CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKNetAddress CResult_NetAddressDecodeErrorZ_get_ok(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return COption_NetworkUpdateZ_clone(&*owner->contents.result);
+	return NetAddress_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(owner & ~1);
-	LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ");
-	*ret_copy = CResult_COption_NetworkUpdateZDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_ok"))) TS_CResult_NetAddressDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)(owner & ~1);
+	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
+	*ret_copy = CResult_NetAddressDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_NetAddressDecodeErrorZ_get_err(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* owner_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_COption_NetworkUpdateZDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_err"))) TS_CResult_NetAddressDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_NetAddressDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6084,85 +6825,78 @@ uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErr
 	return ret_ref;
 }
 
-typedef struct LDKAccess_JCalls {
-	atomic_size_t refcnt;
-	uint32_t instance_ptr;
-} LDKAccess_JCalls;
-static void LDKAccess_JCalls_free(void* this_arg) {
-	LDKAccess_JCalls *j_calls = (LDKAccess_JCalls*) this_arg;
-	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
-		FREE(j_calls);
+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++) {
+		ret.data[i] = UpdateAddHTLC_clone(&orig->data[i]);
 	}
+	return ret;
 }
-LDKCResult_TxOutAccessErrorZ get_utxo_LDKAccess_jcall(const void* this_arg, const uint8_t (* genesis_hash)[32], uint64_t short_channel_id) {
-	LDKAccess_JCalls *j_calls = (LDKAccess_JCalls*) this_arg;
-	int8_tArray genesis_hash_arr = init_int8_tArray(32, __LINE__);
-	memcpy(genesis_hash_arr->elems, *genesis_hash, 32);
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 31, (uint32_t)genesis_hash_arr, (uint32_t)short_channel_id);
-	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
-	CHECK_ACCESS(ret_ptr);
-	LDKCResult_TxOutAccessErrorZ ret_conv = *(LDKCResult_TxOutAccessErrorZ*)(ret_ptr);
-	FREE((void*)ret);
-	return ret_conv;
+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++) {
+		ret.data[i] = UpdateFulfillHTLC_clone(&orig->data[i]);
+	}
+	return ret;
 }
-static void LDKAccess_JCalls_cloned(LDKAccess* new_obj) {
-	LDKAccess_JCalls *j_calls = (LDKAccess_JCalls*) new_obj->this_arg;
-	atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);
+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++) {
+		ret.data[i] = UpdateFailHTLC_clone(&orig->data[i]);
+	}
+	return ret;
 }
-static inline LDKAccess LDKAccess_init (JSValue o) {
-	LDKAccess_JCalls *calls = MALLOC(sizeof(LDKAccess_JCalls), "LDKAccess_JCalls");
-	atomic_init(&calls->refcnt, 1);
-	calls->instance_ptr = o;
-
-	LDKAccess ret = {
-		.this_arg = (void*) calls,
-		.get_utxo = get_utxo_LDKAccess_jcall,
-		.free = LDKAccess_JCalls_free,
-	};
+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++) {
+		ret.data[i] = UpdateFailMalformedHTLC_clone(&orig->data[i]);
+	}
 	return ret;
 }
-long  __attribute__((export_name("TS_LDKAccess_new"))) TS_LDKAccess_new(JSValue o) {
-	LDKAccess *res_ptr = MALLOC(sizeof(LDKAccess), "LDKAccess");
-	*res_ptr = LDKAccess_init(o);
-	return (long)res_ptr;
+static inline struct LDKAcceptChannel CResult_AcceptChannelDecodeErrorZ_get_ok(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR owner){
+CHECK(owner->result_ok);
+	return AcceptChannel_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_Access_get_utxo"))) TS_Access_get_utxo(uint32_t this_arg, int8_tArray genesis_hash, int64_t short_channel_id) {
-	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
-	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
-	LDKAccess* this_arg_conv = (LDKAccess*)this_arg_ptr;
-	unsigned char genesis_hash_arr[32];
-	CHECK(genesis_hash->arr_len == 32);
-	memcpy(genesis_hash_arr, genesis_hash->elems, 32); FREE(genesis_hash);
-	unsigned char (*genesis_hash_ref)[32] = &genesis_hash_arr;
-	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
-	*ret_conv = (this_arg_conv->get_utxo)(this_arg_conv->this_arg, genesis_hash_ref, short_channel_id);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_get_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_AcceptChannelDecodeErrorZ* owner_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(owner & ~1);
+	LDKAcceptChannel ret_var = CResult_AcceptChannelDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_ty_from_ptr"))) TS_LDKCOption_AccessZ_ty_from_ptr(uint32_t ptr) {
-	LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)(ptr & ~1);
-	switch(obj->tag) {
-		case LDKCOption_AccessZ_Some: return 0;
-		case LDKCOption_AccessZ_None: return 1;
-		default: abort();
-	}
+static inline struct LDKDecodeError CResult_AcceptChannelDecodeErrorZ_get_err(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR owner){
+CHECK(!owner->result_ok);
+	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t __attribute__((export_name("TS_LDKCOption_AccessZ_Some_get_some"))) TS_LDKCOption_AccessZ_Some_get_some(uint32_t ptr) {
-	LDKCOption_AccessZ *obj = (LDKCOption_AccessZ*)(ptr & ~1);
-	assert(obj->tag == LDKCOption_AccessZ_Some);
-			LDKAccess* some_ret = MALLOC(sizeof(LDKAccess), "LDKAccess");
-			*some_ret = obj->some;
-			// WARNING: We likely need to clone here, but no clone is available, so we just do it for Java instances
-	return (uintptr_t)some_ret;
+uint32_t  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_get_err"))) TS_CResult_AcceptChannelDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_AcceptChannelDecodeErrorZ* owner_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_AcceptChannelDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
-static inline struct LDKChannelUpdateInfo CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR owner){
+
+static inline struct LDKAnnouncementSignatures CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return ChannelUpdateInfo_clone(&*owner->contents.result);
+	return AnnouncementSignatures_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(owner & ~1);
-	LDKChannelUpdateInfo ret_var = CResult_ChannelUpdateInfoDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_AnnouncementSignaturesDecodeErrorZ* owner_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(owner & ~1);
+	LDKAnnouncementSignatures ret_var = CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6173,14 +6907,14 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_g
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_ChannelUpdateInfoDecodeErrorZ_get_err(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_AnnouncementSignaturesDecodeErrorZ_get_err(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_ChannelUpdateInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_ChannelUpdateInfoDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_AnnouncementSignaturesDecodeErrorZ* owner_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_AnnouncementSignaturesDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6191,14 +6925,14 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_g
 	return ret_ref;
 }
 
-static inline struct LDKChannelInfo CResult_ChannelInfoDecodeErrorZ_get_ok(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKChannelReestablish CResult_ChannelReestablishDecodeErrorZ_get_ok(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return ChannelInfo_clone(&*owner->contents.result);
+	return ChannelReestablish_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_ChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(owner & ~1);
-	LDKChannelInfo ret_var = CResult_ChannelInfoDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_get_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_ChannelReestablishDecodeErrorZ* owner_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(owner & ~1);
+	LDKChannelReestablish ret_var = CResult_ChannelReestablishDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6209,14 +6943,14 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_ok"
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_ChannelInfoDecodeErrorZ_get_err(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_ChannelReestablishDecodeErrorZ_get_err(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_err"))) TS_CResult_ChannelInfoDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_ChannelInfoDecodeErrorZ* owner_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_ChannelInfoDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_get_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_ChannelReestablishDecodeErrorZ* owner_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_ChannelReestablishDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6227,14 +6961,14 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_get_err
 	return ret_ref;
 }
 
-static inline struct LDKRoutingFees CResult_RoutingFeesDecodeErrorZ_get_ok(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKClosingSigned CResult_ClosingSignedDecodeErrorZ_get_ok(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return RoutingFees_clone(&*owner->contents.result);
+	return ClosingSigned_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_RoutingFeesDecodeErrorZ* owner_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(owner & ~1);
-	LDKRoutingFees ret_var = CResult_RoutingFeesDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_get_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_ClosingSignedDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(owner & ~1);
+	LDKClosingSigned ret_var = CResult_ClosingSignedDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6245,14 +6979,14 @@ uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_ok"
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_RoutingFeesDecodeErrorZ_get_err(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_ClosingSignedDecodeErrorZ_get_err(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_err"))) TS_CResult_RoutingFeesDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_RoutingFeesDecodeErrorZ* owner_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_RoutingFeesDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_get_err"))) TS_CResult_ClosingSignedDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_ClosingSignedDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_ClosingSignedDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6263,14 +6997,14 @@ uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_get_err
 	return ret_ref;
 }
 
-static inline struct LDKNodeAnnouncementInfo CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKClosingSignedFeeRange CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return NodeAnnouncementInfo_clone(&*owner->contents.result);
+	return ClosingSignedFeeRange_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(owner & ~1);
-	LDKNodeAnnouncementInfo ret_var = CResult_NodeAnnouncementInfoDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(owner & ~1);
+	LDKClosingSignedFeeRange ret_var = CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6281,14 +7015,14 @@ uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeError
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_NodeAnnouncementInfoDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6299,19 +7033,14 @@ uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeError
 	return ret_ref;
 }
 
-static inline LDKCVec_u64Z CVec_u64Z_clone(const LDKCVec_u64Z *orig) {
-	LDKCVec_u64Z ret = { .data = MALLOC(sizeof(int64_t) * orig->datalen, "LDKCVec_u64Z clone bytes"), .datalen = orig->datalen };
-	memcpy(ret.data, orig->data, sizeof(int64_t) * ret.datalen);
-	return ret;
-}
-static inline struct LDKNodeInfo CResult_NodeInfoDecodeErrorZ_get_ok(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKCommitmentSigned CResult_CommitmentSignedDecodeErrorZ_get_ok(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return NodeInfo_clone(&*owner->contents.result);
+	return CommitmentSigned_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_ok"))) TS_CResult_NodeInfoDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_NodeInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(owner & ~1);
-	LDKNodeInfo ret_var = CResult_NodeInfoDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_get_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_CommitmentSignedDecodeErrorZ* owner_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(owner & ~1);
+	LDKCommitmentSigned ret_var = CResult_CommitmentSignedDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6322,14 +7051,14 @@ uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_ok")))
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_NodeInfoDecodeErrorZ_get_err(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_CommitmentSignedDecodeErrorZ_get_err(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_err"))) TS_CResult_NodeInfoDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_NodeInfoDecodeErrorZ* owner_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_NodeInfoDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_get_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_CommitmentSignedDecodeErrorZ* owner_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_CommitmentSignedDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6340,14 +7069,14 @@ uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_get_err"))
 	return ret_ref;
 }
 
-static inline struct LDKNetworkGraph CResult_NetworkGraphDecodeErrorZ_get_ok(LDKCResult_NetworkGraphDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKFundingCreated CResult_FundingCreatedDecodeErrorZ_get_ok(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return NetworkGraph_clone(&*owner->contents.result);
+	return FundingCreated_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_NetworkGraphDecodeErrorZ* owner_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(owner & ~1);
-	LDKNetworkGraph ret_var = CResult_NetworkGraphDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_get_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_FundingCreatedDecodeErrorZ* owner_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(owner & ~1);
+	LDKFundingCreated ret_var = CResult_FundingCreatedDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6358,346 +7087,14 @@ uint32_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_ok
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_NetworkGraphDecodeErrorZ_get_err(LDKCResult_NetworkGraphDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_FundingCreatedDecodeErrorZ_get_err(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_get_err"))) TS_CResult_NetworkGraphDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_NetworkGraphDecodeErrorZ* owner_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_NetworkGraphDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-uint32_t __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr"))) TS_LDKCOption_CVec_NetAddressZZ_ty_from_ptr(uint32_t ptr) {
-	LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)(ptr & ~1);
-	switch(obj->tag) {
-		case LDKCOption_CVec_NetAddressZZ_Some: return 0;
-		case LDKCOption_CVec_NetAddressZZ_None: return 1;
-		default: abort();
-	}
-}
-uint32_tArray __attribute__((export_name("TS_LDKCOption_CVec_NetAddressZZ_Some_get_some"))) TS_LDKCOption_CVec_NetAddressZZ_Some_get_some(uint32_t ptr) {
-	LDKCOption_CVec_NetAddressZZ *obj = (LDKCOption_CVec_NetAddressZZ*)(ptr & ~1);
-	assert(obj->tag == LDKCOption_CVec_NetAddressZZ_Some);
-			LDKCVec_NetAddressZ some_var = obj->some;
-			uint32_tArray some_arr = NULL;
-			some_arr = init_uint32_tArray(some_var.datalen, __LINE__);
-			uint32_t *some_arr_ptr = (uint32_t*)(((uint8_t*)some_arr) + 4);
-			for (size_t m = 0; m < some_var.datalen; m++) {
-				uintptr_t some_conv_12_ref = ((uintptr_t)&some_var.data[m]) | 1;
-				some_arr_ptr[m] = some_conv_12_ref;
-			}
-			
-	return some_arr;
-}
-static inline struct LDKNetAddress CResult_NetAddressDecodeErrorZ_get_ok(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return NetAddress_clone(&*owner->contents.result);
-}
-uint32_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_ok"))) TS_CResult_NetAddressDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)(owner & ~1);
-	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
-	*ret_copy = CResult_NetAddressDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
-}
-
-static inline struct LDKDecodeError CResult_NetAddressDecodeErrorZ_get_err(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_get_err"))) TS_CResult_NetAddressDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_NetAddressDecodeErrorZ* owner_conv = (LDKCResult_NetAddressDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_NetAddressDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline 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++) {
-		ret.data[i] = UpdateAddHTLC_clone(&orig->data[i]);
-	}
-	return 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++) {
-		ret.data[i] = UpdateFulfillHTLC_clone(&orig->data[i]);
-	}
-	return 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++) {
-		ret.data[i] = UpdateFailHTLC_clone(&orig->data[i]);
-	}
-	return 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++) {
-		ret.data[i] = UpdateFailMalformedHTLC_clone(&orig->data[i]);
-	}
-	return ret;
-}
-static inline struct LDKAcceptChannel CResult_AcceptChannelDecodeErrorZ_get_ok(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return AcceptChannel_clone(&*owner->contents.result);
-}
-uint32_t  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_get_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_AcceptChannelDecodeErrorZ* owner_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(owner & ~1);
-	LDKAcceptChannel ret_var = CResult_AcceptChannelDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKDecodeError CResult_AcceptChannelDecodeErrorZ_get_err(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_get_err"))) TS_CResult_AcceptChannelDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_AcceptChannelDecodeErrorZ* owner_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_AcceptChannelDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKAnnouncementSignatures CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return AnnouncementSignatures_clone(&*owner->contents.result);
-}
-uint32_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_AnnouncementSignaturesDecodeErrorZ* owner_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(owner & ~1);
-	LDKAnnouncementSignatures ret_var = CResult_AnnouncementSignaturesDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKDecodeError CResult_AnnouncementSignaturesDecodeErrorZ_get_err(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_AnnouncementSignaturesDecodeErrorZ* owner_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_AnnouncementSignaturesDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKChannelReestablish CResult_ChannelReestablishDecodeErrorZ_get_ok(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return ChannelReestablish_clone(&*owner->contents.result);
-}
-uint32_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_get_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_ChannelReestablishDecodeErrorZ* owner_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(owner & ~1);
-	LDKChannelReestablish ret_var = CResult_ChannelReestablishDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKDecodeError CResult_ChannelReestablishDecodeErrorZ_get_err(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_get_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_ChannelReestablishDecodeErrorZ* owner_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_ChannelReestablishDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKClosingSigned CResult_ClosingSignedDecodeErrorZ_get_ok(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return ClosingSigned_clone(&*owner->contents.result);
-}
-uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_get_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_ClosingSignedDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(owner & ~1);
-	LDKClosingSigned ret_var = CResult_ClosingSignedDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKDecodeError CResult_ClosingSignedDecodeErrorZ_get_err(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_get_err"))) TS_CResult_ClosingSignedDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_ClosingSignedDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_ClosingSignedDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKClosingSignedFeeRange CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return ClosingSignedFeeRange_clone(&*owner->contents.result);
-}
-uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(owner & ~1);
-	LDKClosingSignedFeeRange ret_var = CResult_ClosingSignedFeeRangeDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKDecodeError CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* owner_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_ClosingSignedFeeRangeDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKCommitmentSigned CResult_CommitmentSignedDecodeErrorZ_get_ok(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return CommitmentSigned_clone(&*owner->contents.result);
-}
-uint32_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_get_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_CommitmentSignedDecodeErrorZ* owner_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(owner & ~1);
-	LDKCommitmentSigned ret_var = CResult_CommitmentSignedDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKDecodeError CResult_CommitmentSignedDecodeErrorZ_get_err(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_get_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_CommitmentSignedDecodeErrorZ* owner_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_CommitmentSignedDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKFundingCreated CResult_FundingCreatedDecodeErrorZ_get_ok(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR owner){
-CHECK(owner->result_ok);
-	return FundingCreated_clone(&*owner->contents.result);
-}
-uint32_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_get_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_FundingCreatedDecodeErrorZ* owner_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(owner & ~1);
-	LDKFundingCreated ret_var = CResult_FundingCreatedDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
-static inline struct LDKDecodeError CResult_FundingCreatedDecodeErrorZ_get_err(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR owner){
-CHECK(!owner->result_ok);
-	return DecodeError_clone(&*owner->contents.err);
-}
-uint32_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_get_err"))) TS_CResult_FundingCreatedDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_FundingCreatedDecodeErrorZ* owner_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_FundingCreatedDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_get_err"))) TS_CResult_FundingCreatedDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_FundingCreatedDecodeErrorZ* owner_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_FundingCreatedDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6715,7 +7112,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_get_ok"))) TS_CResult_FundingSignedDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_FundingSignedDecodeErrorZ* owner_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(owner & ~1);
 	LDKFundingSigned ret_var = CResult_FundingSignedDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6733,7 +7130,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_get_err"))) TS_CResult_FundingSignedDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_FundingSignedDecodeErrorZ* owner_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_FundingSignedDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6744,14 +7141,14 @@ uint32_t  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_get_e
 	return ret_ref;
 }
 
-static inline struct LDKFundingLocked CResult_FundingLockedDecodeErrorZ_get_ok(LDKCResult_FundingLockedDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKChannelReady CResult_ChannelReadyDecodeErrorZ_get_ok(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
-	return FundingLocked_clone(&*owner->contents.result);
+	return ChannelReady_clone(&*owner->contents.result);
 }
-uint32_t  __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_get_ok"))) TS_CResult_FundingLockedDecodeErrorZ_get_ok(uint32_t owner) {
-	LDKCResult_FundingLockedDecodeErrorZ* owner_conv = (LDKCResult_FundingLockedDecodeErrorZ*)(owner & ~1);
-	LDKFundingLocked ret_var = CResult_FundingLockedDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_get_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_get_ok(uint32_t owner) {
+	LDKCResult_ChannelReadyDecodeErrorZ* owner_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(owner & ~1);
+	LDKChannelReady ret_var = CResult_ChannelReadyDecodeErrorZ_get_ok(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6762,14 +7159,14 @@ uint32_t  __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_get_o
 	return ret_ref;
 }
 
-static inline struct LDKDecodeError CResult_FundingLockedDecodeErrorZ_get_err(LDKCResult_FundingLockedDecodeErrorZ *NONNULL_PTR owner){
+static inline struct LDKDecodeError CResult_ChannelReadyDecodeErrorZ_get_err(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR owner){
 CHECK(!owner->result_ok);
 	return DecodeError_clone(&*owner->contents.err);
 }
-uint32_t  __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_get_err"))) TS_CResult_FundingLockedDecodeErrorZ_get_err(uint32_t owner) {
-	LDKCResult_FundingLockedDecodeErrorZ* owner_conv = (LDKCResult_FundingLockedDecodeErrorZ*)(owner & ~1);
-	LDKDecodeError ret_var = CResult_FundingLockedDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_get_err"))) TS_CResult_ChannelReadyDecodeErrorZ_get_err(uint32_t owner) {
+	LDKCResult_ChannelReadyDecodeErrorZ* owner_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(owner & ~1);
+	LDKDecodeError ret_var = CResult_ChannelReadyDecodeErrorZ_get_err(owner_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6787,7 +7184,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_get_ok"))) TS_CResult_InitDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_InitDecodeErrorZ* owner_conv = (LDKCResult_InitDecodeErrorZ*)(owner & ~1);
 	LDKInit ret_var = CResult_InitDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6805,7 +7202,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_get_err"))) TS_CResult_InitDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_InitDecodeErrorZ* owner_conv = (LDKCResult_InitDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_InitDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6823,7 +7220,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_get_ok"))) TS_CResult_OpenChannelDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_OpenChannelDecodeErrorZ* owner_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(owner & ~1);
 	LDKOpenChannel ret_var = CResult_OpenChannelDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6841,7 +7238,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_get_err"))) TS_CResult_OpenChannelDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_OpenChannelDecodeErrorZ* owner_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_OpenChannelDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6859,7 +7256,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_get_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_RevokeAndACKDecodeErrorZ* owner_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(owner & ~1);
 	LDKRevokeAndACK ret_var = CResult_RevokeAndACKDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6877,7 +7274,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_get_err"))) TS_CResult_RevokeAndACKDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_RevokeAndACKDecodeErrorZ* owner_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_RevokeAndACKDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6895,7 +7292,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_get_ok"))) TS_CResult_ShutdownDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ShutdownDecodeErrorZ* owner_conv = (LDKCResult_ShutdownDecodeErrorZ*)(owner & ~1);
 	LDKShutdown ret_var = CResult_ShutdownDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6913,7 +7310,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_get_err"))) TS_CResult_ShutdownDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ShutdownDecodeErrorZ* owner_conv = (LDKCResult_ShutdownDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ShutdownDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6931,7 +7328,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(owner & ~1);
 	LDKUpdateFailHTLC ret_var = CResult_UpdateFailHTLCDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6949,7 +7346,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_UpdateFailHTLCDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6967,7 +7364,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(owner & ~1);
 	LDKUpdateFailMalformedHTLC ret_var = CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -6985,7 +7382,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_UpdateFailMalformedHTLCDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7003,7 +7400,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_get_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_UpdateFeeDecodeErrorZ* owner_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(owner & ~1);
 	LDKUpdateFee ret_var = CResult_UpdateFeeDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7021,7 +7418,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_get_err"))) TS_CResult_UpdateFeeDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_UpdateFeeDecodeErrorZ* owner_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_UpdateFeeDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7039,7 +7436,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(owner & ~1);
 	LDKUpdateFulfillHTLC ret_var = CResult_UpdateFulfillHTLCDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7057,7 +7454,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_UpdateFulfillHTLCDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7075,7 +7472,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_get_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(owner & ~1);
 	LDKUpdateAddHTLC ret_var = CResult_UpdateAddHTLCDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7093,7 +7490,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_get_err"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* owner_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_UpdateAddHTLCDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7111,7 +7508,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_get_ok"))) TS_CResult_PingDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_PingDecodeErrorZ* owner_conv = (LDKCResult_PingDecodeErrorZ*)(owner & ~1);
 	LDKPing ret_var = CResult_PingDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7129,7 +7526,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_get_err"))) TS_CResult_PingDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_PingDecodeErrorZ* owner_conv = (LDKCResult_PingDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_PingDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7147,7 +7544,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_get_ok"))) TS_CResult_PongDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_PongDecodeErrorZ* owner_conv = (LDKCResult_PongDecodeErrorZ*)(owner & ~1);
 	LDKPong ret_var = CResult_PongDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7165,7 +7562,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_get_err"))) TS_CResult_PongDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_PongDecodeErrorZ* owner_conv = (LDKCResult_PongDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_PongDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7183,7 +7580,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(owner & ~1);
 	LDKUnsignedChannelAnnouncement ret_var = CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7201,7 +7598,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_UnsignedChannelAnnouncementDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7219,7 +7616,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(owner & ~1);
 	LDKChannelAnnouncement ret_var = CResult_ChannelAnnouncementDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7237,7 +7634,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_get_err"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ChannelAnnouncementDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7255,7 +7652,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(owner & ~1);
 	LDKUnsignedChannelUpdate ret_var = CResult_UnsignedChannelUpdateDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7273,7 +7670,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_err"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_UnsignedChannelUpdateDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7291,7 +7688,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_get_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(owner & ~1);
 	LDKChannelUpdate ret_var = CResult_ChannelUpdateDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7309,7 +7706,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_get_err"))) TS_CResult_ChannelUpdateDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ChannelUpdateDecodeErrorZ* owner_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ChannelUpdateDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7327,7 +7724,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_get_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ErrorMessageDecodeErrorZ* owner_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(owner & ~1);
 	LDKErrorMessage ret_var = CResult_ErrorMessageDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7345,7 +7742,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_get_err"))) TS_CResult_ErrorMessageDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ErrorMessageDecodeErrorZ* owner_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ErrorMessageDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7363,7 +7760,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_get_ok"))) TS_CResult_WarningMessageDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_WarningMessageDecodeErrorZ* owner_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(owner & ~1);
 	LDKWarningMessage ret_var = CResult_WarningMessageDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7381,7 +7778,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_get_err"))) TS_CResult_WarningMessageDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_WarningMessageDecodeErrorZ* owner_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_WarningMessageDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7399,7 +7796,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(owner & ~1);
 	LDKUnsignedNodeAnnouncement ret_var = CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7417,7 +7814,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_UnsignedNodeAnnouncementDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7435,7 +7832,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_get_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_NodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(owner & ~1);
 	LDKNodeAnnouncement ret_var = CResult_NodeAnnouncementDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7453,7 +7850,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_get_err"))) TS_CResult_NodeAnnouncementDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_NodeAnnouncementDecodeErrorZ* owner_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_NodeAnnouncementDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7471,7 +7868,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* owner_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(owner & ~1);
 	LDKQueryShortChannelIds ret_var = CResult_QueryShortChannelIdsDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7489,7 +7886,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_err"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* owner_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_QueryShortChannelIdsDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7507,7 +7904,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* owner_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(owner & ~1);
 	LDKReplyShortChannelIdsEnd ret_var = CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7525,7 +7922,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* owner_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ReplyShortChannelIdsEndDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7543,7 +7940,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_get_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_QueryChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(owner & ~1);
 	LDKQueryChannelRange ret_var = CResult_QueryChannelRangeDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7561,7 +7958,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_get_err"))) TS_CResult_QueryChannelRangeDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_QueryChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_QueryChannelRangeDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7579,7 +7976,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_get_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(owner & ~1);
 	LDKReplyChannelRange ret_var = CResult_ReplyChannelRangeDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7597,7 +7994,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_get_err"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* owner_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_ReplyChannelRangeDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7615,7 +8012,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_get_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* owner_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(owner & ~1);
 	LDKGossipTimestampFilter ret_var = CResult_GossipTimestampFilterDecodeErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7633,7 +8030,7 @@ CHECK(!owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_get_err"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_get_err(uint32_t owner) {
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* owner_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(owner & ~1);
 	LDKDecodeError ret_var = CResult_GossipTimestampFilterDecodeErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7665,7 +8062,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_get_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_get_ok(uint32_t owner) {
 	LDKCResult_InvoiceSignOrCreationErrorZ* owner_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(owner & ~1);
 	LDKInvoice ret_var = CResult_InvoiceSignOrCreationErrorZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7684,7 +8081,7 @@ uint32_t  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_get
 	LDKCResult_InvoiceSignOrCreationErrorZ* owner_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(owner & ~1);
 	LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError");
 	*ret_copy = CResult_InvoiceSignOrCreationErrorZ_get_err(owner_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -7705,12 +8102,12 @@ void register_tx_LDKFilter_jcall(const void* this_arg, const uint8_t (* txid)[32
 	LDKu8slice script_pubkey_var = script_pubkey;
 	int8_tArray script_pubkey_arr = init_int8_tArray(script_pubkey_var.datalen, __LINE__);
 	memcpy(script_pubkey_arr->elems, script_pubkey_var.data, script_pubkey_var.datalen);
-	js_invoke_function_2(j_calls->instance_ptr, 32, (uint32_t)txid_arr, (uint32_t)script_pubkey_arr);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 32, (uint32_t)txid_arr, (uint32_t)script_pubkey_arr);
 }
 LDKCOption_C2Tuple_usizeTransactionZZ register_output_LDKFilter_jcall(const void* this_arg, LDKWatchedOutput output) {
 	LDKFilter_JCalls *j_calls = (LDKFilter_JCalls*) this_arg;
 	LDKWatchedOutput output_var = output;
-	uintptr_t output_ref = 0;
+	uint32_t output_ref = 0;
 	CHECK((((uintptr_t)output_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&output_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(output_var);
@@ -7718,7 +8115,7 @@ LDKCOption_C2Tuple_usizeTransactionZZ register_output_LDKFilter_jcall(const void
 	if (output_var.is_owned) {
 		output_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 33, (uint32_t)output_ref);
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 33, (uint32_t)output_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCOption_C2Tuple_usizeTransactionZZ ret_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(ret_ptr);
@@ -7757,8 +8154,9 @@ void  __attribute__((export_name("TS_Filter_register_tx"))) TS_Filter_register_t
 	unsigned char (*txid_ref)[32] = &txid_arr;
 	LDKu8slice script_pubkey_ref;
 	script_pubkey_ref.datalen = script_pubkey->arr_len;
-	script_pubkey_ref.data = script_pubkey->elems /* XXX script_pubkey leaks */;
+	script_pubkey_ref.data = script_pubkey->elems;
 	(this_arg_conv->register_tx)(this_arg_conv->this_arg, txid_ref, script_pubkey_ref);
+	FREE(script_pubkey);
 }
 
 uint32_t  __attribute__((export_name("TS_Filter_register_output"))) TS_Filter_register_output(uint32_t this_arg, uint32_t output) {
@@ -7772,7 +8170,7 @@ uint32_t  __attribute__((export_name("TS_Filter_register_output"))) TS_Filter_re
 	output_conv = WatchedOutput_clone(&output_conv);
 	LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ");
 	*ret_copy = (this_arg_conv->register_output)(this_arg_conv->this_arg, output_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -7790,7 +8188,11 @@ uint32_t __attribute__((export_name("TS_LDKCOption_FilterZ_Some_get_some"))) TS_
 			LDKFilter* some_ret = MALLOC(sizeof(LDKFilter), "LDKFilter");
 			*some_ret = obj->some;
 			// WARNING: We likely need to clone here, but no clone is available, so we just do it for Java instances
-	return (uintptr_t)some_ret;
+			if ((*some_ret).free == LDKFilter_JCalls_free) {
+				// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+				LDKFilter_JCalls_cloned(&(*some_ret));
+			}
+	return (uint32_t)some_ret;
 }
 static inline struct LDKLockedChannelMonitor *CResult_LockedChannelMonitorNoneZ_get_ok(LDKCResult_LockedChannelMonitorNoneZ *NONNULL_PTR owner){
 CHECK(owner->result_ok);
@@ -7799,7 +8201,7 @@ CHECK(owner->result_ok);
 uint32_t  __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_get_ok"))) TS_CResult_LockedChannelMonitorNoneZ_get_ok(uint32_t owner) {
 	LDKCResult_LockedChannelMonitorNoneZ* owner_conv = (LDKCResult_LockedChannelMonitorNoneZ*)(owner & ~1);
 	LDKLockedChannelMonitor ret_var = *CResult_LockedChannelMonitorNoneZ_get_ok(owner_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -7835,14 +8237,14 @@ static void LDKMessageSendEventsProvider_JCalls_free(void* this_arg) {
 }
 LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_LDKMessageSendEventsProvider_jcall(const void* this_arg) {
 	LDKMessageSendEventsProvider_JCalls *j_calls = (LDKMessageSendEventsProvider_JCalls*) this_arg;
-	uint32_tArray ret = (uint32_tArray)js_invoke_function_0(j_calls->instance_ptr, 34);
+	uint32_tArray ret = (uint32_tArray)js_invoke_function_u_(j_calls->instance_ptr, 34);
 	LDKCVec_MessageSendEventZ ret_constr;
 	ret_constr.datalen = ret->arr_len;
 	if (ret_constr.datalen > 0)
 		ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKMessageSendEvent), "LDKCVec_MessageSendEventZ Elements");
 	else
 		ret_constr.data = NULL;
-	uint32_t* ret_vals = ret->elems /* XXX ret leaks */;
+	uint32_t* ret_vals = ret->elems;
 	for (size_t s = 0; s < ret_constr.datalen; s++) {
 		uint32_t ret_conv_18 = ret_vals[s];
 		void* ret_conv_18_ptr = (void*)(((uintptr_t)ret_conv_18) & ~1);
@@ -7851,6 +8253,7 @@ LDKCVec_MessageSendEventZ get_and_clear_pending_msg_events_LDKMessageSendEventsP
 		FREE((void*)ret_conv_18);
 		ret_constr.data[s] = ret_conv_18_conv;
 	}
+	FREE(ret);
 	return ret_constr;
 }
 static void LDKMessageSendEventsProvider_JCalls_cloned(LDKMessageSendEventsProvider* new_obj) {
@@ -7885,7 +8288,7 @@ uint32_tArray  __attribute__((export_name("TS_MessageSendEventsProvider_get_and_
 	for (size_t s = 0; s < ret_var.datalen; s++) {
 		LDKMessageSendEvent *ret_conv_18_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 		*ret_conv_18_copy = ret_var.data[s];
-		uintptr_t ret_conv_18_ref = (uintptr_t)ret_conv_18_copy;
+		uint32_t ret_conv_18_ref = (uintptr_t)ret_conv_18_copy;
 		ret_arr_ptr[s] = ret_conv_18_ref;
 	}
 	
@@ -7907,7 +8310,7 @@ void handle_event_LDKEventHandler_jcall(const void* this_arg, const LDKEvent * e
 	LDKEventHandler_JCalls *j_calls = (LDKEventHandler_JCalls*) this_arg;
 	LDKEvent *ret_event = MALLOC(sizeof(LDKEvent), "LDKEvent ret conversion");
 	*ret_event = Event_clone(event);
-	js_invoke_function_1(j_calls->instance_ptr, 35, (uint32_t)(uintptr_t)ret_event);
+	js_invoke_function_u_u(j_calls->instance_ptr, 35, (uint32_t)(uint32_t)ret_event);
 }
 static void LDKEventHandler_JCalls_cloned(LDKEventHandler* new_obj) {
 	LDKEventHandler_JCalls *j_calls = (LDKEventHandler_JCalls*) new_obj->this_arg;
@@ -7952,7 +8355,7 @@ void process_pending_events_LDKEventsProvider_jcall(const void* this_arg, LDKEve
 	LDKEventsProvider_JCalls *j_calls = (LDKEventsProvider_JCalls*) this_arg;
 	LDKEventHandler* handler_ret = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler");
 	*handler_ret = handler;
-	js_invoke_function_1(j_calls->instance_ptr, 36, (uint32_t)(uintptr_t)handler_ret);
+	js_invoke_function_u_u(j_calls->instance_ptr, 36, (uint32_t)(uint32_t)handler_ret);
 }
 static void LDKEventsProvider_JCalls_cloned(LDKEventsProvider* new_obj) {
 	LDKEventsProvider_JCalls *j_calls = (LDKEventsProvider_JCalls*) new_obj->this_arg;
@@ -7982,9 +8385,344 @@ void  __attribute__((export_name("TS_EventsProvider_process_pending_events"))) T
 	void* handler_ptr = (void*)(((uintptr_t)handler) & ~1);
 	CHECK_ACCESS(handler_ptr);
 	LDKEventHandler handler_conv = *(LDKEventHandler*)(handler_ptr);
+	if (handler_conv.free == LDKEventHandler_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKEventHandler_JCalls_cloned(&handler_conv);
+	}
 	(this_arg_conv->process_pending_events)(this_arg_conv->this_arg, handler_conv);
 }
 
+typedef struct LDKScore_JCalls {
+	atomic_size_t refcnt;
+	uint32_t instance_ptr;
+} LDKScore_JCalls;
+static void LDKScore_JCalls_free(void* this_arg) {
+	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg;
+	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
+		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, LDKChannelUsage usage) {
+	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg;
+	int64_t short_channel_id_conv = short_channel_id;
+	LDKNodeId source_var = *source;
+	uint32_t source_ref = 0;
+	source_var = NodeId_clone(&source_var);
+	CHECK((((uintptr_t)source_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&source_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(source_var);
+	source_ref = (uintptr_t)source_var.inner;
+	if (source_var.is_owned) {
+		source_ref |= 1;
+	}
+	LDKNodeId target_var = *target;
+	uint32_t target_ref = 0;
+	target_var = NodeId_clone(&target_var);
+	CHECK((((uintptr_t)target_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&target_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(target_var);
+	target_ref = (uintptr_t)target_var.inner;
+	if (target_var.is_owned) {
+		target_ref |= 1;
+	}
+	LDKChannelUsage usage_var = usage;
+	uint32_t usage_ref = 0;
+	CHECK((((uintptr_t)usage_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&usage_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(usage_var);
+	usage_ref = (uintptr_t)usage_var.inner;
+	if (usage_var.is_owned) {
+		usage_ref |= 1;
+	}
+	return js_invoke_function_b_uuuu(j_calls->instance_ptr, 37, (uint32_t)short_channel_id_conv, (uint32_t)source_ref, (uint32_t)target_ref, (uint32_t)usage_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;
+	LDKCVec_RouteHopZ path_var = path;
+	uint32_tArray path_arr = NULL;
+	path_arr = init_uint32_tArray(path_var.datalen, __LINE__);
+	uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4);
+	for (size_t k = 0; k < path_var.datalen; k++) {
+		LDKRouteHop path_conv_10_var = path_var.data[k];
+		uint32_t path_conv_10_ref = 0;
+		CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+		CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
+		path_conv_10_ref = (uintptr_t)path_conv_10_var.inner;
+		if (path_conv_10_var.is_owned) {
+			path_conv_10_ref |= 1;
+		}
+		path_arr_ptr[k] = path_conv_10_ref;
+	}
+	
+	FREE(path_var.data);
+	int64_t short_channel_id_conv = short_channel_id;
+	js_invoke_function_u_bb(j_calls->instance_ptr, 38, (uint32_t)path_arr, (uint32_t)short_channel_id_conv);
+}
+void payment_path_successful_LDKScore_jcall(void* this_arg, LDKCVec_RouteHopZ path) {
+	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg;
+	LDKCVec_RouteHopZ path_var = path;
+	uint32_tArray path_arr = NULL;
+	path_arr = init_uint32_tArray(path_var.datalen, __LINE__);
+	uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4);
+	for (size_t k = 0; k < path_var.datalen; k++) {
+		LDKRouteHop path_conv_10_var = path_var.data[k];
+		uint32_t path_conv_10_ref = 0;
+		CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+		CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
+		path_conv_10_ref = (uintptr_t)path_conv_10_var.inner;
+		if (path_conv_10_var.is_owned) {
+			path_conv_10_ref |= 1;
+		}
+		path_arr_ptr[k] = path_conv_10_ref;
+	}
+	
+	FREE(path_var.data);
+	js_invoke_function_u_u(j_calls->instance_ptr, 39, (uint32_t)path_arr);
+}
+LDKCVec_u8Z write_LDKScore_jcall(const void* this_arg) {
+	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg;
+	int8_tArray ret = (int8_tArray)js_invoke_function_u_(j_calls->instance_ptr, 40);
+	LDKCVec_u8Z ret_ref;
+	ret_ref.datalen = ret->arr_len;
+	ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes");
+	memcpy(ret_ref.data, ret->elems, ret_ref.datalen); FREE(ret);
+	return ret_ref;
+}
+static void LDKScore_JCalls_cloned(LDKScore* new_obj) {
+	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) new_obj->this_arg;
+	atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);
+}
+static inline LDKScore LDKScore_init (JSValue o) {
+	LDKScore_JCalls *calls = MALLOC(sizeof(LDKScore_JCalls), "LDKScore_JCalls");
+	atomic_init(&calls->refcnt, 1);
+	calls->instance_ptr = o;
+
+	LDKScore ret = {
+		.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,
+	};
+	return ret;
+}
+long  __attribute__((export_name("TS_LDKScore_new"))) TS_LDKScore_new(JSValue o) {
+	LDKScore *res_ptr = MALLOC(sizeof(LDKScore), "LDKScore");
+	*res_ptr = LDKScore_init(o);
+	return (long)res_ptr;
+}
+int64_t  __attribute__((export_name("TS_Score_channel_penalty_msat"))) TS_Score_channel_penalty_msat(uint32_t this_arg, int64_t short_channel_id, uint32_t source, uint32_t target, uint32_t usage) {
+	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr;
+	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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(target_conv);
+	LDKChannelUsage usage_conv;
+	usage_conv.inner = (void*)(usage & (~1));
+	usage_conv.is_owned = (usage & 1) || (usage == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(usage_conv);
+	usage_conv = ChannelUsage_clone(&usage_conv);
+	int64_t ret_conv = (this_arg_conv->channel_penalty_msat)(this_arg_conv->this_arg, short_channel_id, &source_conv, &target_conv, usage_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_Score_payment_path_failed"))) TS_Score_payment_path_failed(uint32_t this_arg, uint32_tArray path, int64_t short_channel_id) {
+	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr;
+	LDKCVec_RouteHopZ path_constr;
+	path_constr.datalen = path->arr_len;
+	if (path_constr.datalen > 0)
+		path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
+	else
+		path_constr.data = NULL;
+	uint32_t* path_vals = path->elems;
+	for (size_t k = 0; k < path_constr.datalen; k++) {
+		uint32_t path_conv_10 = path_vals[k];
+		LDKRouteHop path_conv_10_conv;
+		path_conv_10_conv.inner = (void*)(path_conv_10 & (~1));
+		path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv);
+		path_conv_10_conv = RouteHop_clone(&path_conv_10_conv);
+		path_constr.data[k] = path_conv_10_conv;
+	}
+	FREE(path);
+	(this_arg_conv->payment_path_failed)(this_arg_conv->this_arg, path_constr, short_channel_id);
+}
+
+void  __attribute__((export_name("TS_Score_payment_path_successful"))) TS_Score_payment_path_successful(uint32_t this_arg, uint32_tArray path) {
+	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr;
+	LDKCVec_RouteHopZ path_constr;
+	path_constr.datalen = path->arr_len;
+	if (path_constr.datalen > 0)
+		path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
+	else
+		path_constr.data = NULL;
+	uint32_t* path_vals = path->elems;
+	for (size_t k = 0; k < path_constr.datalen; k++) {
+		uint32_t path_conv_10 = path_vals[k];
+		LDKRouteHop path_conv_10_conv;
+		path_conv_10_conv.inner = (void*)(path_conv_10 & (~1));
+		path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv);
+		path_conv_10_conv = RouteHop_clone(&path_conv_10_conv);
+		path_constr.data[k] = path_conv_10_conv;
+	}
+	FREE(path);
+	(this_arg_conv->payment_path_successful)(this_arg_conv->this_arg, path_constr);
+}
+
+int8_tArray  __attribute__((export_name("TS_Score_write"))) TS_Score_write(uint32_t this_arg) {
+	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr;
+	LDKCVec_u8Z ret_var = (this_arg_conv->write)(this_arg_conv->this_arg);
+	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+typedef struct LDKPersister_JCalls {
+	atomic_size_t refcnt;
+	uint32_t instance_ptr;
+} LDKPersister_JCalls;
+static void LDKPersister_JCalls_free(void* this_arg) {
+	LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) this_arg;
+	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
+		FREE(j_calls);
+	}
+}
+LDKCResult_NoneErrorZ persist_manager_LDKPersister_jcall(const void* this_arg, const LDKChannelManager * channel_manager) {
+	LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) this_arg;
+	LDKChannelManager channel_manager_var = *channel_manager;
+	uint32_t channel_manager_ref = 0;
+	// WARNING: we may need a move here but no clone is available for LDKChannelManager
+	CHECK((((uintptr_t)channel_manager_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&channel_manager_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_manager_var);
+	channel_manager_ref = (uintptr_t)channel_manager_var.inner;
+	if (channel_manager_var.is_owned) {
+		channel_manager_ref |= 1;
+	}
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 41, (uint32_t)channel_manager_ref);
+	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
+	CHECK_ACCESS(ret_ptr);
+	LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr);
+	FREE((void*)ret);
+	return ret_conv;
+}
+LDKCResult_NoneErrorZ persist_graph_LDKPersister_jcall(const void* this_arg, const LDKNetworkGraph * network_graph) {
+	LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) this_arg;
+	LDKNetworkGraph network_graph_var = *network_graph;
+	uint32_t network_graph_ref = 0;
+	// WARNING: we may need a move here but no clone is available for LDKNetworkGraph
+	CHECK((((uintptr_t)network_graph_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&network_graph_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_var);
+	network_graph_ref = (uintptr_t)network_graph_var.inner;
+	if (network_graph_var.is_owned) {
+		network_graph_ref |= 1;
+	}
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 42, (uint32_t)network_graph_ref);
+	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
+	CHECK_ACCESS(ret_ptr);
+	LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr);
+	FREE((void*)ret);
+	return ret_conv;
+}
+LDKCResult_NoneErrorZ persist_scorer_LDKPersister_jcall(const void* this_arg, const LDKMultiThreadedLockableScore * scorer) {
+	LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) this_arg;
+	LDKMultiThreadedLockableScore scorer_var = *scorer;
+	uint32_t scorer_ref = 0;
+	// WARNING: we may need a move here but no clone is available for LDKMultiThreadedLockableScore
+	CHECK((((uintptr_t)scorer_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&scorer_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(scorer_var);
+	scorer_ref = (uintptr_t)scorer_var.inner;
+	if (scorer_var.is_owned) {
+		scorer_ref |= 1;
+	}
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 43, (uint32_t)scorer_ref);
+	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
+	CHECK_ACCESS(ret_ptr);
+	LDKCResult_NoneErrorZ ret_conv = *(LDKCResult_NoneErrorZ*)(ret_ptr);
+	FREE((void*)ret);
+	return ret_conv;
+}
+static void LDKPersister_JCalls_cloned(LDKPersister* new_obj) {
+	LDKPersister_JCalls *j_calls = (LDKPersister_JCalls*) new_obj->this_arg;
+	atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);
+}
+static inline LDKPersister LDKPersister_init (JSValue o) {
+	LDKPersister_JCalls *calls = MALLOC(sizeof(LDKPersister_JCalls), "LDKPersister_JCalls");
+	atomic_init(&calls->refcnt, 1);
+	calls->instance_ptr = o;
+
+	LDKPersister ret = {
+		.this_arg = (void*) calls,
+		.persist_manager = persist_manager_LDKPersister_jcall,
+		.persist_graph = persist_graph_LDKPersister_jcall,
+		.persist_scorer = persist_scorer_LDKPersister_jcall,
+		.free = LDKPersister_JCalls_free,
+	};
+	return ret;
+}
+long  __attribute__((export_name("TS_LDKPersister_new"))) TS_LDKPersister_new(JSValue o) {
+	LDKPersister *res_ptr = MALLOC(sizeof(LDKPersister), "LDKPersister");
+	*res_ptr = LDKPersister_init(o);
+	return (long)res_ptr;
+}
+uint32_t  __attribute__((export_name("TS_Persister_persist_manager"))) TS_Persister_persist_manager(uint32_t this_arg, uint32_t channel_manager) {
+	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKPersister* this_arg_conv = (LDKPersister*)this_arg_ptr;
+	LDKChannelManager channel_manager_conv;
+	channel_manager_conv.inner = (void*)(channel_manager & (~1));
+	channel_manager_conv.is_owned = false;
+	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 (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_Persister_persist_graph"))) TS_Persister_persist_graph(uint32_t this_arg, uint32_t network_graph) {
+	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKPersister* this_arg_conv = (LDKPersister*)this_arg_ptr;
+	LDKNetworkGraph network_graph_conv;
+	network_graph_conv.inner = (void*)(network_graph & (~1));
+	network_graph_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(network_graph_conv);
+	LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ");
+	*ret_conv = (this_arg_conv->persist_graph)(this_arg_conv->this_arg, &network_graph_conv);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_Persister_persist_scorer"))) TS_Persister_persist_scorer(uint32_t this_arg, uint32_t scorer) {
+	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKPersister* this_arg_conv = (LDKPersister*)this_arg_ptr;
+	LDKMultiThreadedLockableScore scorer_conv;
+	scorer_conv.inner = (void*)(scorer & (~1));
+	scorer_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(scorer_conv);
+	LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ");
+	*ret_conv = (this_arg_conv->persist_scorer)(this_arg_conv->this_arg, &scorer_conv);
+	return (uint32_t)ret_conv;
+}
+
 typedef struct LDKListen_JCalls {
 	atomic_size_t refcnt;
 	uint32_t instance_ptr;
@@ -7995,18 +8733,38 @@ static void LDKListen_JCalls_free(void* this_arg) {
 		FREE(j_calls);
 	}
 }
+void filtered_block_connected_LDKListen_jcall(const void* this_arg, const uint8_t (* header)[80], LDKCVec_C2Tuple_usizeTransactionZZ txdata, uint32_t height) {
+	LDKListen_JCalls *j_calls = (LDKListen_JCalls*) this_arg;
+	int8_tArray header_arr = init_int8_tArray(80, __LINE__);
+	memcpy(header_arr->elems, *header, 80);
+	LDKCVec_C2Tuple_usizeTransactionZZ txdata_var = txdata;
+	uint32_tArray txdata_arr = NULL;
+	txdata_arr = init_uint32_tArray(txdata_var.datalen, __LINE__);
+	uint32_t *txdata_arr_ptr = (uint32_t*)(((uint8_t*)txdata_arr) + 4);
+	for (size_t c = 0; c < txdata_var.datalen; c++) {
+		LDKC2Tuple_usizeTransactionZ* txdata_conv_28_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ");
+		*txdata_conv_28_conv = txdata_var.data[c];
+		txdata_arr_ptr[c] = ((uint32_t)txdata_conv_28_conv);
+	}
+	
+	FREE(txdata_var.data);
+	int32_t height_conv = height;
+	js_invoke_function_u_uuu(j_calls->instance_ptr, 44, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height_conv);
+}
 void block_connected_LDKListen_jcall(const void* this_arg, LDKu8slice block, uint32_t height) {
 	LDKListen_JCalls *j_calls = (LDKListen_JCalls*) this_arg;
 	LDKu8slice block_var = block;
 	int8_tArray block_arr = init_int8_tArray(block_var.datalen, __LINE__);
 	memcpy(block_arr->elems, block_var.data, block_var.datalen);
-	js_invoke_function_2(j_calls->instance_ptr, 37, (uint32_t)block_arr, (uint32_t)height);
+	int32_t height_conv = height;
+	js_invoke_function_u_uu(j_calls->instance_ptr, 45, (uint32_t)block_arr, (uint32_t)height_conv);
 }
 void block_disconnected_LDKListen_jcall(const void* this_arg, const uint8_t (* header)[80], uint32_t height) {
 	LDKListen_JCalls *j_calls = (LDKListen_JCalls*) this_arg;
 	int8_tArray header_arr = init_int8_tArray(80, __LINE__);
 	memcpy(header_arr->elems, *header, 80);
-	js_invoke_function_2(j_calls->instance_ptr, 38, (uint32_t)header_arr, (uint32_t)height);
+	int32_t height_conv = height;
+	js_invoke_function_u_uu(j_calls->instance_ptr, 46, (uint32_t)header_arr, (uint32_t)height_conv);
 }
 static void LDKListen_JCalls_cloned(LDKListen* new_obj) {
 	LDKListen_JCalls *j_calls = (LDKListen_JCalls*) new_obj->this_arg;
@@ -8019,6 +8777,7 @@ static inline LDKListen LDKListen_init (JSValue o) {
 
 	LDKListen ret = {
 		.this_arg = (void*) calls,
+		.filtered_block_connected = filtered_block_connected_LDKListen_jcall,
 		.block_connected = block_connected_LDKListen_jcall,
 		.block_disconnected = block_disconnected_LDKListen_jcall,
 		.free = LDKListen_JCalls_free,
@@ -8030,14 +8789,42 @@ long  __attribute__((export_name("TS_LDKListen_new"))) TS_LDKListen_new(JSValue
 	*res_ptr = LDKListen_init(o);
 	return (long)res_ptr;
 }
+void  __attribute__((export_name("TS_Listen_filtered_block_connected"))) TS_Listen_filtered_block_connected(uint32_t this_arg, int8_tArray header, uint32_tArray txdata, int32_t height) {
+	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
+	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
+	LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr;
+	unsigned char header_arr[80];
+	CHECK(header->arr_len == 80);
+	memcpy(header_arr, header->elems, 80); FREE(header);
+	unsigned char (*header_ref)[80] = &header_arr;
+	LDKCVec_C2Tuple_usizeTransactionZZ txdata_constr;
+	txdata_constr.datalen = txdata->arr_len;
+	if (txdata_constr.datalen > 0)
+		txdata_constr.data = MALLOC(txdata_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements");
+	else
+		txdata_constr.data = NULL;
+	uint32_t* txdata_vals = txdata->elems;
+	for (size_t c = 0; c < txdata_constr.datalen; c++) {
+		uint32_t txdata_conv_28 = txdata_vals[c];
+		void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1);
+		CHECK_ACCESS(txdata_conv_28_ptr);
+		LDKC2Tuple_usizeTransactionZ txdata_conv_28_conv = *(LDKC2Tuple_usizeTransactionZ*)(txdata_conv_28_ptr);
+		txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1));
+		txdata_constr.data[c] = txdata_conv_28_conv;
+	}
+	FREE(txdata);
+	(this_arg_conv->filtered_block_connected)(this_arg_conv->this_arg, header_ref, txdata_constr, height);
+}
+
 void  __attribute__((export_name("TS_Listen_block_connected"))) TS_Listen_block_connected(uint32_t this_arg, int8_tArray block, int32_t height) {
 	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKListen* this_arg_conv = (LDKListen*)this_arg_ptr;
 	LDKu8slice block_ref;
 	block_ref.datalen = block->arr_len;
-	block_ref.data = block->elems /* XXX block leaks */;
+	block_ref.data = block->elems;
 	(this_arg_conv->block_connected)(this_arg_conv->this_arg, block_ref, height);
+	FREE(block);
 }
 
 void  __attribute__((export_name("TS_Listen_block_disconnected"))) TS_Listen_block_disconnected(uint32_t this_arg, int8_tArray header, int32_t height) {
@@ -8072,34 +8859,36 @@ void transactions_confirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t
 	for (size_t c = 0; c < txdata_var.datalen; c++) {
 		LDKC2Tuple_usizeTransactionZ* txdata_conv_28_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ");
 		*txdata_conv_28_conv = txdata_var.data[c];
-		txdata_arr_ptr[c] = ((uintptr_t)txdata_conv_28_conv);
+		txdata_arr_ptr[c] = ((uint32_t)txdata_conv_28_conv);
 	}
 	
 	FREE(txdata_var.data);
-	js_invoke_function_3(j_calls->instance_ptr, 39, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height);
+	int32_t height_conv = height;
+	js_invoke_function_u_uuu(j_calls->instance_ptr, 47, (uint32_t)header_arr, (uint32_t)txdata_arr, (uint32_t)height_conv);
 }
 void transaction_unconfirmed_LDKConfirm_jcall(const void* this_arg, const uint8_t (* txid)[32]) {
 	LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg;
 	int8_tArray txid_arr = init_int8_tArray(32, __LINE__);
 	memcpy(txid_arr->elems, *txid, 32);
-	js_invoke_function_1(j_calls->instance_ptr, 40, (uint32_t)txid_arr);
+	js_invoke_function_u_u(j_calls->instance_ptr, 48, (uint32_t)txid_arr);
 }
 void best_block_updated_LDKConfirm_jcall(const void* this_arg, const uint8_t (* header)[80], uint32_t height) {
 	LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg;
 	int8_tArray header_arr = init_int8_tArray(80, __LINE__);
 	memcpy(header_arr->elems, *header, 80);
-	js_invoke_function_2(j_calls->instance_ptr, 41, (uint32_t)header_arr, (uint32_t)height);
+	int32_t height_conv = height;
+	js_invoke_function_u_uu(j_calls->instance_ptr, 49, (uint32_t)header_arr, (uint32_t)height_conv);
 }
 LDKCVec_TxidZ get_relevant_txids_LDKConfirm_jcall(const void* this_arg) {
 	LDKConfirm_JCalls *j_calls = (LDKConfirm_JCalls*) this_arg;
-	ptrArray ret = (ptrArray)js_invoke_function_0(j_calls->instance_ptr, 42);
+	ptrArray ret = (ptrArray)js_invoke_function_u_(j_calls->instance_ptr, 50);
 	LDKCVec_TxidZ ret_constr;
 	ret_constr.datalen = ret->arr_len;
 	if (ret_constr.datalen > 0)
 		ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_TxidZ Elements");
 	else
 		ret_constr.data = NULL;
-	int8_tArray* ret_vals = (void*) ret->elems /* XXX ret leaks */;
+	int8_tArray* ret_vals = (void*) ret->elems;
 	for (size_t m = 0; m < ret_constr.datalen; m++) {
 		int8_tArray ret_conv_12 = ret_vals[m];
 		LDKThirtyTwoBytes ret_conv_12_ref;
@@ -8107,6 +8896,7 @@ LDKCVec_TxidZ get_relevant_txids_LDKConfirm_jcall(const void* this_arg) {
 		memcpy(ret_conv_12_ref.data, ret_conv_12->elems, 32); FREE(ret_conv_12);
 		ret_constr.data[m] = ret_conv_12_ref;
 	}
+	FREE(ret);
 	return ret_constr;
 }
 static void LDKConfirm_JCalls_cloned(LDKConfirm* new_obj) {
@@ -8147,7 +8937,7 @@ void  __attribute__((export_name("TS_Confirm_transactions_confirmed"))) TS_Confi
 		txdata_constr.data = MALLOC(txdata_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements");
 	else
 		txdata_constr.data = NULL;
-	uint32_t* txdata_vals = txdata->elems /* XXX txdata leaks */;
+	uint32_t* txdata_vals = txdata->elems;
 	for (size_t c = 0; c < txdata_constr.datalen; c++) {
 		uint32_t txdata_conv_28 = txdata_vals[c];
 		void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1);
@@ -8156,6 +8946,7 @@ void  __attribute__((export_name("TS_Confirm_transactions_confirmed"))) TS_Confi
 		txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1));
 		txdata_constr.data[c] = txdata_conv_28_conv;
 	}
+	FREE(txdata);
 	(this_arg_conv->transactions_confirmed)(this_arg_conv->this_arg, header_ref, txdata_constr, height);
 }
 
@@ -8212,7 +9003,7 @@ static void LDKPersist_JCalls_free(void* this_arg) {
 LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(const void* this_arg, LDKOutPoint channel_id, const LDKChannelMonitor * data, LDKMonitorUpdateId update_id) {
 	LDKPersist_JCalls *j_calls = (LDKPersist_JCalls*) this_arg;
 	LDKOutPoint channel_id_var = channel_id;
-	uintptr_t channel_id_ref = 0;
+	uint32_t channel_id_ref = 0;
 	CHECK((((uintptr_t)channel_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&channel_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_var);
@@ -8221,8 +9012,8 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(con
 		channel_id_ref |= 1;
 	}
 	LDKChannelMonitor data_var = *data;
-	uintptr_t data_ref = 0;
-	data_var = ChannelMonitor_clone(data);
+	uint32_t data_ref = 0;
+	data_var = ChannelMonitor_clone(&data_var);
 	CHECK((((uintptr_t)data_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&data_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(data_var);
@@ -8231,7 +9022,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(con
 		data_ref |= 1;
 	}
 	LDKMonitorUpdateId update_id_var = update_id;
-	uintptr_t update_id_ref = 0;
+	uint32_t update_id_ref = 0;
 	CHECK((((uintptr_t)update_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&update_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_var);
@@ -8239,7 +9030,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(con
 	if (update_id_var.is_owned) {
 		update_id_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_3(j_calls->instance_ptr, 43, (uint32_t)channel_id_ref, (uint32_t)data_ref, (uint32_t)update_id_ref);
+	uint32_t ret = js_invoke_function_u_uuu(j_calls->instance_ptr, 51, (uint32_t)channel_id_ref, (uint32_t)data_ref, (uint32_t)update_id_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr);
@@ -8249,7 +9040,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ persist_new_channel_LDKPersist_jcall(con
 LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcall(const void* this_arg, LDKOutPoint channel_id, const LDKChannelMonitorUpdate * update, const LDKChannelMonitor * data, LDKMonitorUpdateId update_id) {
 	LDKPersist_JCalls *j_calls = (LDKPersist_JCalls*) this_arg;
 	LDKOutPoint channel_id_var = channel_id;
-	uintptr_t channel_id_ref = 0;
+	uint32_t channel_id_ref = 0;
 	CHECK((((uintptr_t)channel_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&channel_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_id_var);
@@ -8258,9 +9049,9 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcal
 		channel_id_ref |= 1;
 	}
 	LDKChannelMonitorUpdate update_var = *update;
-	uintptr_t update_ref = 0;
+	uint32_t update_ref = 0;
 	if ((uintptr_t)update_var.inner > 4096) {
-		update_var = ChannelMonitorUpdate_clone(update);
+		update_var = ChannelMonitorUpdate_clone(&update_var);
 		CHECK((((uintptr_t)update_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&update_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(update_var);
@@ -8270,8 +9061,8 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcal
 		}
 	}
 	LDKChannelMonitor data_var = *data;
-	uintptr_t data_ref = 0;
-	data_var = ChannelMonitor_clone(data);
+	uint32_t data_ref = 0;
+	data_var = ChannelMonitor_clone(&data_var);
 	CHECK((((uintptr_t)data_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&data_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(data_var);
@@ -8280,7 +9071,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcal
 		data_ref |= 1;
 	}
 	LDKMonitorUpdateId update_id_var = update_id;
-	uintptr_t update_id_ref = 0;
+	uint32_t update_id_ref = 0;
 	CHECK((((uintptr_t)update_id_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&update_id_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(update_id_var);
@@ -8288,7 +9079,7 @@ LDKCResult_NoneChannelMonitorUpdateErrZ update_persisted_channel_LDKPersist_jcal
 	if (update_id_var.is_owned) {
 		update_id_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_4(j_calls->instance_ptr, 44, (uint32_t)channel_id_ref, (uint32_t)update_ref, (uint32_t)data_ref, (uint32_t)update_id_ref);
+	uint32_t ret = js_invoke_function_u_uuuu(j_calls->instance_ptr, 52, (uint32_t)channel_id_ref, (uint32_t)update_ref, (uint32_t)data_ref, (uint32_t)update_id_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneChannelMonitorUpdateErrZ ret_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(ret_ptr);
@@ -8337,7 +9128,7 @@ uint32_t  __attribute__((export_name("TS_Persist_persist_new_channel"))) TS_Pers
 	update_id_conv = MonitorUpdateId_clone(&update_id_conv);
 	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
 	*ret_conv = (this_arg_conv->persist_new_channel)(this_arg_conv->this_arg, channel_id_conv, &data_conv, update_id_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Persist_update_persisted_channel"))) TS_Persist_update_persisted_channel(uint32_t this_arg, uint32_t channel_id, uint32_t update, uint32_t data, uint32_t update_id) {
@@ -8364,7 +9155,7 @@ uint32_t  __attribute__((export_name("TS_Persist_update_persisted_channel"))) TS
 	update_id_conv = MonitorUpdateId_clone(&update_id_conv);
 	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
 	*ret_conv = (this_arg_conv->update_persisted_channel)(this_arg_conv->this_arg, channel_id_conv, &update_conv, &data_conv, update_id_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 typedef struct LDKChannelMessageHandler_JCalls {
@@ -8383,7 +9174,7 @@ void handle_open_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LD
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKInitFeatures their_features_var = their_features;
-	uintptr_t their_features_ref = 0;
+	uint32_t their_features_ref = 0;
 	CHECK((((uintptr_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var);
@@ -8392,8 +9183,8 @@ void handle_open_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LD
 		their_features_ref |= 1;
 	}
 	LDKOpenChannel msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = OpenChannel_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = OpenChannel_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8401,14 +9192,14 @@ void handle_open_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LD
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_3(j_calls->instance_ptr, 45, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref);
+	js_invoke_function_u_uuu(j_calls->instance_ptr, 53, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref);
 }
 void handle_accept_channel_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKInitFeatures their_features, const LDKAcceptChannel * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKInitFeatures their_features_var = their_features;
-	uintptr_t their_features_ref = 0;
+	uint32_t their_features_ref = 0;
 	CHECK((((uintptr_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var);
@@ -8417,8 +9208,8 @@ void handle_accept_channel_LDKChannelMessageHandler_jcall(const void* this_arg,
 		their_features_ref |= 1;
 	}
 	LDKAcceptChannel msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = AcceptChannel_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = AcceptChannel_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8426,15 +9217,15 @@ void handle_accept_channel_LDKChannelMessageHandler_jcall(const void* this_arg,
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_3(j_calls->instance_ptr, 46, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref);
+	js_invoke_function_u_uuu(j_calls->instance_ptr, 54, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref);
 }
 void handle_funding_created_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingCreated * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKFundingCreated msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = FundingCreated_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = FundingCreated_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8442,15 +9233,15 @@ void handle_funding_created_LDKChannelMessageHandler_jcall(const void* this_arg,
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 47, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 55, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_funding_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingSigned * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKFundingSigned msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = FundingSigned_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = FundingSigned_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8458,15 +9249,15 @@ void handle_funding_signed_LDKChannelMessageHandler_jcall(const void* this_arg,
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 48, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 56, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
-void handle_funding_locked_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKFundingLocked * msg) {
+void handle_channel_ready_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelReady * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
-	LDKFundingLocked msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = FundingLocked_clone(msg);
+	LDKChannelReady msg_var = *msg;
+	uint32_t msg_ref = 0;
+	msg_var = ChannelReady_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8474,15 +9265,15 @@ void handle_funding_locked_LDKChannelMessageHandler_jcall(const void* this_arg,
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 49, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 57, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_shutdown_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInitFeatures * their_features, const LDKShutdown * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKInitFeatures their_features_var = *their_features;
-	uintptr_t their_features_ref = 0;
-	their_features_var = InitFeatures_clone(their_features);
+	uint32_t their_features_ref = 0;
+	their_features_var = InitFeatures_clone(&their_features_var);
 	CHECK((((uintptr_t)their_features_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&their_features_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(their_features_var);
@@ -8491,8 +9282,8 @@ void handle_shutdown_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPub
 		their_features_ref |= 1;
 	}
 	LDKShutdown msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = Shutdown_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = Shutdown_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8500,15 +9291,15 @@ void handle_shutdown_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPub
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_3(j_calls->instance_ptr, 50, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref);
+	js_invoke_function_u_uuu(j_calls->instance_ptr, 58, (uint32_t)their_node_id_arr, (uint32_t)their_features_ref, (uint32_t)msg_ref);
 }
 void handle_closing_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKClosingSigned * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKClosingSigned msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = ClosingSigned_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = ClosingSigned_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8516,15 +9307,15 @@ void handle_closing_signed_LDKChannelMessageHandler_jcall(const void* this_arg,
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 51, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 59, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_update_add_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateAddHTLC * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKUpdateAddHTLC msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = UpdateAddHTLC_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = UpdateAddHTLC_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8532,15 +9323,15 @@ void handle_update_add_htlc_LDKChannelMessageHandler_jcall(const void* this_arg,
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 52, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 60, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_update_fulfill_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFulfillHTLC * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKUpdateFulfillHTLC msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = UpdateFulfillHTLC_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = UpdateFulfillHTLC_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8548,15 +9339,15 @@ void handle_update_fulfill_htlc_LDKChannelMessageHandler_jcall(const void* this_
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 53, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 61, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_update_fail_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFailHTLC * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKUpdateFailHTLC msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = UpdateFailHTLC_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = UpdateFailHTLC_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8564,15 +9355,15 @@ void handle_update_fail_htlc_LDKChannelMessageHandler_jcall(const void* this_arg
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 54, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 62, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_update_fail_malformed_htlc_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFailMalformedHTLC * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKUpdateFailMalformedHTLC msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = UpdateFailMalformedHTLC_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = UpdateFailMalformedHTLC_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8580,15 +9371,15 @@ void handle_update_fail_malformed_htlc_LDKChannelMessageHandler_jcall(const void
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 55, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 63, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_commitment_signed_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKCommitmentSigned * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKCommitmentSigned msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = CommitmentSigned_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = CommitmentSigned_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8596,15 +9387,15 @@ void handle_commitment_signed_LDKChannelMessageHandler_jcall(const void* this_ar
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 56, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 64, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_revoke_and_ack_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKRevokeAndACK * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKRevokeAndACK msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = RevokeAndACK_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = RevokeAndACK_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8612,15 +9403,15 @@ void handle_revoke_and_ack_LDKChannelMessageHandler_jcall(const void* this_arg,
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 57, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 65, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_update_fee_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKUpdateFee * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKUpdateFee msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = UpdateFee_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = UpdateFee_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8628,15 +9419,15 @@ void handle_update_fee_LDKChannelMessageHandler_jcall(const void* this_arg, LDKP
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 58, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 66, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_announcement_signatures_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKAnnouncementSignatures * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKAnnouncementSignatures msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = AnnouncementSignatures_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = AnnouncementSignatures_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8644,21 +9435,22 @@ void handle_announcement_signatures_LDKChannelMessageHandler_jcall(const void* t
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 59, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 67, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void peer_disconnected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, bool no_connection_possible) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
-	js_invoke_function_2(j_calls->instance_ptr, 60, (uint32_t)their_node_id_arr, (uint32_t)no_connection_possible);
+	jboolean no_connection_possible_conv = no_connection_possible;
+	js_invoke_function_u_uu(j_calls->instance_ptr, 68, (uint32_t)their_node_id_arr, (uint32_t)no_connection_possible_conv);
 }
 void peer_connected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInit * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKInit msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = Init_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = Init_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8666,15 +9458,15 @@ void peer_connected_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPubl
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 61, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 69, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_channel_reestablish_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelReestablish * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKChannelReestablish msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = ChannelReestablish_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = ChannelReestablish_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8682,15 +9474,15 @@ void handle_channel_reestablish_LDKChannelMessageHandler_jcall(const void* this_
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 62, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 70, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_channel_update_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKChannelUpdate * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKChannelUpdate msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = ChannelUpdate_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = ChannelUpdate_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8698,15 +9490,15 @@ void handle_channel_update_LDKChannelMessageHandler_jcall(const void* this_arg,
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 63, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 71, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 void handle_error_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKErrorMessage * msg) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKErrorMessage msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = ErrorMessage_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = ErrorMessage_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -8714,7 +9506,7 @@ void handle_error_LDKChannelMessageHandler_jcall(const void* this_arg, LDKPublic
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 64, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 72, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 }
 static void LDKChannelMessageHandler_JCalls_cloned(LDKChannelMessageHandler* new_obj) {
 	LDKChannelMessageHandler_JCalls *j_calls = (LDKChannelMessageHandler_JCalls*) new_obj->this_arg;
@@ -8732,7 +9524,7 @@ static inline LDKChannelMessageHandler LDKChannelMessageHandler_init (JSValue o,
 		.handle_accept_channel = handle_accept_channel_LDKChannelMessageHandler_jcall,
 		.handle_funding_created = handle_funding_created_LDKChannelMessageHandler_jcall,
 		.handle_funding_signed = handle_funding_signed_LDKChannelMessageHandler_jcall,
-		.handle_funding_locked = handle_funding_locked_LDKChannelMessageHandler_jcall,
+		.handle_channel_ready = handle_channel_ready_LDKChannelMessageHandler_jcall,
 		.handle_shutdown = handle_shutdown_LDKChannelMessageHandler_jcall,
 		.handle_closing_signed = handle_closing_signed_LDKChannelMessageHandler_jcall,
 		.handle_update_add_htlc = handle_update_add_htlc_LDKChannelMessageHandler_jcall,
@@ -8825,18 +9617,18 @@ void  __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_signed
 	(this_arg_conv->handle_funding_signed)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
-void  __attribute__((export_name("TS_ChannelMessageHandler_handle_funding_locked"))) TS_ChannelMessageHandler_handle_funding_locked(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) {
+void  __attribute__((export_name("TS_ChannelMessageHandler_handle_channel_ready"))) TS_ChannelMessageHandler_handle_channel_ready(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) {
 	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKChannelMessageHandler* this_arg_conv = (LDKChannelMessageHandler*)this_arg_ptr;
 	LDKPublicKey their_node_id_ref;
 	CHECK(their_node_id->arr_len == 33);
 	memcpy(their_node_id_ref.compressed_form, their_node_id->elems, 33); FREE(their_node_id);
-	LDKFundingLocked msg_conv;
+	LDKChannelReady 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);
+	(this_arg_conv->handle_channel_ready)(this_arg_conv->this_arg, their_node_id_ref, &msg_conv);
 }
 
 void  __attribute__((export_name("TS_ChannelMessageHandler_handle_shutdown"))) TS_ChannelMessageHandler_handle_shutdown(uint32_t this_arg, int8_tArray their_node_id, uint32_t their_features, uint32_t msg) {
@@ -9063,8 +9855,8 @@ static void LDKRoutingMessageHandler_JCalls_free(void* this_arg) {
 LDKCResult_boolLightningErrorZ handle_node_announcement_LDKRoutingMessageHandler_jcall(const void* this_arg, const LDKNodeAnnouncement * msg) {
 	LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
 	LDKNodeAnnouncement msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = NodeAnnouncement_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = NodeAnnouncement_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -9072,7 +9864,7 @@ LDKCResult_boolLightningErrorZ handle_node_announcement_LDKRoutingMessageHandler
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 65, (uint32_t)msg_ref);
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 73, (uint32_t)msg_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr);
@@ -9082,8 +9874,8 @@ LDKCResult_boolLightningErrorZ handle_node_announcement_LDKRoutingMessageHandler
 LDKCResult_boolLightningErrorZ handle_channel_announcement_LDKRoutingMessageHandler_jcall(const void* this_arg, const LDKChannelAnnouncement * msg) {
 	LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
 	LDKChannelAnnouncement msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = ChannelAnnouncement_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = ChannelAnnouncement_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -9091,7 +9883,7 @@ LDKCResult_boolLightningErrorZ handle_channel_announcement_LDKRoutingMessageHand
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 66, (uint32_t)msg_ref);
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 74, (uint32_t)msg_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr);
@@ -9101,8 +9893,8 @@ LDKCResult_boolLightningErrorZ handle_channel_announcement_LDKRoutingMessageHand
 LDKCResult_boolLightningErrorZ handle_channel_update_LDKRoutingMessageHandler_jcall(const void* this_arg, const LDKChannelUpdate * msg) {
 	LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
 	LDKChannelUpdate msg_var = *msg;
-	uintptr_t msg_ref = 0;
-	msg_var = ChannelUpdate_clone(msg);
+	uint32_t msg_ref = 0;
+	msg_var = ChannelUpdate_clone(&msg_var);
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -9110,7 +9902,7 @@ LDKCResult_boolLightningErrorZ handle_channel_update_LDKRoutingMessageHandler_jc
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_1(j_calls->instance_ptr, 67, (uint32_t)msg_ref);
+	uint32_t ret = js_invoke_function_u_u(j_calls->instance_ptr, 75, (uint32_t)msg_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_boolLightningErrorZ ret_conv = *(LDKCResult_boolLightningErrorZ*)(ret_ptr);
@@ -9119,14 +9911,16 @@ LDKCResult_boolLightningErrorZ handle_channel_update_LDKRoutingMessageHandler_jc
 }
 LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel_announcements_LDKRoutingMessageHandler_jcall(const void* this_arg, uint64_t starting_point, uint8_t batch_amount) {
 	LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
-	uint32_tArray ret = (uint32_tArray)js_invoke_function_2(j_calls->instance_ptr, 68, (uint32_t)starting_point, (uint32_t)batch_amount);
+	int64_t starting_point_conv = starting_point;
+	int8_t batch_amount_conv = batch_amount;
+	uint32_tArray ret = (uint32_tArray)js_invoke_function_u_uu(j_calls->instance_ptr, 76, (uint32_t)starting_point_conv, (uint32_t)batch_amount_conv);
 	LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ ret_constr;
 	ret_constr.datalen = ret->arr_len;
 	if (ret_constr.datalen > 0)
 		ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ Elements");
 	else
 		ret_constr.data = NULL;
-	uint32_t* ret_vals = ret->elems /* XXX ret leaks */;
+	uint32_t* ret_vals = ret->elems;
 	for (size_t h = 0; h < ret_constr.datalen; h++) {
 		uint32_t ret_conv_59 = ret_vals[h];
 		void* ret_conv_59_ptr = (void*)(((uintptr_t)ret_conv_59) & ~1);
@@ -9135,20 +9929,22 @@ LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ get_next_channel
 		FREE((void*)ret_conv_59);
 		ret_constr.data[h] = ret_conv_59_conv;
 	}
+	FREE(ret);
 	return ret_constr;
 }
 LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey starting_point, uint8_t batch_amount) {
 	LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
 	int8_tArray starting_point_arr = init_int8_tArray(33, __LINE__);
 	memcpy(starting_point_arr->elems, starting_point.compressed_form, 33);
-	uint32_tArray ret = (uint32_tArray)js_invoke_function_2(j_calls->instance_ptr, 69, (uint32_t)starting_point_arr, (uint32_t)batch_amount);
+	int8_t batch_amount_conv = batch_amount;
+	uint32_tArray ret = (uint32_tArray)js_invoke_function_u_uu(j_calls->instance_ptr, 77, (uint32_t)starting_point_arr, (uint32_t)batch_amount_conv);
 	LDKCVec_NodeAnnouncementZ ret_constr;
 	ret_constr.datalen = ret->arr_len;
 	if (ret_constr.datalen > 0)
 		ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKNodeAnnouncement), "LDKCVec_NodeAnnouncementZ Elements");
 	else
 		ret_constr.data = NULL;
-	uint32_t* ret_vals = ret->elems /* XXX ret leaks */;
+	uint32_t* ret_vals = ret->elems;
 	for (size_t s = 0; s < ret_constr.datalen; s++) {
 		uint32_t ret_conv_18 = ret_vals[s];
 		LDKNodeAnnouncement ret_conv_18_conv;
@@ -9157,15 +9953,16 @@ LDKCVec_NodeAnnouncementZ get_next_node_announcements_LDKRoutingMessageHandler_j
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_18_conv);
 		ret_constr.data[s] = ret_conv_18_conv;
 	}
+	FREE(ret);
 	return ret_constr;
 }
-void sync_routing_table_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInit * init) {
+void peer_connected_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, const LDKInit * init) {
 	LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKInit init_var = *init;
-	uintptr_t init_ref = 0;
-	init_var = Init_clone(init);
+	uint32_t init_ref = 0;
+	init_var = Init_clone(&init_var);
 	CHECK((((uintptr_t)init_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&init_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(init_var);
@@ -9173,14 +9970,14 @@ void sync_routing_table_LDKRoutingMessageHandler_jcall(const void* this_arg, LDK
 	if (init_var.is_owned) {
 		init_ref |= 1;
 	}
-	js_invoke_function_2(j_calls->instance_ptr, 70, (uint32_t)their_node_id_arr, (uint32_t)init_ref);
+	js_invoke_function_u_uu(j_calls->instance_ptr, 78, (uint32_t)their_node_id_arr, (uint32_t)init_ref);
 }
 LDKCResult_NoneLightningErrorZ handle_reply_channel_range_LDKRoutingMessageHandler_jcall(const void* this_arg, LDKPublicKey their_node_id, LDKReplyChannelRange msg) {
 	LDKRoutingMessageHandler_JCalls *j_calls = (LDKRoutingMessageHandler_JCalls*) this_arg;
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKReplyChannelRange msg_var = msg;
-	uintptr_t msg_ref = 0;
+	uint32_t msg_ref = 0;
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -9188,7 +9985,7 @@ LDKCResult_NoneLightningErrorZ handle_reply_channel_range_LDKRoutingMessageHandl
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 71, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 79, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr);
@@ -9200,7 +9997,7 @@ LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMess
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKReplyShortChannelIdsEnd msg_var = msg;
-	uintptr_t msg_ref = 0;
+	uint32_t msg_ref = 0;
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -9208,7 +10005,7 @@ LDKCResult_NoneLightningErrorZ handle_reply_short_channel_ids_end_LDKRoutingMess
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 72, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 80, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr);
@@ -9220,7 +10017,7 @@ LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandl
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKQueryChannelRange msg_var = msg;
-	uintptr_t msg_ref = 0;
+	uint32_t msg_ref = 0;
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -9228,7 +10025,7 @@ LDKCResult_NoneLightningErrorZ handle_query_channel_range_LDKRoutingMessageHandl
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 73, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 81, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr);
@@ -9240,7 +10037,7 @@ LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageH
 	int8_tArray their_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(their_node_id_arr->elems, their_node_id.compressed_form, 33);
 	LDKQueryShortChannelIds msg_var = msg;
-	uintptr_t msg_ref = 0;
+	uint32_t msg_ref = 0;
 	CHECK((((uintptr_t)msg_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&msg_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_var);
@@ -9248,7 +10045,7 @@ LDKCResult_NoneLightningErrorZ handle_query_short_channel_ids_LDKRoutingMessageH
 	if (msg_var.is_owned) {
 		msg_ref |= 1;
 	}
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 74, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 82, (uint32_t)their_node_id_arr, (uint32_t)msg_ref);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr);
@@ -9272,7 +10069,7 @@ static inline LDKRoutingMessageHandler LDKRoutingMessageHandler_init (JSValue o,
 		.handle_channel_update = handle_channel_update_LDKRoutingMessageHandler_jcall,
 		.get_next_channel_announcements = get_next_channel_announcements_LDKRoutingMessageHandler_jcall,
 		.get_next_node_announcements = get_next_node_announcements_LDKRoutingMessageHandler_jcall,
-		.sync_routing_table = sync_routing_table_LDKRoutingMessageHandler_jcall,
+		.peer_connected = peer_connected_LDKRoutingMessageHandler_jcall,
 		.handle_reply_channel_range = handle_reply_channel_range_LDKRoutingMessageHandler_jcall,
 		.handle_reply_short_channel_ids_end = handle_reply_short_channel_ids_end_LDKRoutingMessageHandler_jcall,
 		.handle_query_channel_range = handle_query_channel_range_LDKRoutingMessageHandler_jcall,
@@ -9298,7 +10095,7 @@ uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_node_annou
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_node_announcement)(this_arg_conv->this_arg, &msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_announcement"))) TS_RoutingMessageHandler_handle_channel_announcement(uint32_t this_arg, uint32_t msg) {
@@ -9311,7 +10108,7 @@ uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_an
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_channel_announcement)(this_arg_conv->this_arg, &msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_update"))) TS_RoutingMessageHandler_handle_channel_update(uint32_t this_arg, uint32_t msg) {
@@ -9324,7 +10121,7 @@ uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_channel_up
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_channel_update)(this_arg_conv->this_arg, &msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_tArray  __attribute__((export_name("TS_RoutingMessageHandler_get_next_channel_announcements"))) TS_RoutingMessageHandler_get_next_channel_announcements(uint32_t this_arg, int64_t starting_point, int8_t batch_amount) {
@@ -9338,7 +10135,7 @@ uint32_tArray  __attribute__((export_name("TS_RoutingMessageHandler_get_next_cha
 	for (size_t h = 0; h < ret_var.datalen; h++) {
 		LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv_59_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ");
 		*ret_conv_59_conv = ret_var.data[h];
-		ret_arr_ptr[h] = ((uintptr_t)ret_conv_59_conv);
+		ret_arr_ptr[h] = ((uint32_t)ret_conv_59_conv);
 	}
 	
 	FREE(ret_var.data);
@@ -9358,7 +10155,7 @@ uint32_tArray  __attribute__((export_name("TS_RoutingMessageHandler_get_next_nod
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t s = 0; s < ret_var.datalen; s++) {
 		LDKNodeAnnouncement ret_conv_18_var = ret_var.data[s];
-		uintptr_t ret_conv_18_ref = 0;
+		uint32_t ret_conv_18_ref = 0;
 		CHECK((((uintptr_t)ret_conv_18_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_18_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_18_var);
@@ -9373,7 +10170,7 @@ uint32_tArray  __attribute__((export_name("TS_RoutingMessageHandler_get_next_nod
 	return ret_arr;
 }
 
-void  __attribute__((export_name("TS_RoutingMessageHandler_sync_routing_table"))) TS_RoutingMessageHandler_sync_routing_table(uint32_t this_arg, int8_tArray their_node_id, uint32_t init) {
+void  __attribute__((export_name("TS_RoutingMessageHandler_peer_connected"))) TS_RoutingMessageHandler_peer_connected(uint32_t this_arg, int8_tArray their_node_id, uint32_t init) {
 	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKRoutingMessageHandler* this_arg_conv = (LDKRoutingMessageHandler*)this_arg_ptr;
@@ -9384,7 +10181,7 @@ void  __attribute__((export_name("TS_RoutingMessageHandler_sync_routing_table"))
 	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);
+	(this_arg_conv->peer_connected)(this_arg_conv->this_arg, their_node_id_ref, &init_conv);
 }
 
 uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_channel_range"))) TS_RoutingMessageHandler_handle_reply_channel_range(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) {
@@ -9401,7 +10198,7 @@ uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_chan
 	msg_conv = ReplyChannelRange_clone(&msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_reply_channel_range)(this_arg_conv->this_arg, their_node_id_ref, msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_short_channel_ids_end"))) TS_RoutingMessageHandler_handle_reply_short_channel_ids_end(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) {
@@ -9418,7 +10215,7 @@ uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_reply_shor
 	msg_conv = ReplyShortChannelIdsEnd_clone(&msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_reply_short_channel_ids_end)(this_arg_conv->this_arg, their_node_id_ref, msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_query_channel_range"))) TS_RoutingMessageHandler_handle_query_channel_range(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) {
@@ -9435,7 +10232,7 @@ uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_query_chan
 	msg_conv = QueryChannelRange_clone(&msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_query_channel_range)(this_arg_conv->this_arg, their_node_id_ref, msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_query_short_channel_ids"))) TS_RoutingMessageHandler_handle_query_short_channel_ids(uint32_t this_arg, int8_tArray their_node_id, uint32_t msg) {
@@ -9452,7 +10249,7 @@ uint32_t  __attribute__((export_name("TS_RoutingMessageHandler_handle_query_shor
 	msg_conv = QueryShortChannelIds_clone(&msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_query_short_channel_ids)(this_arg_conv->this_arg, their_node_id_ref, msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 typedef struct LDKCustomMessageReader_JCalls {
@@ -9467,10 +10264,11 @@ static void LDKCustomMessageReader_JCalls_free(void* this_arg) {
 }
 LDKCResult_COption_TypeZDecodeErrorZ read_LDKCustomMessageReader_jcall(const void* this_arg, uint16_t message_type, LDKu8slice buffer) {
 	LDKCustomMessageReader_JCalls *j_calls = (LDKCustomMessageReader_JCalls*) this_arg;
+	int16_t message_type_conv = message_type;
 	LDKu8slice buffer_var = buffer;
 	int8_tArray buffer_arr = init_int8_tArray(buffer_var.datalen, __LINE__);
 	memcpy(buffer_arr->elems, buffer_var.data, buffer_var.datalen);
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 75, (uint32_t)message_type, (uint32_t)buffer_arr);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 83, (uint32_t)message_type_conv, (uint32_t)buffer_arr);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_COption_TypeZDecodeErrorZ ret_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(ret_ptr);
@@ -9504,10 +10302,11 @@ uint32_t  __attribute__((export_name("TS_CustomMessageReader_read"))) TS_CustomM
 	LDKCustomMessageReader* this_arg_conv = (LDKCustomMessageReader*)this_arg_ptr;
 	LDKu8slice buffer_ref;
 	buffer_ref.datalen = buffer->arr_len;
-	buffer_ref.data = buffer->elems /* XXX buffer leaks */;
+	buffer_ref.data = buffer->elems;
 	LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
 	*ret_conv = (this_arg_conv->read)(this_arg_conv->this_arg, message_type, buffer_ref);
-	return (uintptr_t)ret_conv;
+	FREE(buffer);
+	return (uint32_t)ret_conv;
 }
 
 typedef struct LDKCustomMessageHandler_JCalls {
@@ -9527,7 +10326,7 @@ LDKCResult_NoneLightningErrorZ handle_custom_message_LDKCustomMessageHandler_jca
 	*msg_ret = msg;
 	int8_tArray sender_node_id_arr = init_int8_tArray(33, __LINE__);
 	memcpy(sender_node_id_arr->elems, sender_node_id.compressed_form, 33);
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 76, (uint32_t)(uintptr_t)msg_ret, (uint32_t)sender_node_id_arr);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 84, (uint32_t)(uint32_t)msg_ret, (uint32_t)sender_node_id_arr);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NoneLightningErrorZ ret_conv = *(LDKCResult_NoneLightningErrorZ*)(ret_ptr);
@@ -9536,14 +10335,14 @@ LDKCResult_NoneLightningErrorZ handle_custom_message_LDKCustomMessageHandler_jca
 }
 LDKCVec_C2Tuple_PublicKeyTypeZZ get_and_clear_pending_msg_LDKCustomMessageHandler_jcall(const void* this_arg) {
 	LDKCustomMessageHandler_JCalls *j_calls = (LDKCustomMessageHandler_JCalls*) this_arg;
-	uint32_tArray ret = (uint32_tArray)js_invoke_function_0(j_calls->instance_ptr, 77);
+	uint32_tArray ret = (uint32_tArray)js_invoke_function_u_(j_calls->instance_ptr, 85);
 	LDKCVec_C2Tuple_PublicKeyTypeZZ ret_constr;
 	ret_constr.datalen = ret->arr_len;
 	if (ret_constr.datalen > 0)
 		ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKCVec_C2Tuple_PublicKeyTypeZZ Elements");
 	else
 		ret_constr.data = NULL;
-	uint32_t* ret_vals = ret->elems /* XXX ret leaks */;
+	uint32_t* ret_vals = ret->elems;
 	for (size_t z = 0; z < ret_constr.datalen; z++) {
 		uint32_t ret_conv_25 = ret_vals[z];
 		void* ret_conv_25_ptr = (void*)(((uintptr_t)ret_conv_25) & ~1);
@@ -9552,6 +10351,7 @@ LDKCVec_C2Tuple_PublicKeyTypeZZ get_and_clear_pending_msg_LDKCustomMessageHandle
 		FREE((void*)ret_conv_25);
 		ret_constr.data[z] = ret_conv_25_conv;
 	}
+	FREE(ret);
 	return ret_constr;
 }
 static void LDKCustomMessageHandler_JCalls_cloned(LDKCustomMessageHandler* new_obj) {
@@ -9586,12 +10386,16 @@ uint32_t  __attribute__((export_name("TS_CustomMessageHandler_handle_custom_mess
 	void* msg_ptr = (void*)(((uintptr_t)msg) & ~1);
 	CHECK_ACCESS(msg_ptr);
 	LDKType msg_conv = *(LDKType*)(msg_ptr);
+	if (msg_conv.free == LDKType_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKType_JCalls_cloned(&msg_conv);
+	}
 	LDKPublicKey sender_node_id_ref;
 	CHECK(sender_node_id->arr_len == 33);
 	memcpy(sender_node_id_ref.compressed_form, sender_node_id->elems, 33); FREE(sender_node_id);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = (this_arg_conv->handle_custom_message)(this_arg_conv->this_arg, msg_conv, sender_node_id_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_tArray  __attribute__((export_name("TS_CustomMessageHandler_get_and_clear_pending_msg"))) TS_CustomMessageHandler_get_and_clear_pending_msg(uint32_t this_arg) {
@@ -9605,7 +10409,7 @@ uint32_tArray  __attribute__((export_name("TS_CustomMessageHandler_get_and_clear
 	for (size_t z = 0; z < ret_var.datalen; z++) {
 		LDKC2Tuple_PublicKeyTypeZ* ret_conv_25_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ");
 		*ret_conv_25_conv = ret_var.data[z];
-		ret_arr_ptr[z] = ((uintptr_t)ret_conv_25_conv);
+		ret_arr_ptr[z] = ((uint32_t)ret_conv_25_conv);
 	}
 	
 	FREE(ret_var.data);
@@ -9627,21 +10431,22 @@ uintptr_t send_data_LDKSocketDescriptor_jcall(void* this_arg, LDKu8slice data, b
 	LDKu8slice data_var = data;
 	int8_tArray data_arr = init_int8_tArray(data_var.datalen, __LINE__);
 	memcpy(data_arr->elems, data_var.data, data_var.datalen);
-	return js_invoke_function_2(j_calls->instance_ptr, 78, (uint32_t)data_arr, (uint32_t)resume_read);
+	jboolean resume_read_conv = resume_read;
+	return js_invoke_function_u_uu(j_calls->instance_ptr, 86, (uint32_t)data_arr, (uint32_t)resume_read_conv);
 }
 void disconnect_socket_LDKSocketDescriptor_jcall(void* this_arg) {
 	LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg;
-	js_invoke_function_0(j_calls->instance_ptr, 79);
+	js_invoke_function_u_(j_calls->instance_ptr, 87);
 }
 bool eq_LDKSocketDescriptor_jcall(const void* this_arg, const LDKSocketDescriptor * other_arg) {
 	LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg;
 	LDKSocketDescriptor *other_arg_clone = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor");
 	*other_arg_clone = SocketDescriptor_clone(other_arg);
-	return js_invoke_function_1(j_calls->instance_ptr, 80, (uint32_t)(uintptr_t)other_arg_clone);
+	return js_invoke_function_u_u(j_calls->instance_ptr, 88, (uint32_t)(uint32_t)other_arg_clone);
 }
 uint64_t hash_LDKSocketDescriptor_jcall(const void* this_arg) {
 	LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) this_arg;
-	return js_invoke_function_0(j_calls->instance_ptr, 81);
+	return js_invoke_function_b_(j_calls->instance_ptr, 89);
 }
 static void LDKSocketDescriptor_JCalls_cloned(LDKSocketDescriptor* new_obj) {
 	LDKSocketDescriptor_JCalls *j_calls = (LDKSocketDescriptor_JCalls*) new_obj->this_arg;
@@ -9668,15 +10473,16 @@ long  __attribute__((export_name("TS_LDKSocketDescriptor_new"))) TS_LDKSocketDes
 	*res_ptr = LDKSocketDescriptor_init(o);
 	return (long)res_ptr;
 }
-intptr_t  __attribute__((export_name("TS_SocketDescriptor_send_data"))) TS_SocketDescriptor_send_data(uint32_t this_arg, int8_tArray data, jboolean resume_read) {
+uint32_t  __attribute__((export_name("TS_SocketDescriptor_send_data"))) TS_SocketDescriptor_send_data(uint32_t this_arg, int8_tArray data, jboolean resume_read) {
 	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg_ptr;
 	LDKu8slice data_ref;
 	data_ref.datalen = data->arr_len;
-	data_ref.data = data->elems /* XXX data leaks */;
-	intptr_t ret_val = (this_arg_conv->send_data)(this_arg_conv->this_arg, data_ref, resume_read);
-	return ret_val;
+	data_ref.data = data->elems;
+	uint32_t ret_conv = (this_arg_conv->send_data)(this_arg_conv->this_arg, data_ref, resume_read);
+	FREE(data);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_SocketDescriptor_disconnect_socket"))) TS_SocketDescriptor_disconnect_socket(uint32_t this_arg) {
@@ -9690,8 +10496,8 @@ int64_t  __attribute__((export_name("TS_SocketDescriptor_hash"))) TS_SocketDescr
 	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
 	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
 	LDKSocketDescriptor* this_arg_conv = (LDKSocketDescriptor*)this_arg_ptr;
-	int64_t ret_val = (this_arg_conv->hash)(this_arg_conv->this_arg);
-	return ret_val;
+	int64_t ret_conv = (this_arg_conv->hash)(this_arg_conv->this_arg);
+	return ret_conv;
 }
 
 uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_ty_from_ptr"))) TS_LDKEffectiveCapacity_ty_from_ptr(uint32_t ptr) {
@@ -9708,202 +10514,27 @@ uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_ty_from_ptr"))) TS_
 int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat"))) TS_LDKEffectiveCapacity_ExactLiquidity_get_liquidity_msat(uint32_t ptr) {
 	LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1);
 	assert(obj->tag == LDKEffectiveCapacity_ExactLiquidity);
-	return obj->exact_liquidity.liquidity_msat;
+			int64_t liquidity_msat_conv = obj->exact_liquidity.liquidity_msat;
+	return liquidity_msat_conv;
 }
 int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_MaximumHTLC_get_amount_msat"))) TS_LDKEffectiveCapacity_MaximumHTLC_get_amount_msat(uint32_t ptr) {
 	LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1);
 	assert(obj->tag == LDKEffectiveCapacity_MaximumHTLC);
-	return obj->maximum_htlc.amount_msat;
+			int64_t amount_msat_conv = obj->maximum_htlc.amount_msat;
+	return amount_msat_conv;
 }
 int64_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_capacity_msat"))) TS_LDKEffectiveCapacity_Total_get_capacity_msat(uint32_t ptr) {
 	LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1);
 	assert(obj->tag == LDKEffectiveCapacity_Total);
-	return obj->total.capacity_msat;
-}
-typedef struct LDKScore_JCalls {
-	atomic_size_t refcnt;
-	uint32_t instance_ptr;
-} LDKScore_JCalls;
-static void LDKScore_JCalls_free(void* this_arg) {
-	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg;
-	if (atomic_fetch_sub_explicit(&j_calls->refcnt, 1, memory_order_acquire) == 1) {
-		FREE(j_calls);
-	}
-}
-uint64_t channel_penalty_msat_LDKScore_jcall(const void* this_arg, uint64_t short_channel_id, uint64_t send_amt_msat, uint64_t capacity_msat, const LDKNodeId * source, const LDKNodeId * target) {
-	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg;
-	LDKNodeId source_var = *source;
-	uintptr_t source_ref = 0;
-	source_var = NodeId_clone(source);
-	CHECK((((uintptr_t)source_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&source_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(source_var);
-	source_ref = (uintptr_t)source_var.inner;
-	if (source_var.is_owned) {
-		source_ref |= 1;
-	}
-	LDKNodeId target_var = *target;
-	uintptr_t target_ref = 0;
-	target_var = NodeId_clone(target);
-	CHECK((((uintptr_t)target_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&target_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(target_var);
-	target_ref = (uintptr_t)target_var.inner;
-	if (target_var.is_owned) {
-		target_ref |= 1;
-	}
-	return js_invoke_function_5(j_calls->instance_ptr, 82, (uint32_t)short_channel_id, (uint32_t)send_amt_msat, (uint32_t)capacity_msat, (uint32_t)source_ref, (uint32_t)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;
-	LDKCVec_RouteHopZ path_var = path;
-	uint32_tArray path_arr = NULL;
-	path_arr = init_uint32_tArray(path_var.datalen, __LINE__);
-	uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4);
-	for (size_t k = 0; k < path_var.datalen; k++) {
-		LDKRouteHop path_conv_10_var = path_var.data[k];
-		uintptr_t path_conv_10_ref = 0;
-		CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-		CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
-		path_conv_10_ref = (uintptr_t)path_conv_10_var.inner;
-		if (path_conv_10_var.is_owned) {
-			path_conv_10_ref |= 1;
-		}
-		path_arr_ptr[k] = path_conv_10_ref;
-	}
-	
-	FREE(path_var.data);
-	js_invoke_function_2(j_calls->instance_ptr, 83, (uint32_t)path_arr, (uint32_t)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_uint32_tArray(path_var.datalen, __LINE__);
-	uint32_t *path_arr_ptr = (uint32_t*)(((uint8_t*)path_arr) + 4);
-	for (size_t k = 0; k < path_var.datalen; k++) {
-		LDKRouteHop path_conv_10_var = path_var.data[k];
-		uintptr_t path_conv_10_ref = 0;
-		CHECK((((uintptr_t)path_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-		CHECK((((uintptr_t)&path_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_var);
-		path_conv_10_ref = (uintptr_t)path_conv_10_var.inner;
-		if (path_conv_10_var.is_owned) {
-			path_conv_10_ref |= 1;
-		}
-		path_arr_ptr[k] = path_conv_10_ref;
-	}
-	
-	FREE(path_var.data);
-	js_invoke_function_1(j_calls->instance_ptr, 84, (uint32_t)path_arr);
-}
-LDKCVec_u8Z write_LDKScore_jcall(const void* this_arg) {
-	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) this_arg;
-	int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 85);
-	LDKCVec_u8Z ret_ref;
-	ret_ref.datalen = ret->arr_len;
-	ret_ref.data = MALLOC(ret_ref.datalen, "LDKCVec_u8Z Bytes");
-	memcpy(ret_ref.data, ret->elems, ret_ref.datalen); FREE(ret);
-	return ret_ref;
-}
-static void LDKScore_JCalls_cloned(LDKScore* new_obj) {
-	LDKScore_JCalls *j_calls = (LDKScore_JCalls*) new_obj->this_arg;
-	atomic_fetch_add_explicit(&j_calls->refcnt, 1, memory_order_release);
-}
-static inline LDKScore LDKScore_init (JSValue o) {
-	LDKScore_JCalls *calls = MALLOC(sizeof(LDKScore_JCalls), "LDKScore_JCalls");
-	atomic_init(&calls->refcnt, 1);
-	calls->instance_ptr = o;
-
-	LDKScore ret = {
-		.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,
-	};
-	return ret;
-}
-long  __attribute__((export_name("TS_LDKScore_new"))) TS_LDKScore_new(JSValue o) {
-	LDKScore *res_ptr = MALLOC(sizeof(LDKScore), "LDKScore");
-	*res_ptr = LDKScore_init(o);
-	return (long)res_ptr;
-}
-int64_t  __attribute__((export_name("TS_Score_channel_penalty_msat"))) TS_Score_channel_penalty_msat(uint32_t this_arg, int64_t short_channel_id, int64_t send_amt_msat, int64_t capacity_msat, uint32_t source, uint32_t target) {
-	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
-	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
-	LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr;
-	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;
-	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, capacity_msat, &source_conv, &target_conv);
-	return ret_val;
-}
-
-void  __attribute__((export_name("TS_Score_payment_path_failed"))) TS_Score_payment_path_failed(uint32_t this_arg, uint32_tArray path, int64_t short_channel_id) {
-	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
-	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
-	LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr;
-	LDKCVec_RouteHopZ path_constr;
-	path_constr.datalen = path->arr_len;
-	if (path_constr.datalen > 0)
-		path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
-	else
-		path_constr.data = NULL;
-	uint32_t* path_vals = path->elems /* XXX path leaks */;
-	for (size_t k = 0; k < path_constr.datalen; k++) {
-		uint32_t path_conv_10 = path_vals[k];
-		LDKRouteHop path_conv_10_conv;
-		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);
+			int64_t capacity_msat_conv = obj->total.capacity_msat;
+	return capacity_msat_conv;
 }
-
-void  __attribute__((export_name("TS_Score_payment_path_successful"))) TS_Score_payment_path_successful(uint32_t this_arg, uint32_tArray path) {
-	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
-	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
-	LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr;
-	LDKCVec_RouteHopZ path_constr;
-	path_constr.datalen = path->arr_len;
-	if (path_constr.datalen > 0)
-		path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
-	else
-		path_constr.data = NULL;
-	uint32_t* path_vals = path->elems /* XXX path leaks */;
-	for (size_t k = 0; k < path_constr.datalen; k++) {
-		uint32_t path_conv_10 = path_vals[k];
-		LDKRouteHop path_conv_10_conv;
-		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__((export_name("TS_Score_write"))) TS_Score_write(uint32_t this_arg) {
-	void* this_arg_ptr = (void*)(((uintptr_t)this_arg) & ~1);
-	if (!(this_arg & 1)) { CHECK_ACCESS(this_arg_ptr); }
-	LDKScore* this_arg_conv = (LDKScore*)this_arg_ptr;
-	LDKCVec_u8Z ret_var = (this_arg_conv->write)(this_arg_conv->this_arg);
-	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
-	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
+uint32_t __attribute__((export_name("TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat"))) TS_LDKEffectiveCapacity_Total_get_htlc_maximum_msat(uint32_t ptr) {
+	LDKEffectiveCapacity *obj = (LDKEffectiveCapacity*)(ptr & ~1);
+	assert(obj->tag == LDKEffectiveCapacity_Total);
+			uint32_t htlc_maximum_msat_ref = ((uintptr_t)&obj->total.htlc_maximum_msat) | 1;
+	return htlc_maximum_msat_ref;
 }
-
 typedef struct LDKLockableScore_JCalls {
 	atomic_size_t refcnt;
 	uint32_t instance_ptr;
@@ -9916,10 +10547,14 @@ static void LDKLockableScore_JCalls_free(void* this_arg) {
 }
 LDKScore lock_LDKLockableScore_jcall(const void* this_arg) {
 	LDKLockableScore_JCalls *j_calls = (LDKLockableScore_JCalls*) this_arg;
-	uint32_t ret = js_invoke_function_0(j_calls->instance_ptr, 86);
+	uint32_t ret = js_invoke_function_u_(j_calls->instance_ptr, 90);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
-	LDKScore ret_conv = *(LDKScore*)(ret_ptr);// WARNING: we may need a move here but no clone is available for LDKScore
+	LDKScore ret_conv = *(LDKScore*)(ret_ptr);
+	if (ret_conv.free == LDKScore_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKScore_JCalls_cloned(&ret_conv);
+	}// WARNING: we may need a move here but no clone is available for LDKScore
 	
 	return ret_conv;
 }
@@ -9950,7 +10585,7 @@ uint32_t  __attribute__((export_name("TS_LockableScore_lock"))) TS_LockableScore
 	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 (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t __attribute__((export_name("TS_LDKFallback_ty_from_ptr"))) TS_LDKFallback_ty_from_ptr(uint32_t ptr) {
@@ -10002,7 +10637,7 @@ static void LDKPayer_JCalls_free(void* this_arg) {
 }
 LDKPublicKey node_id_LDKPayer_jcall(const void* this_arg) {
 	LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg;
-	int8_tArray ret = (int8_tArray)js_invoke_function_0(j_calls->instance_ptr, 87);
+	int8_tArray ret = (int8_tArray)js_invoke_function_u_(j_calls->instance_ptr, 91);
 	LDKPublicKey ret_ref;
 	CHECK(ret->arr_len == 33);
 	memcpy(ret_ref.compressed_form, ret->elems, 33); FREE(ret);
@@ -10010,14 +10645,14 @@ LDKPublicKey node_id_LDKPayer_jcall(const void* this_arg) {
 }
 LDKCVec_ChannelDetailsZ first_hops_LDKPayer_jcall(const void* this_arg) {
 	LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg;
-	uint32_tArray ret = (uint32_tArray)js_invoke_function_0(j_calls->instance_ptr, 88);
+	uint32_tArray ret = (uint32_tArray)js_invoke_function_u_(j_calls->instance_ptr, 92);
 	LDKCVec_ChannelDetailsZ ret_constr;
 	ret_constr.datalen = ret->arr_len;
 	if (ret_constr.datalen > 0)
 		ret_constr.data = MALLOC(ret_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements");
 	else
 		ret_constr.data = NULL;
-	uint32_t* ret_vals = ret->elems /* XXX ret leaks */;
+	uint32_t* ret_vals = ret->elems;
 	for (size_t q = 0; q < ret_constr.datalen; q++) {
 		uint32_t ret_conv_16 = ret_vals[q];
 		LDKChannelDetails ret_conv_16_conv;
@@ -10026,13 +10661,14 @@ LDKCVec_ChannelDetailsZ first_hops_LDKPayer_jcall(const void* this_arg) {
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_conv);
 		ret_constr.data[q] = ret_conv_16_conv;
 	}
+	FREE(ret);
 	return ret_constr;
 }
 LDKCResult_PaymentIdPaymentSendFailureZ send_payment_LDKPayer_jcall(const void* this_arg, const LDKRoute * route, LDKThirtyTwoBytes payment_hash, LDKThirtyTwoBytes payment_secret) {
 	LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg;
 	LDKRoute route_var = *route;
-	uintptr_t route_ref = 0;
-	route_var = Route_clone(route);
+	uint32_t route_ref = 0;
+	route_var = Route_clone(&route_var);
 	CHECK((((uintptr_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&route_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_var);
@@ -10044,7 +10680,7 @@ LDKCResult_PaymentIdPaymentSendFailureZ send_payment_LDKPayer_jcall(const void*
 	memcpy(payment_hash_arr->elems, payment_hash.data, 32);
 	int8_tArray payment_secret_arr = init_int8_tArray(32, __LINE__);
 	memcpy(payment_secret_arr->elems, payment_secret.data, 32);
-	uint32_t ret = js_invoke_function_3(j_calls->instance_ptr, 89, (uint32_t)route_ref, (uint32_t)payment_hash_arr, (uint32_t)payment_secret_arr);
+	uint32_t ret = js_invoke_function_u_uuu(j_calls->instance_ptr, 93, (uint32_t)route_ref, (uint32_t)payment_hash_arr, (uint32_t)payment_secret_arr);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_PaymentIdPaymentSendFailureZ ret_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(ret_ptr);
@@ -10054,8 +10690,8 @@ LDKCResult_PaymentIdPaymentSendFailureZ send_payment_LDKPayer_jcall(const void*
 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;
-	uintptr_t route_ref = 0;
-	route_var = Route_clone(route);
+	uint32_t route_ref = 0;
+	route_var = Route_clone(&route_var);
 	CHECK((((uintptr_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&route_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_var);
@@ -10065,7 +10701,7 @@ LDKCResult_PaymentIdPaymentSendFailureZ send_spontaneous_payment_LDKPayer_jcall(
 	}
 	int8_tArray payment_preimage_arr = init_int8_tArray(32, __LINE__);
 	memcpy(payment_preimage_arr->elems, payment_preimage.data, 32);
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 90, (uint32_t)route_ref, (uint32_t)payment_preimage_arr);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 94, (uint32_t)route_ref, (uint32_t)payment_preimage_arr);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_PaymentIdPaymentSendFailureZ ret_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(ret_ptr);
@@ -10075,8 +10711,8 @@ LDKCResult_PaymentIdPaymentSendFailureZ send_spontaneous_payment_LDKPayer_jcall(
 LDKCResult_NonePaymentSendFailureZ retry_payment_LDKPayer_jcall(const void* this_arg, const LDKRoute * route, LDKThirtyTwoBytes payment_id) {
 	LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg;
 	LDKRoute route_var = *route;
-	uintptr_t route_ref = 0;
-	route_var = Route_clone(route);
+	uint32_t route_ref = 0;
+	route_var = Route_clone(&route_var);
 	CHECK((((uintptr_t)route_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&route_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_var);
@@ -10086,7 +10722,7 @@ LDKCResult_NonePaymentSendFailureZ retry_payment_LDKPayer_jcall(const void* this
 	}
 	int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__);
 	memcpy(payment_id_arr->elems, payment_id.data, 32);
-	uint32_t ret = js_invoke_function_2(j_calls->instance_ptr, 91, (uint32_t)route_ref, (uint32_t)payment_id_arr);
+	uint32_t ret = js_invoke_function_u_uu(j_calls->instance_ptr, 95, (uint32_t)route_ref, (uint32_t)payment_id_arr);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_NonePaymentSendFailureZ ret_conv = *(LDKCResult_NonePaymentSendFailureZ*)(ret_ptr);
@@ -10097,7 +10733,7 @@ void abandon_payment_LDKPayer_jcall(const void* this_arg, LDKThirtyTwoBytes paym
 	LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) this_arg;
 	int8_tArray payment_id_arr = init_int8_tArray(32, __LINE__);
 	memcpy(payment_id_arr->elems, payment_id.data, 32);
-	js_invoke_function_1(j_calls->instance_ptr, 92, (uint32_t)payment_id_arr);
+	js_invoke_function_u_u(j_calls->instance_ptr, 96, (uint32_t)payment_id_arr);
 }
 static void LDKPayer_JCalls_cloned(LDKPayer* new_obj) {
 	LDKPayer_JCalls *j_calls = (LDKPayer_JCalls*) new_obj->this_arg;
@@ -10144,7 +10780,7 @@ uint32_tArray  __attribute__((export_name("TS_Payer_first_hops"))) TS_Payer_firs
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t q = 0; q < ret_var.datalen; q++) {
 		LDKChannelDetails ret_conv_16_var = ret_var.data[q];
-		uintptr_t ret_conv_16_ref = 0;
+		uint32_t ret_conv_16_ref = 0;
 		CHECK((((uintptr_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var);
@@ -10175,7 +10811,7 @@ uint32_t  __attribute__((export_name("TS_Payer_send_payment"))) TS_Payer_send_pa
 	memcpy(payment_secret_ref.data, payment_secret->elems, 32); FREE(payment_secret);
 	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
 	*ret_conv = (this_arg_conv->send_payment)(this_arg_conv->this_arg, &route_conv, payment_hash_ref, payment_secret_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Payer_send_spontaneous_payment"))) TS_Payer_send_spontaneous_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_preimage) {
@@ -10191,7 +10827,7 @@ uint32_t  __attribute__((export_name("TS_Payer_send_spontaneous_payment"))) TS_P
 	memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage);
 	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
 	*ret_conv = (this_arg_conv->send_spontaneous_payment)(this_arg_conv->this_arg, &route_conv, payment_preimage_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Payer_retry_payment"))) TS_Payer_retry_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_id) {
@@ -10207,7 +10843,7 @@ uint32_t  __attribute__((export_name("TS_Payer_retry_payment"))) TS_Payer_retry_
 	memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id);
 	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
 	*ret_conv = (this_arg_conv->retry_payment)(this_arg_conv->this_arg, &route_conv, payment_id_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_Payer_abandon_payment"))) TS_Payer_abandon_payment(uint32_t this_arg, int8_tArray payment_id) {
@@ -10235,8 +10871,8 @@ LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg,
 	int8_tArray payer_arr = init_int8_tArray(33, __LINE__);
 	memcpy(payer_arr->elems, payer.compressed_form, 33);
 	LDKRouteParameters route_params_var = *route_params;
-	uintptr_t route_params_ref = 0;
-	route_params_var = RouteParameters_clone(route_params);
+	uint32_t route_params_ref = 0;
+	route_params_var = RouteParameters_clone(&route_params_var);
 	CHECK((((uintptr_t)route_params_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&route_params_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_var);
@@ -10254,7 +10890,7 @@ LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg,
 		uint32_t *first_hops_arr_ptr = (uint32_t*)(((uint8_t*)first_hops_arr) + 4);
 		for (size_t q = 0; q < first_hops_var.datalen; q++) {
 			LDKChannelDetails first_hops_conv_16_var = 	first_hops_var.data[q];
-			uintptr_t first_hops_conv_16_ref = 0;
+			uint32_t first_hops_conv_16_ref = 0;
 			CHECK((((uintptr_t)first_hops_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&first_hops_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_var);
@@ -10267,8 +10903,8 @@ LDKCResult_RouteLightningErrorZ find_route_LDKRouter_jcall(const void* this_arg,
 	
 	}
 	// WARNING: This object doesn't live past this scope, needs clone!
-	uintptr_t ret_scorer = ((uintptr_t)scorer) | 1;
-	uint32_t ret = js_invoke_function_5(j_calls->instance_ptr, 93, (uint32_t)payer_arr, (uint32_t)route_params_ref, (uint32_t)payment_hash_arr, (uint32_t)first_hops_arr, (uint32_t)ret_scorer);
+	uint32_t ret_scorer = ((uintptr_t)scorer) | 1;
+	uint32_t ret = js_invoke_function_u_uuuuu(j_calls->instance_ptr, 97, (uint32_t)payer_arr, (uint32_t)route_params_ref, (uint32_t)payment_hash_arr, (uint32_t)first_hops_arr, (uint32_t)ret_scorer);
 	void* ret_ptr = (void*)(((uintptr_t)ret) & ~1);
 	CHECK_ACCESS(ret_ptr);
 	LDKCResult_RouteLightningErrorZ ret_conv = *(LDKCResult_RouteLightningErrorZ*)(ret_ptr);
@@ -10319,7 +10955,7 @@ uint32_t  __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_ro
 			first_hops_constr.data = MALLOC(first_hops_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements");
 		else
 			first_hops_constr.data = NULL;
-		uint32_t* first_hops_vals = first_hops->elems /* XXX first_hops leaks */;
+		uint32_t* first_hops_vals = first_hops->elems;
 		for (size_t q = 0; q < first_hops_constr.datalen; q++) {
 			uint32_t first_hops_conv_16 = first_hops_vals[q];
 			LDKChannelDetails first_hops_conv_16_conv;
@@ -10328,6 +10964,7 @@ uint32_t  __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_ro
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_conv);
 			first_hops_constr.data[q] = first_hops_conv_16_conv;
 		}
+		FREE(first_hops);
 		first_hops_ptr = &first_hops_constr;
 	}
 	void* scorer_ptr = (void*)(((uintptr_t)scorer) & ~1);
@@ -10336,9 +10973,22 @@ uint32_t  __attribute__((export_name("TS_Router_find_route"))) TS_Router_find_ro
 	LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ");
 	*ret_conv = (this_arg_conv->find_route)(this_arg_conv->this_arg, payer_ref, &route_params_conv, payment_hash_ref, first_hops_ptr, scorer_conv);
 	if (first_hops_ptr != NULL) { FREE(first_hops_constr.data); }
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
+uint32_t __attribute__((export_name("TS_LDKRetry_ty_from_ptr"))) TS_LDKRetry_ty_from_ptr(uint32_t ptr) {
+	LDKRetry *obj = (LDKRetry*)(ptr & ~1);
+	switch(obj->tag) {
+		case LDKRetry_Attempts: return 0;
+		default: abort();
+	}
+}
+uint32_t __attribute__((export_name("TS_LDKRetry_Attempts_get_attempts"))) TS_LDKRetry_Attempts_get_attempts(uint32_t ptr) {
+	LDKRetry *obj = (LDKRetry*)(ptr & ~1);
+	assert(obj->tag == LDKRetry_Attempts);
+			uint32_t attempts_conv = obj->attempts;
+	return attempts_conv;
+}
 jstring  __attribute__((export_name("TS__ldk_get_compiled_version"))) TS__ldk_get_compiled_version() {
 	LDKStr ret_str = _ldk_get_compiled_version();
 	jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len);
@@ -10353,6 +11003,35 @@ jstring  __attribute__((export_name("TS__ldk_c_bindings_get_compiled_version")))
 	return ret_conv;
 }
 
+static inline uintptr_t Bech32Error_clone_ptr(LDKBech32Error *NONNULL_PTR arg) {
+	LDKBech32Error *ret_copy = MALLOC(sizeof(LDKBech32Error), "LDKBech32Error");
+	*ret_copy = Bech32Error_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+uint32_t  __attribute__((export_name("TS_Bech32Error_clone_ptr"))) TS_Bech32Error_clone_ptr(uint32_t arg) {
+	LDKBech32Error* arg_conv = (LDKBech32Error*)arg;
+	uint32_t ret_conv = Bech32Error_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_Bech32Error_clone"))) TS_Bech32Error_clone(uint32_t orig) {
+	LDKBech32Error* orig_conv = (LDKBech32Error*)orig;
+	LDKBech32Error *ret_copy = MALLOC(sizeof(LDKBech32Error), "LDKBech32Error");
+	*ret_copy = Bech32Error_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_Bech32Error_free"))) TS_Bech32Error_free(uint32_t o) {
+	if ((o & 1) != 0) return;
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKBech32Error o_conv = *(LDKBech32Error*)(o_ptr);
+	FREE((void*)o);
+	Bech32Error_free(o_conv);
+}
+
 void  __attribute__((export_name("TS_Transaction_free"))) TS_Transaction_free(int8_tArray _res) {
 	LDKTransaction _res_ref;
 	_res_ref.datalen = _res->arr_len;
@@ -10369,7 +11048,7 @@ uint32_t  __attribute__((export_name("TS_TxOut_new"))) TS_TxOut_new(int8_tArray
 	memcpy(script_pubkey_ref.data, script_pubkey->elems, script_pubkey_ref.datalen); FREE(script_pubkey);
 	LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut");
 	*ret_ref = TxOut_new(script_pubkey_ref, value);
-	return (uintptr_t)ret_ref;
+	return (uint32_t)ret_ref;
 }
 
 void  __attribute__((export_name("TS_TxOut_free"))) TS_TxOut_free(uint32_t _res) {
@@ -10384,19 +11063,19 @@ void  __attribute__((export_name("TS_TxOut_free"))) TS_TxOut_free(uint32_t _res)
 static inline uintptr_t TxOut_clone_ptr(LDKTxOut *NONNULL_PTR arg) {
 	LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut");
 	*ret_ref = TxOut_clone(arg);
-	return (uintptr_t)ret_ref;
+	return (uint32_t)ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_TxOut_clone_ptr"))) TS_TxOut_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_TxOut_clone_ptr"))) TS_TxOut_clone_ptr(uint32_t arg) {
 	LDKTxOut* arg_conv = (LDKTxOut*)(arg & ~1);
-	intptr_t ret_val = TxOut_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = TxOut_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_TxOut_clone"))) TS_TxOut_clone(uint32_t orig) {
 	LDKTxOut* orig_conv = (LDKTxOut*)(orig & ~1);
 	LDKTxOut* ret_ref = MALLOC(sizeof(LDKTxOut), "LDKTxOut");
 	*ret_ref = TxOut_clone(orig_conv);
-	return (uintptr_t)ret_ref;
+	return (uint32_t)ret_ref;
 }
 
 void  __attribute__((export_name("TS_Str_free"))) TS_Str_free(jstring _res) {
@@ -10407,19 +11086,19 @@ void  __attribute__((export_name("TS_Str_free"))) TS_Str_free(jstring _res) {
 uint32_t  __attribute__((export_name("TS_CResult_NoneNoneZ_ok"))) TS_CResult_NoneNoneZ_ok() {
 	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
 	*ret_conv = CResult_NoneNoneZ_ok();
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_NoneNoneZ_err"))) TS_CResult_NoneNoneZ_err() {
 	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
 	*ret_conv = CResult_NoneNoneZ_err();
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_NoneNoneZ_is_ok"))) TS_CResult_NoneNoneZ_is_ok(uint32_t o) {
 	LDKCResult_NoneNoneZ* o_conv = (LDKCResult_NoneNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_NoneNoneZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_NoneNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_NoneNoneZ_free"))) TS_CResult_NoneNoneZ_free(uint32_t _res) {
@@ -10434,19 +11113,19 @@ void  __attribute__((export_name("TS_CResult_NoneNoneZ_free"))) TS_CResult_NoneN
 static inline uintptr_t CResult_NoneNoneZ_clone_ptr(LDKCResult_NoneNoneZ *NONNULL_PTR arg) {
 	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
 	*ret_conv = CResult_NoneNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NoneNoneZ_clone_ptr"))) TS_CResult_NoneNoneZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_NoneNoneZ_clone_ptr"))) TS_CResult_NoneNoneZ_clone_ptr(uint32_t arg) {
 	LDKCResult_NoneNoneZ* arg_conv = (LDKCResult_NoneNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NoneNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_NoneNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_NoneNoneZ_clone"))) TS_CResult_NoneNoneZ_clone(uint32_t orig) {
 	LDKCResult_NoneNoneZ* orig_conv = (LDKCResult_NoneNoneZ*)(orig & ~1);
 	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
 	*ret_conv = CResult_NoneNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(uint32_t o) {
@@ -10457,7 +11136,7 @@ uint32_t  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDe
 	o_conv = CounterpartyCommitmentSecrets_clone(&o_conv);
 	LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ");
 	*ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(uint32_t e) {
@@ -10468,13 +11147,13 @@ uint32_t  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDe
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ");
 	*ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* o_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_free(uint32_t _res) {
@@ -10489,19 +11168,19 @@ void  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecode
 static inline uintptr_t CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ");
 	*ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone"))) TS_CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ*)(orig & ~1);
 	LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ");
 	*ret_conv = CResult_CounterpartyCommitmentSecretsDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_SecretKeyErrorZ_ok"))) TS_CResult_SecretKeyErrorZ_ok(int8_tArray o) {
@@ -10510,20 +11189,20 @@ uint32_t  __attribute__((export_name("TS_CResult_SecretKeyErrorZ_ok"))) TS_CResu
 	memcpy(o_ref.bytes, o->elems, 32); FREE(o);
 	LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ");
 	*ret_conv = CResult_SecretKeyErrorZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_SecretKeyErrorZ_err"))) TS_CResult_SecretKeyErrorZ_err(uint32_t e) {
 	LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e);
 	LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ");
 	*ret_conv = CResult_SecretKeyErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_SecretKeyErrorZ_is_ok"))) TS_CResult_SecretKeyErrorZ_is_ok(uint32_t o) {
 	LDKCResult_SecretKeyErrorZ* o_conv = (LDKCResult_SecretKeyErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_SecretKeyErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_SecretKeyErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_SecretKeyErrorZ_free"))) TS_CResult_SecretKeyErrorZ_free(uint32_t _res) {
@@ -10538,19 +11217,19 @@ void  __attribute__((export_name("TS_CResult_SecretKeyErrorZ_free"))) TS_CResult
 static inline uintptr_t CResult_SecretKeyErrorZ_clone_ptr(LDKCResult_SecretKeyErrorZ *NONNULL_PTR arg) {
 	LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ");
 	*ret_conv = CResult_SecretKeyErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone_ptr"))) TS_CResult_SecretKeyErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone_ptr"))) TS_CResult_SecretKeyErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_SecretKeyErrorZ* arg_conv = (LDKCResult_SecretKeyErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_SecretKeyErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_SecretKeyErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_SecretKeyErrorZ_clone"))) TS_CResult_SecretKeyErrorZ_clone(uint32_t orig) {
 	LDKCResult_SecretKeyErrorZ* orig_conv = (LDKCResult_SecretKeyErrorZ*)(orig & ~1);
 	LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ");
 	*ret_conv = CResult_SecretKeyErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PublicKeyErrorZ_ok"))) TS_CResult_PublicKeyErrorZ_ok(int8_tArray o) {
@@ -10559,20 +11238,20 @@ uint32_t  __attribute__((export_name("TS_CResult_PublicKeyErrorZ_ok"))) TS_CResu
 	memcpy(o_ref.compressed_form, o->elems, 33); FREE(o);
 	LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ");
 	*ret_conv = CResult_PublicKeyErrorZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PublicKeyErrorZ_err"))) TS_CResult_PublicKeyErrorZ_err(uint32_t e) {
 	LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e);
 	LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ");
 	*ret_conv = CResult_PublicKeyErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_PublicKeyErrorZ_is_ok"))) TS_CResult_PublicKeyErrorZ_is_ok(uint32_t o) {
 	LDKCResult_PublicKeyErrorZ* o_conv = (LDKCResult_PublicKeyErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PublicKeyErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_PublicKeyErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_PublicKeyErrorZ_free"))) TS_CResult_PublicKeyErrorZ_free(uint32_t _res) {
@@ -10587,19 +11266,19 @@ void  __attribute__((export_name("TS_CResult_PublicKeyErrorZ_free"))) TS_CResult
 static inline uintptr_t CResult_PublicKeyErrorZ_clone_ptr(LDKCResult_PublicKeyErrorZ *NONNULL_PTR arg) {
 	LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ");
 	*ret_conv = CResult_PublicKeyErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone_ptr"))) TS_CResult_PublicKeyErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone_ptr"))) TS_CResult_PublicKeyErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_PublicKeyErrorZ* arg_conv = (LDKCResult_PublicKeyErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PublicKeyErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_PublicKeyErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PublicKeyErrorZ_clone"))) TS_CResult_PublicKeyErrorZ_clone(uint32_t orig) {
 	LDKCResult_PublicKeyErrorZ* orig_conv = (LDKCResult_PublicKeyErrorZ*)(orig & ~1);
 	LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ");
 	*ret_conv = CResult_PublicKeyErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_ok(uint32_t o) {
@@ -10610,7 +11289,7 @@ uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_ok")
 	o_conv = TxCreationKeys_clone(&o_conv);
 	LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ");
 	*ret_conv = CResult_TxCreationKeysDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_err"))) TS_CResult_TxCreationKeysDecodeErrorZ_err(uint32_t e) {
@@ -10621,13 +11300,13 @@ uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_err"
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ");
 	*ret_conv = CResult_TxCreationKeysDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_is_ok"))) TS_CResult_TxCreationKeysDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_TxCreationKeysDecodeErrorZ* o_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_TxCreationKeysDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_TxCreationKeysDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_free"))) TS_CResult_TxCreationKeysDecodeErrorZ_free(uint32_t _res) {
@@ -10642,19 +11321,19 @@ void  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_free")))
 static inline uintptr_t CResult_TxCreationKeysDecodeErrorZ_clone_ptr(LDKCResult_TxCreationKeysDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ");
 	*ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_TxCreationKeysDecodeErrorZ* arg_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysDecodeErrorZ_clone"))) TS_CResult_TxCreationKeysDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_TxCreationKeysDecodeErrorZ* orig_conv = (LDKCResult_TxCreationKeysDecodeErrorZ*)(orig & ~1);
 	LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ");
 	*ret_conv = CResult_TxCreationKeysDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_ok(uint32_t o) {
@@ -10665,7 +11344,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_o
 	o_conv = ChannelPublicKeys_clone(&o_conv);
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ");
 	*ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_err"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_err(uint32_t e) {
@@ -10676,13 +11355,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_e
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ");
 	*ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* o_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelPublicKeysDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_free"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_free(uint32_t _res) {
@@ -10697,19 +11376,19 @@ void  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_free"
 static inline uintptr_t CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(LDKCResult_ChannelPublicKeysDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ");
 	*ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* arg_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelPublicKeysDecodeErrorZ_clone"))) TS_CResult_ChannelPublicKeysDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* orig_conv = (LDKCResult_ChannelPublicKeysDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ");
 	*ret_conv = CResult_ChannelPublicKeysDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_ok"))) TS_CResult_TxCreationKeysErrorZ_ok(uint32_t o) {
@@ -10720,20 +11399,20 @@ uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_ok"))) TS_
 	o_conv = TxCreationKeys_clone(&o_conv);
 	LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ");
 	*ret_conv = CResult_TxCreationKeysErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_err"))) TS_CResult_TxCreationKeysErrorZ_err(uint32_t e) {
 	LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e);
 	LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ");
 	*ret_conv = CResult_TxCreationKeysErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_is_ok"))) TS_CResult_TxCreationKeysErrorZ_is_ok(uint32_t o) {
 	LDKCResult_TxCreationKeysErrorZ* o_conv = (LDKCResult_TxCreationKeysErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_TxCreationKeysErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_TxCreationKeysErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_free"))) TS_CResult_TxCreationKeysErrorZ_free(uint32_t _res) {
@@ -10748,32 +11427,32 @@ void  __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_free"))) TS_CR
 static inline uintptr_t CResult_TxCreationKeysErrorZ_clone_ptr(LDKCResult_TxCreationKeysErrorZ *NONNULL_PTR arg) {
 	LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ");
 	*ret_conv = CResult_TxCreationKeysErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone_ptr"))) TS_CResult_TxCreationKeysErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_TxCreationKeysErrorZ* arg_conv = (LDKCResult_TxCreationKeysErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_TxCreationKeysErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_TxCreationKeysErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_TxCreationKeysErrorZ_clone"))) TS_CResult_TxCreationKeysErrorZ_clone(uint32_t orig) {
 	LDKCResult_TxCreationKeysErrorZ* orig_conv = (LDKCResult_TxCreationKeysErrorZ*)(orig & ~1);
 	LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ");
 	*ret_conv = CResult_TxCreationKeysErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_u32Z_some"))) TS_COption_u32Z_some(int32_t o) {
 	LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z");
 	*ret_copy = COption_u32Z_some(o);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_u32Z_none"))) TS_COption_u32Z_none() {
 	LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z");
 	*ret_copy = COption_u32Z_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -10789,20 +11468,20 @@ void  __attribute__((export_name("TS_COption_u32Z_free"))) TS_COption_u32Z_free(
 static inline uintptr_t COption_u32Z_clone_ptr(LDKCOption_u32Z *NONNULL_PTR arg) {
 	LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z");
 	*ret_copy = COption_u32Z_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_COption_u32Z_clone_ptr"))) TS_COption_u32Z_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_COption_u32Z_clone_ptr"))) TS_COption_u32Z_clone_ptr(uint32_t arg) {
 	LDKCOption_u32Z* arg_conv = (LDKCOption_u32Z*)arg;
-	intptr_t ret_val = COption_u32Z_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = COption_u32Z_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_u32Z_clone"))) TS_COption_u32Z_clone(uint32_t orig) {
 	LDKCOption_u32Z* orig_conv = (LDKCOption_u32Z*)orig;
 	LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z");
 	*ret_copy = COption_u32Z_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -10814,7 +11493,7 @@ uint32_t  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErr
 	o_conv = HTLCOutputInCommitment_clone(&o_conv);
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ");
 	*ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_err(uint32_t e) {
@@ -10825,13 +11504,13 @@ uint32_t  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErr
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ");
 	*ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* o_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_free(uint32_t _res) {
@@ -10846,19 +11525,19 @@ void  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_
 static inline uintptr_t CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ");
 	*ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* arg_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone"))) TS_CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* orig_conv = (LDKCResult_HTLCOutputInCommitmentDecodeErrorZ*)(orig & ~1);
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ");
 	*ret_conv = CResult_HTLCOutputInCommitmentDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_NoneZ_some"))) TS_COption_NoneZ_some() {
@@ -10884,7 +11563,7 @@ uint32_t  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionP
 	o_conv = CounterpartyChannelTransactionParameters_clone(&o_conv);
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(uint32_t e) {
@@ -10895,13 +11574,13 @@ uint32_t  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionP
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_free(uint32_t _res) {
@@ -10916,19 +11595,19 @@ void  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParam
 static inline uintptr_t CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone"))) TS_CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ*)(orig & ~1);
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_CounterpartyChannelTransactionParametersDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_ok(uint32_t o) {
@@ -10939,7 +11618,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDec
 	o_conv = ChannelTransactionParameters_clone(&o_conv);
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_err"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_err(uint32_t e) {
@@ -10950,13 +11629,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDec
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* o_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_free"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_free(uint32_t _res) {
@@ -10971,19 +11650,19 @@ void  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeE
 static inline uintptr_t CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(LDKCResult_ChannelTransactionParametersDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* arg_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone"))) TS_CResult_ChannelTransactionParametersDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* orig_conv = (LDKCResult_ChannelTransactionParametersDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CResult_ChannelTransactionParametersDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_CVec_SignatureZ_free"))) TS_CVec_SignatureZ_free(ptrArray _res) {
@@ -10993,7 +11672,7 @@ void  __attribute__((export_name("TS_CVec_SignatureZ_free"))) TS_CVec_SignatureZ
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements");
 	else
 		_res_constr.data = NULL;
-	int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */;
+	int8_tArray* _res_vals = (void*) _res->elems;
 	for (size_t m = 0; m < _res_constr.datalen; m++) {
 		int8_tArray _res_conv_12 = _res_vals[m];
 		LDKSignature _res_conv_12_ref;
@@ -11001,6 +11680,7 @@ void  __attribute__((export_name("TS_CVec_SignatureZ_free"))) TS_CVec_SignatureZ
 		memcpy(_res_conv_12_ref.compact_form, _res_conv_12->elems, 64); FREE(_res_conv_12);
 		_res_constr.data[m] = _res_conv_12_ref;
 	}
+	FREE(_res);
 	CVec_SignatureZ_free(_res_constr);
 }
 
@@ -11012,7 +11692,7 @@ uint32_t  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDeco
 	o_conv = HolderCommitmentTransaction_clone(&o_conv);
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_err(uint32_t e) {
@@ -11023,13 +11703,13 @@ uint32_t  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDeco
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_free(uint32_t _res) {
@@ -11044,19 +11724,19 @@ void  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeEr
 static inline uintptr_t CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_HolderCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_HolderCommitmentTransactionDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_HolderCommitmentTransactionDecodeErrorZ*)(orig & ~1);
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_HolderCommitmentTransactionDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(uint32_t o) {
@@ -11067,7 +11747,7 @@ uint32_t  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecod
 	o_conv = BuiltCommitmentTransaction_clone(&o_conv);
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_err(uint32_t e) {
@@ -11078,13 +11758,13 @@ uint32_t  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecod
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_free(uint32_t _res) {
@@ -11099,19 +11779,19 @@ void  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErr
 static inline uintptr_t CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_BuiltCommitmentTransactionDecodeErrorZ*)(orig & ~1);
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_BuiltCommitmentTransactionDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_ok(uint32_t o) {
@@ -11122,19 +11802,19 @@ uint32_t  __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_
 	// WARNING: we need a move here but no clone is available for LDKTrustedClosingTransaction
 	LDKCResult_TrustedClosingTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedClosingTransactionNoneZ), "LDKCResult_TrustedClosingTransactionNoneZ");
 	*ret_conv = CResult_TrustedClosingTransactionNoneZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_err"))) TS_CResult_TrustedClosingTransactionNoneZ_err() {
 	LDKCResult_TrustedClosingTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedClosingTransactionNoneZ), "LDKCResult_TrustedClosingTransactionNoneZ");
 	*ret_conv = CResult_TrustedClosingTransactionNoneZ_err();
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_is_ok"))) TS_CResult_TrustedClosingTransactionNoneZ_is_ok(uint32_t o) {
 	LDKCResult_TrustedClosingTransactionNoneZ* o_conv = (LDKCResult_TrustedClosingTransactionNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_TrustedClosingTransactionNoneZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_TrustedClosingTransactionNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_TrustedClosingTransactionNoneZ_free"))) TS_CResult_TrustedClosingTransactionNoneZ_free(uint32_t _res) {
@@ -11154,7 +11834,7 @@ uint32_t  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErro
 	o_conv = CommitmentTransaction_clone(&o_conv);
 	LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_CommitmentTransactionDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_err"))) TS_CResult_CommitmentTransactionDecodeErrorZ_err(uint32_t e) {
@@ -11165,13 +11845,13 @@ uint32_t  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErro
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_CommitmentTransactionDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok"))) TS_CResult_CommitmentTransactionDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_CommitmentTransactionDecodeErrorZ* o_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_CommitmentTransactionDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_CommitmentTransactionDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_free"))) TS_CResult_CommitmentTransactionDecodeErrorZ_free(uint32_t _res) {
@@ -11186,19 +11866,19 @@ void  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_f
 static inline uintptr_t CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(LDKCResult_CommitmentTransactionDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_CommitmentTransactionDecodeErrorZ* arg_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CommitmentTransactionDecodeErrorZ_clone"))) TS_CResult_CommitmentTransactionDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_CommitmentTransactionDecodeErrorZ* orig_conv = (LDKCResult_CommitmentTransactionDecodeErrorZ*)(orig & ~1);
 	LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ");
 	*ret_conv = CResult_CommitmentTransactionDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_ok(uint32_t o) {
@@ -11209,19 +11889,19 @@ uint32_t  __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNon
 	// WARNING: we need a move here but no clone is available for LDKTrustedCommitmentTransaction
 	LDKCResult_TrustedCommitmentTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedCommitmentTransactionNoneZ), "LDKCResult_TrustedCommitmentTransactionNoneZ");
 	*ret_conv = CResult_TrustedCommitmentTransactionNoneZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_err"))) TS_CResult_TrustedCommitmentTransactionNoneZ_err() {
 	LDKCResult_TrustedCommitmentTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedCommitmentTransactionNoneZ), "LDKCResult_TrustedCommitmentTransactionNoneZ");
 	*ret_conv = CResult_TrustedCommitmentTransactionNoneZ_err();
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok"))) TS_CResult_TrustedCommitmentTransactionNoneZ_is_ok(uint32_t o) {
 	LDKCResult_TrustedCommitmentTransactionNoneZ* o_conv = (LDKCResult_TrustedCommitmentTransactionNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_TrustedCommitmentTransactionNoneZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_TrustedCommitmentTransactionNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_TrustedCommitmentTransactionNoneZ_free"))) TS_CResult_TrustedCommitmentTransactionNoneZ_free(uint32_t _res) {
@@ -11240,7 +11920,7 @@ uint32_t  __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_ok"))) TS_
 		o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements");
 	else
 		o_constr.data = NULL;
-	int8_tArray* o_vals = (void*) o->elems /* XXX o leaks */;
+	int8_tArray* o_vals = (void*) o->elems;
 	for (size_t m = 0; m < o_constr.datalen; m++) {
 		int8_tArray o_conv_12 = o_vals[m];
 		LDKSignature o_conv_12_ref;
@@ -11248,21 +11928,22 @@ uint32_t  __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_ok"))) TS_
 		memcpy(o_conv_12_ref.compact_form, o_conv_12->elems, 64); FREE(o_conv_12);
 		o_constr.data[m] = o_conv_12_ref;
 	}
+	FREE(o);
 	LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ");
 	*ret_conv = CResult_CVec_SignatureZNoneZ_ok(o_constr);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_err"))) TS_CResult_CVec_SignatureZNoneZ_err() {
 	LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ");
 	*ret_conv = CResult_CVec_SignatureZNoneZ_err();
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_is_ok"))) TS_CResult_CVec_SignatureZNoneZ_is_ok(uint32_t o) {
 	LDKCResult_CVec_SignatureZNoneZ* o_conv = (LDKCResult_CVec_SignatureZNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_CVec_SignatureZNoneZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_CVec_SignatureZNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_free"))) TS_CResult_CVec_SignatureZNoneZ_free(uint32_t _res) {
@@ -11277,19 +11958,19 @@ void  __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_free"))) TS_CR
 static inline uintptr_t CResult_CVec_SignatureZNoneZ_clone_ptr(LDKCResult_CVec_SignatureZNoneZ *NONNULL_PTR arg) {
 	LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ");
 	*ret_conv = CResult_CVec_SignatureZNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone_ptr"))) TS_CResult_CVec_SignatureZNoneZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone_ptr"))) TS_CResult_CVec_SignatureZNoneZ_clone_ptr(uint32_t arg) {
 	LDKCResult_CVec_SignatureZNoneZ* arg_conv = (LDKCResult_CVec_SignatureZNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_CVec_SignatureZNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_CVec_SignatureZNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CVec_SignatureZNoneZ_clone"))) TS_CResult_CVec_SignatureZNoneZ_clone(uint32_t orig) {
 	LDKCResult_CVec_SignatureZNoneZ* orig_conv = (LDKCResult_CVec_SignatureZNoneZ*)(orig & ~1);
 	LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ");
 	*ret_conv = CResult_CVec_SignatureZNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_ok(uint32_t o) {
@@ -11300,7 +11981,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_ok")
 	o_conv = ShutdownScript_clone(&o_conv);
 	LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ");
 	*ret_conv = CResult_ShutdownScriptDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_err"))) TS_CResult_ShutdownScriptDecodeErrorZ_err(uint32_t e) {
@@ -11311,13 +11992,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_err"
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ");
 	*ret_conv = CResult_ShutdownScriptDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_is_ok"))) TS_CResult_ShutdownScriptDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ShutdownScriptDecodeErrorZ* o_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ShutdownScriptDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ShutdownScriptDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_free"))) TS_CResult_ShutdownScriptDecodeErrorZ_free(uint32_t _res) {
@@ -11332,19 +12013,19 @@ void  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_free")))
 static inline uintptr_t CResult_ShutdownScriptDecodeErrorZ_clone_ptr(LDKCResult_ShutdownScriptDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ");
 	*ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ShutdownScriptDecodeErrorZ* arg_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptDecodeErrorZ_clone"))) TS_CResult_ShutdownScriptDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ShutdownScriptDecodeErrorZ* orig_conv = (LDKCResult_ShutdownScriptDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ");
 	*ret_conv = CResult_ShutdownScriptDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_ok(uint32_t o) {
@@ -11355,7 +12036,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownSc
 	o_conv = ShutdownScript_clone(&o_conv);
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ");
 	*ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_err(uint32_t e) {
@@ -11366,13 +12047,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownSc
 	e_conv = InvalidShutdownScript_clone(&e_conv);
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ");
 	*ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(uint32_t o) {
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* o_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(o & ~1);
-	jboolean ret_val = CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_free(uint32_t _res) {
@@ -11387,19 +12068,19 @@ void  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScript
 static inline uintptr_t CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(LDKCResult_ShutdownScriptInvalidShutdownScriptZ *NONNULL_PTR arg) {
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ");
 	*ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* arg_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone"))) TS_CResult_ShutdownScriptInvalidShutdownScriptZ_clone(uint32_t orig) {
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* orig_conv = (LDKCResult_ShutdownScriptInvalidShutdownScriptZ*)(orig & ~1);
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ");
 	*ret_conv = CResult_ShutdownScriptInvalidShutdownScriptZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_ok"))) TS_CResult_RouteHopDecodeErrorZ_ok(uint32_t o) {
@@ -11410,7 +12091,7 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_ok"))) TS_
 	o_conv = RouteHop_clone(&o_conv);
 	LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHopDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_err"))) TS_CResult_RouteHopDecodeErrorZ_err(uint32_t e) {
@@ -11421,13 +12102,13 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_err"))) TS
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHopDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHopDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_RouteHopDecodeErrorZ* o_conv = (LDKCResult_RouteHopDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_RouteHopDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_RouteHopDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_free"))) TS_CResult_RouteHopDecodeErrorZ_free(uint32_t _res) {
@@ -11442,19 +12123,19 @@ void  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_free"))) TS_CR
 static inline uintptr_t CResult_RouteHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHopDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHopDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHopDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHopDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_RouteHopDecodeErrorZ* arg_conv = (LDKCResult_RouteHopDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_RouteHopDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_RouteHopDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteHopDecodeErrorZ_clone"))) TS_CResult_RouteHopDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHopDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHopDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_CVec_RouteHopZ_free"))) TS_CVec_RouteHopZ_free(uint32_tArray _res) {
@@ -11464,7 +12145,7 @@ void  __attribute__((export_name("TS_CVec_RouteHopZ_free"))) TS_CVec_RouteHopZ_f
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t k = 0; k < _res_constr.datalen; k++) {
 		uint32_t _res_conv_10 = _res_vals[k];
 		LDKRouteHop _res_conv_10_conv;
@@ -11473,6 +12154,7 @@ void  __attribute__((export_name("TS_CVec_RouteHopZ_free"))) TS_CVec_RouteHopZ_f
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_10_conv);
 		_res_constr.data[k] = _res_conv_10_conv;
 	}
+	FREE(_res);
 	CVec_RouteHopZ_free(_res_constr);
 }
 
@@ -11483,7 +12165,7 @@ void  __attribute__((export_name("TS_CVec_CVec_RouteHopZZ_free"))) TS_CVec_CVec_
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKCVec_RouteHopZ), "LDKCVec_CVec_RouteHopZZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */;
+	uint32_tArray* _res_vals = (void*) _res->elems;
 	for (size_t m = 0; m < _res_constr.datalen; m++) {
 		uint32_tArray _res_conv_12 = _res_vals[m];
 		LDKCVec_RouteHopZ _res_conv_12_constr;
@@ -11492,7 +12174,7 @@ void  __attribute__((export_name("TS_CVec_CVec_RouteHopZZ_free"))) TS_CVec_CVec_
 			_res_conv_12_constr.data = MALLOC(_res_conv_12_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
 		else
 			_res_conv_12_constr.data = NULL;
-		uint32_t* _res_conv_12_vals = _res_conv_12->elems /* XXX _res_conv_12 leaks */;
+		uint32_t* _res_conv_12_vals = _res_conv_12->elems;
 		for (size_t k = 0; k < _res_conv_12_constr.datalen; k++) {
 			uint32_t _res_conv_12_conv_10 = _res_conv_12_vals[k];
 			LDKRouteHop _res_conv_12_conv_10_conv;
@@ -11501,8 +12183,10 @@ void  __attribute__((export_name("TS_CVec_CVec_RouteHopZZ_free"))) TS_CVec_CVec_
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_12_conv_10_conv);
 			_res_conv_12_constr.data[k] = _res_conv_12_conv_10_conv;
 		}
+		FREE(_res_conv_12);
 		_res_constr.data[m] = _res_conv_12_constr;
 	}
+	FREE(_res);
 	CVec_CVec_RouteHopZZ_free(_res_constr);
 }
 
@@ -11514,7 +12198,7 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_ok"))) TS_CRe
 	o_conv = Route_clone(&o_conv);
 	LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ");
 	*ret_conv = CResult_RouteDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_err"))) TS_CResult_RouteDecodeErrorZ_err(uint32_t e) {
@@ -11525,13 +12209,13 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_err"))) TS_CR
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ");
 	*ret_conv = CResult_RouteDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_is_ok"))) TS_CResult_RouteDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_RouteDecodeErrorZ* o_conv = (LDKCResult_RouteDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_RouteDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_RouteDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_free"))) TS_CResult_RouteDecodeErrorZ_free(uint32_t _res) {
@@ -11546,19 +12230,19 @@ void  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_free"))) TS_CResu
 static inline uintptr_t CResult_RouteDecodeErrorZ_clone_ptr(LDKCResult_RouteDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ");
 	*ret_conv = CResult_RouteDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone_ptr"))) TS_CResult_RouteDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone_ptr"))) TS_CResult_RouteDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_RouteDecodeErrorZ* arg_conv = (LDKCResult_RouteDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_RouteDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_RouteDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteDecodeErrorZ_clone"))) TS_CResult_RouteDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteDecodeErrorZ* orig_conv = (LDKCResult_RouteDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ");
 	*ret_conv = CResult_RouteDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_ok"))) TS_CResult_RouteParametersDecodeErrorZ_ok(uint32_t o) {
@@ -11569,7 +12253,7 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_ok"
 	o_conv = RouteParameters_clone(&o_conv);
 	LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ");
 	*ret_conv = CResult_RouteParametersDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_err"))) TS_CResult_RouteParametersDecodeErrorZ_err(uint32_t e) {
@@ -11580,13 +12264,13 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_err
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ");
 	*ret_conv = CResult_RouteParametersDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_is_ok"))) TS_CResult_RouteParametersDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_RouteParametersDecodeErrorZ* o_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_RouteParametersDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_RouteParametersDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_free"))) TS_CResult_RouteParametersDecodeErrorZ_free(uint32_t _res) {
@@ -11601,19 +12285,19 @@ void  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_free"))
 static inline uintptr_t CResult_RouteParametersDecodeErrorZ_clone_ptr(LDKCResult_RouteParametersDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ");
 	*ret_conv = CResult_RouteParametersDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone_ptr"))) TS_CResult_RouteParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone_ptr"))) TS_CResult_RouteParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_RouteParametersDecodeErrorZ* arg_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_RouteParametersDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_RouteParametersDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteParametersDecodeErrorZ_clone"))) TS_CResult_RouteParametersDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteParametersDecodeErrorZ* orig_conv = (LDKCResult_RouteParametersDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ");
 	*ret_conv = CResult_RouteParametersDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ_free(uint32_tArray _res) {
@@ -11623,7 +12307,7 @@ void  __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t l = 0; l < _res_constr.datalen; l++) {
 		uint32_t _res_conv_11 = _res_vals[l];
 		LDKRouteHint _res_conv_11_conv;
@@ -11632,20 +12316,21 @@ void  __attribute__((export_name("TS_CVec_RouteHintZ_free"))) TS_CVec_RouteHintZ
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_11_conv);
 		_res_constr.data[l] = _res_conv_11_conv;
 	}
+	FREE(_res);
 	CVec_RouteHintZ_free(_res_constr);
 }
 
 uint32_t  __attribute__((export_name("TS_COption_u64Z_some"))) TS_COption_u64Z_some(int64_t o) {
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = COption_u64Z_some(o);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_u64Z_none"))) TS_COption_u64Z_none() {
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = COption_u64Z_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -11661,20 +12346,20 @@ void  __attribute__((export_name("TS_COption_u64Z_free"))) TS_COption_u64Z_free(
 static inline uintptr_t COption_u64Z_clone_ptr(LDKCOption_u64Z *NONNULL_PTR arg) {
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = COption_u64Z_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_COption_u64Z_clone_ptr"))) TS_COption_u64Z_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_COption_u64Z_clone_ptr"))) TS_COption_u64Z_clone_ptr(uint32_t arg) {
 	LDKCOption_u64Z* arg_conv = (LDKCOption_u64Z*)arg;
-	intptr_t ret_val = COption_u64Z_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = COption_u64Z_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_u64Z_clone"))) TS_COption_u64Z_clone(uint32_t orig) {
 	LDKCOption_u64Z* orig_conv = (LDKCOption_u64Z*)orig;
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = COption_u64Z_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -11686,7 +12371,7 @@ uint32_t  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_o
 	o_conv = PaymentParameters_clone(&o_conv);
 	LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ");
 	*ret_conv = CResult_PaymentParametersDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_err"))) TS_CResult_PaymentParametersDecodeErrorZ_err(uint32_t e) {
@@ -11697,13 +12382,13 @@ uint32_t  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_e
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ");
 	*ret_conv = CResult_PaymentParametersDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_is_ok"))) TS_CResult_PaymentParametersDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_PaymentParametersDecodeErrorZ* o_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PaymentParametersDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_PaymentParametersDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_free"))) TS_CResult_PaymentParametersDecodeErrorZ_free(uint32_t _res) {
@@ -11718,19 +12403,19 @@ void  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_free"
 static inline uintptr_t CResult_PaymentParametersDecodeErrorZ_clone_ptr(LDKCResult_PaymentParametersDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ");
 	*ret_conv = CResult_PaymentParametersDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_PaymentParametersDecodeErrorZ* arg_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PaymentParametersDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_PaymentParametersDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PaymentParametersDecodeErrorZ_clone"))) TS_CResult_PaymentParametersDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_PaymentParametersDecodeErrorZ* orig_conv = (LDKCResult_PaymentParametersDecodeErrorZ*)(orig & ~1);
 	LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ");
 	*ret_conv = CResult_PaymentParametersDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHintHopZ_free(uint32_tArray _res) {
@@ -11740,7 +12425,7 @@ void  __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHi
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKRouteHintHop), "LDKCVec_RouteHintHopZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t o = 0; o < _res_constr.datalen; o++) {
 		uint32_t _res_conv_14 = _res_vals[o];
 		LDKRouteHintHop _res_conv_14_conv;
@@ -11749,6 +12434,7 @@ void  __attribute__((export_name("TS_CVec_RouteHintHopZ_free"))) TS_CVec_RouteHi
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv);
 		_res_constr.data[o] = _res_conv_14_conv;
 	}
+	FREE(_res);
 	CVec_RouteHintHopZ_free(_res_constr);
 }
 
@@ -11760,7 +12446,7 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_ok"))) TS
 	o_conv = RouteHint_clone(&o_conv);
 	LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ");
 	*ret_conv = CResult_RouteHintDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_err"))) TS_CResult_RouteHintDecodeErrorZ_err(uint32_t e) {
@@ -11771,13 +12457,13 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_err"))) T
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ");
 	*ret_conv = CResult_RouteHintDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_is_ok"))) TS_CResult_RouteHintDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_RouteHintDecodeErrorZ* o_conv = (LDKCResult_RouteHintDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_RouteHintDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_RouteHintDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_free"))) TS_CResult_RouteHintDecodeErrorZ_free(uint32_t _res) {
@@ -11792,19 +12478,19 @@ void  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_free"))) TS_C
 static inline uintptr_t CResult_RouteHintDecodeErrorZ_clone_ptr(LDKCResult_RouteHintDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ");
 	*ret_conv = CResult_RouteHintDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_RouteHintDecodeErrorZ* arg_conv = (LDKCResult_RouteHintDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_RouteHintDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_RouteHintDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteHintDecodeErrorZ_clone"))) TS_CResult_RouteHintDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteHintDecodeErrorZ* orig_conv = (LDKCResult_RouteHintDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ");
 	*ret_conv = CResult_RouteHintDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_ok(uint32_t o) {
@@ -11815,7 +12501,7 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_ok")))
 	o_conv = RouteHintHop_clone(&o_conv);
 	LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHintHopDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_err"))) TS_CResult_RouteHintHopDecodeErrorZ_err(uint32_t e) {
@@ -11826,13 +12512,13 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_err"))
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHintHopDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_is_ok"))) TS_CResult_RouteHintHopDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_RouteHintHopDecodeErrorZ* o_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_RouteHintHopDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_RouteHintHopDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_free"))) TS_CResult_RouteHintHopDecodeErrorZ_free(uint32_t _res) {
@@ -11847,19 +12533,19 @@ void  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_free"))) T
 static inline uintptr_t CResult_RouteHintHopDecodeErrorZ_clone_ptr(LDKCResult_RouteHintHopDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHintHopDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr"))) TS_CResult_RouteHintHopDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_RouteHintHopDecodeErrorZ* arg_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_RouteHintHopDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteHintHopDecodeErrorZ_clone"))) TS_CResult_RouteHintHopDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteHintHopDecodeErrorZ* orig_conv = (LDKCResult_RouteHintHopDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ");
 	*ret_conv = CResult_RouteHintHopDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_ChannelDetailsZ_free(uint32_tArray _res) {
@@ -11869,7 +12555,7 @@ void  __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_Chann
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t q = 0; q < _res_constr.datalen; q++) {
 		uint32_t _res_conv_16 = _res_vals[q];
 		LDKChannelDetails _res_conv_16_conv;
@@ -11878,6 +12564,7 @@ void  __attribute__((export_name("TS_CVec_ChannelDetailsZ_free"))) TS_CVec_Chann
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv);
 		_res_constr.data[q] = _res_conv_16_conv;
 	}
+	FREE(_res);
 	CVec_ChannelDetailsZ_free(_res_constr);
 }
 
@@ -11889,7 +12576,7 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_ok"))) TS_
 	o_conv = Route_clone(&o_conv);
 	LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ");
 	*ret_conv = CResult_RouteLightningErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_err"))) TS_CResult_RouteLightningErrorZ_err(uint32_t e) {
@@ -11900,13 +12587,13 @@ uint32_t  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_err"))) TS
 	e_conv = LightningError_clone(&e_conv);
 	LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ");
 	*ret_conv = CResult_RouteLightningErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_is_ok"))) TS_CResult_RouteLightningErrorZ_is_ok(uint32_t o) {
 	LDKCResult_RouteLightningErrorZ* o_conv = (LDKCResult_RouteLightningErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_RouteLightningErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_RouteLightningErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_free"))) TS_CResult_RouteLightningErrorZ_free(uint32_t _res) {
@@ -11921,256 +12608,92 @@ void  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_free"))) TS_CR
 static inline uintptr_t CResult_RouteLightningErrorZ_clone_ptr(LDKCResult_RouteLightningErrorZ *NONNULL_PTR arg) {
 	LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ");
 	*ret_conv = CResult_RouteLightningErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone_ptr"))) TS_CResult_RouteLightningErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone_ptr"))) TS_CResult_RouteLightningErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_RouteLightningErrorZ* arg_conv = (LDKCResult_RouteLightningErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_RouteLightningErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_RouteLightningErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RouteLightningErrorZ_clone"))) TS_CResult_RouteLightningErrorZ_clone(uint32_t orig) {
 	LDKCResult_RouteLightningErrorZ* orig_conv = (LDKCResult_RouteLightningErrorZ*)(orig & ~1);
 	LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ");
 	*ret_conv = CResult_RouteLightningErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_ok"))) TS_CResult_TxOutAccessErrorZ_ok(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKTxOut o_conv = *(LDKTxOut*)(o_ptr);
-	o_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)o) & ~1));
-	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
-	*ret_conv = CResult_TxOutAccessErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_err"))) TS_CResult_TxOutAccessErrorZ_err(uint32_t e) {
-	LDKAccessError e_conv = LDKAccessError_from_js(e);
-	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
-	*ret_conv = CResult_TxOutAccessErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
-}
-
-jboolean  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_is_ok"))) TS_CResult_TxOutAccessErrorZ_is_ok(uint32_t o) {
-	LDKCResult_TxOutAccessErrorZ* o_conv = (LDKCResult_TxOutAccessErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_TxOutAccessErrorZ_is_ok(o_conv);
-	return ret_val;
-}
-
-void  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_free"))) TS_CResult_TxOutAccessErrorZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKCResult_TxOutAccessErrorZ _res_conv = *(LDKCResult_TxOutAccessErrorZ*)(_res_ptr);
-	FREE((void*)_res);
-	CResult_TxOutAccessErrorZ_free(_res_conv);
-}
-
-static inline uintptr_t CResult_TxOutAccessErrorZ_clone_ptr(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR arg) {
-	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
-	*ret_conv = CResult_TxOutAccessErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone_ptr"))) TS_CResult_TxOutAccessErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_TxOutAccessErrorZ* arg_conv = (LDKCResult_TxOutAccessErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_TxOutAccessErrorZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone"))) TS_CResult_TxOutAccessErrorZ_clone(uint32_t orig) {
-	LDKCResult_TxOutAccessErrorZ* orig_conv = (LDKCResult_TxOutAccessErrorZ*)(orig & ~1);
-	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
-	*ret_conv = CResult_TxOutAccessErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
-}
-
-static inline uintptr_t C2Tuple_usizeTransactionZ_clone_ptr(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR arg) {
-	LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ");
-	*ret_conv = C2Tuple_usizeTransactionZ_clone(arg);
-	return ((uintptr_t)ret_conv);
-}
-intptr_t  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone_ptr"))) TS_C2Tuple_usizeTransactionZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_usizeTransactionZ* arg_conv = (LDKC2Tuple_usizeTransactionZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_usizeTransactionZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone"))) 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");
-	*ret_conv = C2Tuple_usizeTransactionZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
-}
-
-uint32_t  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_new"))) TS_C2Tuple_usizeTransactionZ_new(intptr_t a, int8_tArray b) {
-	LDKTransaction b_ref;
-	b_ref.datalen = b->arr_len;
-	b_ref.data = MALLOC(b_ref.datalen, "LDKTransaction Bytes");
-	memcpy(b_ref.data, b->elems, b_ref.datalen); FREE(b);
-	b_ref.data_is_owned = true;
-	LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ");
-	*ret_conv = C2Tuple_usizeTransactionZ_new(a, b_ref);
-	return ((uintptr_t)ret_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_free"))) TS_C2Tuple_usizeTransactionZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_usizeTransactionZ _res_conv = *(LDKC2Tuple_usizeTransactionZ*)(_res_ptr);
-	FREE((void*)_res);
-	C2Tuple_usizeTransactionZ_free(_res_conv);
-}
-
-void  __attribute__((export_name("TS_CVec_C2Tuple_usizeTransactionZZ_free"))) TS_CVec_C2Tuple_usizeTransactionZZ_free(uint32_tArray _res) {
-	LDKCVec_C2Tuple_usizeTransactionZZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t c = 0; c < _res_constr.datalen; c++) {
-		uint32_t _res_conv_28 = _res_vals[c];
-		void* _res_conv_28_ptr = (void*)(((uintptr_t)_res_conv_28) & ~1);
-		CHECK_ACCESS(_res_conv_28_ptr);
-		LDKC2Tuple_usizeTransactionZ _res_conv_28_conv = *(LDKC2Tuple_usizeTransactionZ*)(_res_conv_28_ptr);
-		FREE((void*)_res_conv_28);
-		_res_constr.data[c] = _res_conv_28_conv;
-	}
-	CVec_C2Tuple_usizeTransactionZZ_free(_res_constr);
-}
-
-void  __attribute__((export_name("TS_CVec_TxidZ_free"))) TS_CVec_TxidZ_free(ptrArray _res) {
-	LDKCVec_TxidZ _res_constr;
+void  __attribute__((export_name("TS_CVec_PublicKeyZ_free"))) TS_CVec_PublicKeyZ_free(ptrArray _res) {
+	LDKCVec_PublicKeyZ _res_constr;
 	_res_constr.datalen = _res->arr_len;
 	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_TxidZ Elements");
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKPublicKey), "LDKCVec_PublicKeyZ Elements");
 	else
 		_res_constr.data = NULL;
-	int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */;
+	int8_tArray* _res_vals = (void*) _res->elems;
 	for (size_t m = 0; m < _res_constr.datalen; m++) {
 		int8_tArray _res_conv_12 = _res_vals[m];
-		LDKThirtyTwoBytes _res_conv_12_ref;
-		CHECK(_res_conv_12->arr_len == 32);
-		memcpy(_res_conv_12_ref.data, _res_conv_12->elems, 32); FREE(_res_conv_12);
+		LDKPublicKey _res_conv_12_ref;
+		CHECK(_res_conv_12->arr_len == 33);
+		memcpy(_res_conv_12_ref.compressed_form, _res_conv_12->elems, 33); FREE(_res_conv_12);
 		_res_constr.data[m] = _res_conv_12_ref;
 	}
-	CVec_TxidZ_free(_res_constr);
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_ok() {
-	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
-	*ret_conv = CResult_NoneChannelMonitorUpdateErrZ_ok();
-	return (uintptr_t)ret_conv;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_err(uint32_t e) {
-	LDKChannelMonitorUpdateErr e_conv = LDKChannelMonitorUpdateErr_from_js(e);
-	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
-	*ret_conv = CResult_NoneChannelMonitorUpdateErrZ_err(e_conv);
-	return (uintptr_t)ret_conv;
-}
-
-jboolean  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok(uint32_t o) {
-	LDKCResult_NoneChannelMonitorUpdateErrZ* o_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(o & ~1);
-	jboolean ret_val = CResult_NoneChannelMonitorUpdateErrZ_is_ok(o_conv);
-	return ret_val;
-}
-
-void  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_free"))) TS_CResult_NoneChannelMonitorUpdateErrZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NoneChannelMonitorUpdateErrZ _res_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(_res_ptr);
-	FREE((void*)_res);
-	CResult_NoneChannelMonitorUpdateErrZ_free(_res_conv);
-}
-
-static inline uintptr_t CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR arg) {
-	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
-	*ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(uint32_t arg) {
-	LDKCResult_NoneChannelMonitorUpdateErrZ* arg_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone(uint32_t orig) {
-	LDKCResult_NoneChannelMonitorUpdateErrZ* orig_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(orig & ~1);
-	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
-	*ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
-}
-
-void  __attribute__((export_name("TS_CVec_MonitorEventZ_free"))) TS_CVec_MonitorEventZ_free(uint32_tArray _res) {
-	LDKCVec_MonitorEventZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t o = 0; o < _res_constr.datalen; o++) {
-		uint32_t _res_conv_14 = _res_vals[o];
-		void* _res_conv_14_ptr = (void*)(((uintptr_t)_res_conv_14) & ~1);
-		CHECK_ACCESS(_res_conv_14_ptr);
-		LDKMonitorEvent _res_conv_14_conv = *(LDKMonitorEvent*)(_res_conv_14_ptr);
-		FREE((void*)_res_conv_14);
-		_res_constr.data[o] = _res_conv_14_conv;
-	}
-	CVec_MonitorEventZ_free(_res_constr);
+	FREE(_res);
+	CVec_PublicKeyZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_some"))) TS_COption_C2Tuple_usizeTransactionZZ_some(uint32_t o) {
+uint32_t  __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_ok(uint32_t o) {
 	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
 	CHECK_ACCESS(o_ptr);
-	LDKC2Tuple_usizeTransactionZ o_conv = *(LDKC2Tuple_usizeTransactionZ*)(o_ptr);
-	o_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)o) & ~1));
-	LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ");
-	*ret_copy = COption_C2Tuple_usizeTransactionZZ_some(o_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+	LDKPaymentPurpose o_conv = *(LDKPaymentPurpose*)(o_ptr);
+	o_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uintptr_t)o) & ~1));
+	LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ");
+	*ret_conv = CResult_PaymentPurposeDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_none"))) TS_COption_C2Tuple_usizeTransactionZZ_none() {
-	LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ");
-	*ret_copy = COption_C2Tuple_usizeTransactionZZ_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_err"))) TS_CResult_PaymentPurposeDecodeErrorZ_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_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ");
+	*ret_conv = CResult_PaymentPurposeDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_free"))) TS_COption_C2Tuple_usizeTransactionZZ_free(uint32_t _res) {
+jboolean  __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_is_ok"))) TS_CResult_PaymentPurposeDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentPurposeDecodeErrorZ* o_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_PaymentPurposeDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_free"))) TS_CResult_PaymentPurposeDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCOption_C2Tuple_usizeTransactionZZ _res_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(_res_ptr);
+	LDKCResult_PaymentPurposeDecodeErrorZ _res_conv = *(LDKCResult_PaymentPurposeDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	COption_C2Tuple_usizeTransactionZZ_free(_res_conv);
+	CResult_PaymentPurposeDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t COption_C2Tuple_usizeTransactionZZ_clone_ptr(LDKCOption_C2Tuple_usizeTransactionZZ *NONNULL_PTR arg) {
-	LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ");
-	*ret_copy = COption_C2Tuple_usizeTransactionZZ_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+static inline uintptr_t CResult_PaymentPurposeDecodeErrorZ_clone_ptr(LDKCResult_PaymentPurposeDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ");
+	*ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr"))) TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr(uint32_t arg) {
-	LDKCOption_C2Tuple_usizeTransactionZZ* arg_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)arg;
-	intptr_t ret_val = COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_clone_ptr"))) TS_CResult_PaymentPurposeDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentPurposeDecodeErrorZ* arg_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone"))) TS_COption_C2Tuple_usizeTransactionZZ_clone(uint32_t orig) {
-	LDKCOption_C2Tuple_usizeTransactionZZ* orig_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)orig;
-	LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ");
-	*ret_copy = COption_C2Tuple_usizeTransactionZZ_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentPurposeDecodeErrorZ_clone"))) TS_CResult_PaymentPurposeDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_PaymentPurposeDecodeErrorZ* orig_conv = (LDKCResult_PaymentPurposeDecodeErrorZ*)(orig & ~1);
+	LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ");
+	*ret_conv = CResult_PaymentPurposeDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_ClosureReasonZ_some"))) TS_COption_ClosureReasonZ_some(uint32_t o) {
@@ -12180,14 +12703,14 @@ uint32_t  __attribute__((export_name("TS_COption_ClosureReasonZ_some"))) TS_COpt
 	o_conv = ClosureReason_clone((LDKClosureReason*)(((uintptr_t)o) & ~1));
 	LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ");
 	*ret_copy = COption_ClosureReasonZ_some(o_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_ClosureReasonZ_none"))) TS_COption_ClosureReasonZ_none() {
 	LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ");
 	*ret_copy = COption_ClosureReasonZ_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -12203,20 +12726,20 @@ void  __attribute__((export_name("TS_COption_ClosureReasonZ_free"))) TS_COption_
 static inline uintptr_t COption_ClosureReasonZ_clone_ptr(LDKCOption_ClosureReasonZ *NONNULL_PTR arg) {
 	LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ");
 	*ret_copy = COption_ClosureReasonZ_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_COption_ClosureReasonZ_clone_ptr"))) TS_COption_ClosureReasonZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_COption_ClosureReasonZ_clone_ptr"))) TS_COption_ClosureReasonZ_clone_ptr(uint32_t arg) {
 	LDKCOption_ClosureReasonZ* arg_conv = (LDKCOption_ClosureReasonZ*)arg;
-	intptr_t ret_val = COption_ClosureReasonZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = COption_ClosureReasonZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_ClosureReasonZ_clone"))) TS_COption_ClosureReasonZ_clone(uint32_t orig) {
 	LDKCOption_ClosureReasonZ* orig_conv = (LDKCOption_ClosureReasonZ*)orig;
 	LDKCOption_ClosureReasonZ *ret_copy = MALLOC(sizeof(LDKCOption_ClosureReasonZ), "LDKCOption_ClosureReasonZ");
 	*ret_copy = COption_ClosureReasonZ_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -12227,7 +12750,7 @@ uint32_t  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErr
 	o_conv = COption_ClosureReasonZ_clone((LDKCOption_ClosureReasonZ*)(((uintptr_t)o) & ~1));
 	LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ");
 	*ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_err"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_err(uint32_t e) {
@@ -12238,13 +12761,13 @@ uint32_t  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErr
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ");
 	*ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_COption_ClosureReasonZDecodeErrorZ* o_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_free"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_free(uint32_t _res) {
@@ -12259,19 +12782,19 @@ void  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_
 static inline uintptr_t CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(LDKCResult_COption_ClosureReasonZDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ");
 	*ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_COption_ClosureReasonZDecodeErrorZ* arg_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone"))) TS_CResult_COption_ClosureReasonZDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_COption_ClosureReasonZDecodeErrorZ* orig_conv = (LDKCResult_COption_ClosureReasonZDecodeErrorZ*)(orig & ~1);
 	LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ");
 	*ret_conv = CResult_COption_ClosureReasonZDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_NetworkUpdateZ_some"))) TS_COption_NetworkUpdateZ_some(uint32_t o) {
@@ -12281,14 +12804,14 @@ uint32_t  __attribute__((export_name("TS_COption_NetworkUpdateZ_some"))) TS_COpt
 	o_conv = NetworkUpdate_clone((LDKNetworkUpdate*)(((uintptr_t)o) & ~1));
 	LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ");
 	*ret_copy = COption_NetworkUpdateZ_some(o_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_NetworkUpdateZ_none"))) TS_COption_NetworkUpdateZ_none() {
 	LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ");
 	*ret_copy = COption_NetworkUpdateZ_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -12304,20 +12827,20 @@ void  __attribute__((export_name("TS_COption_NetworkUpdateZ_free"))) TS_COption_
 static inline uintptr_t COption_NetworkUpdateZ_clone_ptr(LDKCOption_NetworkUpdateZ *NONNULL_PTR arg) {
 	LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ");
 	*ret_copy = COption_NetworkUpdateZ_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_COption_NetworkUpdateZ_clone_ptr"))) TS_COption_NetworkUpdateZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_COption_NetworkUpdateZ_clone_ptr"))) TS_COption_NetworkUpdateZ_clone_ptr(uint32_t arg) {
 	LDKCOption_NetworkUpdateZ* arg_conv = (LDKCOption_NetworkUpdateZ*)arg;
-	intptr_t ret_val = COption_NetworkUpdateZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = COption_NetworkUpdateZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_NetworkUpdateZ_clone"))) TS_COption_NetworkUpdateZ_clone(uint32_t orig) {
 	LDKCOption_NetworkUpdateZ* orig_conv = (LDKCOption_NetworkUpdateZ*)orig;
 	LDKCOption_NetworkUpdateZ *ret_copy = MALLOC(sizeof(LDKCOption_NetworkUpdateZ), "LDKCOption_NetworkUpdateZ");
 	*ret_copy = COption_NetworkUpdateZ_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -12328,7 +12851,7 @@ void  __attribute__((export_name("TS_CVec_SpendableOutputDescriptorZ_free"))) TS
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t b = 0; b < _res_constr.datalen; b++) {
 		uint32_t _res_conv_27 = _res_vals[b];
 		void* _res_conv_27_ptr = (void*)(((uintptr_t)_res_conv_27) & ~1);
@@ -12337,6 +12860,7 @@ void  __attribute__((export_name("TS_CVec_SpendableOutputDescriptorZ_free"))) TS
 		FREE((void*)_res_conv_27);
 		_res_constr.data[b] = _res_conv_27_conv;
 	}
+	FREE(_res);
 	CVec_SpendableOutputDescriptorZ_free(_res_constr);
 }
 
@@ -12347,14 +12871,14 @@ uint32_t  __attribute__((export_name("TS_COption_EventZ_some"))) TS_COption_Even
 	o_conv = Event_clone((LDKEvent*)(((uintptr_t)o) & ~1));
 	LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ");
 	*ret_copy = COption_EventZ_some(o_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_EventZ_none"))) TS_COption_EventZ_none() {
 	LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ");
 	*ret_copy = COption_EventZ_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -12370,20 +12894,20 @@ void  __attribute__((export_name("TS_COption_EventZ_free"))) TS_COption_EventZ_f
 static inline uintptr_t COption_EventZ_clone_ptr(LDKCOption_EventZ *NONNULL_PTR arg) {
 	LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ");
 	*ret_copy = COption_EventZ_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_COption_EventZ_clone_ptr"))) TS_COption_EventZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_COption_EventZ_clone_ptr"))) TS_COption_EventZ_clone_ptr(uint32_t arg) {
 	LDKCOption_EventZ* arg_conv = (LDKCOption_EventZ*)arg;
-	intptr_t ret_val = COption_EventZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = COption_EventZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_EventZ_clone"))) TS_COption_EventZ_clone(uint32_t orig) {
 	LDKCOption_EventZ* orig_conv = (LDKCOption_EventZ*)orig;
 	LDKCOption_EventZ *ret_copy = MALLOC(sizeof(LDKCOption_EventZ), "LDKCOption_EventZ");
 	*ret_copy = COption_EventZ_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -12394,7 +12918,7 @@ uint32_t  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_ok")
 	o_conv = COption_EventZ_clone((LDKCOption_EventZ*)(((uintptr_t)o) & ~1));
 	LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ");
 	*ret_conv = CResult_COption_EventZDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_err"))) TS_CResult_COption_EventZDecodeErrorZ_err(uint32_t e) {
@@ -12405,13 +12929,13 @@ uint32_t  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_err"
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ");
 	*ret_conv = CResult_COption_EventZDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_is_ok"))) TS_CResult_COption_EventZDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_COption_EventZDecodeErrorZ* o_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_COption_EventZDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_COption_EventZDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_free"))) TS_CResult_COption_EventZDecodeErrorZ_free(uint32_t _res) {
@@ -12426,19 +12950,19 @@ void  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_free")))
 static inline uintptr_t CResult_COption_EventZDecodeErrorZ_clone_ptr(LDKCResult_COption_EventZDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ");
 	*ret_conv = CResult_COption_EventZDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_EventZDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_EventZDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_COption_EventZDecodeErrorZ* arg_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_COption_EventZDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_COption_EventZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_COption_EventZDecodeErrorZ_clone"))) TS_CResult_COption_EventZDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_COption_EventZDecodeErrorZ* orig_conv = (LDKCResult_COption_EventZDecodeErrorZ*)(orig & ~1);
 	LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ");
 	*ret_conv = CResult_COption_EventZDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_CVec_MessageSendEventZ_free"))) TS_CVec_MessageSendEventZ_free(uint32_tArray _res) {
@@ -12448,7 +12972,7 @@ void  __attribute__((export_name("TS_CVec_MessageSendEventZ_free"))) TS_CVec_Mes
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKMessageSendEvent), "LDKCVec_MessageSendEventZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t s = 0; s < _res_constr.datalen; s++) {
 		uint32_t _res_conv_18 = _res_vals[s];
 		void* _res_conv_18_ptr = (void*)(((uintptr_t)_res_conv_18) & ~1);
@@ -12457,9 +12981,324 @@ void  __attribute__((export_name("TS_CVec_MessageSendEventZ_free"))) TS_CVec_Mes
 		FREE((void*)_res_conv_18);
 		_res_constr.data[s] = _res_conv_18_conv;
 	}
+	FREE(_res);
 	CVec_MessageSendEventZ_free(_res_constr);
 }
 
+uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_ok"))) TS_CResult_TxOutAccessErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKTxOut o_conv = *(LDKTxOut*)(o_ptr);
+	o_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)o) & ~1));
+	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
+	*ret_conv = CResult_TxOutAccessErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_err"))) TS_CResult_TxOutAccessErrorZ_err(uint32_t e) {
+	LDKAccessError e_conv = LDKAccessError_from_js(e);
+	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
+	*ret_conv = CResult_TxOutAccessErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_is_ok"))) TS_CResult_TxOutAccessErrorZ_is_ok(uint32_t o) {
+	LDKCResult_TxOutAccessErrorZ* o_conv = (LDKCResult_TxOutAccessErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_TxOutAccessErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_free"))) TS_CResult_TxOutAccessErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_TxOutAccessErrorZ _res_conv = *(LDKCResult_TxOutAccessErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_TxOutAccessErrorZ_free(_res_conv);
+}
+
+static inline uintptr_t CResult_TxOutAccessErrorZ_clone_ptr(LDKCResult_TxOutAccessErrorZ *NONNULL_PTR arg) {
+	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
+	*ret_conv = CResult_TxOutAccessErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone_ptr"))) TS_CResult_TxOutAccessErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_TxOutAccessErrorZ* arg_conv = (LDKCResult_TxOutAccessErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_TxOutAccessErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_TxOutAccessErrorZ_clone"))) TS_CResult_TxOutAccessErrorZ_clone(uint32_t orig) {
+	LDKCResult_TxOutAccessErrorZ* orig_conv = (LDKCResult_TxOutAccessErrorZ*)(orig & ~1);
+	LDKCResult_TxOutAccessErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxOutAccessErrorZ), "LDKCResult_TxOutAccessErrorZ");
+	*ret_conv = CResult_TxOutAccessErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
+}
+
+static inline uintptr_t C2Tuple_usizeTransactionZ_clone_ptr(LDKC2Tuple_usizeTransactionZ *NONNULL_PTR arg) {
+	LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ");
+	*ret_conv = C2Tuple_usizeTransactionZ_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone_ptr"))) TS_C2Tuple_usizeTransactionZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_usizeTransactionZ* arg_conv = (LDKC2Tuple_usizeTransactionZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_usizeTransactionZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_clone"))) TS_C2Tuple_usizeTransactionZ_clone(uint32_t orig) {
+	LDKC2Tuple_usizeTransactionZ* orig_conv = (LDKC2Tuple_usizeTransactionZ*)(orig & ~1);
+	LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ");
+	*ret_conv = C2Tuple_usizeTransactionZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_new"))) TS_C2Tuple_usizeTransactionZ_new(uint32_t a, int8_tArray b) {
+	LDKTransaction b_ref;
+	b_ref.datalen = b->arr_len;
+	b_ref.data = MALLOC(b_ref.datalen, "LDKTransaction Bytes");
+	memcpy(b_ref.data, b->elems, b_ref.datalen); FREE(b);
+	b_ref.data_is_owned = true;
+	LDKC2Tuple_usizeTransactionZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_usizeTransactionZ), "LDKC2Tuple_usizeTransactionZ");
+	*ret_conv = C2Tuple_usizeTransactionZ_new(a, b_ref);
+	return ((uint32_t)ret_conv);
+}
+
+void  __attribute__((export_name("TS_C2Tuple_usizeTransactionZ_free"))) TS_C2Tuple_usizeTransactionZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKC2Tuple_usizeTransactionZ _res_conv = *(LDKC2Tuple_usizeTransactionZ*)(_res_ptr);
+	FREE((void*)_res);
+	C2Tuple_usizeTransactionZ_free(_res_conv);
+}
+
+void  __attribute__((export_name("TS_CVec_C2Tuple_usizeTransactionZZ_free"))) TS_CVec_C2Tuple_usizeTransactionZZ_free(uint32_tArray _res) {
+	LDKCVec_C2Tuple_usizeTransactionZZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t c = 0; c < _res_constr.datalen; c++) {
+		uint32_t _res_conv_28 = _res_vals[c];
+		void* _res_conv_28_ptr = (void*)(((uintptr_t)_res_conv_28) & ~1);
+		CHECK_ACCESS(_res_conv_28_ptr);
+		LDKC2Tuple_usizeTransactionZ _res_conv_28_conv = *(LDKC2Tuple_usizeTransactionZ*)(_res_conv_28_ptr);
+		FREE((void*)_res_conv_28);
+		_res_constr.data[c] = _res_conv_28_conv;
+	}
+	FREE(_res);
+	CVec_C2Tuple_usizeTransactionZZ_free(_res_constr);
+}
+
+void  __attribute__((export_name("TS_CVec_TxidZ_free"))) TS_CVec_TxidZ_free(ptrArray _res) {
+	LDKCVec_TxidZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_TxidZ Elements");
+	else
+		_res_constr.data = NULL;
+	int8_tArray* _res_vals = (void*) _res->elems;
+	for (size_t m = 0; m < _res_constr.datalen; m++) {
+		int8_tArray _res_conv_12 = _res_vals[m];
+		LDKThirtyTwoBytes _res_conv_12_ref;
+		CHECK(_res_conv_12->arr_len == 32);
+		memcpy(_res_conv_12_ref.data, _res_conv_12->elems, 32); FREE(_res_conv_12);
+		_res_constr.data[m] = _res_conv_12_ref;
+	}
+	FREE(_res);
+	CVec_TxidZ_free(_res_constr);
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_ok() {
+	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
+	*ret_conv = CResult_NoneChannelMonitorUpdateErrZ_ok();
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_err"))) TS_CResult_NoneChannelMonitorUpdateErrZ_err(uint32_t e) {
+	LDKChannelMonitorUpdateErr e_conv = LDKChannelMonitorUpdateErr_from_js(e);
+	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
+	*ret_conv = CResult_NoneChannelMonitorUpdateErrZ_err(e_conv);
+	return (uint32_t)ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok"))) TS_CResult_NoneChannelMonitorUpdateErrZ_is_ok(uint32_t o) {
+	LDKCResult_NoneChannelMonitorUpdateErrZ* o_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(o & ~1);
+	jboolean ret_conv = CResult_NoneChannelMonitorUpdateErrZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_free"))) TS_CResult_NoneChannelMonitorUpdateErrZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_NoneChannelMonitorUpdateErrZ _res_conv = *(LDKCResult_NoneChannelMonitorUpdateErrZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_NoneChannelMonitorUpdateErrZ_free(_res_conv);
+}
+
+static inline uintptr_t CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(LDKCResult_NoneChannelMonitorUpdateErrZ *NONNULL_PTR arg) {
+	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
+	*ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneChannelMonitorUpdateErrZ* arg_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_NoneChannelMonitorUpdateErrZ_clone"))) TS_CResult_NoneChannelMonitorUpdateErrZ_clone(uint32_t orig) {
+	LDKCResult_NoneChannelMonitorUpdateErrZ* orig_conv = (LDKCResult_NoneChannelMonitorUpdateErrZ*)(orig & ~1);
+	LDKCResult_NoneChannelMonitorUpdateErrZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneChannelMonitorUpdateErrZ), "LDKCResult_NoneChannelMonitorUpdateErrZ");
+	*ret_conv = CResult_NoneChannelMonitorUpdateErrZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
+}
+
+void  __attribute__((export_name("TS_CVec_MonitorEventZ_free"))) TS_CVec_MonitorEventZ_free(uint32_tArray _res) {
+	LDKCVec_MonitorEventZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t o = 0; o < _res_constr.datalen; o++) {
+		uint32_t _res_conv_14 = _res_vals[o];
+		void* _res_conv_14_ptr = (void*)(((uintptr_t)_res_conv_14) & ~1);
+		CHECK_ACCESS(_res_conv_14_ptr);
+		LDKMonitorEvent _res_conv_14_conv = *(LDKMonitorEvent*)(_res_conv_14_ptr);
+		FREE((void*)_res_conv_14);
+		_res_constr.data[o] = _res_conv_14_conv;
+	}
+	FREE(_res);
+	CVec_MonitorEventZ_free(_res_constr);
+}
+
+static inline uintptr_t C2Tuple_OutPointCVec_MonitorEventZZ_clone_ptr(LDKC2Tuple_OutPointCVec_MonitorEventZZ *NONNULL_PTR arg) {
+	LDKC2Tuple_OutPointCVec_MonitorEventZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKC2Tuple_OutPointCVec_MonitorEventZZ");
+	*ret_conv = C2Tuple_OutPointCVec_MonitorEventZZ_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_clone_ptr"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_OutPointCVec_MonitorEventZZ* arg_conv = (LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_OutPointCVec_MonitorEventZZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_clone"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_clone(uint32_t orig) {
+	LDKC2Tuple_OutPointCVec_MonitorEventZZ* orig_conv = (LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(orig & ~1);
+	LDKC2Tuple_OutPointCVec_MonitorEventZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKC2Tuple_OutPointCVec_MonitorEventZZ");
+	*ret_conv = C2Tuple_OutPointCVec_MonitorEventZZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_new"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_new(uint32_t a, uint32_tArray b) {
+	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_MonitorEventZ b_constr;
+	b_constr.datalen = b->arr_len;
+	if (b_constr.datalen > 0)
+		b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKMonitorEvent), "LDKCVec_MonitorEventZ Elements");
+	else
+		b_constr.data = NULL;
+	uint32_t* b_vals = b->elems;
+	for (size_t o = 0; o < b_constr.datalen; o++) {
+		uint32_t b_conv_14 = b_vals[o];
+		void* b_conv_14_ptr = (void*)(((uintptr_t)b_conv_14) & ~1);
+		CHECK_ACCESS(b_conv_14_ptr);
+		LDKMonitorEvent b_conv_14_conv = *(LDKMonitorEvent*)(b_conv_14_ptr);
+		b_conv_14_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uintptr_t)b_conv_14) & ~1));
+		b_constr.data[o] = b_conv_14_conv;
+	}
+	FREE(b);
+	LDKC2Tuple_OutPointCVec_MonitorEventZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKC2Tuple_OutPointCVec_MonitorEventZZ");
+	*ret_conv = C2Tuple_OutPointCVec_MonitorEventZZ_new(a_conv, b_constr);
+	return ((uint32_t)ret_conv);
+}
+
+void  __attribute__((export_name("TS_C2Tuple_OutPointCVec_MonitorEventZZ_free"))) TS_C2Tuple_OutPointCVec_MonitorEventZZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKC2Tuple_OutPointCVec_MonitorEventZZ _res_conv = *(LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(_res_ptr);
+	FREE((void*)_res);
+	C2Tuple_OutPointCVec_MonitorEventZZ_free(_res_conv);
+}
+
+void  __attribute__((export_name("TS_CVec_C2Tuple_OutPointCVec_MonitorEventZZZ_free"))) TS_CVec_C2Tuple_OutPointCVec_MonitorEventZZZ_free(uint32_tArray _res) {
+	LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_OutPointCVec_MonitorEventZZ), "LDKCVec_C2Tuple_OutPointCVec_MonitorEventZZZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t m = 0; m < _res_constr.datalen; m++) {
+		uint32_t _res_conv_38 = _res_vals[m];
+		void* _res_conv_38_ptr = (void*)(((uintptr_t)_res_conv_38) & ~1);
+		CHECK_ACCESS(_res_conv_38_ptr);
+		LDKC2Tuple_OutPointCVec_MonitorEventZZ _res_conv_38_conv = *(LDKC2Tuple_OutPointCVec_MonitorEventZZ*)(_res_conv_38_ptr);
+		FREE((void*)_res_conv_38);
+		_res_constr.data[m] = _res_conv_38_conv;
+	}
+	FREE(_res);
+	CVec_C2Tuple_OutPointCVec_MonitorEventZZZ_free(_res_constr);
+}
+
+uint32_t  __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_some"))) TS_COption_C2Tuple_usizeTransactionZZ_some(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKC2Tuple_usizeTransactionZ o_conv = *(LDKC2Tuple_usizeTransactionZ*)(o_ptr);
+	o_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)o) & ~1));
+	LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ");
+	*ret_copy = COption_C2Tuple_usizeTransactionZZ_some(o_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_none"))) TS_COption_C2Tuple_usizeTransactionZZ_none() {
+	LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ");
+	*ret_copy = COption_C2Tuple_usizeTransactionZZ_none();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_free"))) TS_COption_C2Tuple_usizeTransactionZZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCOption_C2Tuple_usizeTransactionZZ _res_conv = *(LDKCOption_C2Tuple_usizeTransactionZZ*)(_res_ptr);
+	FREE((void*)_res);
+	COption_C2Tuple_usizeTransactionZZ_free(_res_conv);
+}
+
+static inline uintptr_t COption_C2Tuple_usizeTransactionZZ_clone_ptr(LDKCOption_C2Tuple_usizeTransactionZZ *NONNULL_PTR arg) {
+	LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ");
+	*ret_copy = COption_C2Tuple_usizeTransactionZZ_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+uint32_t  __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr"))) TS_COption_C2Tuple_usizeTransactionZZ_clone_ptr(uint32_t arg) {
+	LDKCOption_C2Tuple_usizeTransactionZZ* arg_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)arg;
+	uint32_t ret_conv = COption_C2Tuple_usizeTransactionZZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_COption_C2Tuple_usizeTransactionZZ_clone"))) TS_COption_C2Tuple_usizeTransactionZZ_clone(uint32_t orig) {
+	LDKCOption_C2Tuple_usizeTransactionZZ* orig_conv = (LDKCOption_C2Tuple_usizeTransactionZZ*)orig;
+	LDKCOption_C2Tuple_usizeTransactionZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_usizeTransactionZZ), "LDKCOption_C2Tuple_usizeTransactionZZ");
+	*ret_copy = COption_C2Tuple_usizeTransactionZZ_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
 uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_ok(uint32_t o) {
 	LDKFixedPenaltyScorer o_conv;
 	o_conv.inner = (void*)(o & (~1));
@@ -12468,7 +13307,7 @@ uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_
 	o_conv = FixedPenaltyScorer_clone(&o_conv);
 	LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ");
 	*ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_err"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_err(uint32_t e) {
@@ -12479,13 +13318,13 @@ uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ");
 	*ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_is_ok"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_FixedPenaltyScorerDecodeErrorZ* o_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_free"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_free(uint32_t _res) {
@@ -12500,166 +13339,156 @@ void  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_free
 static inline uintptr_t CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(LDKCResult_FixedPenaltyScorerDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ");
 	*ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_FixedPenaltyScorerDecodeErrorZ* arg_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone"))) TS_CResult_FixedPenaltyScorerDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_FixedPenaltyScorerDecodeErrorZ* orig_conv = (LDKCResult_FixedPenaltyScorerDecodeErrorZ*)(orig & ~1);
 	LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ");
 	*ret_conv = CResult_FixedPenaltyScorerDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_ok"))) TS_CResult_ScoringParametersDecodeErrorZ_ok(uint32_t o) {
-	LDKScoringParameters 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 = ScoringParameters_clone(&o_conv);
-	LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ");
-	*ret_conv = CResult_ScoringParametersDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t C2Tuple_u64u64Z_clone_ptr(LDKC2Tuple_u64u64Z *NONNULL_PTR arg) {
+	LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z");
+	*ret_conv = C2Tuple_u64u64Z_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_u64u64Z_clone_ptr"))) TS_C2Tuple_u64u64Z_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_u64u64Z* arg_conv = (LDKC2Tuple_u64u64Z*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_u64u64Z_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_err"))) 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_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ");
-	*ret_conv = CResult_ScoringParametersDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_u64u64Z_clone"))) TS_C2Tuple_u64u64Z_clone(uint32_t orig) {
+	LDKC2Tuple_u64u64Z* orig_conv = (LDKC2Tuple_u64u64Z*)(orig & ~1);
+	LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z");
+	*ret_conv = C2Tuple_u64u64Z_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-jboolean  __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_is_ok"))) 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;
+uint32_t  __attribute__((export_name("TS_C2Tuple_u64u64Z_new"))) TS_C2Tuple_u64u64Z_new(int64_t a, int64_t b) {
+	LDKC2Tuple_u64u64Z* ret_conv = MALLOC(sizeof(LDKC2Tuple_u64u64Z), "LDKC2Tuple_u64u64Z");
+	*ret_conv = C2Tuple_u64u64Z_new(a, b);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_free"))) TS_CResult_ScoringParametersDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C2Tuple_u64u64Z_free"))) TS_C2Tuple_u64u64Z_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ScoringParametersDecodeErrorZ _res_conv = *(LDKCResult_ScoringParametersDecodeErrorZ*)(_res_ptr);
+	LDKC2Tuple_u64u64Z _res_conv = *(LDKC2Tuple_u64u64Z*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_ScoringParametersDecodeErrorZ_free(_res_conv);
+	C2Tuple_u64u64Z_free(_res_conv);
 }
 
-static inline uintptr_t CResult_ScoringParametersDecodeErrorZ_clone_ptr(LDKCResult_ScoringParametersDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ");
-	*ret_conv = CResult_ScoringParametersDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_clone_ptr"))) TS_CResult_ScoringParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_ScoringParametersDecodeErrorZ* arg_conv = (LDKCResult_ScoringParametersDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ScoringParametersDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_some"))) TS_COption_C2Tuple_u64u64ZZ_some(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKC2Tuple_u64u64Z o_conv = *(LDKC2Tuple_u64u64Z*)(o_ptr);
+	o_conv = C2Tuple_u64u64Z_clone((LDKC2Tuple_u64u64Z*)(((uintptr_t)o) & ~1));
+	LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ");
+	*ret_copy = COption_C2Tuple_u64u64ZZ_some(o_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ScoringParametersDecodeErrorZ_clone"))) TS_CResult_ScoringParametersDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_ScoringParametersDecodeErrorZ* orig_conv = (LDKCResult_ScoringParametersDecodeErrorZ*)(orig & ~1);
-	LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ");
-	*ret_conv = CResult_ScoringParametersDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_none"))) TS_COption_C2Tuple_u64u64ZZ_none() {
+	LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ");
+	*ret_copy = COption_C2Tuple_u64u64ZZ_none();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ScorerDecodeErrorZ_ok"))) TS_CResult_ScorerDecodeErrorZ_ok(uint32_t o) {
-	LDKScorer 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 LDKScorer
-	LDKCResult_ScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScorerDecodeErrorZ), "LDKCResult_ScorerDecodeErrorZ");
-	*ret_conv = CResult_ScorerDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_free"))) TS_COption_C2Tuple_u64u64ZZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCOption_C2Tuple_u64u64ZZ _res_conv = *(LDKCOption_C2Tuple_u64u64ZZ*)(_res_ptr);
+	FREE((void*)_res);
+	COption_C2Tuple_u64u64ZZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ScorerDecodeErrorZ_err"))) 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_ScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScorerDecodeErrorZ), "LDKCResult_ScorerDecodeErrorZ");
-	*ret_conv = CResult_ScorerDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t COption_C2Tuple_u64u64ZZ_clone_ptr(LDKCOption_C2Tuple_u64u64ZZ *NONNULL_PTR arg) {
+	LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ");
+	*ret_copy = COption_C2Tuple_u64u64ZZ_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+uint32_t  __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone_ptr"))) TS_COption_C2Tuple_u64u64ZZ_clone_ptr(uint32_t arg) {
+	LDKCOption_C2Tuple_u64u64ZZ* arg_conv = (LDKCOption_C2Tuple_u64u64ZZ*)arg;
+	uint32_t ret_conv = COption_C2Tuple_u64u64ZZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_ScorerDecodeErrorZ_is_ok"))) 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;
+uint32_t  __attribute__((export_name("TS_COption_C2Tuple_u64u64ZZ_clone"))) TS_COption_C2Tuple_u64u64ZZ_clone(uint32_t orig) {
+	LDKCOption_C2Tuple_u64u64ZZ* orig_conv = (LDKCOption_C2Tuple_u64u64ZZ*)orig;
+	LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ");
+	*ret_copy = COption_C2Tuple_u64u64ZZ_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_CResult_ScorerDecodeErrorZ_free"))) TS_CResult_ScorerDecodeErrorZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ScorerDecodeErrorZ _res_conv = *(LDKCResult_ScorerDecodeErrorZ*)(_res_ptr);
-	FREE((void*)_res);
-	CResult_ScorerDecodeErrorZ_free(_res_conv);
+void  __attribute__((export_name("TS_CVec_NodeIdZ_free"))) TS_CVec_NodeIdZ_free(uint32_tArray _res) {
+	LDKCVec_NodeIdZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNodeId), "LDKCVec_NodeIdZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t i = 0; i < _res_constr.datalen; i++) {
+		uint32_t _res_conv_8 = _res_vals[i];
+		LDKNodeId _res_conv_8_conv;
+		_res_conv_8_conv.inner = (void*)(_res_conv_8 & (~1));
+		_res_conv_8_conv.is_owned = (_res_conv_8 & 1) || (_res_conv_8 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_8_conv);
+		_res_constr.data[i] = _res_conv_8_conv;
+	}
+	FREE(_res);
+	CVec_NodeIdZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_ok"))) TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_ok(uint32_t o) {
-	LDKProbabilisticScoringParameters o_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_ok(uint32_t o) {
+	LDKProbabilisticScorer o_conv;
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = (o & 1) || (o == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
-	o_conv = ProbabilisticScoringParameters_clone(&o_conv);
-	LDKCResult_ProbabilisticScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScoringParametersDecodeErrorZ), "LDKCResult_ProbabilisticScoringParametersDecodeErrorZ");
-	*ret_conv = CResult_ProbabilisticScoringParametersDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	// WARNING: we need a move here but no clone is available for LDKProbabilisticScorer
+	LDKCResult_ProbabilisticScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScorerDecodeErrorZ), "LDKCResult_ProbabilisticScorerDecodeErrorZ");
+	*ret_conv = CResult_ProbabilisticScorerDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_err"))) TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_err"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_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_ProbabilisticScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScoringParametersDecodeErrorZ), "LDKCResult_ProbabilisticScoringParametersDecodeErrorZ");
-	*ret_conv = CResult_ProbabilisticScoringParametersDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_ProbabilisticScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScorerDecodeErrorZ), "LDKCResult_ProbabilisticScorerDecodeErrorZ");
+	*ret_conv = CResult_ProbabilisticScorerDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_is_ok"))) TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_ProbabilisticScoringParametersDecodeErrorZ* o_conv = (LDKCResult_ProbabilisticScoringParametersDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ProbabilisticScoringParametersDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_is_ok"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ProbabilisticScorerDecodeErrorZ* o_conv = (LDKCResult_ProbabilisticScorerDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_ProbabilisticScorerDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_free"))) TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_ProbabilisticScorerDecodeErrorZ_free"))) TS_CResult_ProbabilisticScorerDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ProbabilisticScoringParametersDecodeErrorZ _res_conv = *(LDKCResult_ProbabilisticScoringParametersDecodeErrorZ*)(_res_ptr);
+	LDKCResult_ProbabilisticScorerDecodeErrorZ _res_conv = *(LDKCResult_ProbabilisticScorerDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_ProbabilisticScoringParametersDecodeErrorZ_free(_res_conv);
-}
-
-static inline uintptr_t CResult_ProbabilisticScoringParametersDecodeErrorZ_clone_ptr(LDKCResult_ProbabilisticScoringParametersDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_ProbabilisticScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScoringParametersDecodeErrorZ), "LDKCResult_ProbabilisticScoringParametersDecodeErrorZ");
-	*ret_conv = CResult_ProbabilisticScoringParametersDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_clone_ptr"))) TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_ProbabilisticScoringParametersDecodeErrorZ* arg_conv = (LDKCResult_ProbabilisticScoringParametersDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ProbabilisticScoringParametersDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_clone"))) TS_CResult_ProbabilisticScoringParametersDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_ProbabilisticScoringParametersDecodeErrorZ* orig_conv = (LDKCResult_ProbabilisticScoringParametersDecodeErrorZ*)(orig & ~1);
-	LDKCResult_ProbabilisticScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScoringParametersDecodeErrorZ), "LDKCResult_ProbabilisticScoringParametersDecodeErrorZ");
-	*ret_conv = CResult_ProbabilisticScoringParametersDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	CResult_ProbabilisticScorerDecodeErrorZ_free(_res_conv);
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_ok(uint32_t o) {
@@ -12670,7 +13499,7 @@ uint32_t  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_ok")))
 	o_conv = InitFeatures_clone(&o_conv);
 	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
 	*ret_conv = CResult_InitFeaturesDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_err"))) TS_CResult_InitFeaturesDecodeErrorZ_err(uint32_t e) {
@@ -12681,13 +13510,13 @@ uint32_t  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_err"))
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
 	*ret_conv = CResult_InitFeaturesDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InitFeaturesDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_InitFeaturesDecodeErrorZ* o_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_InitFeaturesDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_InitFeaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_free"))) TS_CResult_InitFeaturesDecodeErrorZ_free(uint32_t _res) {
@@ -12699,6 +13528,24 @@ void  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_free"))) T
 	CResult_InitFeaturesDecodeErrorZ_free(_res_conv);
 }
 
+static inline uintptr_t CResult_InitFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InitFeaturesDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
+	*ret_conv = CResult_InitFeaturesDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_InitFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_InitFeaturesDecodeErrorZ* arg_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_InitFeaturesDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_InitFeaturesDecodeErrorZ_clone"))) TS_CResult_InitFeaturesDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_InitFeaturesDecodeErrorZ* orig_conv = (LDKCResult_InitFeaturesDecodeErrorZ*)(orig & ~1);
+	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
+	*ret_conv = CResult_InitFeaturesDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
+}
+
 uint32_t  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_ok(uint32_t o) {
 	LDKChannelFeatures o_conv;
 	o_conv.inner = (void*)(o & (~1));
@@ -12707,7 +13554,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_ok"
 	o_conv = ChannelFeatures_clone(&o_conv);
 	LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ");
 	*ret_conv = CResult_ChannelFeaturesDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelFeaturesDecodeErrorZ_err(uint32_t e) {
@@ -12718,13 +13565,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_err
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ");
 	*ret_conv = CResult_ChannelFeaturesDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelFeaturesDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ChannelFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelFeaturesDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ChannelFeaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelFeaturesDecodeErrorZ_free(uint32_t _res) {
@@ -12736,6 +13583,24 @@ void  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_free"))
 	CResult_ChannelFeaturesDecodeErrorZ_free(_res_conv);
 }
 
+static inline uintptr_t CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelFeaturesDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ");
+	*ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelFeaturesDecodeErrorZ* arg_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_ChannelFeaturesDecodeErrorZ_clone"))) TS_CResult_ChannelFeaturesDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_ChannelFeaturesDecodeErrorZ* orig_conv = (LDKCResult_ChannelFeaturesDecodeErrorZ*)(orig & ~1);
+	LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ");
+	*ret_conv = CResult_ChannelFeaturesDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
+}
+
 uint32_t  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_ok(uint32_t o) {
 	LDKNodeFeatures o_conv;
 	o_conv.inner = (void*)(o & (~1));
@@ -12744,7 +13609,7 @@ uint32_t  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_ok")))
 	o_conv = NodeFeatures_clone(&o_conv);
 	LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ");
 	*ret_conv = CResult_NodeFeaturesDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_err"))) TS_CResult_NodeFeaturesDecodeErrorZ_err(uint32_t e) {
@@ -12755,13 +13620,13 @@ uint32_t  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_err"))
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ");
 	*ret_conv = CResult_NodeFeaturesDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_NodeFeaturesDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_NodeFeaturesDecodeErrorZ* o_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NodeFeaturesDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_NodeFeaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_free"))) TS_CResult_NodeFeaturesDecodeErrorZ_free(uint32_t _res) {
@@ -12773,6 +13638,24 @@ void  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_free"))) T
 	CResult_NodeFeaturesDecodeErrorZ_free(_res_conv);
 }
 
+static inline uintptr_t CResult_NodeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_NodeFeaturesDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ");
+	*ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_NodeFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NodeFeaturesDecodeErrorZ* arg_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_NodeFeaturesDecodeErrorZ_clone"))) TS_CResult_NodeFeaturesDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_NodeFeaturesDecodeErrorZ* orig_conv = (LDKCResult_NodeFeaturesDecodeErrorZ*)(orig & ~1);
+	LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ");
+	*ret_conv = CResult_NodeFeaturesDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
+}
+
 uint32_t  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_ok(uint32_t o) {
 	LDKInvoiceFeatures o_conv;
 	o_conv.inner = (void*)(o & (~1));
@@ -12781,7 +13664,7 @@ uint32_t  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_ok"
 	o_conv = InvoiceFeatures_clone(&o_conv);
 	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
 	*ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_err"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_err(uint32_t e) {
@@ -12792,13 +13675,13 @@ uint32_t  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_err
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
 	*ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_InvoiceFeaturesDecodeErrorZ* o_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_InvoiceFeaturesDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_free"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_free(uint32_t _res) {
@@ -12810,6 +13693,24 @@ void  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_free"))
 	CResult_InvoiceFeaturesDecodeErrorZ_free(_res_conv);
 }
 
+static inline uintptr_t CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(LDKCResult_InvoiceFeaturesDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
+	*ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_InvoiceFeaturesDecodeErrorZ* arg_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceFeaturesDecodeErrorZ_clone"))) TS_CResult_InvoiceFeaturesDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_InvoiceFeaturesDecodeErrorZ* orig_conv = (LDKCResult_InvoiceFeaturesDecodeErrorZ*)(orig & ~1);
+	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
+	*ret_conv = CResult_InvoiceFeaturesDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
+}
+
 uint32_t  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_ok(uint32_t o) {
 	LDKChannelTypeFeatures o_conv;
 	o_conv.inner = (void*)(o & (~1));
@@ -12818,7 +13719,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ
 	o_conv = ChannelTypeFeatures_clone(&o_conv);
 	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ");
 	*ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_err(uint32_t e) {
@@ -12829,13 +13730,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ");
 	*ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* o_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_free(uint32_t _res) {
@@ -12847,4197 +13748,4417 @@ void  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_fre
 	CResult_ChannelTypeFeaturesDecodeErrorZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(uint32_t o) {
-	LDKDelayedPaymentOutputDescriptor o_conv;
+static inline uintptr_t CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(LDKCResult_ChannelTypeFeaturesDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ");
+	*ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* arg_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone"))) TS_CResult_ChannelTypeFeaturesDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* orig_conv = (LDKCResult_ChannelTypeFeaturesDecodeErrorZ*)(orig & ~1);
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ");
+	*ret_conv = CResult_ChannelTypeFeaturesDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_ok"))) TS_CResult_NodeIdDecodeErrorZ_ok(uint32_t 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 = DelayedPaymentOutputDescriptor_clone(&o_conv);
-	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	o_conv = NodeId_clone(&o_conv);
+	LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
+	*ret_conv = CResult_NodeIdDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_err"))) TS_CResult_NodeIdDecodeErrorZ_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_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
+	*ret_conv = CResult_NodeIdDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_is_ok"))) TS_CResult_NodeIdDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NodeIdDecodeErrorZ* o_conv = (LDKCResult_NodeIdDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_NodeIdDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_free"))) TS_CResult_NodeIdDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(_res_ptr);
+	LDKCResult_NodeIdDecodeErrorZ _res_conv = *(LDKCResult_NodeIdDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(_res_conv);
+	CResult_NodeIdDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_NodeIdDecodeErrorZ_clone_ptr(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
+	*ret_conv = CResult_NodeIdDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone_ptr"))) TS_CResult_NodeIdDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NodeIdDecodeErrorZ* arg_conv = (LDKCResult_NodeIdDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NodeIdDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(orig & ~1);
-	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone"))) TS_CResult_NodeIdDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_NodeIdDecodeErrorZ* orig_conv = (LDKCResult_NodeIdDecodeErrorZ*)(orig & ~1);
+	LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
+	*ret_conv = CResult_NodeIdDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKCOption_NetworkUpdateZ o_conv = *(LDKCOption_NetworkUpdateZ*)(o_ptr);
+	o_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uintptr_t)o) & ~1));
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
+	*ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err"))) 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_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
+	*ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* o_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(_res_ptr);
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ _res_conv = *(LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(_res_conv);
+	CResult_COption_NetworkUpdateZDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
+	*ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* arg_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(orig & ~1);
-	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* orig_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(orig & ~1);
+	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
+	*ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok(uint32_t o) {
+uint32_t  __attribute__((export_name("TS_COption_AccessZ_some"))) TS_COption_AccessZ_some(uint32_t o) {
 	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
 	CHECK_ACCESS(o_ptr);
-	LDKSpendableOutputDescriptor o_conv = *(LDKSpendableOutputDescriptor*)(o_ptr);
-	o_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)o) & ~1));
-	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	LDKAccess o_conv = *(LDKAccess*)(o_ptr);
+	if (o_conv.free == LDKAccess_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKAccess_JCalls_cloned(&o_conv);
+	}
+	LDKCOption_AccessZ *ret_copy = MALLOC(sizeof(LDKCOption_AccessZ), "LDKCOption_AccessZ");
+	*ret_copy = COption_AccessZ_some(o_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err(uint32_t e) {
-	LDKDecodeError e_conv;
+uint32_t  __attribute__((export_name("TS_COption_AccessZ_none"))) TS_COption_AccessZ_none() {
+	LDKCOption_AccessZ *ret_copy = MALLOC(sizeof(LDKCOption_AccessZ), "LDKCOption_AccessZ");
+	*ret_copy = COption_AccessZ_none();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_COption_AccessZ_free"))) TS_COption_AccessZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCOption_AccessZ _res_conv = *(LDKCOption_AccessZ*)(_res_ptr);
+	FREE((void*)_res);
+	COption_AccessZ_free(_res_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_boolLightningErrorZ_ok"))) TS_CResult_boolLightningErrorZ_ok(jboolean o) {
+	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
+	*ret_conv = CResult_boolLightningErrorZ_ok(o);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_boolLightningErrorZ_err"))) TS_CResult_boolLightningErrorZ_err(uint32_t e) {
+	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 = DecodeError_clone(&e_conv);
-	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	e_conv = LightningError_clone(&e_conv);
+	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
+	*ret_conv = CResult_boolLightningErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_boolLightningErrorZ_is_ok"))) TS_CResult_boolLightningErrorZ_is_ok(uint32_t o) {
+	LDKCResult_boolLightningErrorZ* o_conv = (LDKCResult_boolLightningErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_boolLightningErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_boolLightningErrorZ_free"))) TS_CResult_boolLightningErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_SpendableOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(_res_ptr);
+	LDKCResult_boolLightningErrorZ _res_conv = *(LDKCResult_boolLightningErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_SpendableOutputDescriptorDecodeErrorZ_free(_res_conv);
+	CResult_boolLightningErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_boolLightningErrorZ_clone_ptr(LDKCResult_boolLightningErrorZ *NONNULL_PTR arg) {
+	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
+	*ret_conv = CResult_boolLightningErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone_ptr"))) TS_CResult_boolLightningErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_boolLightningErrorZ* arg_conv = (LDKCResult_boolLightningErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_boolLightningErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(orig & ~1);
-	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ");
-	*ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone"))) TS_CResult_boolLightningErrorZ_clone(uint32_t orig) {
+	LDKCResult_boolLightningErrorZ* orig_conv = (LDKCResult_boolLightningErrorZ*)(orig & ~1);
+	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
+	*ret_conv = CResult_boolLightningErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CVec_PaymentPreimageZ_free"))) TS_CVec_PaymentPreimageZ_free(ptrArray _res) {
-	LDKCVec_PaymentPreimageZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_PaymentPreimageZ Elements");
-	else
-		_res_constr.data = NULL;
-	int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */;
-	for (size_t m = 0; m < _res_constr.datalen; m++) {
-		int8_tArray _res_conv_12 = _res_vals[m];
-		LDKThirtyTwoBytes _res_conv_12_ref;
-		CHECK(_res_conv_12->arr_len == 32);
-		memcpy(_res_conv_12_ref.data, _res_conv_12->elems, 32); FREE(_res_conv_12);
-		_res_constr.data[m] = _res_conv_12_ref;
-	}
-	CVec_PaymentPreimageZ_free(_res_constr);
-}
-
-static inline uintptr_t C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR arg) {
-	LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ");
-	*ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone(arg);
-	return ((uintptr_t)ret_conv);
+static inline uintptr_t C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR arg) {
+	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ");
+	*ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(arg);
+	return ((uint32_t)ret_conv);
 }
-intptr_t  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_SignatureCVec_SignatureZZ* arg_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(uint32_t arg) {
+	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* arg_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(arg & ~1);
+	uint32_t ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone(uint32_t orig) {
-	LDKC2Tuple_SignatureCVec_SignatureZZ* orig_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(orig & ~1);
-	LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ");
-	*ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(uint32_t orig) {
+	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* orig_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(orig & ~1);
+	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ");
+	*ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_new"))) TS_C2Tuple_SignatureCVec_SignatureZZ_new(int8_tArray a, ptrArray b) {
-	LDKSignature a_ref;
-	CHECK(a->arr_len == 64);
-	memcpy(a_ref.compact_form, a->elems, 64); FREE(a);
-	LDKCVec_SignatureZ b_constr;
-	b_constr.datalen = b->arr_len;
-	if (b_constr.datalen > 0)
-		b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements");
-	else
-		b_constr.data = NULL;
-	int8_tArray* b_vals = (void*) b->elems /* XXX b leaks */;
-	for (size_t m = 0; m < b_constr.datalen; m++) {
-		int8_tArray b_conv_12 = b_vals[m];
-		LDKSignature b_conv_12_ref;
-		CHECK(b_conv_12->arr_len == 64);
-		memcpy(b_conv_12_ref.compact_form, b_conv_12->elems, 64); FREE(b_conv_12);
-		b_constr.data[m] = b_conv_12_ref;
-	}
-	LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ");
-	*ret_conv = C2Tuple_SignatureCVec_SignatureZZ_new(a_ref, b_constr);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(uint32_t a, uint32_t b, uint32_t c) {
+	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);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_free"))) TS_C2Tuple_SignatureCVec_SignatureZZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_SignatureCVec_SignatureZZ _res_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(_res_ptr);
+	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(_res_ptr);
 	FREE((void*)_res);
-	C2Tuple_SignatureCVec_SignatureZZ_free(_res_conv);
+	C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKC2Tuple_SignatureCVec_SignatureZZ o_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(o_ptr);
-	o_conv = C2Tuple_SignatureCVec_SignatureZZ_clone((LDKC2Tuple_SignatureCVec_SignatureZZ*)(((uintptr_t)o) & ~1));
-	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
-	*ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free"))) TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(uint32_tArray _res) {
+	LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t h = 0; h < _res_constr.datalen; h++) {
+		uint32_t _res_conv_59 = _res_vals[h];
+		void* _res_conv_59_ptr = (void*)(((uintptr_t)_res_conv_59) & ~1);
+		CHECK_ACCESS(_res_conv_59_ptr);
+		LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv_59_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(_res_conv_59_ptr);
+		FREE((void*)_res_conv_59);
+		_res_constr.data[h] = _res_conv_59_conv;
+	}
+	FREE(_res);
+	CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err() {
-	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
-	*ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err();
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_NodeAnnouncementZ_free"))) TS_CVec_NodeAnnouncementZ_free(uint32_tArray _res) {
+	LDKCVec_NodeAnnouncementZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNodeAnnouncement), "LDKCVec_NodeAnnouncementZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t s = 0; s < _res_constr.datalen; s++) {
+		uint32_t _res_conv_18 = _res_vals[s];
+		LDKNodeAnnouncement _res_conv_18_conv;
+		_res_conv_18_conv.inner = (void*)(_res_conv_18 & (~1));
+		_res_conv_18_conv.is_owned = (_res_conv_18 & 1) || (_res_conv_18 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_18_conv);
+		_res_constr.data[s] = _res_conv_18_conv;
+	}
+	FREE(_res);
+	CVec_NodeAnnouncementZ_free(_res_constr);
 }
 
-jboolean  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(uint32_t o) {
-	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_ok"))) TS_CResult_NoneLightningErrorZ_ok() {
+	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
+	*ret_conv = CResult_NoneLightningErrorZ_ok();
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(uint32_t _res) {
+uint32_t  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_err"))) TS_CResult_NoneLightningErrorZ_err(uint32_t e) {
+	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 (uint32_t)ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_is_ok"))) TS_CResult_NoneLightningErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NoneLightningErrorZ* o_conv = (LDKCResult_NoneLightningErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_NoneLightningErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_free"))) TS_CResult_NoneLightningErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(_res_ptr);
+	LDKCResult_NoneLightningErrorZ _res_conv = *(LDKCResult_NoneLightningErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(_res_conv);
+	CResult_NoneLightningErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR arg) {
-	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
-	*ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_NoneLightningErrorZ_clone_ptr(LDKCResult_NoneLightningErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
+	*ret_conv = CResult_NoneLightningErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone_ptr"))) TS_CResult_NoneLightningErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneLightningErrorZ* arg_conv = (LDKCResult_NoneLightningErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NoneLightningErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(uint32_t orig) {
-	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(orig & ~1);
-	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
-	*ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone"))) TS_CResult_NoneLightningErrorZ_clone(uint32_t orig) {
+	LDKCResult_NoneLightningErrorZ* orig_conv = (LDKCResult_NoneLightningErrorZ*)(orig & ~1);
+	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
+	*ret_conv = CResult_NoneLightningErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SignatureNoneZ_ok"))) TS_CResult_SignatureNoneZ_ok(int8_tArray o) {
-	LDKSignature o_ref;
-	CHECK(o->arr_len == 64);
-	memcpy(o_ref.compact_form, o->elems, 64); FREE(o);
-	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
-	*ret_conv = CResult_SignatureNoneZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok(uint32_t o) {
+	LDKChannelUpdateInfo 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 = ChannelUpdateInfo_clone(&o_conv);
+	LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ");
+	*ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SignatureNoneZ_err"))) TS_CResult_SignatureNoneZ_err() {
-	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
-	*ret_conv = CResult_SignatureNoneZ_err();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_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_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ");
+	*ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_SignatureNoneZ_is_ok"))) TS_CResult_SignatureNoneZ_is_ok(uint32_t o) {
-	LDKCResult_SignatureNoneZ* o_conv = (LDKCResult_SignatureNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_SignatureNoneZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelUpdateInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_SignatureNoneZ_free"))) TS_CResult_SignatureNoneZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_free"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_SignatureNoneZ _res_conv = *(LDKCResult_SignatureNoneZ*)(_res_ptr);
+	LDKCResult_ChannelUpdateInfoDecodeErrorZ _res_conv = *(LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_SignatureNoneZ_free(_res_conv);
+	CResult_ChannelUpdateInfoDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_SignatureNoneZ_clone_ptr(LDKCResult_SignatureNoneZ *NONNULL_PTR arg) {
-	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
-	*ret_conv = CResult_SignatureNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ");
+	*ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_SignatureNoneZ_clone_ptr"))) TS_CResult_SignatureNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_SignatureNoneZ* arg_conv = (LDKCResult_SignatureNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_SignatureNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelUpdateInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SignatureNoneZ_clone"))) TS_CResult_SignatureNoneZ_clone(uint32_t orig) {
-	LDKCResult_SignatureNoneZ* orig_conv = (LDKCResult_SignatureNoneZ*)(orig & ~1);
-	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
-	*ret_conv = CResult_SignatureNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_ChannelUpdateInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(orig & ~1);
+	LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ");
+	*ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-static inline uintptr_t C2Tuple_SignatureSignatureZ_clone_ptr(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR arg) {
-	LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ");
-	*ret_conv = C2Tuple_SignatureSignatureZ_clone(arg);
-	return ((uintptr_t)ret_conv);
-}
-intptr_t  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone_ptr"))) TS_C2Tuple_SignatureSignatureZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_SignatureSignatureZ* arg_conv = (LDKC2Tuple_SignatureSignatureZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_SignatureSignatureZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone"))) TS_C2Tuple_SignatureSignatureZ_clone(uint32_t orig) {
-	LDKC2Tuple_SignatureSignatureZ* orig_conv = (LDKC2Tuple_SignatureSignatureZ*)(orig & ~1);
-	LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ");
-	*ret_conv = C2Tuple_SignatureSignatureZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_err"))) TS_CResult_ChannelInfoDecodeErrorZ_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_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ");
+	*ret_conv = CResult_ChannelInfoDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_new"))) TS_C2Tuple_SignatureSignatureZ_new(int8_tArray a, int8_tArray b) {
-	LDKSignature a_ref;
-	CHECK(a->arr_len == 64);
-	memcpy(a_ref.compact_form, a->elems, 64); FREE(a);
-	LDKSignature b_ref;
-	CHECK(b->arr_len == 64);
-	memcpy(b_ref.compact_form, b->elems, 64); FREE(b);
-	LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ");
-	*ret_conv = C2Tuple_SignatureSignatureZ_new(a_ref, b_ref);
-	return ((uintptr_t)ret_conv);
+jboolean  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_ChannelInfoDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_free"))) TS_C2Tuple_SignatureSignatureZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_free"))) TS_CResult_ChannelInfoDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_SignatureSignatureZ _res_conv = *(LDKC2Tuple_SignatureSignatureZ*)(_res_ptr);
+	LDKCResult_ChannelInfoDecodeErrorZ _res_conv = *(LDKCResult_ChannelInfoDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	C2Tuple_SignatureSignatureZ_free(_res_conv);
+	CResult_ChannelInfoDecodeErrorZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKC2Tuple_SignatureSignatureZ o_conv = *(LDKC2Tuple_SignatureSignatureZ*)(o_ptr);
-	o_conv = C2Tuple_SignatureSignatureZ_clone((LDKC2Tuple_SignatureSignatureZ*)(((uintptr_t)o) & ~1));
-	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ");
-	*ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_ChannelInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ");
+	*ret_conv = CResult_ChannelInfoDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err() {
-	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ");
-	*ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_err();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone"))) TS_CResult_ChannelInfoDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_ChannelInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(orig & ~1);
+	LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ");
+	*ret_conv = CResult_ChannelInfoDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(uint32_t o) {
-	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free(uint32_t _res) {
+uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_err"))) TS_CResult_RoutingFeesDecodeErrorZ_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_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ");
+	*ret_conv = CResult_RoutingFeesDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_is_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_RoutingFeesDecodeErrorZ* o_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_RoutingFeesDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_free"))) TS_CResult_RoutingFeesDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_C2Tuple_SignatureSignatureZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(_res_ptr);
+	LDKCResult_RoutingFeesDecodeErrorZ _res_conv = *(LDKCResult_RoutingFeesDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_C2Tuple_SignatureSignatureZNoneZ_free(_res_conv);
+	CResult_RoutingFeesDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR arg) {
-	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ");
-	*ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_RoutingFeesDecodeErrorZ_clone_ptr(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ");
+	*ret_conv = CResult_RoutingFeesDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr"))) TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RoutingFeesDecodeErrorZ* arg_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone(uint32_t orig) {
-	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(orig & ~1);
-	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ");
-	*ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone"))) TS_CResult_RoutingFeesDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_RoutingFeesDecodeErrorZ* orig_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(orig & ~1);
+	LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ");
+	*ret_conv = CResult_RoutingFeesDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_ok"))) TS_CResult_SecretKeyNoneZ_ok(int8_tArray o) {
-	LDKSecretKey o_ref;
-	CHECK(o->arr_len == 32);
-	memcpy(o_ref.bytes, o->elems, 32); FREE(o);
-	LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ");
-	*ret_conv = CResult_SecretKeyNoneZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_NetAddressZ_free"))) TS_CVec_NetAddressZ_free(uint32_tArray _res) {
+	LDKCVec_NetAddressZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t m = 0; m < _res_constr.datalen; m++) {
+		uint32_t _res_conv_12 = _res_vals[m];
+		void* _res_conv_12_ptr = (void*)(((uintptr_t)_res_conv_12) & ~1);
+		CHECK_ACCESS(_res_conv_12_ptr);
+		LDKNetAddress _res_conv_12_conv = *(LDKNetAddress*)(_res_conv_12_ptr);
+		FREE((void*)_res_conv_12);
+		_res_constr.data[m] = _res_conv_12_conv;
+	}
+	FREE(_res);
+	CVec_NetAddressZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_err"))) TS_CResult_SecretKeyNoneZ_err() {
-	LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ");
-	*ret_conv = CResult_SecretKeyNoneZ_err();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_is_ok"))) TS_CResult_SecretKeyNoneZ_is_ok(uint32_t o) {
-	LDKCResult_SecretKeyNoneZ* o_conv = (LDKCResult_SecretKeyNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_SecretKeyNoneZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_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_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ");
+	*ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_free"))) TS_CResult_SecretKeyNoneZ_free(uint32_t _res) {
+jboolean  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_SecretKeyNoneZ _res_conv = *(LDKCResult_SecretKeyNoneZ*)(_res_ptr);
+	LDKCResult_NodeAnnouncementInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_SecretKeyNoneZ_free(_res_conv);
+	CResult_NodeAnnouncementInfoDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_SecretKeyNoneZ_clone_ptr(LDKCResult_SecretKeyNoneZ *NONNULL_PTR arg) {
-	LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ");
-	*ret_conv = CResult_SecretKeyNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ");
+	*ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone_ptr"))) TS_CResult_SecretKeyNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_SecretKeyNoneZ* arg_conv = (LDKCResult_SecretKeyNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_SecretKeyNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone"))) TS_CResult_SecretKeyNoneZ_clone(uint32_t orig) {
-	LDKCResult_SecretKeyNoneZ* orig_conv = (LDKCResult_SecretKeyNoneZ*)(orig & ~1);
-	LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ");
-	*ret_conv = CResult_SecretKeyNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(orig & ~1);
+	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ");
+	*ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_ok"))) TS_CResult_SignDecodeErrorZ_ok(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKSign o_conv = *(LDKSign*)(o_ptr);
-	LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ");
-	*ret_conv = CResult_SignDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_ok"))) TS_CResult_NodeAliasDecodeErrorZ_ok(uint32_t o) {
+	LDKNodeAlias o_conv;
+	o_conv.inner = (void*)(o & (~1));
+	o_conv.is_owned = (o & 1) || (o == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
+	o_conv = NodeAlias_clone(&o_conv);
+	LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ");
+	*ret_conv = CResult_NodeAliasDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_err"))) TS_CResult_SignDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_err"))) TS_CResult_NodeAliasDecodeErrorZ_err(uint32_t e) {
 	LDKDecodeError e_conv;
 	e_conv.inner = (void*)(e & (~1));
 	e_conv.is_owned = (e & 1) || (e == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(e_conv);
 	e_conv = DecodeError_clone(&e_conv);
-	LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ");
-	*ret_conv = CResult_SignDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ");
+	*ret_conv = CResult_NodeAliasDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_is_ok"))) 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;
+jboolean  __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_is_ok"))) TS_CResult_NodeAliasDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NodeAliasDecodeErrorZ* o_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_NodeAliasDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_free"))) TS_CResult_SignDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_free"))) TS_CResult_NodeAliasDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_SignDecodeErrorZ _res_conv = *(LDKCResult_SignDecodeErrorZ*)(_res_ptr);
+	LDKCResult_NodeAliasDecodeErrorZ _res_conv = *(LDKCResult_NodeAliasDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_SignDecodeErrorZ_free(_res_conv);
+	CResult_NodeAliasDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_SignDecodeErrorZ_clone_ptr(LDKCResult_SignDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ");
-	*ret_conv = CResult_SignDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_NodeAliasDecodeErrorZ_clone_ptr(LDKCResult_NodeAliasDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ");
+	*ret_conv = CResult_NodeAliasDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone_ptr"))) TS_CResult_SignDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_SignDecodeErrorZ* arg_conv = (LDKCResult_SignDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_SignDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAliasDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NodeAliasDecodeErrorZ* arg_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NodeAliasDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone"))) 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");
-	*ret_conv = CResult_SignDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NodeAliasDecodeErrorZ_clone"))) TS_CResult_NodeAliasDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_NodeAliasDecodeErrorZ* orig_conv = (LDKCResult_NodeAliasDecodeErrorZ*)(orig & ~1);
+	LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ");
+	*ret_conv = CResult_NodeAliasDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CVec_u5Z_free"))) TS_CVec_u5Z_free(ptrArray _res) {
-	LDKCVec_u5Z _res_constr;
+void  __attribute__((export_name("TS_CVec_u64Z_free"))) TS_CVec_u64Z_free(int64_tArray _res) {
+	LDKCVec_u64Z _res_constr;
 	_res_constr.datalen = _res->arr_len;
 	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKu5), "LDKCVec_u5Z Elements");
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements");
 	else
 		_res_constr.data = NULL;
-	int8_t* _res_vals = (void*) _res->elems /* XXX _res leaks */;
-	for (size_t h = 0; h < _res_constr.datalen; h++) {
-		int8_t _res_conv_7 = _res_vals[h];
-		
-		_res_constr.data[h] = (LDKu5){ ._0 = _res_conv_7 };
+	int64_t* _res_vals = _res->elems;
+	for (size_t i = 0; i < _res_constr.datalen; i++) {
+		int64_t _res_conv_8 = _res_vals[i];
+		_res_constr.data[i] = _res_conv_8;
 	}
-	CVec_u5Z_free(_res_constr);
+	FREE(_res);
+	CVec_u64Z_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_ok"))) TS_CResult_RecoverableSignatureNoneZ_ok(int8_tArray o) {
-	LDKRecoverableSignature o_ref;
-	CHECK(o->arr_len == 68);
-	memcpy(o_ref.serialized_form, o->elems, 68); FREE(o);
-	LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ");
-	*ret_conv = CResult_RecoverableSignatureNoneZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_ok"))) TS_CResult_NodeInfoDecodeErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_err"))) TS_CResult_RecoverableSignatureNoneZ_err() {
-	LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ");
-	*ret_conv = CResult_RecoverableSignatureNoneZ_err();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_err"))) TS_CResult_NodeInfoDecodeErrorZ_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_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ");
+	*ret_conv = CResult_NodeInfoDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_is_ok"))) TS_CResult_RecoverableSignatureNoneZ_is_ok(uint32_t o) {
-	LDKCResult_RecoverableSignatureNoneZ* o_conv = (LDKCResult_RecoverableSignatureNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_RecoverableSignatureNoneZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeInfoDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NodeInfoDecodeErrorZ* o_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_NodeInfoDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_free"))) TS_CResult_RecoverableSignatureNoneZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_free"))) TS_CResult_NodeInfoDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_RecoverableSignatureNoneZ _res_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(_res_ptr);
+	LDKCResult_NodeInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeInfoDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_RecoverableSignatureNoneZ_free(_res_conv);
+	CResult_NodeInfoDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_RecoverableSignatureNoneZ_clone_ptr(LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR arg) {
-	LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ");
-	*ret_conv = CResult_RecoverableSignatureNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone_ptr"))) TS_CResult_RecoverableSignatureNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_RecoverableSignatureNoneZ* arg_conv = (LDKCResult_RecoverableSignatureNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_RecoverableSignatureNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+static inline uintptr_t CResult_NodeInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ");
+	*ret_conv = CResult_NodeInfoDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-
-uint32_t  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone"))) TS_CResult_RecoverableSignatureNoneZ_clone(uint32_t orig) {
-	LDKCResult_RecoverableSignatureNoneZ* orig_conv = (LDKCResult_RecoverableSignatureNoneZ*)(orig & ~1);
-	LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ");
-	*ret_conv = CResult_RecoverableSignatureNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NodeInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NodeInfoDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CVec_u8Z_free"))) TS_CVec_u8Z_free(int8_tArray _res) {
-	LDKCVec_u8Z _res_ref;
-	_res_ref.datalen = _res->arr_len;
-	_res_ref.data = MALLOC(_res_ref.datalen, "LDKCVec_u8Z Bytes");
-	memcpy(_res_ref.data, _res->elems, _res_ref.datalen); FREE(_res);
-	CVec_u8Z_free(_res_ref);
+uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone"))) TS_CResult_NodeInfoDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_NodeInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(orig & ~1);
+	LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ");
+	*ret_conv = CResult_NodeInfoDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CVec_CVec_u8ZZ_free"))) TS_CVec_CVec_u8ZZ_free(ptrArray _res) {
-	LDKCVec_CVec_u8ZZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKCVec_u8Z), "LDKCVec_CVec_u8ZZ Elements");
-	else
-		_res_constr.data = NULL;
-	int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */;
-	for (size_t m = 0; m < _res_constr.datalen; m++) {
-		int8_tArray _res_conv_12 = _res_vals[m];
-		LDKCVec_u8Z _res_conv_12_ref;
-		_res_conv_12_ref.datalen = _res_conv_12->arr_len;
-		_res_conv_12_ref.data = MALLOC(_res_conv_12_ref.datalen, "LDKCVec_u8Z Bytes");
-		memcpy(_res_conv_12_ref.data, _res_conv_12->elems, _res_conv_12_ref.datalen); FREE(_res_conv_12);
-		_res_constr.data[m] = _res_conv_12_ref;
-	}
-	CVec_CVec_u8ZZ_free(_res_constr);
+uint32_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_ok(uint32_t o) {
+	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);
+	// WARNING: we need a move here but no clone is available for LDKNetworkGraph
+	LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ");
+	*ret_conv = CResult_NetworkGraphDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_ok(ptrArray o) {
-	LDKCVec_CVec_u8ZZ o_constr;
+uint32_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_err"))) TS_CResult_NetworkGraphDecodeErrorZ_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_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ");
+	*ret_conv = CResult_NetworkGraphDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_is_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NetworkGraphDecodeErrorZ* o_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_NetworkGraphDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_free"))) TS_CResult_NetworkGraphDecodeErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_NetworkGraphDecodeErrorZ _res_conv = *(LDKCResult_NetworkGraphDecodeErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_NetworkGraphDecodeErrorZ_free(_res_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_COption_CVec_NetAddressZZ_some"))) TS_COption_CVec_NetAddressZZ_some(uint32_tArray o) {
+	LDKCVec_NetAddressZ o_constr;
 	o_constr.datalen = o->arr_len;
 	if (o_constr.datalen > 0)
-		o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKCVec_u8Z), "LDKCVec_CVec_u8ZZ Elements");
+		o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements");
 	else
 		o_constr.data = NULL;
-	int8_tArray* o_vals = (void*) o->elems /* XXX o leaks */;
+	uint32_t* o_vals = o->elems;
 	for (size_t m = 0; m < o_constr.datalen; m++) {
-		int8_tArray o_conv_12 = o_vals[m];
-		LDKCVec_u8Z o_conv_12_ref;
-		o_conv_12_ref.datalen = o_conv_12->arr_len;
-		o_conv_12_ref.data = MALLOC(o_conv_12_ref.datalen, "LDKCVec_u8Z Bytes");
-		memcpy(o_conv_12_ref.data, o_conv_12->elems, o_conv_12_ref.datalen); FREE(o_conv_12);
-		o_constr.data[m] = o_conv_12_ref;
+		uint32_t o_conv_12 = o_vals[m];
+		void* o_conv_12_ptr = (void*)(((uintptr_t)o_conv_12) & ~1);
+		CHECK_ACCESS(o_conv_12_ptr);
+		LDKNetAddress o_conv_12_conv = *(LDKNetAddress*)(o_conv_12_ptr);
+		o_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o_conv_12) & ~1));
+		o_constr.data[m] = o_conv_12_conv;
 	}
-	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
-	*ret_conv = CResult_CVec_CVec_u8ZZNoneZ_ok(o_constr);
-	return (uintptr_t)ret_conv;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_err"))) TS_CResult_CVec_CVec_u8ZZNoneZ_err() {
-	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
-	*ret_conv = CResult_CVec_CVec_u8ZZNoneZ_err();
-	return (uintptr_t)ret_conv;
+	FREE(o);
+	LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ");
+	*ret_copy = COption_CVec_NetAddressZZ_some(o_constr);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok(uint32_t o) {
-	LDKCResult_CVec_CVec_u8ZZNoneZ* o_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_CVec_CVec_u8ZZNoneZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_COption_CVec_NetAddressZZ_none"))) TS_COption_CVec_NetAddressZZ_none() {
+	LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ");
+	*ret_copy = COption_CVec_NetAddressZZ_none();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_free"))) TS_CResult_CVec_CVec_u8ZZNoneZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_COption_CVec_NetAddressZZ_free"))) TS_COption_CVec_NetAddressZZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_CVec_CVec_u8ZZNoneZ _res_conv = *(LDKCResult_CVec_CVec_u8ZZNoneZ*)(_res_ptr);
+	LDKCOption_CVec_NetAddressZZ _res_conv = *(LDKCOption_CVec_NetAddressZZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_CVec_CVec_u8ZZNoneZ_free(_res_conv);
+	COption_CVec_NetAddressZZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR arg) {
-	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
-	*ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t COption_CVec_NetAddressZZ_clone_ptr(LDKCOption_CVec_NetAddressZZ *NONNULL_PTR arg) {
+	LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ");
+	*ret_copy = COption_CVec_NetAddressZZ_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_CVec_CVec_u8ZZNoneZ* arg_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone_ptr"))) TS_COption_CVec_NetAddressZZ_clone_ptr(uint32_t arg) {
+	LDKCOption_CVec_NetAddressZZ* arg_conv = (LDKCOption_CVec_NetAddressZZ*)arg;
+	uint32_t ret_conv = COption_CVec_NetAddressZZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone(uint32_t orig) {
-	LDKCResult_CVec_CVec_u8ZZNoneZ* orig_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(orig & ~1);
-	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
-	*ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone"))) TS_COption_CVec_NetAddressZZ_clone(uint32_t orig) {
+	LDKCOption_CVec_NetAddressZZ* orig_conv = (LDKCOption_CVec_NetAddressZZ*)orig;
+	LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ");
+	*ret_copy = COption_CVec_NetAddressZZ_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_ok(uint32_t o) {
-	LDKInMemorySigner o_conv;
+uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok"))) 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 = InMemorySigner_clone(&o_conv);
-	LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
-	*ret_conv = CResult_InMemorySignerDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	o_conv = DelayedPaymentOutputDescriptor_clone(&o_conv);
+	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
+	*ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_err"))) TS_CResult_InMemorySignerDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_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_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
-	*ret_conv = CResult_InMemorySignerDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
+	*ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_is_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_InMemorySignerDecodeErrorZ* o_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_InMemorySignerDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_free"))) TS_CResult_InMemorySignerDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_InMemorySignerDecodeErrorZ _res_conv = *(LDKCResult_InMemorySignerDecodeErrorZ*)(_res_ptr);
+	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_InMemorySignerDecodeErrorZ_free(_res_conv);
-}
-
-static inline uintptr_t CResult_InMemorySignerDecodeErrorZ_clone_ptr(LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
-	*ret_conv = CResult_InMemorySignerDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr"))) TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_InMemorySignerDecodeErrorZ* arg_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone"))) 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");
-	*ret_conv = CResult_InMemorySignerDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
-}
-
-void  __attribute__((export_name("TS_CVec_TxOutZ_free"))) TS_CVec_TxOutZ_free(uint32_tArray _res) {
-	LDKCVec_TxOutZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t h = 0; h < _res_constr.datalen; h++) {
-		uint32_t _res_conv_7 = _res_vals[h];
-		void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1);
-		CHECK_ACCESS(_res_conv_7_ptr);
-		LDKTxOut _res_conv_7_conv = *(LDKTxOut*)(_res_conv_7_ptr);
-		FREE((void*)_res_conv_7);
-		_res_constr.data[h] = _res_conv_7_conv;
-	}
-	CVec_TxOutZ_free(_res_constr);
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_TransactionNoneZ_ok"))) TS_CResult_TransactionNoneZ_ok(int8_tArray o) {
-	LDKTransaction o_ref;
-	o_ref.datalen = o->arr_len;
-	o_ref.data = MALLOC(o_ref.datalen, "LDKTransaction Bytes");
-	memcpy(o_ref.data, o->elems, o_ref.datalen); FREE(o);
-	o_ref.data_is_owned = true;
-	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
-	*ret_conv = CResult_TransactionNoneZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_TransactionNoneZ_err"))) TS_CResult_TransactionNoneZ_err() {
-	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
-	*ret_conv = CResult_TransactionNoneZ_err();
-	return (uintptr_t)ret_conv;
+	CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_free(_res_conv);
 }
 
-jboolean  __attribute__((export_name("TS_CResult_TransactionNoneZ_is_ok"))) TS_CResult_TransactionNoneZ_is_ok(uint32_t o) {
-	LDKCResult_TransactionNoneZ* o_conv = (LDKCResult_TransactionNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_TransactionNoneZ_is_ok(o_conv);
-	return ret_val;
+static inline uintptr_t CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
+	*ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-
-void  __attribute__((export_name("TS_CResult_TransactionNoneZ_free"))) TS_CResult_TransactionNoneZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKCResult_TransactionNoneZ _res_conv = *(LDKCResult_TransactionNoneZ*)(_res_ptr);
-	FREE((void*)_res);
-	CResult_TransactionNoneZ_free(_res_conv);
+uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-static inline uintptr_t CResult_TransactionNoneZ_clone_ptr(LDKCResult_TransactionNoneZ *NONNULL_PTR arg) {
-	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
-	*ret_conv = CResult_TransactionNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_TransactionNoneZ_clone_ptr"))) TS_CResult_TransactionNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_TransactionNoneZ* arg_conv = (LDKCResult_TransactionNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_TransactionNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone"))) 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");
+	*ret_conv = CResult_DelayedPaymentOutputDescriptorDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_TransactionNoneZ_clone"))) TS_CResult_TransactionNoneZ_clone(uint32_t orig) {
-	LDKCResult_TransactionNoneZ* orig_conv = (LDKCResult_TransactionNoneZ*)(orig & ~1);
-	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
-	*ret_conv = CResult_TransactionNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_u16Z_some"))) TS_COption_u16Z_some(int16_t o) {
-	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
-	*ret_copy = COption_u16Z_some(o);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_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_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ");
+	*ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_u16Z_none"))) TS_COption_u16Z_none() {
-	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
-	*ret_copy = COption_u16Z_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+jboolean  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_COption_u16Z_free"))) TS_COption_u16Z_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCOption_u16Z _res_conv = *(LDKCOption_u16Z*)(_res_ptr);
+	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	COption_u16Z_free(_res_conv);
+	CResult_StaticPaymentOutputDescriptorDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t COption_u16Z_clone_ptr(LDKCOption_u16Z *NONNULL_PTR arg) {
-	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
-	*ret_copy = COption_u16Z_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+static inline uintptr_t CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ");
+	*ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_COption_u16Z_clone_ptr"))) TS_COption_u16Z_clone_ptr(uint32_t arg) {
-	LDKCOption_u16Z* arg_conv = (LDKCOption_u16Z*)arg;
-	intptr_t ret_val = COption_u16Z_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_u16Z_clone"))) TS_COption_u16Z_clone(uint32_t orig) {
-	LDKCOption_u16Z* orig_conv = (LDKCOption_u16Z*)orig;
-	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
-	*ret_copy = COption_u16Z_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone"))) 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");
+	*ret_conv = CResult_StaticPaymentOutputDescriptorDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_ok"))) TS_CResult_NoneAPIErrorZ_ok() {
-	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
-	*ret_conv = CResult_NoneAPIErrorZ_ok();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKSpendableOutputDescriptor o_conv = *(LDKSpendableOutputDescriptor*)(o_ptr);
+	o_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)o) & ~1));
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ");
+	*ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_err"))) TS_CResult_NoneAPIErrorZ_err(uint32_t e) {
-	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
-	CHECK_ACCESS(e_ptr);
-	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
-	e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1));
-	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
-	*ret_conv = CResult_NoneAPIErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_err"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_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_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ");
+	*ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_is_ok"))) TS_CResult_NoneAPIErrorZ_is_ok(uint32_t o) {
-	LDKCResult_NoneAPIErrorZ* o_conv = (LDKCResult_NoneAPIErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NoneAPIErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* o_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_free"))) TS_CResult_NoneAPIErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NoneAPIErrorZ _res_conv = *(LDKCResult_NoneAPIErrorZ*)(_res_ptr);
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ _res_conv = *(LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_NoneAPIErrorZ_free(_res_conv);
+	CResult_SpendableOutputDescriptorDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_NoneAPIErrorZ_clone_ptr(LDKCResult_NoneAPIErrorZ *NONNULL_PTR arg) {
-	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
-	*ret_conv = CResult_NoneAPIErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(LDKCResult_SpendableOutputDescriptorDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ");
+	*ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone_ptr"))) TS_CResult_NoneAPIErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_NoneAPIErrorZ* arg_conv = (LDKCResult_NoneAPIErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NoneAPIErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* arg_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone"))) TS_CResult_NoneAPIErrorZ_clone(uint32_t orig) {
-	LDKCResult_NoneAPIErrorZ* orig_conv = (LDKCResult_NoneAPIErrorZ*)(orig & ~1);
-	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
-	*ret_conv = CResult_NoneAPIErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone"))) TS_CResult_SpendableOutputDescriptorDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* orig_conv = (LDKCResult_SpendableOutputDescriptorDecodeErrorZ*)(orig & ~1);
+	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ");
+	*ret_conv = CResult_SpendableOutputDescriptorDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CVec_CResult_NoneAPIErrorZZ_free"))) TS_CVec_CResult_NoneAPIErrorZZ_free(uint32_tArray _res) {
-	LDKCVec_CResult_NoneAPIErrorZZ _res_constr;
+void  __attribute__((export_name("TS_CVec_PaymentPreimageZ_free"))) TS_CVec_PaymentPreimageZ_free(ptrArray _res) {
+	LDKCVec_PaymentPreimageZ _res_constr;
 	_res_constr.datalen = _res->arr_len;
 	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKCResult_NoneAPIErrorZ), "LDKCVec_CResult_NoneAPIErrorZZ Elements");
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_PaymentPreimageZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t w = 0; w < _res_constr.datalen; w++) {
-		uint32_t _res_conv_22 = _res_vals[w];
-		void* _res_conv_22_ptr = (void*)(((uintptr_t)_res_conv_22) & ~1);
-		CHECK_ACCESS(_res_conv_22_ptr);
-		LDKCResult_NoneAPIErrorZ _res_conv_22_conv = *(LDKCResult_NoneAPIErrorZ*)(_res_conv_22_ptr);
-		FREE((void*)_res_conv_22);
-		_res_constr.data[w] = _res_conv_22_conv;
+	int8_tArray* _res_vals = (void*) _res->elems;
+	for (size_t m = 0; m < _res_constr.datalen; m++) {
+		int8_tArray _res_conv_12 = _res_vals[m];
+		LDKThirtyTwoBytes _res_conv_12_ref;
+		CHECK(_res_conv_12->arr_len == 32);
+		memcpy(_res_conv_12_ref.data, _res_conv_12->elems, 32); FREE(_res_conv_12);
+		_res_constr.data[m] = _res_conv_12_ref;
 	}
-	CVec_CResult_NoneAPIErrorZZ_free(_res_constr);
+	FREE(_res);
+	CVec_PaymentPreimageZ_free(_res_constr);
 }
 
-void  __attribute__((export_name("TS_CVec_APIErrorZ_free"))) TS_CVec_APIErrorZ_free(uint32_tArray _res) {
-	LDKCVec_APIErrorZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKAPIError), "LDKCVec_APIErrorZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t k = 0; k < _res_constr.datalen; k++) {
-		uint32_t _res_conv_10 = _res_vals[k];
-		void* _res_conv_10_ptr = (void*)(((uintptr_t)_res_conv_10) & ~1);
-		CHECK_ACCESS(_res_conv_10_ptr);
-		LDKAPIError _res_conv_10_conv = *(LDKAPIError*)(_res_conv_10_ptr);
-		FREE((void*)_res_conv_10);
-		_res_constr.data[k] = _res_conv_10_conv;
-	}
-	CVec_APIErrorZ_free(_res_constr);
+static inline uintptr_t C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(LDKC2Tuple_SignatureCVec_SignatureZZ *NONNULL_PTR arg) {
+	LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ");
+	*ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone(arg);
+	return ((uint32_t)ret_conv);
 }
-
-uint32_t  __attribute__((export_name("TS_CResult__u832APIErrorZ_ok"))) TS_CResult__u832APIErrorZ_ok(int8_tArray o) {
-	LDKThirtyTwoBytes o_ref;
-	CHECK(o->arr_len == 32);
-	memcpy(o_ref.data, o->elems, 32); FREE(o);
-	LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ");
-	*ret_conv = CResult__u832APIErrorZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_SignatureCVec_SignatureZZ* arg_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult__u832APIErrorZ_err"))) TS_CResult__u832APIErrorZ_err(uint32_t e) {
-	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
-	CHECK_ACCESS(e_ptr);
-	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
-	e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1));
-	LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ");
-	*ret_conv = CResult__u832APIErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_clone"))) TS_C2Tuple_SignatureCVec_SignatureZZ_clone(uint32_t orig) {
+	LDKC2Tuple_SignatureCVec_SignatureZZ* orig_conv = (LDKC2Tuple_SignatureCVec_SignatureZZ*)(orig & ~1);
+	LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ");
+	*ret_conv = C2Tuple_SignatureCVec_SignatureZZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-jboolean  __attribute__((export_name("TS_CResult__u832APIErrorZ_is_ok"))) TS_CResult__u832APIErrorZ_is_ok(uint32_t o) {
-	LDKCResult__u832APIErrorZ* o_conv = (LDKCResult__u832APIErrorZ*)(o & ~1);
-	jboolean ret_val = CResult__u832APIErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_new"))) TS_C2Tuple_SignatureCVec_SignatureZZ_new(int8_tArray a, ptrArray b) {
+	LDKSignature a_ref;
+	CHECK(a->arr_len == 64);
+	memcpy(a_ref.compact_form, a->elems, 64); FREE(a);
+	LDKCVec_SignatureZ b_constr;
+	b_constr.datalen = b->arr_len;
+	if (b_constr.datalen > 0)
+		b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements");
+	else
+		b_constr.data = NULL;
+	int8_tArray* b_vals = (void*) b->elems;
+	for (size_t m = 0; m < b_constr.datalen; m++) {
+		int8_tArray b_conv_12 = b_vals[m];
+		LDKSignature b_conv_12_ref;
+		CHECK(b_conv_12->arr_len == 64);
+		memcpy(b_conv_12_ref.compact_form, b_conv_12->elems, 64); FREE(b_conv_12);
+		b_constr.data[m] = b_conv_12_ref;
+	}
+	FREE(b);
+	LDKC2Tuple_SignatureCVec_SignatureZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureCVec_SignatureZZ), "LDKC2Tuple_SignatureCVec_SignatureZZ");
+	*ret_conv = C2Tuple_SignatureCVec_SignatureZZ_new(a_ref, b_constr);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_CResult__u832APIErrorZ_free"))) TS_CResult__u832APIErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C2Tuple_SignatureCVec_SignatureZZ_free"))) TS_C2Tuple_SignatureCVec_SignatureZZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult__u832APIErrorZ _res_conv = *(LDKCResult__u832APIErrorZ*)(_res_ptr);
+	LDKC2Tuple_SignatureCVec_SignatureZZ _res_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult__u832APIErrorZ_free(_res_conv);
-}
-
-static inline uintptr_t CResult__u832APIErrorZ_clone_ptr(LDKCResult__u832APIErrorZ *NONNULL_PTR arg) {
-	LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ");
-	*ret_conv = CResult__u832APIErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult__u832APIErrorZ_clone_ptr"))) TS_CResult__u832APIErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult__u832APIErrorZ* arg_conv = (LDKCResult__u832APIErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult__u832APIErrorZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult__u832APIErrorZ_clone"))) 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");
-	*ret_conv = CResult__u832APIErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	C2Tuple_SignatureCVec_SignatureZZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_ok(int8_tArray o) {
-	LDKThirtyTwoBytes o_ref;
-	CHECK(o->arr_len == 32);
-	memcpy(o_ref.data, o->elems, 32); FREE(o);
-	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
-	*ret_conv = CResult_PaymentIdPaymentSendFailureZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKC2Tuple_SignatureCVec_SignatureZZ o_conv = *(LDKC2Tuple_SignatureCVec_SignatureZZ*)(o_ptr);
+	o_conv = C2Tuple_SignatureCVec_SignatureZZ_clone((LDKC2Tuple_SignatureCVec_SignatureZZ*)(((uintptr_t)o) & ~1));
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
+	*ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_err(uint32_t e) {
-	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
-	CHECK_ACCESS(e_ptr);
-	LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr);
-	e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1));
-	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
-	*ret_conv = CResult_PaymentIdPaymentSendFailureZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err() {
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
+	*ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_err();
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_is_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_is_ok(uint32_t o) {
-	LDKCResult_PaymentIdPaymentSendFailureZ* o_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(o & ~1);
-	jboolean ret_val = CResult_PaymentIdPaymentSendFailureZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(o & ~1);
+	jboolean ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_free"))) TS_CResult_PaymentIdPaymentSendFailureZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_PaymentIdPaymentSendFailureZ _res_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(_res_ptr);
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_PaymentIdPaymentSendFailureZ_free(_res_conv);
+	CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_PaymentIdPaymentSendFailureZ_clone_ptr(LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR arg) {
-	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
-	*ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ *NONNULL_PTR arg) {
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
+	*ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr(uint32_t arg) {
-	LDKCResult_PaymentIdPaymentSendFailureZ* arg_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone(uint32_t orig) {
-	LDKCResult_PaymentIdPaymentSendFailureZ* orig_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(orig & ~1);
-	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
-	*ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(uint32_t orig) {
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ*)(orig & ~1);
+	LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ), "LDKCResult_C2Tuple_SignatureCVec_SignatureZZNoneZ");
+	*ret_conv = CResult_C2Tuple_SignatureCVec_SignatureZZNoneZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_ok"))) TS_CResult_NonePaymentSendFailureZ_ok() {
-	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
-	*ret_conv = CResult_NonePaymentSendFailureZ_ok();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SignatureNoneZ_ok"))) TS_CResult_SignatureNoneZ_ok(int8_tArray o) {
+	LDKSignature o_ref;
+	CHECK(o->arr_len == 64);
+	memcpy(o_ref.compact_form, o->elems, 64); FREE(o);
+	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
+	*ret_conv = CResult_SignatureNoneZ_ok(o_ref);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_err"))) TS_CResult_NonePaymentSendFailureZ_err(uint32_t e) {
-	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
-	CHECK_ACCESS(e_ptr);
-	LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr);
-	e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1));
-	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
-	*ret_conv = CResult_NonePaymentSendFailureZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SignatureNoneZ_err"))) TS_CResult_SignatureNoneZ_err() {
+	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
+	*ret_conv = CResult_SignatureNoneZ_err();
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_is_ok"))) TS_CResult_NonePaymentSendFailureZ_is_ok(uint32_t o) {
-	LDKCResult_NonePaymentSendFailureZ* o_conv = (LDKCResult_NonePaymentSendFailureZ*)(o & ~1);
-	jboolean ret_val = CResult_NonePaymentSendFailureZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_SignatureNoneZ_is_ok"))) TS_CResult_SignatureNoneZ_is_ok(uint32_t o) {
+	LDKCResult_SignatureNoneZ* o_conv = (LDKCResult_SignatureNoneZ*)(o & ~1);
+	jboolean ret_conv = CResult_SignatureNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_free"))) TS_CResult_NonePaymentSendFailureZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_SignatureNoneZ_free"))) TS_CResult_SignatureNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NonePaymentSendFailureZ _res_conv = *(LDKCResult_NonePaymentSendFailureZ*)(_res_ptr);
+	LDKCResult_SignatureNoneZ _res_conv = *(LDKCResult_SignatureNoneZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_NonePaymentSendFailureZ_free(_res_conv);
+	CResult_SignatureNoneZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_NonePaymentSendFailureZ_clone_ptr(LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR arg) {
-	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
-	*ret_conv = CResult_NonePaymentSendFailureZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_SignatureNoneZ_clone_ptr(LDKCResult_SignatureNoneZ *NONNULL_PTR arg) {
+	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
+	*ret_conv = CResult_SignatureNoneZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone_ptr"))) TS_CResult_NonePaymentSendFailureZ_clone_ptr(uint32_t arg) {
-	LDKCResult_NonePaymentSendFailureZ* arg_conv = (LDKCResult_NonePaymentSendFailureZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NonePaymentSendFailureZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_SignatureNoneZ_clone_ptr"))) TS_CResult_SignatureNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SignatureNoneZ* arg_conv = (LDKCResult_SignatureNoneZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_SignatureNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone"))) TS_CResult_NonePaymentSendFailureZ_clone(uint32_t orig) {
-	LDKCResult_NonePaymentSendFailureZ* orig_conv = (LDKCResult_NonePaymentSendFailureZ*)(orig & ~1);
-	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
-	*ret_conv = CResult_NonePaymentSendFailureZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SignatureNoneZ_clone"))) TS_CResult_SignatureNoneZ_clone(uint32_t orig) {
+	LDKCResult_SignatureNoneZ* orig_conv = (LDKCResult_SignatureNoneZ*)(orig & ~1);
+	LDKCResult_SignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignatureNoneZ), "LDKCResult_SignatureNoneZ");
+	*ret_conv = CResult_SignatureNoneZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-static inline uintptr_t C2Tuple_PaymentHashPaymentIdZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR arg) {
-	LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ");
-	*ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone(arg);
-	return ((uintptr_t)ret_conv);
+static inline uintptr_t C2Tuple_SignatureSignatureZ_clone_ptr(LDKC2Tuple_SignatureSignatureZ *NONNULL_PTR arg) {
+	LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ");
+	*ret_conv = C2Tuple_SignatureSignatureZ_clone(arg);
+	return ((uint32_t)ret_conv);
 }
-intptr_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_PaymentHashPaymentIdZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone_ptr"))) TS_C2Tuple_SignatureSignatureZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_SignatureSignatureZ* arg_conv = (LDKC2Tuple_SignatureSignatureZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_SignatureSignatureZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone(uint32_t orig) {
-	LDKC2Tuple_PaymentHashPaymentIdZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(orig & ~1);
-	LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ");
-	*ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_clone"))) TS_C2Tuple_SignatureSignatureZ_clone(uint32_t orig) {
+	LDKC2Tuple_SignatureSignatureZ* orig_conv = (LDKC2Tuple_SignatureSignatureZ*)(orig & ~1);
+	LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ");
+	*ret_conv = C2Tuple_SignatureSignatureZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_new"))) TS_C2Tuple_PaymentHashPaymentIdZ_new(int8_tArray a, int8_tArray b) {
-	LDKThirtyTwoBytes a_ref;
-	CHECK(a->arr_len == 32);
-	memcpy(a_ref.data, a->elems, 32); FREE(a);
-	LDKThirtyTwoBytes b_ref;
-	CHECK(b->arr_len == 32);
-	memcpy(b_ref.data, b->elems, 32); FREE(b);
-	LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ");
-	*ret_conv = C2Tuple_PaymentHashPaymentIdZ_new(a_ref, b_ref);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_new"))) TS_C2Tuple_SignatureSignatureZ_new(int8_tArray a, int8_tArray b) {
+	LDKSignature a_ref;
+	CHECK(a->arr_len == 64);
+	memcpy(a_ref.compact_form, a->elems, 64); FREE(a);
+	LDKSignature b_ref;
+	CHECK(b->arr_len == 64);
+	memcpy(b_ref.compact_form, b->elems, 64); FREE(b);
+	LDKC2Tuple_SignatureSignatureZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_SignatureSignatureZ), "LDKC2Tuple_SignatureSignatureZ");
+	*ret_conv = C2Tuple_SignatureSignatureZ_new(a_ref, b_ref);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_free"))) TS_C2Tuple_PaymentHashPaymentIdZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C2Tuple_SignatureSignatureZ_free"))) TS_C2Tuple_SignatureSignatureZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_PaymentHashPaymentIdZ _res_conv = *(LDKC2Tuple_PaymentHashPaymentIdZ*)(_res_ptr);
+	LDKC2Tuple_SignatureSignatureZ _res_conv = *(LDKC2Tuple_SignatureSignatureZ*)(_res_ptr);
 	FREE((void*)_res);
-	C2Tuple_PaymentHashPaymentIdZ_free(_res_conv);
+	C2Tuple_SignatureSignatureZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(uint32_t o) {
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_ok(uint32_t o) {
 	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
 	CHECK_ACCESS(o_ptr);
-	LDKC2Tuple_PaymentHashPaymentIdZ o_conv = *(LDKC2Tuple_PaymentHashPaymentIdZ*)(o_ptr);
-	o_conv = C2Tuple_PaymentHashPaymentIdZ_clone((LDKC2Tuple_PaymentHashPaymentIdZ*)(((uintptr_t)o) & ~1));
-	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	LDKC2Tuple_SignatureSignatureZ o_conv = *(LDKC2Tuple_SignatureSignatureZ*)(o_ptr);
+	o_conv = C2Tuple_SignatureSignatureZ_clone((LDKC2Tuple_SignatureSignatureZ*)(((uintptr_t)o) & ~1));
+	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ");
+	*ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(uint32_t e) {
-	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
-	CHECK_ACCESS(e_ptr);
-	LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr);
-	e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1));
-	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_err() {
+	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ");
+	*ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_err();
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(uint32_t o) {
-	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(o & ~1);
-	jboolean ret_val = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* o_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(o & ~1);
+	jboolean ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(_res_ptr);
+	LDKCResult_C2Tuple_SignatureSignatureZNoneZ _res_conv = *(LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(_res_conv);
-}
-
-static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR arg) {
-	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(uint32_t arg) {
-	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(arg & ~1);
-	intptr_t ret_val = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(uint32_t orig) {
-	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(orig & ~1);
-	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
-}
-
-void  __attribute__((export_name("TS_CVec_NetAddressZ_free"))) TS_CVec_NetAddressZ_free(uint32_tArray _res) {
-	LDKCVec_NetAddressZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t m = 0; m < _res_constr.datalen; m++) {
-		uint32_t _res_conv_12 = _res_vals[m];
-		void* _res_conv_12_ptr = (void*)(((uintptr_t)_res_conv_12) & ~1);
-		CHECK_ACCESS(_res_conv_12_ptr);
-		LDKNetAddress _res_conv_12_conv = *(LDKNetAddress*)(_res_conv_12_ptr);
-		FREE((void*)_res_conv_12);
-		_res_constr.data[m] = _res_conv_12_conv;
-	}
-	CVec_NetAddressZ_free(_res_constr);
-}
-
-static inline uintptr_t C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR arg) {
-	LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
-	*ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone(arg);
-	return ((uintptr_t)ret_conv);
-}
-intptr_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_PaymentHashPaymentSecretZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg_conv);
-	return ret_val;
+	CResult_C2Tuple_SignatureSignatureZNoneZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone(uint32_t orig) {
-	LDKC2Tuple_PaymentHashPaymentSecretZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(orig & ~1);
-	LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
-	*ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+static inline uintptr_t CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(LDKCResult_C2Tuple_SignatureSignatureZNoneZ *NONNULL_PTR arg) {
+	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ");
+	*ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-
-uint32_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_new"))) TS_C2Tuple_PaymentHashPaymentSecretZ_new(int8_tArray a, int8_tArray b) {
-	LDKThirtyTwoBytes a_ref;
-	CHECK(a->arr_len == 32);
-	memcpy(a_ref.data, a->elems, 32); FREE(a);
-	LDKThirtyTwoBytes b_ref;
-	CHECK(b->arr_len == 32);
-	memcpy(b_ref.data, b->elems, 32); FREE(b);
-	LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
-	*ret_conv = C2Tuple_PaymentHashPaymentSecretZ_new(a_ref, b_ref);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* arg_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_free"))) TS_C2Tuple_PaymentHashPaymentSecretZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_PaymentHashPaymentSecretZ _res_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(_res_ptr);
-	FREE((void*)_res);
-	C2Tuple_PaymentHashPaymentSecretZ_free(_res_conv);
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone"))) TS_CResult_C2Tuple_SignatureSignatureZNoneZ_clone(uint32_t orig) {
+	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* orig_conv = (LDKCResult_C2Tuple_SignatureSignatureZNoneZ*)(orig & ~1);
+	LDKCResult_C2Tuple_SignatureSignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_SignatureSignatureZNoneZ), "LDKCResult_C2Tuple_SignatureSignatureZNoneZ");
+	*ret_conv = CResult_C2Tuple_SignatureSignatureZNoneZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr);
-	o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uintptr_t)o) & ~1));
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_ok"))) TS_CResult_SecretKeyNoneZ_ok(int8_tArray o) {
+	LDKSecretKey o_ref;
+	CHECK(o->arr_len == 32);
+	memcpy(o_ref.bytes, o->elems, 32); FREE(o);
+	LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ");
+	*ret_conv = CResult_SecretKeyNoneZ_ok(o_ref);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err() {
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_err"))) TS_CResult_SecretKeyNoneZ_err() {
+	LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ");
+	*ret_conv = CResult_SecretKeyNoneZ_err();
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(uint32_t o) {
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_is_ok"))) TS_CResult_SecretKeyNoneZ_is_ok(uint32_t o) {
+	LDKCResult_SecretKeyNoneZ* o_conv = (LDKCResult_SecretKeyNoneZ*)(o & ~1);
+	jboolean ret_conv = CResult_SecretKeyNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_free"))) TS_CResult_SecretKeyNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(_res_ptr);
+	LDKCResult_SecretKeyNoneZ _res_conv = *(LDKCResult_SecretKeyNoneZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(_res_conv);
+	CResult_SecretKeyNoneZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR arg) {
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_SecretKeyNoneZ_clone_ptr(LDKCResult_SecretKeyNoneZ *NONNULL_PTR arg) {
+	LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ");
+	*ret_conv = CResult_SecretKeyNoneZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone_ptr"))) TS_CResult_SecretKeyNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SecretKeyNoneZ* arg_conv = (LDKCResult_SecretKeyNoneZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_SecretKeyNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(uint32_t orig) {
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(orig & ~1);
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SecretKeyNoneZ_clone"))) TS_CResult_SecretKeyNoneZ_clone(uint32_t orig) {
+	LDKCResult_SecretKeyNoneZ* orig_conv = (LDKCResult_SecretKeyNoneZ*)(orig & ~1);
+	LDKCResult_SecretKeyNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyNoneZ), "LDKCResult_SecretKeyNoneZ");
+	*ret_conv = CResult_SecretKeyNoneZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(uint32_t o) {
+uint32_t  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_ok"))) TS_CResult_SignDecodeErrorZ_ok(uint32_t o) {
 	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
 	CHECK_ACCESS(o_ptr);
-	LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr);
-	o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uintptr_t)o) & ~1));
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	LDKSign o_conv = *(LDKSign*)(o_ptr);
+	if (o_conv.free == LDKSign_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKSign_JCalls_cloned(&o_conv);
+	}
+	LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ");
+	*ret_conv = CResult_SignDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(uint32_t e) {
-	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
-	CHECK_ACCESS(e_ptr);
-	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
-	e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1));
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_err"))) TS_CResult_SignDecodeErrorZ_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_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ");
+	*ret_conv = CResult_SignDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(uint32_t o) {
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_is_ok"))) TS_CResult_SignDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_SignDecodeErrorZ* o_conv = (LDKCResult_SignDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_SignDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_free"))) TS_CResult_SignDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(_res_ptr);
+	LDKCResult_SignDecodeErrorZ _res_conv = *(LDKCResult_SignDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(_res_conv);
+	CResult_SignDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR arg) {
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_SignDecodeErrorZ_clone_ptr(LDKCResult_SignDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ");
+	*ret_conv = CResult_SignDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone_ptr"))) TS_CResult_SignDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SignDecodeErrorZ* arg_conv = (LDKCResult_SignDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_SignDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(uint32_t orig) {
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(orig & ~1);
-	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
-	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_SignDecodeErrorZ_clone"))) TS_CResult_SignDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_SignDecodeErrorZ* orig_conv = (LDKCResult_SignDecodeErrorZ*)(orig & ~1);
+	LDKCResult_SignDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignDecodeErrorZ), "LDKCResult_SignDecodeErrorZ");
+	*ret_conv = CResult_SignDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_ok"))) TS_CResult_PaymentSecretNoneZ_ok(int8_tArray o) {
-	LDKThirtyTwoBytes o_ref;
-	CHECK(o->arr_len == 32);
-	memcpy(o_ref.data, o->elems, 32); FREE(o);
-	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
-	*ret_conv = CResult_PaymentSecretNoneZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_u5Z_free"))) TS_CVec_u5Z_free(ptrArray _res) {
+	LDKCVec_u5Z _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKu5), "LDKCVec_u5Z Elements");
+	else
+		_res_constr.data = NULL;
+	int8_t* _res_vals = (void*) _res->elems;
+	for (size_t h = 0; h < _res_constr.datalen; h++) {
+		int8_t _res_conv_7 = _res_vals[h];
+		
+		_res_constr.data[h] = (LDKu5){ ._0 = _res_conv_7 };
+	}
+	FREE(_res);
+	CVec_u5Z_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_err"))) TS_CResult_PaymentSecretNoneZ_err() {
-	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
-	*ret_conv = CResult_PaymentSecretNoneZ_err();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_ok"))) TS_CResult_RecoverableSignatureNoneZ_ok(int8_tArray o) {
+	LDKRecoverableSignature o_ref;
+	CHECK(o->arr_len == 68);
+	memcpy(o_ref.serialized_form, o->elems, 68); FREE(o);
+	LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ");
+	*ret_conv = CResult_RecoverableSignatureNoneZ_ok(o_ref);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_is_ok"))) TS_CResult_PaymentSecretNoneZ_is_ok(uint32_t o) {
-	LDKCResult_PaymentSecretNoneZ* o_conv = (LDKCResult_PaymentSecretNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_PaymentSecretNoneZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_err"))) TS_CResult_RecoverableSignatureNoneZ_err() {
+	LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ");
+	*ret_conv = CResult_RecoverableSignatureNoneZ_err();
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_free"))) TS_CResult_PaymentSecretNoneZ_free(uint32_t _res) {
+jboolean  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_is_ok"))) TS_CResult_RecoverableSignatureNoneZ_is_ok(uint32_t o) {
+	LDKCResult_RecoverableSignatureNoneZ* o_conv = (LDKCResult_RecoverableSignatureNoneZ*)(o & ~1);
+	jboolean ret_conv = CResult_RecoverableSignatureNoneZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_free"))) TS_CResult_RecoverableSignatureNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_PaymentSecretNoneZ _res_conv = *(LDKCResult_PaymentSecretNoneZ*)(_res_ptr);
+	LDKCResult_RecoverableSignatureNoneZ _res_conv = *(LDKCResult_RecoverableSignatureNoneZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_PaymentSecretNoneZ_free(_res_conv);
-}
-
-static inline uintptr_t CResult_PaymentSecretNoneZ_clone_ptr(LDKCResult_PaymentSecretNoneZ *NONNULL_PTR arg) {
-	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
-	*ret_conv = CResult_PaymentSecretNoneZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone_ptr"))) TS_CResult_PaymentSecretNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_PaymentSecretNoneZ* arg_conv = (LDKCResult_PaymentSecretNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PaymentSecretNoneZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone"))) 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 (uintptr_t)ret_conv;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_ok"))) TS_CResult_PaymentSecretAPIErrorZ_ok(int8_tArray o) {
-	LDKThirtyTwoBytes o_ref;
-	CHECK(o->arr_len == 32);
-	memcpy(o_ref.data, o->elems, 32); FREE(o);
-	LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ");
-	*ret_conv = CResult_PaymentSecretAPIErrorZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+	CResult_RecoverableSignatureNoneZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_err"))) TS_CResult_PaymentSecretAPIErrorZ_err(uint32_t e) {
-	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
-	CHECK_ACCESS(e_ptr);
-	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
-	e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1));
-	LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ");
-	*ret_conv = CResult_PaymentSecretAPIErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_RecoverableSignatureNoneZ_clone_ptr(LDKCResult_RecoverableSignatureNoneZ *NONNULL_PTR arg) {
+	LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ");
+	*ret_conv = CResult_RecoverableSignatureNoneZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-
-jboolean  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_is_ok"))) TS_CResult_PaymentSecretAPIErrorZ_is_ok(uint32_t o) {
-	LDKCResult_PaymentSecretAPIErrorZ* o_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PaymentSecretAPIErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone_ptr"))) TS_CResult_RecoverableSignatureNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_RecoverableSignatureNoneZ* arg_conv = (LDKCResult_RecoverableSignatureNoneZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_RecoverableSignatureNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_free"))) TS_CResult_PaymentSecretAPIErrorZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKCResult_PaymentSecretAPIErrorZ _res_conv = *(LDKCResult_PaymentSecretAPIErrorZ*)(_res_ptr);
-	FREE((void*)_res);
-	CResult_PaymentSecretAPIErrorZ_free(_res_conv);
+uint32_t  __attribute__((export_name("TS_CResult_RecoverableSignatureNoneZ_clone"))) TS_CResult_RecoverableSignatureNoneZ_clone(uint32_t orig) {
+	LDKCResult_RecoverableSignatureNoneZ* orig_conv = (LDKCResult_RecoverableSignatureNoneZ*)(orig & ~1);
+	LDKCResult_RecoverableSignatureNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_RecoverableSignatureNoneZ), "LDKCResult_RecoverableSignatureNoneZ");
+	*ret_conv = CResult_RecoverableSignatureNoneZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-static inline uintptr_t CResult_PaymentSecretAPIErrorZ_clone_ptr(LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR arg) {
-	LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ");
-	*ret_conv = CResult_PaymentSecretAPIErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone_ptr"))) TS_CResult_PaymentSecretAPIErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_PaymentSecretAPIErrorZ* arg_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PaymentSecretAPIErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+void  __attribute__((export_name("TS_CVec_u8Z_free"))) TS_CVec_u8Z_free(int8_tArray _res) {
+	LDKCVec_u8Z _res_ref;
+	_res_ref.datalen = _res->arr_len;
+	_res_ref.data = MALLOC(_res_ref.datalen, "LDKCVec_u8Z Bytes");
+	memcpy(_res_ref.data, _res->elems, _res_ref.datalen); FREE(_res);
+	CVec_u8Z_free(_res_ref);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone"))) 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");
-	*ret_conv = CResult_PaymentSecretAPIErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_CVec_u8ZZ_free"))) TS_CVec_CVec_u8ZZ_free(ptrArray _res) {
+	LDKCVec_CVec_u8ZZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKCVec_u8Z), "LDKCVec_CVec_u8ZZ Elements");
+	else
+		_res_constr.data = NULL;
+	int8_tArray* _res_vals = (void*) _res->elems;
+	for (size_t m = 0; m < _res_constr.datalen; m++) {
+		int8_tArray _res_conv_12 = _res_vals[m];
+		LDKCVec_u8Z _res_conv_12_ref;
+		_res_conv_12_ref.datalen = _res_conv_12->arr_len;
+		_res_conv_12_ref.data = MALLOC(_res_conv_12_ref.datalen, "LDKCVec_u8Z Bytes");
+		memcpy(_res_conv_12_ref.data, _res_conv_12->elems, _res_conv_12_ref.datalen); FREE(_res_conv_12);
+		_res_constr.data[m] = _res_conv_12_ref;
+	}
+	FREE(_res);
+	CVec_CVec_u8ZZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_ok(int8_tArray o) {
-	LDKThirtyTwoBytes o_ref;
-	CHECK(o->arr_len == 32);
-	memcpy(o_ref.data, o->elems, 32); FREE(o);
-	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
-	*ret_conv = CResult_PaymentPreimageAPIErrorZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_ok(ptrArray o) {
+	LDKCVec_CVec_u8ZZ o_constr;
+	o_constr.datalen = o->arr_len;
+	if (o_constr.datalen > 0)
+		o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKCVec_u8Z), "LDKCVec_CVec_u8ZZ Elements");
+	else
+		o_constr.data = NULL;
+	int8_tArray* o_vals = (void*) o->elems;
+	for (size_t m = 0; m < o_constr.datalen; m++) {
+		int8_tArray o_conv_12 = o_vals[m];
+		LDKCVec_u8Z o_conv_12_ref;
+		o_conv_12_ref.datalen = o_conv_12->arr_len;
+		o_conv_12_ref.data = MALLOC(o_conv_12_ref.datalen, "LDKCVec_u8Z Bytes");
+		memcpy(o_conv_12_ref.data, o_conv_12->elems, o_conv_12_ref.datalen); FREE(o_conv_12);
+		o_constr.data[m] = o_conv_12_ref;
+	}
+	FREE(o);
+	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
+	*ret_conv = CResult_CVec_CVec_u8ZZNoneZ_ok(o_constr);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_err"))) TS_CResult_PaymentPreimageAPIErrorZ_err(uint32_t e) {
-	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
-	CHECK_ACCESS(e_ptr);
-	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
-	e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1));
-	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
-	*ret_conv = CResult_PaymentPreimageAPIErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_err"))) TS_CResult_CVec_CVec_u8ZZNoneZ_err() {
+	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
+	*ret_conv = CResult_CVec_CVec_u8ZZNoneZ_err();
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_is_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_is_ok(uint32_t o) {
-	LDKCResult_PaymentPreimageAPIErrorZ* o_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PaymentPreimageAPIErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok"))) TS_CResult_CVec_CVec_u8ZZNoneZ_is_ok(uint32_t o) {
+	LDKCResult_CVec_CVec_u8ZZNoneZ* o_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(o & ~1);
+	jboolean ret_conv = CResult_CVec_CVec_u8ZZNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_free"))) TS_CResult_PaymentPreimageAPIErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_free"))) TS_CResult_CVec_CVec_u8ZZNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_PaymentPreimageAPIErrorZ _res_conv = *(LDKCResult_PaymentPreimageAPIErrorZ*)(_res_ptr);
+	LDKCResult_CVec_CVec_u8ZZNoneZ _res_conv = *(LDKCResult_CVec_CVec_u8ZZNoneZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_PaymentPreimageAPIErrorZ_free(_res_conv);
+	CResult_CVec_CVec_u8ZZNoneZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_PaymentPreimageAPIErrorZ_clone_ptr(LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR arg) {
-	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
-	*ret_conv = CResult_PaymentPreimageAPIErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(LDKCResult_CVec_CVec_u8ZZNoneZ *NONNULL_PTR arg) {
+	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
+	*ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr"))) TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_PaymentPreimageAPIErrorZ* arg_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_CVec_CVec_u8ZZNoneZ* arg_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone"))) TS_CResult_PaymentPreimageAPIErrorZ_clone(uint32_t orig) {
-	LDKCResult_PaymentPreimageAPIErrorZ* orig_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(orig & ~1);
-	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
-	*ret_conv = CResult_PaymentPreimageAPIErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_CVec_CVec_u8ZZNoneZ_clone"))) TS_CResult_CVec_CVec_u8ZZNoneZ_clone(uint32_t orig) {
+	LDKCResult_CVec_CVec_u8ZZNoneZ* orig_conv = (LDKCResult_CVec_CVec_u8ZZNoneZ*)(orig & ~1);
+	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
+	*ret_conv = CResult_CVec_CVec_u8ZZNoneZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(uint32_t o) {
-	LDKCounterpartyForwardingInfo o_conv;
+uint32_t  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_ok(uint32_t o) {
+	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 = CounterpartyForwardingInfo_clone(&o_conv);
-	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ");
-	*ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	o_conv = InMemorySigner_clone(&o_conv);
+	LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
+	*ret_conv = CResult_InMemorySignerDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_err"))) TS_CResult_InMemorySignerDecodeErrorZ_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_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ");
-	*ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
+	*ret_conv = CResult_InMemorySignerDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* o_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_is_ok"))) TS_CResult_InMemorySignerDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_InMemorySignerDecodeErrorZ* o_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_InMemorySignerDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_free"))) TS_CResult_InMemorySignerDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ _res_conv = *(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(_res_ptr);
+	LDKCResult_InMemorySignerDecodeErrorZ _res_conv = *(LDKCResult_InMemorySignerDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_CounterpartyForwardingInfoDecodeErrorZ_free(_res_conv);
+	CResult_InMemorySignerDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ");
-	*ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_InMemorySignerDecodeErrorZ_clone_ptr(LDKCResult_InMemorySignerDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
+	*ret_conv = CResult_InMemorySignerDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr"))) TS_CResult_InMemorySignerDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_InMemorySignerDecodeErrorZ* arg_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_InMemorySignerDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(orig & ~1);
-	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ");
-	*ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_InMemorySignerDecodeErrorZ_clone"))) TS_CResult_InMemorySignerDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_InMemorySignerDecodeErrorZ* orig_conv = (LDKCResult_InMemorySignerDecodeErrorZ*)(orig & ~1);
+	LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
+	*ret_conv = CResult_InMemorySignerDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_ok(uint32_t o) {
-	LDKChannelCounterparty 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 = ChannelCounterparty_clone(&o_conv);
-	LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ");
-	*ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_TxOutZ_free"))) TS_CVec_TxOutZ_free(uint32_tArray _res) {
+	LDKCVec_TxOutZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t h = 0; h < _res_constr.datalen; h++) {
+		uint32_t _res_conv_7 = _res_vals[h];
+		void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1);
+		CHECK_ACCESS(_res_conv_7_ptr);
+		LDKTxOut _res_conv_7_conv = *(LDKTxOut*)(_res_conv_7_ptr);
+		FREE((void*)_res_conv_7);
+		_res_constr.data[h] = _res_conv_7_conv;
+	}
+	FREE(_res);
+	CVec_TxOutZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_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_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ");
-	*ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_TransactionNoneZ_ok"))) TS_CResult_TransactionNoneZ_ok(int8_tArray o) {
+	LDKTransaction o_ref;
+	o_ref.datalen = o->arr_len;
+	o_ref.data = MALLOC(o_ref.datalen, "LDKTransaction Bytes");
+	memcpy(o_ref.data, o->elems, o_ref.datalen); FREE(o);
+	o_ref.data_is_owned = true;
+	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
+	*ret_conv = CResult_TransactionNoneZ_ok(o_ref);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_ChannelCounterpartyDecodeErrorZ* o_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelCounterpartyDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_TransactionNoneZ_err"))) TS_CResult_TransactionNoneZ_err() {
+	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
+	*ret_conv = CResult_TransactionNoneZ_err();
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_free"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_free(uint32_t _res) {
+jboolean  __attribute__((export_name("TS_CResult_TransactionNoneZ_is_ok"))) TS_CResult_TransactionNoneZ_is_ok(uint32_t o) {
+	LDKCResult_TransactionNoneZ* o_conv = (LDKCResult_TransactionNoneZ*)(o & ~1);
+	jboolean ret_conv = CResult_TransactionNoneZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_TransactionNoneZ_free"))) TS_CResult_TransactionNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ChannelCounterpartyDecodeErrorZ _res_conv = *(LDKCResult_ChannelCounterpartyDecodeErrorZ*)(_res_ptr);
+	LDKCResult_TransactionNoneZ _res_conv = *(LDKCResult_TransactionNoneZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_ChannelCounterpartyDecodeErrorZ_free(_res_conv);
+	CResult_TransactionNoneZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ");
-	*ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_ChannelCounterpartyDecodeErrorZ* arg_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+static inline uintptr_t CResult_TransactionNoneZ_clone_ptr(LDKCResult_TransactionNoneZ *NONNULL_PTR arg) {
+	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
+	*ret_conv = CResult_TransactionNoneZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-
-uint32_t  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_ChannelCounterpartyDecodeErrorZ* orig_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(orig & ~1);
-	LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ");
-	*ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_TransactionNoneZ_clone_ptr"))) TS_CResult_TransactionNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_TransactionNoneZ* arg_conv = (LDKCResult_TransactionNoneZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_TransactionNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_ok(uint32_t o) {
-	LDKChannelDetails 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 = ChannelDetails_clone(&o_conv);
-	LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ");
-	*ret_conv = CResult_ChannelDetailsDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_TransactionNoneZ_clone"))) TS_CResult_TransactionNoneZ_clone(uint32_t orig) {
+	LDKCResult_TransactionNoneZ* orig_conv = (LDKCResult_TransactionNoneZ*)(orig & ~1);
+	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
+	*ret_conv = CResult_TransactionNoneZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_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_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ");
-	*ret_conv = CResult_ChannelDetailsDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_COption_u16Z_some"))) TS_COption_u16Z_some(int16_t o) {
+	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
+	*ret_copy = COption_u16Z_some(o);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_is_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_ChannelDetailsDecodeErrorZ* o_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelDetailsDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_COption_u16Z_none"))) TS_COption_u16Z_none() {
+	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
+	*ret_copy = COption_u16Z_none();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_free"))) TS_CResult_ChannelDetailsDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_COption_u16Z_free"))) TS_COption_u16Z_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ChannelDetailsDecodeErrorZ _res_conv = *(LDKCResult_ChannelDetailsDecodeErrorZ*)(_res_ptr);
+	LDKCOption_u16Z _res_conv = *(LDKCOption_u16Z*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_ChannelDetailsDecodeErrorZ_free(_res_conv);
+	COption_u16Z_free(_res_conv);
 }
 
-static inline uintptr_t CResult_ChannelDetailsDecodeErrorZ_clone_ptr(LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ");
-	*ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t COption_u16Z_clone_ptr(LDKCOption_u16Z *NONNULL_PTR arg) {
+	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
+	*ret_copy = COption_u16Z_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_ChannelDetailsDecodeErrorZ* arg_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelDetailsDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_COption_u16Z_clone_ptr"))) TS_COption_u16Z_clone_ptr(uint32_t arg) {
+	LDKCOption_u16Z* arg_conv = (LDKCOption_u16Z*)arg;
+	uint32_t ret_conv = COption_u16Z_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_ChannelDetailsDecodeErrorZ* orig_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(orig & ~1);
-	LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ");
-	*ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_COption_u16Z_clone"))) TS_COption_u16Z_clone(uint32_t orig) {
+	LDKCOption_u16Z* orig_conv = (LDKCOption_u16Z*)orig;
+	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
+	*ret_copy = COption_u16Z_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_ok(uint32_t o) {
-	LDKPhantomRouteHints 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 = PhantomRouteHints_clone(&o_conv);
-	LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ");
-	*ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_ok"))) TS_CResult_NoneAPIErrorZ_ok() {
+	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
+	*ret_conv = CResult_NoneAPIErrorZ_ok();
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_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_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ");
-	*ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_err"))) TS_CResult_NoneAPIErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
+	e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1));
+	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
+	*ret_conv = CResult_NoneAPIErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_PhantomRouteHintsDecodeErrorZ* o_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PhantomRouteHintsDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_is_ok"))) TS_CResult_NoneAPIErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NoneAPIErrorZ* o_conv = (LDKCResult_NoneAPIErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_NoneAPIErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_free"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_free"))) TS_CResult_NoneAPIErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_PhantomRouteHintsDecodeErrorZ _res_conv = *(LDKCResult_PhantomRouteHintsDecodeErrorZ*)(_res_ptr);
+	LDKCResult_NoneAPIErrorZ _res_conv = *(LDKCResult_NoneAPIErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_PhantomRouteHintsDecodeErrorZ_free(_res_conv);
+	CResult_NoneAPIErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ");
-	*ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_NoneAPIErrorZ_clone_ptr(LDKCResult_NoneAPIErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
+	*ret_conv = CResult_NoneAPIErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_PhantomRouteHintsDecodeErrorZ* arg_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone_ptr"))) TS_CResult_NoneAPIErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneAPIErrorZ* arg_conv = (LDKCResult_NoneAPIErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NoneAPIErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_PhantomRouteHintsDecodeErrorZ* orig_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(orig & ~1);
-	LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ");
-	*ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NoneAPIErrorZ_clone"))) TS_CResult_NoneAPIErrorZ_clone(uint32_t orig) {
+	LDKCResult_NoneAPIErrorZ* orig_conv = (LDKCResult_NoneAPIErrorZ*)(orig & ~1);
+	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
+	*ret_conv = CResult_NoneAPIErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_ChannelMonitorZ_free(uint32_tArray _res) {
-	LDKCVec_ChannelMonitorZ _res_constr;
+void  __attribute__((export_name("TS_CVec_CResult_NoneAPIErrorZZ_free"))) TS_CVec_CResult_NoneAPIErrorZZ_free(uint32_tArray _res) {
+	LDKCVec_CResult_NoneAPIErrorZZ _res_constr;
 	_res_constr.datalen = _res->arr_len;
 	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKChannelMonitor), "LDKCVec_ChannelMonitorZ Elements");
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKCResult_NoneAPIErrorZ), "LDKCVec_CResult_NoneAPIErrorZZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t q = 0; q < _res_constr.datalen; q++) {
-		uint32_t _res_conv_16 = _res_vals[q];
-		LDKChannelMonitor _res_conv_16_conv;
-		_res_conv_16_conv.inner = (void*)(_res_conv_16 & (~1));
-		_res_conv_16_conv.is_owned = (_res_conv_16 & 1) || (_res_conv_16 == 0);
-		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv);
-		_res_constr.data[q] = _res_conv_16_conv;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t w = 0; w < _res_constr.datalen; w++) {
+		uint32_t _res_conv_22 = _res_vals[w];
+		void* _res_conv_22_ptr = (void*)(((uintptr_t)_res_conv_22) & ~1);
+		CHECK_ACCESS(_res_conv_22_ptr);
+		LDKCResult_NoneAPIErrorZ _res_conv_22_conv = *(LDKCResult_NoneAPIErrorZ*)(_res_conv_22_ptr);
+		FREE((void*)_res_conv_22);
+		_res_constr.data[w] = _res_conv_22_conv;
 	}
-	CVec_ChannelMonitorZ_free(_res_constr);
-}
-
-uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_new"))) TS_C2Tuple_BlockHashChannelManagerZ_new(int8_tArray a, uint32_t b) {
-	LDKThirtyTwoBytes a_ref;
-	CHECK(a->arr_len == 32);
-	memcpy(a_ref.data, a->elems, 32); FREE(a);
-	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);
-	return ((uintptr_t)ret_conv);
-}
-
-void  __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_free"))) TS_C2Tuple_BlockHashChannelManagerZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_BlockHashChannelManagerZ _res_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)(_res_ptr);
-	FREE((void*)_res);
-	C2Tuple_BlockHashChannelManagerZ_free(_res_conv);
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKC2Tuple_BlockHashChannelManagerZ o_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)(o_ptr);
-	// WARNING: we may need a move here but no clone is available for LDKC2Tuple_BlockHashChannelManagerZ
-	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ");
-	*ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_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_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ");
-	*ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
-}
-
-jboolean  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	FREE(_res);
+	CVec_CResult_NoneAPIErrorZZ_free(_res_constr);
 }
 
-void  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(_res_ptr);
-	FREE((void*)_res);
-	CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(_res_conv);
+void  __attribute__((export_name("TS_CVec_APIErrorZ_free"))) TS_CVec_APIErrorZ_free(uint32_tArray _res) {
+	LDKCVec_APIErrorZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKAPIError), "LDKCVec_APIErrorZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t k = 0; k < _res_constr.datalen; k++) {
+		uint32_t _res_conv_10 = _res_vals[k];
+		void* _res_conv_10_ptr = (void*)(((uintptr_t)_res_conv_10) & ~1);
+		CHECK_ACCESS(_res_conv_10_ptr);
+		LDKAPIError _res_conv_10_conv = *(LDKAPIError*)(_res_conv_10_ptr);
+		FREE((void*)_res_conv_10);
+		_res_constr.data[k] = _res_conv_10_conv;
+	}
+	FREE(_res);
+	CVec_APIErrorZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult__u832APIErrorZ_ok"))) TS_CResult__u832APIErrorZ_ok(int8_tArray o) {
+	LDKThirtyTwoBytes o_ref;
+	CHECK(o->arr_len == 32);
+	memcpy(o_ref.data, o->elems, 32); FREE(o);
+	LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ");
+	*ret_conv = CResult__u832APIErrorZ_ok(o_ref);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_err"))) TS_CResult_ChannelConfigDecodeErrorZ_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_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ");
-	*ret_conv = CResult_ChannelConfigDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult__u832APIErrorZ_err"))) TS_CResult__u832APIErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
+	e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1));
+	LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ");
+	*ret_conv = CResult__u832APIErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_is_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_ChannelConfigDecodeErrorZ* o_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelConfigDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult__u832APIErrorZ_is_ok"))) TS_CResult__u832APIErrorZ_is_ok(uint32_t o) {
+	LDKCResult__u832APIErrorZ* o_conv = (LDKCResult__u832APIErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult__u832APIErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_free"))) TS_CResult_ChannelConfigDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult__u832APIErrorZ_free"))) TS_CResult__u832APIErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ChannelConfigDecodeErrorZ _res_conv = *(LDKCResult_ChannelConfigDecodeErrorZ*)(_res_ptr);
+	LDKCResult__u832APIErrorZ _res_conv = *(LDKCResult__u832APIErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_ChannelConfigDecodeErrorZ_free(_res_conv);
+	CResult__u832APIErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_ChannelConfigDecodeErrorZ_clone_ptr(LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ");
-	*ret_conv = CResult_ChannelConfigDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult__u832APIErrorZ_clone_ptr(LDKCResult__u832APIErrorZ *NONNULL_PTR arg) {
+	LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ");
+	*ret_conv = CResult__u832APIErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_ChannelConfigDecodeErrorZ* arg_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult__u832APIErrorZ_clone_ptr"))) TS_CResult__u832APIErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult__u832APIErrorZ* arg_conv = (LDKCResult__u832APIErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult__u832APIErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone"))) TS_CResult_ChannelConfigDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_ChannelConfigDecodeErrorZ* orig_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(orig & ~1);
-	LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ");
-	*ret_conv = CResult_ChannelConfigDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult__u832APIErrorZ_clone"))) TS_CResult__u832APIErrorZ_clone(uint32_t orig) {
+	LDKCResult__u832APIErrorZ* orig_conv = (LDKCResult__u832APIErrorZ*)(orig & ~1);
+	LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ");
+	*ret_conv = CResult__u832APIErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_ok"))) TS_CResult_OutPointDecodeErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_ok(int8_tArray o) {
+	LDKThirtyTwoBytes o_ref;
+	CHECK(o->arr_len == 32);
+	memcpy(o_ref.data, o->elems, 32); FREE(o);
+	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
+	*ret_conv = CResult_PaymentIdPaymentSendFailureZ_ok(o_ref);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_err"))) TS_CResult_OutPointDecodeErrorZ_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_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ");
-	*ret_conv = CResult_OutPointDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_err"))) TS_CResult_PaymentIdPaymentSendFailureZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr);
+	e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1));
+	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
+	*ret_conv = CResult_PaymentIdPaymentSendFailureZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_is_ok"))) TS_CResult_OutPointDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_OutPointDecodeErrorZ* o_conv = (LDKCResult_OutPointDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_OutPointDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_is_ok"))) TS_CResult_PaymentIdPaymentSendFailureZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentIdPaymentSendFailureZ* o_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(o & ~1);
+	jboolean ret_conv = CResult_PaymentIdPaymentSendFailureZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_free"))) TS_CResult_OutPointDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_free"))) TS_CResult_PaymentIdPaymentSendFailureZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_OutPointDecodeErrorZ _res_conv = *(LDKCResult_OutPointDecodeErrorZ*)(_res_ptr);
+	LDKCResult_PaymentIdPaymentSendFailureZ _res_conv = *(LDKCResult_PaymentIdPaymentSendFailureZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_OutPointDecodeErrorZ_free(_res_conv);
+	CResult_PaymentIdPaymentSendFailureZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_OutPointDecodeErrorZ_clone_ptr(LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ");
-	*ret_conv = CResult_OutPointDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_PaymentIdPaymentSendFailureZ_clone_ptr(LDKCResult_PaymentIdPaymentSendFailureZ *NONNULL_PTR arg) {
+	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
+	*ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone_ptr"))) TS_CResult_OutPointDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_OutPointDecodeErrorZ* arg_conv = (LDKCResult_OutPointDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_OutPointDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentIdPaymentSendFailureZ* arg_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone"))) TS_CResult_OutPointDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_OutPointDecodeErrorZ* orig_conv = (LDKCResult_OutPointDecodeErrorZ*)(orig & ~1);
-	LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ");
-	*ret_conv = CResult_OutPointDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentSendFailureZ_clone"))) TS_CResult_PaymentIdPaymentSendFailureZ_clone(uint32_t orig) {
+	LDKCResult_PaymentIdPaymentSendFailureZ* orig_conv = (LDKCResult_PaymentIdPaymentSendFailureZ*)(orig & ~1);
+	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
+	*ret_conv = CResult_PaymentIdPaymentSendFailureZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_TypeZ_some"))) TS_COption_TypeZ_some(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKType o_conv = *(LDKType*)(o_ptr);
-	LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ");
-	*ret_copy = COption_TypeZ_some(o_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_ok"))) TS_CResult_NonePaymentSendFailureZ_ok() {
+	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
+	*ret_conv = CResult_NonePaymentSendFailureZ_ok();
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_TypeZ_none"))) TS_COption_TypeZ_none() {
-	LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ");
-	*ret_copy = COption_TypeZ_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_err"))) TS_CResult_NonePaymentSendFailureZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr);
+	e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1));
+	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
+	*ret_conv = CResult_NonePaymentSendFailureZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_COption_TypeZ_free"))) TS_COption_TypeZ_free(uint32_t _res) {
+jboolean  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_is_ok"))) TS_CResult_NonePaymentSendFailureZ_is_ok(uint32_t o) {
+	LDKCResult_NonePaymentSendFailureZ* o_conv = (LDKCResult_NonePaymentSendFailureZ*)(o & ~1);
+	jboolean ret_conv = CResult_NonePaymentSendFailureZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_free"))) TS_CResult_NonePaymentSendFailureZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCOption_TypeZ _res_conv = *(LDKCOption_TypeZ*)(_res_ptr);
+	LDKCResult_NonePaymentSendFailureZ _res_conv = *(LDKCResult_NonePaymentSendFailureZ*)(_res_ptr);
 	FREE((void*)_res);
-	COption_TypeZ_free(_res_conv);
+	CResult_NonePaymentSendFailureZ_free(_res_conv);
 }
 
-static inline uintptr_t COption_TypeZ_clone_ptr(LDKCOption_TypeZ *NONNULL_PTR arg) {
-	LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ");
-	*ret_copy = COption_TypeZ_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+static inline uintptr_t CResult_NonePaymentSendFailureZ_clone_ptr(LDKCResult_NonePaymentSendFailureZ *NONNULL_PTR arg) {
+	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
+	*ret_conv = CResult_NonePaymentSendFailureZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_COption_TypeZ_clone_ptr"))) TS_COption_TypeZ_clone_ptr(uint32_t arg) {
-	LDKCOption_TypeZ* arg_conv = (LDKCOption_TypeZ*)arg;
-	intptr_t ret_val = COption_TypeZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone_ptr"))) TS_CResult_NonePaymentSendFailureZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NonePaymentSendFailureZ* arg_conv = (LDKCResult_NonePaymentSendFailureZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NonePaymentSendFailureZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_TypeZ_clone"))) TS_COption_TypeZ_clone(uint32_t orig) {
-	LDKCOption_TypeZ* orig_conv = (LDKCOption_TypeZ*)orig;
-	LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ");
-	*ret_copy = COption_TypeZ_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_NonePaymentSendFailureZ_clone"))) TS_CResult_NonePaymentSendFailureZ_clone(uint32_t orig) {
+	LDKCResult_NonePaymentSendFailureZ* orig_conv = (LDKCResult_NonePaymentSendFailureZ*)(orig & ~1);
+	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
+	*ret_conv = CResult_NonePaymentSendFailureZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_ok(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKCOption_TypeZ o_conv = *(LDKCOption_TypeZ*)(o_ptr);
-	o_conv = COption_TypeZ_clone((LDKCOption_TypeZ*)(((uintptr_t)o) & ~1));
-	LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
-	*ret_conv = CResult_COption_TypeZDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t C2Tuple_PaymentHashPaymentIdZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentIdZ *NONNULL_PTR arg) {
+	LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ");
+	*ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_PaymentHashPaymentIdZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_err"))) TS_CResult_COption_TypeZDecodeErrorZ_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_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
-	*ret_conv = CResult_COption_TypeZDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_clone"))) TS_C2Tuple_PaymentHashPaymentIdZ_clone(uint32_t orig) {
+	LDKC2Tuple_PaymentHashPaymentIdZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentIdZ*)(orig & ~1);
+	LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ");
+	*ret_conv = C2Tuple_PaymentHashPaymentIdZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-jboolean  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_is_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_COption_TypeZDecodeErrorZ* o_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_COption_TypeZDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_new"))) TS_C2Tuple_PaymentHashPaymentIdZ_new(int8_tArray a, int8_tArray b) {
+	LDKThirtyTwoBytes a_ref;
+	CHECK(a->arr_len == 32);
+	memcpy(a_ref.data, a->elems, 32); FREE(a);
+	LDKThirtyTwoBytes b_ref;
+	CHECK(b->arr_len == 32);
+	memcpy(b_ref.data, b->elems, 32); FREE(b);
+	LDKC2Tuple_PaymentHashPaymentIdZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentIdZ), "LDKC2Tuple_PaymentHashPaymentIdZ");
+	*ret_conv = C2Tuple_PaymentHashPaymentIdZ_new(a_ref, b_ref);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_free"))) TS_CResult_COption_TypeZDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentIdZ_free"))) TS_C2Tuple_PaymentHashPaymentIdZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_COption_TypeZDecodeErrorZ _res_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(_res_ptr);
+	LDKC2Tuple_PaymentHashPaymentIdZ _res_conv = *(LDKC2Tuple_PaymentHashPaymentIdZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_COption_TypeZDecodeErrorZ_free(_res_conv);
-}
-
-static inline uintptr_t CResult_COption_TypeZDecodeErrorZ_clone_ptr(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
-	*ret_conv = CResult_COption_TypeZDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_COption_TypeZDecodeErrorZ* arg_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone"))) TS_CResult_COption_TypeZDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_COption_TypeZDecodeErrorZ* orig_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(orig & ~1);
-	LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
-	*ret_conv = CResult_COption_TypeZDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	C2Tuple_PaymentHashPaymentIdZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_ok"))) TS_CResult_PaymentIdPaymentErrorZ_ok(int8_tArray o) {
-	LDKThirtyTwoBytes o_ref;
-	CHECK(o->arr_len == 32);
-	memcpy(o_ref.data, o->elems, 32); FREE(o);
-	LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ");
-	*ret_conv = CResult_PaymentIdPaymentErrorZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKC2Tuple_PaymentHashPaymentIdZ o_conv = *(LDKC2Tuple_PaymentHashPaymentIdZ*)(o_ptr);
+	o_conv = C2Tuple_PaymentHashPaymentIdZ_clone((LDKC2Tuple_PaymentHashPaymentIdZ*)(((uintptr_t)o) & ~1));
+	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_err"))) TS_CResult_PaymentIdPaymentErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(uint32_t e) {
 	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
 	CHECK_ACCESS(e_ptr);
-	LDKPaymentError e_conv = *(LDKPaymentError*)(e_ptr);
-	e_conv = PaymentError_clone((LDKPaymentError*)(((uintptr_t)e) & ~1));
-	LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ");
-	*ret_conv = CResult_PaymentIdPaymentErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKPaymentSendFailure e_conv = *(LDKPaymentSendFailure*)(e_ptr);
+	e_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)e) & ~1));
+	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_is_ok"))) TS_CResult_PaymentIdPaymentErrorZ_is_ok(uint32_t o) {
-	LDKCResult_PaymentIdPaymentErrorZ* o_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PaymentIdPaymentErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(o & ~1);
+	jboolean ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_free"))) TS_CResult_PaymentIdPaymentErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_PaymentIdPaymentErrorZ _res_conv = *(LDKCResult_PaymentIdPaymentErrorZ*)(_res_ptr);
+	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_PaymentIdPaymentErrorZ_free(_res_conv);
+	CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_free(_res_conv);
 }
 
-static inline uintptr_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 (uintptr_t)ret_conv;
+static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ *NONNULL_PTR arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone_ptr"))) TS_CResult_PaymentIdPaymentErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_PaymentIdPaymentErrorZ* arg_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PaymentIdPaymentErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone"))) TS_CResult_PaymentIdPaymentErrorZ_clone(uint32_t orig) {
-	LDKCResult_PaymentIdPaymentErrorZ* orig_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(orig & ~1);
-	LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ");
-	*ret_conv = CResult_PaymentIdPaymentErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(uint32_t orig) {
+	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ*)(orig & ~1);
+	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SiPrefixNoneZ_ok"))) TS_CResult_SiPrefixNoneZ_ok(uint32_t o) {
-	LDKSiPrefix o_conv = LDKSiPrefix_from_js(o);
-	LDKCResult_SiPrefixNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixNoneZ), "LDKCResult_SiPrefixNoneZ");
-	*ret_conv = CResult_SiPrefixNoneZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_ThirtyTwoBytesZ_free"))) TS_CVec_ThirtyTwoBytesZ_free(ptrArray _res) {
+	LDKCVec_ThirtyTwoBytesZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_ThirtyTwoBytesZ Elements");
+	else
+		_res_constr.data = NULL;
+	int8_tArray* _res_vals = (void*) _res->elems;
+	for (size_t m = 0; m < _res_constr.datalen; m++) {
+		int8_tArray _res_conv_12 = _res_vals[m];
+		LDKThirtyTwoBytes _res_conv_12_ref;
+		CHECK(_res_conv_12->arr_len == 32);
+		memcpy(_res_conv_12_ref.data, _res_conv_12->elems, 32); FREE(_res_conv_12);
+		_res_constr.data[m] = _res_conv_12_ref;
+	}
+	FREE(_res);
+	CVec_ThirtyTwoBytesZ_free(_res_constr);
+}
+
+static inline uintptr_t C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(LDKC2Tuple_PaymentHashPaymentSecretZ *NONNULL_PTR arg) {
+	LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
+	*ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_PaymentHashPaymentSecretZ* arg_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SiPrefixNoneZ_err"))) TS_CResult_SiPrefixNoneZ_err() {
-	LDKCResult_SiPrefixNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixNoneZ), "LDKCResult_SiPrefixNoneZ");
-	*ret_conv = CResult_SiPrefixNoneZ_err();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_clone"))) TS_C2Tuple_PaymentHashPaymentSecretZ_clone(uint32_t orig) {
+	LDKC2Tuple_PaymentHashPaymentSecretZ* orig_conv = (LDKC2Tuple_PaymentHashPaymentSecretZ*)(orig & ~1);
+	LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
+	*ret_conv = C2Tuple_PaymentHashPaymentSecretZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-jboolean  __attribute__((export_name("TS_CResult_SiPrefixNoneZ_is_ok"))) 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;
+uint32_t  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_new"))) TS_C2Tuple_PaymentHashPaymentSecretZ_new(int8_tArray a, int8_tArray b) {
+	LDKThirtyTwoBytes a_ref;
+	CHECK(a->arr_len == 32);
+	memcpy(a_ref.data, a->elems, 32); FREE(a);
+	LDKThirtyTwoBytes b_ref;
+	CHECK(b->arr_len == 32);
+	memcpy(b_ref.data, b->elems, 32); FREE(b);
+	LDKC2Tuple_PaymentHashPaymentSecretZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PaymentHashPaymentSecretZ), "LDKC2Tuple_PaymentHashPaymentSecretZ");
+	*ret_conv = C2Tuple_PaymentHashPaymentSecretZ_new(a_ref, b_ref);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_CResult_SiPrefixNoneZ_free"))) TS_CResult_SiPrefixNoneZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C2Tuple_PaymentHashPaymentSecretZ_free"))) TS_C2Tuple_PaymentHashPaymentSecretZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_SiPrefixNoneZ _res_conv = *(LDKCResult_SiPrefixNoneZ*)(_res_ptr);
+	LDKC2Tuple_PaymentHashPaymentSecretZ _res_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_SiPrefixNoneZ_free(_res_conv);
-}
-
-static inline uintptr_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 (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_SiPrefixNoneZ_clone_ptr"))) TS_CResult_SiPrefixNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_SiPrefixNoneZ* arg_conv = (LDKCResult_SiPrefixNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_SiPrefixNoneZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_SiPrefixNoneZ_clone"))) 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");
-	*ret_conv = CResult_SiPrefixNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	C2Tuple_PaymentHashPaymentSecretZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_InvoiceNoneZ_ok"))) TS_CResult_InvoiceNoneZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr);
+	o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uintptr_t)o) & ~1));
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_InvoiceNoneZ_err"))) TS_CResult_InvoiceNoneZ_err() {
-	LDKCResult_InvoiceNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceNoneZ), "LDKCResult_InvoiceNoneZ");
-	*ret_conv = CResult_InvoiceNoneZ_err();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err() {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_err();
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_InvoiceNoneZ_is_ok"))) 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;
+jboolean  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(o & ~1);
+	jboolean ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_InvoiceNoneZ_free"))) TS_CResult_InvoiceNoneZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_InvoiceNoneZ _res_conv = *(LDKCResult_InvoiceNoneZ*)(_res_ptr);
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_InvoiceNoneZ_free(_res_conv);
+	CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_free(_res_conv);
 }
 
-static inline uintptr_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 (uintptr_t)ret_conv;
+static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ *NONNULL_PTR arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_InvoiceNoneZ_clone_ptr"))) TS_CResult_InvoiceNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_InvoiceNoneZ* arg_conv = (LDKCResult_InvoiceNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_InvoiceNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_InvoiceNoneZ_clone"))) 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");
-	*ret_conv = CResult_InvoiceNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(uint32_t orig) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ*)(orig & ~1);
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZNoneZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceNoneZ_ok"))) TS_CResult_SignedRawInvoiceNoneZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKC2Tuple_PaymentHashPaymentSecretZ o_conv = *(LDKC2Tuple_PaymentHashPaymentSecretZ*)(o_ptr);
+	o_conv = C2Tuple_PaymentHashPaymentSecretZ_clone((LDKC2Tuple_PaymentHashPaymentSecretZ*)(((uintptr_t)o) & ~1));
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceNoneZ_err"))) TS_CResult_SignedRawInvoiceNoneZ_err() {
-	LDKCResult_SignedRawInvoiceNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceNoneZ), "LDKCResult_SignedRawInvoiceNoneZ");
-	*ret_conv = CResult_SignedRawInvoiceNoneZ_err();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
+	e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1));
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_SignedRawInvoiceNoneZ_is_ok"))) 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;
+jboolean  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* o_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_SignedRawInvoiceNoneZ_free"))) TS_CResult_SignedRawInvoiceNoneZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_SignedRawInvoiceNoneZ _res_conv = *(LDKCResult_SignedRawInvoiceNoneZ*)(_res_ptr);
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ _res_conv = *(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_SignedRawInvoiceNoneZ_free(_res_conv);
+	CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_free(_res_conv);
 }
 
-static inline uintptr_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 (uintptr_t)ret_conv;
+static inline uintptr_t CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ *NONNULL_PTR arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceNoneZ_clone_ptr"))) TS_CResult_SignedRawInvoiceNoneZ_clone_ptr(uint32_t arg) {
-	LDKCResult_SignedRawInvoiceNoneZ* arg_conv = (LDKCResult_SignedRawInvoiceNoneZ*)(arg & ~1);
-	intptr_t ret_val = CResult_SignedRawInvoiceNoneZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* arg_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceNoneZ_clone"))) 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");
-	*ret_conv = CResult_SignedRawInvoiceNoneZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone"))) TS_CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(uint32_t orig) {
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* orig_conv = (LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ*)(orig & ~1);
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
+	*ret_conv = CResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-static inline uintptr_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 ((uintptr_t)ret_conv);
-}
-intptr_t  __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(uint32_t arg) {
-	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* arg_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(arg & ~1);
-	intptr_t ret_val = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_ok"))) TS_CResult_PaymentSecretNoneZ_ok(int8_tArray o) {
+	LDKThirtyTwoBytes o_ref;
+	CHECK(o->arr_len == 32);
+	memcpy(o_ref.data, o->elems, 32); FREE(o);
+	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
+	*ret_conv = CResult_PaymentSecretNoneZ_ok(o_ref);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(uint32_t orig) {
-	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* orig_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(orig & ~1);
-	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ");
-	*ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_err"))) TS_CResult_PaymentSecretNoneZ_err() {
+	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
+	*ret_conv = CResult_PaymentSecretNoneZ_err();
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(uint32_t a, int8_tArray b, uint32_t c) {
-	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(b->arr_len == 32);
-	memcpy(b_ref.data, b->elems, 32); FREE(b);
-	LDKInvoiceSignature c_conv;
-	c_conv.inner = (void*)(c & (~1));
-	c_conv.is_owned = (c & 1) || (c == 0);
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(c_conv);
-	c_conv = InvoiceSignature_clone(&c_conv);
-	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ");
-	*ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(a_conv, b_ref, c_conv);
-	return ((uintptr_t)ret_conv);
+jboolean  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_is_ok"))) TS_CResult_PaymentSecretNoneZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentSecretNoneZ* o_conv = (LDKCResult_PaymentSecretNoneZ*)(o & ~1);
+	jboolean ret_conv = CResult_PaymentSecretNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_free"))) TS_CResult_PaymentSecretNoneZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ _res_conv = *(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(_res_ptr);
+	LDKCResult_PaymentSecretNoneZ _res_conv = *(LDKCResult_PaymentSecretNoneZ*)(_res_ptr);
 	FREE((void*)_res);
-	C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(_res_conv);
+	CResult_PaymentSecretNoneZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_ok"))) TS_CResult_PayeePubKeyErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_PaymentSecretNoneZ_clone_ptr(LDKCResult_PaymentSecretNoneZ *NONNULL_PTR arg) {
+	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
+	*ret_conv = CResult_PaymentSecretNoneZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone_ptr"))) TS_CResult_PaymentSecretNoneZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentSecretNoneZ* arg_conv = (LDKCResult_PaymentSecretNoneZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_PaymentSecretNoneZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_err"))) TS_CResult_PayeePubKeyErrorZ_err(uint32_t e) {
-	LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e);
-	LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ");
-	*ret_conv = CResult_PayeePubKeyErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretNoneZ_clone"))) TS_CResult_PaymentSecretNoneZ_clone(uint32_t orig) {
+	LDKCResult_PaymentSecretNoneZ* orig_conv = (LDKCResult_PaymentSecretNoneZ*)(orig & ~1);
+	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
+	*ret_conv = CResult_PaymentSecretNoneZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_is_ok"))) TS_CResult_PayeePubKeyErrorZ_is_ok(uint32_t o) {
-	LDKCResult_PayeePubKeyErrorZ* o_conv = (LDKCResult_PayeePubKeyErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PayeePubKeyErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_ok"))) TS_CResult_PaymentSecretAPIErrorZ_ok(int8_tArray o) {
+	LDKThirtyTwoBytes o_ref;
+	CHECK(o->arr_len == 32);
+	memcpy(o_ref.data, o->elems, 32); FREE(o);
+	LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ");
+	*ret_conv = CResult_PaymentSecretAPIErrorZ_ok(o_ref);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_free"))) TS_CResult_PayeePubKeyErrorZ_free(uint32_t _res) {
+uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_err"))) TS_CResult_PaymentSecretAPIErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
+	e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1));
+	LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ");
+	*ret_conv = CResult_PaymentSecretAPIErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_is_ok"))) TS_CResult_PaymentSecretAPIErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentSecretAPIErrorZ* o_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_PaymentSecretAPIErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_free"))) TS_CResult_PaymentSecretAPIErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_PayeePubKeyErrorZ _res_conv = *(LDKCResult_PayeePubKeyErrorZ*)(_res_ptr);
+	LDKCResult_PaymentSecretAPIErrorZ _res_conv = *(LDKCResult_PaymentSecretAPIErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_PayeePubKeyErrorZ_free(_res_conv);
+	CResult_PaymentSecretAPIErrorZ_free(_res_conv);
 }
 
-static inline uintptr_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 (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone_ptr"))) TS_CResult_PayeePubKeyErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_PayeePubKeyErrorZ* arg_conv = (LDKCResult_PayeePubKeyErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PayeePubKeyErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+static inline uintptr_t CResult_PaymentSecretAPIErrorZ_clone_ptr(LDKCResult_PaymentSecretAPIErrorZ *NONNULL_PTR arg) {
+	LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ");
+	*ret_conv = CResult_PaymentSecretAPIErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-
-uint32_t  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone"))) TS_CResult_PayeePubKeyErrorZ_clone(uint32_t orig) {
-	LDKCResult_PayeePubKeyErrorZ* orig_conv = (LDKCResult_PayeePubKeyErrorZ*)(orig & ~1);
-	LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ");
-	*ret_conv = CResult_PayeePubKeyErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone_ptr"))) TS_CResult_PaymentSecretAPIErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentSecretAPIErrorZ* arg_conv = (LDKCResult_PaymentSecretAPIErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_PaymentSecretAPIErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CVec_PrivateRouteZ_free"))) TS_CVec_PrivateRouteZ_free(uint32_tArray _res) {
-	LDKCVec_PrivateRouteZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKPrivateRoute), "LDKCVec_PrivateRouteZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t o = 0; o < _res_constr.datalen; o++) {
-		uint32_t _res_conv_14 = _res_vals[o];
-		LDKPrivateRoute _res_conv_14_conv;
-		_res_conv_14_conv.inner = (void*)(_res_conv_14 & (~1));
-		_res_conv_14_conv.is_owned = (_res_conv_14 & 1) || (_res_conv_14 == 0);
-		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv);
-		_res_constr.data[o] = _res_conv_14_conv;
-	}
-	CVec_PrivateRouteZ_free(_res_constr);
+uint32_t  __attribute__((export_name("TS_CResult_PaymentSecretAPIErrorZ_clone"))) 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");
+	*ret_conv = CResult_PaymentSecretAPIErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_ok(int8_tArray o) {
+	LDKThirtyTwoBytes o_ref;
+	CHECK(o->arr_len == 32);
+	memcpy(o_ref.data, o->elems, 32); FREE(o);
+	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
+	*ret_conv = CResult_PaymentPreimageAPIErrorZ_ok(o_ref);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_err"))) TS_CResult_PositiveTimestampCreationErrorZ_err(uint32_t e) {
-	LDKCreationError e_conv = LDKCreationError_from_js(e);
-	LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ");
-	*ret_conv = CResult_PositiveTimestampCreationErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_err"))) TS_CResult_PaymentPreimageAPIErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKAPIError e_conv = *(LDKAPIError*)(e_ptr);
+	e_conv = APIError_clone((LDKAPIError*)(((uintptr_t)e) & ~1));
+	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
+	*ret_conv = CResult_PaymentPreimageAPIErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_is_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_is_ok(uint32_t o) {
-	LDKCResult_PositiveTimestampCreationErrorZ* o_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PositiveTimestampCreationErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_is_ok"))) TS_CResult_PaymentPreimageAPIErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentPreimageAPIErrorZ* o_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_PaymentPreimageAPIErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_free"))) TS_CResult_PositiveTimestampCreationErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_free"))) TS_CResult_PaymentPreimageAPIErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_PositiveTimestampCreationErrorZ _res_conv = *(LDKCResult_PositiveTimestampCreationErrorZ*)(_res_ptr);
+	LDKCResult_PaymentPreimageAPIErrorZ _res_conv = *(LDKCResult_PaymentPreimageAPIErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_PositiveTimestampCreationErrorZ_free(_res_conv);
+	CResult_PaymentPreimageAPIErrorZ_free(_res_conv);
 }
 
-static inline uintptr_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 (uintptr_t)ret_conv;
+static inline uintptr_t CResult_PaymentPreimageAPIErrorZ_clone_ptr(LDKCResult_PaymentPreimageAPIErrorZ *NONNULL_PTR arg) {
+	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
+	*ret_conv = CResult_PaymentPreimageAPIErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr"))) TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_PositiveTimestampCreationErrorZ* arg_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PositiveTimestampCreationErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr"))) TS_CResult_PaymentPreimageAPIErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentPreimageAPIErrorZ* arg_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_PaymentPreimageAPIErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone"))) TS_CResult_PositiveTimestampCreationErrorZ_clone(uint32_t orig) {
-	LDKCResult_PositiveTimestampCreationErrorZ* orig_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(orig & ~1);
-	LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ");
-	*ret_conv = CResult_PositiveTimestampCreationErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentPreimageAPIErrorZ_clone"))) TS_CResult_PaymentPreimageAPIErrorZ_clone(uint32_t orig) {
+	LDKCResult_PaymentPreimageAPIErrorZ* orig_conv = (LDKCResult_PaymentPreimageAPIErrorZ*)(orig & ~1);
+	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
+	*ret_conv = CResult_PaymentPreimageAPIErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_ok"))) TS_CResult_NoneSemanticErrorZ_ok() {
-	LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ");
-	*ret_conv = CResult_NoneSemanticErrorZ_ok();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(uint32_t o) {
+	LDKCounterpartyForwardingInfo 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 = CounterpartyForwardingInfo_clone(&o_conv);
+	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ");
+	*ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_err"))) TS_CResult_NoneSemanticErrorZ_err(uint32_t e) {
-	LDKSemanticError e_conv = LDKSemanticError_from_js(e);
-	LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ");
-	*ret_conv = CResult_NoneSemanticErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_err"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_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_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ");
+	*ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_is_ok"))) TS_CResult_NoneSemanticErrorZ_is_ok(uint32_t o) {
-	LDKCResult_NoneSemanticErrorZ* o_conv = (LDKCResult_NoneSemanticErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NoneSemanticErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* o_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_free"))) TS_CResult_NoneSemanticErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NoneSemanticErrorZ _res_conv = *(LDKCResult_NoneSemanticErrorZ*)(_res_ptr);
+	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ _res_conv = *(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_NoneSemanticErrorZ_free(_res_conv);
+	CResult_CounterpartyForwardingInfoDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_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 (uintptr_t)ret_conv;
+static inline uintptr_t CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ");
+	*ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone_ptr"))) TS_CResult_NoneSemanticErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_NoneSemanticErrorZ* arg_conv = (LDKCResult_NoneSemanticErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NoneSemanticErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* arg_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone"))) TS_CResult_NoneSemanticErrorZ_clone(uint32_t orig) {
-	LDKCResult_NoneSemanticErrorZ* orig_conv = (LDKCResult_NoneSemanticErrorZ*)(orig & ~1);
-	LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ");
-	*ret_conv = CResult_NoneSemanticErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone"))) TS_CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* orig_conv = (LDKCResult_CounterpartyForwardingInfoDecodeErrorZ*)(orig & ~1);
+	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ");
+	*ret_conv = CResult_CounterpartyForwardingInfoDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_ok"))) TS_CResult_InvoiceSemanticErrorZ_ok(uint32_t o) {
-	LDKInvoice o_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_ok(uint32_t o) {
+	LDKChannelCounterparty 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);
-	return (uintptr_t)ret_conv;
+	o_conv = ChannelCounterparty_clone(&o_conv);
+	LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ");
+	*ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_err"))) TS_CResult_InvoiceSemanticErrorZ_err(uint32_t e) {
-	LDKSemanticError e_conv = LDKSemanticError_from_js(e);
-	LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ");
-	*ret_conv = CResult_InvoiceSemanticErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_err"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_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_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ");
+	*ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_is_ok"))) TS_CResult_InvoiceSemanticErrorZ_is_ok(uint32_t o) {
-	LDKCResult_InvoiceSemanticErrorZ* o_conv = (LDKCResult_InvoiceSemanticErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_InvoiceSemanticErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelCounterpartyDecodeErrorZ* o_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_free"))) TS_CResult_InvoiceSemanticErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_free"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_InvoiceSemanticErrorZ _res_conv = *(LDKCResult_InvoiceSemanticErrorZ*)(_res_ptr);
+	LDKCResult_ChannelCounterpartyDecodeErrorZ _res_conv = *(LDKCResult_ChannelCounterpartyDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_InvoiceSemanticErrorZ_free(_res_conv);
+	CResult_ChannelCounterpartyDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_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 (uintptr_t)ret_conv;
+static inline uintptr_t CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(LDKCResult_ChannelCounterpartyDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ");
+	*ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceSemanticErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_InvoiceSemanticErrorZ* arg_conv = (LDKCResult_InvoiceSemanticErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_InvoiceSemanticErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelCounterpartyDecodeErrorZ* arg_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone"))) TS_CResult_InvoiceSemanticErrorZ_clone(uint32_t orig) {
-	LDKCResult_InvoiceSemanticErrorZ* orig_conv = (LDKCResult_InvoiceSemanticErrorZ*)(orig & ~1);
-	LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ");
-	*ret_conv = CResult_InvoiceSemanticErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelCounterpartyDecodeErrorZ_clone"))) TS_CResult_ChannelCounterpartyDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_ChannelCounterpartyDecodeErrorZ* orig_conv = (LDKCResult_ChannelCounterpartyDecodeErrorZ*)(orig & ~1);
+	LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ");
+	*ret_conv = CResult_ChannelCounterpartyDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_ok"))) TS_CResult_DescriptionCreationErrorZ_ok(uint32_t o) {
-	LDKDescription o_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_ok(uint32_t o) {
+	LDKChannelDetails 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);
-	return (uintptr_t)ret_conv;
+	o_conv = ChannelDetails_clone(&o_conv);
+	LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ");
+	*ret_conv = CResult_ChannelDetailsDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_err"))) TS_CResult_DescriptionCreationErrorZ_err(uint32_t e) {
-	LDKCreationError e_conv = LDKCreationError_from_js(e);
-	LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ");
-	*ret_conv = CResult_DescriptionCreationErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_err"))) TS_CResult_ChannelDetailsDecodeErrorZ_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_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ");
+	*ret_conv = CResult_ChannelDetailsDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_is_ok"))) TS_CResult_DescriptionCreationErrorZ_is_ok(uint32_t o) {
-	LDKCResult_DescriptionCreationErrorZ* o_conv = (LDKCResult_DescriptionCreationErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_DescriptionCreationErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_is_ok"))) TS_CResult_ChannelDetailsDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelDetailsDecodeErrorZ* o_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_ChannelDetailsDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_free"))) TS_CResult_DescriptionCreationErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_free"))) TS_CResult_ChannelDetailsDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_DescriptionCreationErrorZ _res_conv = *(LDKCResult_DescriptionCreationErrorZ*)(_res_ptr);
+	LDKCResult_ChannelDetailsDecodeErrorZ _res_conv = *(LDKCResult_ChannelDetailsDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_DescriptionCreationErrorZ_free(_res_conv);
+	CResult_ChannelDetailsDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_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 (uintptr_t)ret_conv;
+static inline uintptr_t CResult_ChannelDetailsDecodeErrorZ_clone_ptr(LDKCResult_ChannelDetailsDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ");
+	*ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone_ptr"))) TS_CResult_DescriptionCreationErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_DescriptionCreationErrorZ* arg_conv = (LDKCResult_DescriptionCreationErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_DescriptionCreationErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelDetailsDecodeErrorZ* arg_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone"))) TS_CResult_DescriptionCreationErrorZ_clone(uint32_t orig) {
-	LDKCResult_DescriptionCreationErrorZ* orig_conv = (LDKCResult_DescriptionCreationErrorZ*)(orig & ~1);
-	LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ");
-	*ret_conv = CResult_DescriptionCreationErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelDetailsDecodeErrorZ_clone"))) TS_CResult_ChannelDetailsDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_ChannelDetailsDecodeErrorZ* orig_conv = (LDKCResult_ChannelDetailsDecodeErrorZ*)(orig & ~1);
+	LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ");
+	*ret_conv = CResult_ChannelDetailsDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_ok"))) TS_CResult_PrivateRouteCreationErrorZ_ok(uint32_t o) {
-	LDKPrivateRoute o_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_ok(uint32_t o) {
+	LDKPhantomRouteHints 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);
-	return (uintptr_t)ret_conv;
+	o_conv = PhantomRouteHints_clone(&o_conv);
+	LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ");
+	*ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_err"))) TS_CResult_PrivateRouteCreationErrorZ_err(uint32_t e) {
-	LDKCreationError e_conv = LDKCreationError_from_js(e);
-	LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ");
-	*ret_conv = CResult_PrivateRouteCreationErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_err"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_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_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ");
+	*ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_is_ok"))) TS_CResult_PrivateRouteCreationErrorZ_is_ok(uint32_t o) {
-	LDKCResult_PrivateRouteCreationErrorZ* o_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PrivateRouteCreationErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PhantomRouteHintsDecodeErrorZ* o_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_free"))) TS_CResult_PrivateRouteCreationErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_free"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_PrivateRouteCreationErrorZ _res_conv = *(LDKCResult_PrivateRouteCreationErrorZ*)(_res_ptr);
+	LDKCResult_PhantomRouteHintsDecodeErrorZ _res_conv = *(LDKCResult_PhantomRouteHintsDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_PrivateRouteCreationErrorZ_free(_res_conv);
+	CResult_PhantomRouteHintsDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_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 (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone_ptr"))) TS_CResult_PrivateRouteCreationErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_PrivateRouteCreationErrorZ* arg_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PrivateRouteCreationErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+static inline uintptr_t CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(LDKCResult_PhantomRouteHintsDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ");
+	*ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-
-uint32_t  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone"))) 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");
-	*ret_conv = CResult_PrivateRouteCreationErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PhantomRouteHintsDecodeErrorZ* arg_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_StringErrorZ_ok"))) TS_CResult_StringErrorZ_ok(jstring o) {
-	LDKStr o_conv = str_ref_to_owned_c(o);
-	LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ");
-	*ret_conv = CResult_StringErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PhantomRouteHintsDecodeErrorZ_clone"))) TS_CResult_PhantomRouteHintsDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_PhantomRouteHintsDecodeErrorZ* orig_conv = (LDKCResult_PhantomRouteHintsDecodeErrorZ*)(orig & ~1);
+	LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ");
+	*ret_conv = CResult_PhantomRouteHintsDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_StringErrorZ_err"))) TS_CResult_StringErrorZ_err(uint32_t e) {
-	LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e);
-	LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ");
-	*ret_conv = CResult_StringErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_ChannelMonitorZ_free"))) TS_CVec_ChannelMonitorZ_free(uint32_tArray _res) {
+	LDKCVec_ChannelMonitorZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKChannelMonitor), "LDKCVec_ChannelMonitorZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t q = 0; q < _res_constr.datalen; q++) {
+		uint32_t _res_conv_16 = _res_vals[q];
+		LDKChannelMonitor _res_conv_16_conv;
+		_res_conv_16_conv.inner = (void*)(_res_conv_16 & (~1));
+		_res_conv_16_conv.is_owned = (_res_conv_16 & 1) || (_res_conv_16 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv);
+		_res_constr.data[q] = _res_conv_16_conv;
+	}
+	FREE(_res);
+	CVec_ChannelMonitorZ_free(_res_constr);
 }
 
-jboolean  __attribute__((export_name("TS_CResult_StringErrorZ_is_ok"))) TS_CResult_StringErrorZ_is_ok(uint32_t o) {
-	LDKCResult_StringErrorZ* o_conv = (LDKCResult_StringErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_StringErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_new"))) TS_C2Tuple_BlockHashChannelManagerZ_new(int8_tArray a, uint32_t b) {
+	LDKThirtyTwoBytes a_ref;
+	CHECK(a->arr_len == 32);
+	memcpy(a_ref.data, a->elems, 32); FREE(a);
+	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);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_CResult_StringErrorZ_free"))) TS_CResult_StringErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_free"))) TS_C2Tuple_BlockHashChannelManagerZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_StringErrorZ _res_conv = *(LDKCResult_StringErrorZ*)(_res_ptr);
+	LDKC2Tuple_BlockHashChannelManagerZ _res_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_StringErrorZ_free(_res_conv);
+	C2Tuple_BlockHashChannelManagerZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKC2Tuple_BlockHashChannelManagerZ o_conv = *(LDKC2Tuple_BlockHashChannelManagerZ*)(o_ptr);
+	// WARNING: we may need a move here but no clone is available for LDKC2Tuple_BlockHashChannelManagerZ
+	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ");
+	*ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_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_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ");
-	*ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ");
+	*ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free"))) TS_CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ChannelMonitorUpdateDecodeErrorZ _res_conv = *(LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(_res_ptr);
+	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_ChannelMonitorUpdateDecodeErrorZ_free(_res_conv);
-}
-
-static inline uintptr_t CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ");
-	*ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	CResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(orig & ~1);
-	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ");
-	*ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_MonitorEventZ_some"))) TS_COption_MonitorEventZ_some(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKMonitorEvent o_conv = *(LDKMonitorEvent*)(o_ptr);
-	o_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uintptr_t)o) & ~1));
-	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
-	*ret_copy = COption_MonitorEventZ_some(o_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_err"))) TS_CResult_ChannelConfigDecodeErrorZ_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_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ");
+	*ret_conv = CResult_ChannelConfigDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_MonitorEventZ_none"))) TS_COption_MonitorEventZ_none() {
-	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
-	*ret_copy = COption_MonitorEventZ_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+jboolean  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_is_ok"))) TS_CResult_ChannelConfigDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelConfigDecodeErrorZ* o_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_ChannelConfigDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_COption_MonitorEventZ_free"))) TS_COption_MonitorEventZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_free"))) TS_CResult_ChannelConfigDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCOption_MonitorEventZ _res_conv = *(LDKCOption_MonitorEventZ*)(_res_ptr);
+	LDKCResult_ChannelConfigDecodeErrorZ _res_conv = *(LDKCResult_ChannelConfigDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	COption_MonitorEventZ_free(_res_conv);
+	CResult_ChannelConfigDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t COption_MonitorEventZ_clone_ptr(LDKCOption_MonitorEventZ *NONNULL_PTR arg) {
-	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
-	*ret_copy = COption_MonitorEventZ_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+static inline uintptr_t CResult_ChannelConfigDecodeErrorZ_clone_ptr(LDKCResult_ChannelConfigDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ");
+	*ret_conv = CResult_ChannelConfigDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_COption_MonitorEventZ_clone_ptr"))) TS_COption_MonitorEventZ_clone_ptr(uint32_t arg) {
-	LDKCOption_MonitorEventZ* arg_conv = (LDKCOption_MonitorEventZ*)arg;
-	intptr_t ret_val = COption_MonitorEventZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelConfigDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelConfigDecodeErrorZ* arg_conv = (LDKCResult_ChannelConfigDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_ChannelConfigDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_MonitorEventZ_clone"))) TS_COption_MonitorEventZ_clone(uint32_t orig) {
-	LDKCOption_MonitorEventZ* orig_conv = (LDKCOption_MonitorEventZ*)orig;
-	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
-	*ret_copy = COption_MonitorEventZ_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelConfigDecodeErrorZ_clone"))) 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");
+	*ret_conv = CResult_ChannelConfigDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_ok(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKCOption_MonitorEventZ o_conv = *(LDKCOption_MonitorEventZ*)(o_ptr);
-	o_conv = COption_MonitorEventZ_clone((LDKCOption_MonitorEventZ*)(((uintptr_t)o) & ~1));
-	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
-	*ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_ok"))) TS_CResult_OutPointDecodeErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_err"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_err"))) TS_CResult_OutPointDecodeErrorZ_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 (uintptr_t)ret_conv;
+	LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ");
+	*ret_conv = CResult_OutPointDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_COption_MonitorEventZDecodeErrorZ* o_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_COption_MonitorEventZDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_is_ok"))) TS_CResult_OutPointDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_OutPointDecodeErrorZ* o_conv = (LDKCResult_OutPointDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_OutPointDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_free"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_free"))) TS_CResult_OutPointDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_COption_MonitorEventZDecodeErrorZ _res_conv = *(LDKCResult_COption_MonitorEventZDecodeErrorZ*)(_res_ptr);
+	LDKCResult_OutPointDecodeErrorZ _res_conv = *(LDKCResult_OutPointDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_COption_MonitorEventZDecodeErrorZ_free(_res_conv);
+	CResult_OutPointDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
-	*ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_OutPointDecodeErrorZ_clone_ptr(LDKCResult_OutPointDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ");
+	*ret_conv = CResult_OutPointDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_COption_MonitorEventZDecodeErrorZ* arg_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone_ptr"))) TS_CResult_OutPointDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_OutPointDecodeErrorZ* arg_conv = (LDKCResult_OutPointDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_OutPointDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_COption_MonitorEventZDecodeErrorZ* orig_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(orig & ~1);
-	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
-	*ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_OutPointDecodeErrorZ_clone"))) TS_CResult_OutPointDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_OutPointDecodeErrorZ* orig_conv = (LDKCResult_OutPointDecodeErrorZ*)(orig & ~1);
+	LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ");
+	*ret_conv = CResult_OutPointDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_ok"))) 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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_COption_TypeZ_some"))) TS_COption_TypeZ_some(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKType o_conv = *(LDKType*)(o_ptr);
+	if (o_conv.free == LDKType_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKType_JCalls_cloned(&o_conv);
+	}
+	LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ");
+	*ret_copy = COption_TypeZ_some(o_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_COption_TypeZ_none"))) TS_COption_TypeZ_none() {
+	LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ");
+	*ret_copy = COption_TypeZ_none();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_COption_TypeZ_free"))) TS_COption_TypeZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCOption_TypeZ _res_conv = *(LDKCOption_TypeZ*)(_res_ptr);
+	FREE((void*)_res);
+	COption_TypeZ_free(_res_conv);
+}
+
+static inline uintptr_t COption_TypeZ_clone_ptr(LDKCOption_TypeZ *NONNULL_PTR arg) {
+	LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ");
+	*ret_copy = COption_TypeZ_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+uint32_t  __attribute__((export_name("TS_COption_TypeZ_clone_ptr"))) TS_COption_TypeZ_clone_ptr(uint32_t arg) {
+	LDKCOption_TypeZ* arg_conv = (LDKCOption_TypeZ*)arg;
+	uint32_t ret_conv = COption_TypeZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_COption_TypeZ_clone"))) TS_COption_TypeZ_clone(uint32_t orig) {
+	LDKCOption_TypeZ* orig_conv = (LDKCOption_TypeZ*)orig;
+	LDKCOption_TypeZ *ret_copy = MALLOC(sizeof(LDKCOption_TypeZ), "LDKCOption_TypeZ");
+	*ret_copy = COption_TypeZ_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKCOption_TypeZ o_conv = *(LDKCOption_TypeZ*)(o_ptr);
+	o_conv = COption_TypeZ_clone((LDKCOption_TypeZ*)(((uintptr_t)o) & ~1));
+	LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
+	*ret_conv = CResult_COption_TypeZDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_err"))) TS_CResult_COption_TypeZDecodeErrorZ_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_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ");
-	*ret_conv = CResult_HTLCUpdateDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
+	*ret_conv = CResult_COption_TypeZDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_is_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_HTLCUpdateDecodeErrorZ* o_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_HTLCUpdateDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_is_ok"))) TS_CResult_COption_TypeZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_COption_TypeZDecodeErrorZ* o_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_COption_TypeZDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_free"))) TS_CResult_HTLCUpdateDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_free"))) TS_CResult_COption_TypeZDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_HTLCUpdateDecodeErrorZ _res_conv = *(LDKCResult_HTLCUpdateDecodeErrorZ*)(_res_ptr);
+	LDKCResult_COption_TypeZDecodeErrorZ _res_conv = *(LDKCResult_COption_TypeZDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_HTLCUpdateDecodeErrorZ_free(_res_conv);
+	CResult_COption_TypeZDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_HTLCUpdateDecodeErrorZ_clone_ptr(LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ");
-	*ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_COption_TypeZDecodeErrorZ_clone_ptr(LDKCResult_COption_TypeZDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
+	*ret_conv = CResult_COption_TypeZDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_HTLCUpdateDecodeErrorZ* arg_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_TypeZDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_COption_TypeZDecodeErrorZ* arg_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_COption_TypeZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_HTLCUpdateDecodeErrorZ* orig_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(orig & ~1);
-	LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ");
-	*ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_COption_TypeZDecodeErrorZ_clone"))) TS_CResult_COption_TypeZDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_COption_TypeZDecodeErrorZ* orig_conv = (LDKCResult_COption_TypeZDecodeErrorZ*)(orig & ~1);
+	LDKCResult_COption_TypeZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_TypeZDecodeErrorZ), "LDKCResult_COption_TypeZDecodeErrorZ");
+	*ret_conv = CResult_COption_TypeZDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-static inline uintptr_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 ((uintptr_t)ret_conv);
-}
-intptr_t  __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone_ptr"))) TS_C2Tuple_OutPointScriptZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_OutPointScriptZ* arg_conv = (LDKC2Tuple_OutPointScriptZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_OutPointScriptZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_ok"))) TS_CResult_PaymentIdPaymentErrorZ_ok(int8_tArray o) {
+	LDKThirtyTwoBytes o_ref;
+	CHECK(o->arr_len == 32);
+	memcpy(o_ref.data, o->elems, 32); FREE(o);
+	LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ");
+	*ret_conv = CResult_PaymentIdPaymentErrorZ_ok(o_ref);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone"))) TS_C2Tuple_OutPointScriptZ_clone(uint32_t orig) {
-	LDKC2Tuple_OutPointScriptZ* orig_conv = (LDKC2Tuple_OutPointScriptZ*)(orig & ~1);
-	LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ");
-	*ret_conv = C2Tuple_OutPointScriptZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_err"))) TS_CResult_PaymentIdPaymentErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKPaymentError e_conv = *(LDKPaymentError*)(e_ptr);
+	e_conv = PaymentError_clone((LDKPaymentError*)(((uintptr_t)e) & ~1));
+	LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ");
+	*ret_conv = CResult_PaymentIdPaymentErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_new"))) TS_C2Tuple_OutPointScriptZ_new(uint32_t a, int8_tArray b) {
-	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 = b->arr_len;
-	b_ref.data = MALLOC(b_ref.datalen, "LDKCVec_u8Z Bytes");
-	memcpy(b_ref.data, b->elems, b_ref.datalen); FREE(b);
-	LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ");
-	*ret_conv = C2Tuple_OutPointScriptZ_new(a_conv, b_ref);
-	return ((uintptr_t)ret_conv);
+jboolean  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_is_ok"))) TS_CResult_PaymentIdPaymentErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PaymentIdPaymentErrorZ* o_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_PaymentIdPaymentErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_free"))) TS_C2Tuple_OutPointScriptZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_free"))) TS_CResult_PaymentIdPaymentErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_OutPointScriptZ _res_conv = *(LDKC2Tuple_OutPointScriptZ*)(_res_ptr);
+	LDKCResult_PaymentIdPaymentErrorZ _res_conv = *(LDKCResult_PaymentIdPaymentErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	C2Tuple_OutPointScriptZ_free(_res_conv);
+	CResult_PaymentIdPaymentErrorZ_free(_res_conv);
 }
 
-static inline uintptr_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 ((uintptr_t)ret_conv);
+static inline uintptr_t CResult_PaymentIdPaymentErrorZ_clone_ptr(LDKCResult_PaymentIdPaymentErrorZ *NONNULL_PTR arg) {
+	LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ");
+	*ret_conv = CResult_PaymentIdPaymentErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone_ptr"))) TS_C2Tuple_u32ScriptZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_u32ScriptZ* arg_conv = (LDKC2Tuple_u32ScriptZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_u32ScriptZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone_ptr"))) TS_CResult_PaymentIdPaymentErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PaymentIdPaymentErrorZ* arg_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_PaymentIdPaymentErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone"))) TS_C2Tuple_u32ScriptZ_clone(uint32_t orig) {
-	LDKC2Tuple_u32ScriptZ* orig_conv = (LDKC2Tuple_u32ScriptZ*)(orig & ~1);
-	LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ");
-	*ret_conv = C2Tuple_u32ScriptZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_PaymentIdPaymentErrorZ_clone"))) TS_CResult_PaymentIdPaymentErrorZ_clone(uint32_t orig) {
+	LDKCResult_PaymentIdPaymentErrorZ* orig_conv = (LDKCResult_PaymentIdPaymentErrorZ*)(orig & ~1);
+	LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ");
+	*ret_conv = CResult_PaymentIdPaymentErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_u32ScriptZ_new"))) TS_C2Tuple_u32ScriptZ_new(int32_t a, int8_tArray b) {
-	LDKCVec_u8Z b_ref;
-	b_ref.datalen = b->arr_len;
-	b_ref.data = MALLOC(b_ref.datalen, "LDKCVec_u8Z Bytes");
-	memcpy(b_ref.data, b->elems, b_ref.datalen); FREE(b);
-	LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ");
-	*ret_conv = C2Tuple_u32ScriptZ_new(a, b_ref);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_ok"))) TS_CResult_SiPrefixParseErrorZ_ok(uint32_t o) {
+	LDKSiPrefix o_conv = LDKSiPrefix_from_js(o);
+	LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ");
+	*ret_conv = CResult_SiPrefixParseErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_C2Tuple_u32ScriptZ_free"))) TS_C2Tuple_u32ScriptZ_free(uint32_t _res) {
+uint32_t  __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_err"))) TS_CResult_SiPrefixParseErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKParseError e_conv = *(LDKParseError*)(e_ptr);
+	e_conv = ParseError_clone((LDKParseError*)(((uintptr_t)e) & ~1));
+	LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ");
+	*ret_conv = CResult_SiPrefixParseErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_is_ok"))) TS_CResult_SiPrefixParseErrorZ_is_ok(uint32_t o) {
+	LDKCResult_SiPrefixParseErrorZ* o_conv = (LDKCResult_SiPrefixParseErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_SiPrefixParseErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_free"))) TS_CResult_SiPrefixParseErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_u32ScriptZ _res_conv = *(LDKC2Tuple_u32ScriptZ*)(_res_ptr);
+	LDKCResult_SiPrefixParseErrorZ _res_conv = *(LDKCResult_SiPrefixParseErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	C2Tuple_u32ScriptZ_free(_res_conv);
+	CResult_SiPrefixParseErrorZ_free(_res_conv);
 }
 
-void  __attribute__((export_name("TS_CVec_C2Tuple_u32ScriptZZ_free"))) TS_CVec_C2Tuple_u32ScriptZZ_free(uint32_tArray _res) {
-	LDKCVec_C2Tuple_u32ScriptZZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_u32ScriptZ), "LDKCVec_C2Tuple_u32ScriptZZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t v = 0; v < _res_constr.datalen; v++) {
-		uint32_t _res_conv_21 = _res_vals[v];
-		void* _res_conv_21_ptr = (void*)(((uintptr_t)_res_conv_21) & ~1);
-		CHECK_ACCESS(_res_conv_21_ptr);
-		LDKC2Tuple_u32ScriptZ _res_conv_21_conv = *(LDKC2Tuple_u32ScriptZ*)(_res_conv_21_ptr);
-		FREE((void*)_res_conv_21);
-		_res_constr.data[v] = _res_conv_21_conv;
-	}
-	CVec_C2Tuple_u32ScriptZZ_free(_res_constr);
+static inline uintptr_t CResult_SiPrefixParseErrorZ_clone_ptr(LDKCResult_SiPrefixParseErrorZ *NONNULL_PTR arg) {
+	LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ");
+	*ret_conv = CResult_SiPrefixParseErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_clone_ptr"))) TS_CResult_SiPrefixParseErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SiPrefixParseErrorZ* arg_conv = (LDKCResult_SiPrefixParseErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_SiPrefixParseErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-static inline uintptr_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 ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_SiPrefixParseErrorZ_clone"))) TS_CResult_SiPrefixParseErrorZ_clone(uint32_t orig) {
+	LDKCResult_SiPrefixParseErrorZ* orig_conv = (LDKCResult_SiPrefixParseErrorZ*)(orig & ~1);
+	LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ");
+	*ret_conv = CResult_SiPrefixParseErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(arg_conv);
-	return ret_val;
+
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_ok(uint32_t o) {
+	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_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ");
+	*ret_conv = CResult_InvoiceParseOrSemanticErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(uint32_t orig) {
-	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(orig & ~1);
-	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ");
-	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_err"))) TS_CResult_InvoiceParseOrSemanticErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKParseOrSemanticError e_conv = *(LDKParseOrSemanticError*)(e_ptr);
+	e_conv = ParseOrSemanticError_clone((LDKParseOrSemanticError*)(((uintptr_t)e) & ~1));
+	LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ");
+	*ret_conv = CResult_InvoiceParseOrSemanticErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(int8_tArray a, uint32_tArray b) {
-	LDKThirtyTwoBytes a_ref;
-	CHECK(a->arr_len == 32);
-	memcpy(a_ref.data, a->elems, 32); FREE(a);
-	LDKCVec_C2Tuple_u32ScriptZZ b_constr;
-	b_constr.datalen = b->arr_len;
-	if (b_constr.datalen > 0)
-		b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKC2Tuple_u32ScriptZ), "LDKCVec_C2Tuple_u32ScriptZZ Elements");
-	else
-		b_constr.data = NULL;
-	uint32_t* b_vals = b->elems /* XXX b leaks */;
-	for (size_t v = 0; v < b_constr.datalen; v++) {
-		uint32_t b_conv_21 = b_vals[v];
-		void* b_conv_21_ptr = (void*)(((uintptr_t)b_conv_21) & ~1);
-		CHECK_ACCESS(b_conv_21_ptr);
-		LDKC2Tuple_u32ScriptZ b_conv_21_conv = *(LDKC2Tuple_u32ScriptZ*)(b_conv_21_ptr);
-		b_conv_21_conv = C2Tuple_u32ScriptZ_clone((LDKC2Tuple_u32ScriptZ*)(((uintptr_t)b_conv_21) & ~1));
-		b_constr.data[v] = b_conv_21_conv;
-	}
-	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ");
-	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(a_ref, b_constr);
-	return ((uintptr_t)ret_conv);
+jboolean  __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_is_ok"))) TS_CResult_InvoiceParseOrSemanticErrorZ_is_ok(uint32_t o) {
+	LDKCResult_InvoiceParseOrSemanticErrorZ* o_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_InvoiceParseOrSemanticErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_free"))) TS_CResult_InvoiceParseOrSemanticErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(_res_ptr);
+	LDKCResult_InvoiceParseOrSemanticErrorZ _res_conv = *(LDKCResult_InvoiceParseOrSemanticErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(_res_conv);
+	CResult_InvoiceParseOrSemanticErrorZ_free(_res_conv);
 }
 
-void  __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(uint32_tArray _res) {
-	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t o = 0; o < _res_constr.datalen; o++) {
-		uint32_t _res_conv_40 = _res_vals[o];
-		void* _res_conv_40_ptr = (void*)(((uintptr_t)_res_conv_40) & ~1);
-		CHECK_ACCESS(_res_conv_40_ptr);
-		LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ _res_conv_40_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(_res_conv_40_ptr);
-		FREE((void*)_res_conv_40);
-		_res_constr.data[o] = _res_conv_40_conv;
-	}
-	CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(_res_constr);
+static inline uintptr_t CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(LDKCResult_InvoiceParseOrSemanticErrorZ *NONNULL_PTR arg) {
+	LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ");
+	*ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-
-void  __attribute__((export_name("TS_CVec_EventZ_free"))) TS_CVec_EventZ_free(uint32_tArray _res) {
-	LDKCVec_EventZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKEvent), "LDKCVec_EventZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t h = 0; h < _res_constr.datalen; h++) {
-		uint32_t _res_conv_7 = _res_vals[h];
-		void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1);
-		CHECK_ACCESS(_res_conv_7_ptr);
-		LDKEvent _res_conv_7_conv = *(LDKEvent*)(_res_conv_7_ptr);
-		FREE((void*)_res_conv_7);
-		_res_constr.data[h] = _res_conv_7_conv;
-	}
-	CVec_EventZ_free(_res_constr);
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_InvoiceParseOrSemanticErrorZ* arg_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CVec_TransactionZ_free"))) TS_CVec_TransactionZ_free(ptrArray _res) {
-	LDKCVec_TransactionZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKTransaction), "LDKCVec_TransactionZ Elements");
-	else
-		_res_constr.data = NULL;
-	int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */;
-	for (size_t m = 0; m < _res_constr.datalen; m++) {
-		int8_tArray _res_conv_12 = _res_vals[m];
-		LDKTransaction _res_conv_12_ref;
-		_res_conv_12_ref.datalen = _res_conv_12->arr_len;
-		_res_conv_12_ref.data = MALLOC(_res_conv_12_ref.datalen, "LDKTransaction Bytes");
-		memcpy(_res_conv_12_ref.data, _res_conv_12->elems, _res_conv_12_ref.datalen); FREE(_res_conv_12);
-		_res_conv_12_ref.data_is_owned = true;
-		_res_constr.data[m] = _res_conv_12_ref;
-	}
-	CVec_TransactionZ_free(_res_constr);
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceParseOrSemanticErrorZ_clone"))) TS_CResult_InvoiceParseOrSemanticErrorZ_clone(uint32_t orig) {
+	LDKCResult_InvoiceParseOrSemanticErrorZ* orig_conv = (LDKCResult_InvoiceParseOrSemanticErrorZ*)(orig & ~1);
+	LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ");
+	*ret_conv = CResult_InvoiceParseOrSemanticErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-static inline uintptr_t C2Tuple_u32TxOutZ_clone_ptr(LDKC2Tuple_u32TxOutZ *NONNULL_PTR arg) {
-	LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ");
-	*ret_conv = C2Tuple_u32TxOutZ_clone(arg);
-	return ((uintptr_t)ret_conv);
-}
-intptr_t  __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone_ptr"))) TS_C2Tuple_u32TxOutZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_u32TxOutZ* arg_conv = (LDKC2Tuple_u32TxOutZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_u32TxOutZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_ok(uint32_t o) {
+	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_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ");
+	*ret_conv = CResult_SignedRawInvoiceParseErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone"))) TS_C2Tuple_u32TxOutZ_clone(uint32_t orig) {
-	LDKC2Tuple_u32TxOutZ* orig_conv = (LDKC2Tuple_u32TxOutZ*)(orig & ~1);
-	LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ");
-	*ret_conv = C2Tuple_u32TxOutZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_err"))) TS_CResult_SignedRawInvoiceParseErrorZ_err(uint32_t e) {
+	void* e_ptr = (void*)(((uintptr_t)e) & ~1);
+	CHECK_ACCESS(e_ptr);
+	LDKParseError e_conv = *(LDKParseError*)(e_ptr);
+	e_conv = ParseError_clone((LDKParseError*)(((uintptr_t)e) & ~1));
+	LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ");
+	*ret_conv = CResult_SignedRawInvoiceParseErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_u32TxOutZ_new"))) TS_C2Tuple_u32TxOutZ_new(int32_t a, uint32_t b) {
-	void* b_ptr = (void*)(((uintptr_t)b) & ~1);
-	CHECK_ACCESS(b_ptr);
-	LDKTxOut b_conv = *(LDKTxOut*)(b_ptr);
-	b_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)b) & ~1));
-	LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ");
-	*ret_conv = C2Tuple_u32TxOutZ_new(a, b_conv);
-	return ((uintptr_t)ret_conv);
+jboolean  __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_is_ok"))) TS_CResult_SignedRawInvoiceParseErrorZ_is_ok(uint32_t o) {
+	LDKCResult_SignedRawInvoiceParseErrorZ* o_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_SignedRawInvoiceParseErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_C2Tuple_u32TxOutZ_free"))) TS_C2Tuple_u32TxOutZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_free"))) TS_CResult_SignedRawInvoiceParseErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_u32TxOutZ _res_conv = *(LDKC2Tuple_u32TxOutZ*)(_res_ptr);
+	LDKCResult_SignedRawInvoiceParseErrorZ _res_conv = *(LDKCResult_SignedRawInvoiceParseErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	C2Tuple_u32TxOutZ_free(_res_conv);
+	CResult_SignedRawInvoiceParseErrorZ_free(_res_conv);
 }
 
-void  __attribute__((export_name("TS_CVec_C2Tuple_u32TxOutZZ_free"))) TS_CVec_C2Tuple_u32TxOutZZ_free(uint32_tArray _res) {
-	LDKCVec_C2Tuple_u32TxOutZZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_u32TxOutZ), "LDKCVec_C2Tuple_u32TxOutZZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t u = 0; u < _res_constr.datalen; u++) {
-		uint32_t _res_conv_20 = _res_vals[u];
-		void* _res_conv_20_ptr = (void*)(((uintptr_t)_res_conv_20) & ~1);
-		CHECK_ACCESS(_res_conv_20_ptr);
-		LDKC2Tuple_u32TxOutZ _res_conv_20_conv = *(LDKC2Tuple_u32TxOutZ*)(_res_conv_20_ptr);
-		FREE((void*)_res_conv_20);
-		_res_constr.data[u] = _res_conv_20_conv;
-	}
-	CVec_C2Tuple_u32TxOutZZ_free(_res_constr);
+static inline uintptr_t CResult_SignedRawInvoiceParseErrorZ_clone_ptr(LDKCResult_SignedRawInvoiceParseErrorZ *NONNULL_PTR arg) {
+	LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ");
+	*ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_clone_ptr"))) TS_CResult_SignedRawInvoiceParseErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_SignedRawInvoiceParseErrorZ* arg_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-static inline uintptr_t C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR arg) {
-	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ");
-	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(arg);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_SignedRawInvoiceParseErrorZ_clone"))) TS_CResult_SignedRawInvoiceParseErrorZ_clone(uint32_t orig) {
+	LDKCResult_SignedRawInvoiceParseErrorZ* orig_conv = (LDKCResult_SignedRawInvoiceParseErrorZ*)(orig & ~1);
+	LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ");
+	*ret_conv = CResult_SignedRawInvoiceParseErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg_conv);
-	return ret_val;
+
+static inline uintptr_t C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ *NONNULL_PTR arg) {
+	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ");
+	*ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(uint32_t arg) {
+	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* arg_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(arg & ~1);
+	uint32_t ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(uint32_t orig) {
-	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(orig & ~1);
-	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ");
-	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(uint32_t orig) {
+	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* orig_conv = (LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(orig & ~1);
+	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ");
+	*ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(int8_tArray a, uint32_tArray b) {
-	LDKThirtyTwoBytes a_ref;
-	CHECK(a->arr_len == 32);
-	memcpy(a_ref.data, a->elems, 32); FREE(a);
-	LDKCVec_C2Tuple_u32TxOutZZ b_constr;
-	b_constr.datalen = b->arr_len;
-	if (b_constr.datalen > 0)
-		b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKC2Tuple_u32TxOutZ), "LDKCVec_C2Tuple_u32TxOutZZ Elements");
-	else
-		b_constr.data = NULL;
-	uint32_t* b_vals = b->elems /* XXX b leaks */;
-	for (size_t u = 0; u < b_constr.datalen; u++) {
-		uint32_t b_conv_20 = b_vals[u];
-		void* b_conv_20_ptr = (void*)(((uintptr_t)b_conv_20) & ~1);
-		CHECK_ACCESS(b_conv_20_ptr);
-		LDKC2Tuple_u32TxOutZ b_conv_20_conv = *(LDKC2Tuple_u32TxOutZ*)(b_conv_20_ptr);
-		b_conv_20_conv = C2Tuple_u32TxOutZ_clone((LDKC2Tuple_u32TxOutZ*)(((uintptr_t)b_conv_20) & ~1));
-		b_constr.data[u] = b_conv_20_conv;
-	}
-	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ");
-	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(a_ref, b_constr);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(uint32_t a, int8_tArray b, uint32_t c) {
+	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(b->arr_len == 32);
+	memcpy(b_ref.data, b->elems, 32); FREE(b);
+	LDKInvoiceSignature c_conv;
+	c_conv.inner = (void*)(c & (~1));
+	c_conv.is_owned = (c & 1) || (c == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(c_conv);
+	c_conv = InvoiceSignature_clone(&c_conv);
+	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ");
+	*ret_conv = C3Tuple_RawInvoice_u832InvoiceSignatureZ_new(a_conv, b_ref, c_conv);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free"))) TS_C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(_res_ptr);
+	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ _res_conv = *(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ*)(_res_ptr);
 	FREE((void*)_res);
-	C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(_res_conv);
+	C3Tuple_RawInvoice_u832InvoiceSignatureZ_free(_res_conv);
 }
 
-void  __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(uint32_tArray _res) {
-	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t n = 0; n < _res_constr.datalen; n++) {
-		uint32_t _res_conv_39 = _res_vals[n];
-		void* _res_conv_39_ptr = (void*)(((uintptr_t)_res_conv_39) & ~1);
-		CHECK_ACCESS(_res_conv_39_ptr);
-		LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res_conv_39_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(_res_conv_39_ptr);
-		FREE((void*)_res_conv_39);
-		_res_constr.data[n] = _res_conv_39_conv;
-	}
-	CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(_res_constr);
+uint32_t  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_ok"))) TS_CResult_PayeePubKeyErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CVec_BalanceZ_free"))) TS_CVec_BalanceZ_free(uint32_tArray _res) {
-	LDKCVec_BalanceZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKBalance), "LDKCVec_BalanceZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t j = 0; j < _res_constr.datalen; j++) {
-		uint32_t _res_conv_9 = _res_vals[j];
-		void* _res_conv_9_ptr = (void*)(((uintptr_t)_res_conv_9) & ~1);
-		CHECK_ACCESS(_res_conv_9_ptr);
-		LDKBalance _res_conv_9_conv = *(LDKBalance*)(_res_conv_9_ptr);
-		FREE((void*)_res_conv_9);
-		_res_constr.data[j] = _res_conv_9_conv;
-	}
-	CVec_BalanceZ_free(_res_constr);
+uint32_t  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_err"))) TS_CResult_PayeePubKeyErrorZ_err(uint32_t e) {
+	LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e);
+	LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ");
+	*ret_conv = CResult_PayeePubKeyErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-static inline uintptr_t C2Tuple_BlockHashChannelMonitorZ_clone_ptr(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR arg) {
-	LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ");
-	*ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone(arg);
-	return ((uintptr_t)ret_conv);
+jboolean  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_is_ok"))) TS_CResult_PayeePubKeyErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PayeePubKeyErrorZ* o_conv = (LDKCResult_PayeePubKeyErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_PayeePubKeyErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_BlockHashChannelMonitorZ* arg_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg_conv);
-	return ret_val;
+
+void  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_free"))) TS_CResult_PayeePubKeyErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_PayeePubKeyErrorZ _res_conv = *(LDKCResult_PayeePubKeyErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_PayeePubKeyErrorZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone(uint32_t orig) {
-	LDKC2Tuple_BlockHashChannelMonitorZ* orig_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(orig & ~1);
-	LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ");
-	*ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+static inline uintptr_t CResult_PayeePubKeyErrorZ_clone_ptr(LDKCResult_PayeePubKeyErrorZ *NONNULL_PTR arg) {
+	LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ");
+	*ret_conv = CResult_PayeePubKeyErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone_ptr"))) TS_CResult_PayeePubKeyErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PayeePubKeyErrorZ* arg_conv = (LDKCResult_PayeePubKeyErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_PayeePubKeyErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_new"))) TS_C2Tuple_BlockHashChannelMonitorZ_new(int8_tArray a, uint32_t b) {
-	LDKThirtyTwoBytes a_ref;
-	CHECK(a->arr_len == 32);
-	memcpy(a_ref.data, a->elems, 32); FREE(a);
-	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);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_PayeePubKeyErrorZ_clone"))) TS_CResult_PayeePubKeyErrorZ_clone(uint32_t orig) {
+	LDKCResult_PayeePubKeyErrorZ* orig_conv = (LDKCResult_PayeePubKeyErrorZ*)(orig & ~1);
+	LDKCResult_PayeePubKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PayeePubKeyErrorZ), "LDKCResult_PayeePubKeyErrorZ");
+	*ret_conv = CResult_PayeePubKeyErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_free"))) TS_C2Tuple_BlockHashChannelMonitorZ_free(uint32_t _res) {
-	if ((_res & 1) != 0) return;
-	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
-	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_BlockHashChannelMonitorZ _res_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(_res_ptr);
-	FREE((void*)_res);
-	C2Tuple_BlockHashChannelMonitorZ_free(_res_conv);
+void  __attribute__((export_name("TS_CVec_PrivateRouteZ_free"))) TS_CVec_PrivateRouteZ_free(uint32_tArray _res) {
+	LDKCVec_PrivateRouteZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKPrivateRoute), "LDKCVec_PrivateRouteZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t o = 0; o < _res_constr.datalen; o++) {
+		uint32_t _res_conv_14 = _res_vals[o];
+		LDKPrivateRoute _res_conv_14_conv;
+		_res_conv_14_conv.inner = (void*)(_res_conv_14 & (~1));
+		_res_conv_14_conv.is_owned = (_res_conv_14 & 1) || (_res_conv_14 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_14_conv);
+		_res_constr.data[o] = _res_conv_14_conv;
+	}
+	FREE(_res);
+	CVec_PrivateRouteZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKC2Tuple_BlockHashChannelMonitorZ o_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(o_ptr);
-	o_conv = C2Tuple_BlockHashChannelMonitorZ_clone((LDKC2Tuple_BlockHashChannelMonitorZ*)(((uintptr_t)o) & ~1));
-	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ");
-	*ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_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_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ");
-	*ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_err"))) TS_CResult_PositiveTimestampCreationErrorZ_err(uint32_t e) {
+	LDKCreationError e_conv = LDKCreationError_from_js(e);
+	LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ");
+	*ret_conv = CResult_PositiveTimestampCreationErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_is_ok"))) TS_CResult_PositiveTimestampCreationErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PositiveTimestampCreationErrorZ* o_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_PositiveTimestampCreationErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_free"))) TS_CResult_PositiveTimestampCreationErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(_res_ptr);
+	LDKCResult_PositiveTimestampCreationErrorZ _res_conv = *(LDKCResult_PositiveTimestampCreationErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(_res_conv);
+	CResult_PositiveTimestampCreationErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ");
-	*ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_PositiveTimestampCreationErrorZ_clone_ptr(LDKCResult_PositiveTimestampCreationErrorZ *NONNULL_PTR arg) {
+	LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ");
+	*ret_conv = CResult_PositiveTimestampCreationErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* arg_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr"))) TS_CResult_PositiveTimestampCreationErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PositiveTimestampCreationErrorZ* arg_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_PositiveTimestampCreationErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* orig_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(orig & ~1);
-	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ");
-	*ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_PositiveTimestampCreationErrorZ_clone"))) TS_CResult_PositiveTimestampCreationErrorZ_clone(uint32_t orig) {
+	LDKCResult_PositiveTimestampCreationErrorZ* orig_conv = (LDKCResult_PositiveTimestampCreationErrorZ*)(orig & ~1);
+	LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ");
+	*ret_conv = CResult_PositiveTimestampCreationErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_ok"))) TS_CResult_NoneLightningErrorZ_ok() {
-	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
-	*ret_conv = CResult_NoneLightningErrorZ_ok();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_ok"))) TS_CResult_NoneSemanticErrorZ_ok() {
+	LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ");
+	*ret_conv = CResult_NoneSemanticErrorZ_ok();
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_err"))) TS_CResult_NoneLightningErrorZ_err(uint32_t e) {
-	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 (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_err"))) TS_CResult_NoneSemanticErrorZ_err(uint32_t e) {
+	LDKSemanticError e_conv = LDKSemanticError_from_js(e);
+	LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ");
+	*ret_conv = CResult_NoneSemanticErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_is_ok"))) TS_CResult_NoneLightningErrorZ_is_ok(uint32_t o) {
-	LDKCResult_NoneLightningErrorZ* o_conv = (LDKCResult_NoneLightningErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NoneLightningErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_is_ok"))) TS_CResult_NoneSemanticErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NoneSemanticErrorZ* o_conv = (LDKCResult_NoneSemanticErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_NoneSemanticErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_free"))) TS_CResult_NoneLightningErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_free"))) TS_CResult_NoneSemanticErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NoneLightningErrorZ _res_conv = *(LDKCResult_NoneLightningErrorZ*)(_res_ptr);
+	LDKCResult_NoneSemanticErrorZ _res_conv = *(LDKCResult_NoneSemanticErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_NoneLightningErrorZ_free(_res_conv);
+	CResult_NoneSemanticErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_NoneLightningErrorZ_clone_ptr(LDKCResult_NoneLightningErrorZ *NONNULL_PTR arg) {
-	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
-	*ret_conv = CResult_NoneLightningErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_NoneSemanticErrorZ_clone_ptr(LDKCResult_NoneSemanticErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ");
+	*ret_conv = CResult_NoneSemanticErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone_ptr"))) TS_CResult_NoneLightningErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_NoneLightningErrorZ* arg_conv = (LDKCResult_NoneLightningErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NoneLightningErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone_ptr"))) TS_CResult_NoneSemanticErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneSemanticErrorZ* arg_conv = (LDKCResult_NoneSemanticErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NoneSemanticErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NoneLightningErrorZ_clone"))) TS_CResult_NoneLightningErrorZ_clone(uint32_t orig) {
-	LDKCResult_NoneLightningErrorZ* orig_conv = (LDKCResult_NoneLightningErrorZ*)(orig & ~1);
-	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
-	*ret_conv = CResult_NoneLightningErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_NoneSemanticErrorZ_clone"))) TS_CResult_NoneSemanticErrorZ_clone(uint32_t orig) {
+	LDKCResult_NoneSemanticErrorZ* orig_conv = (LDKCResult_NoneSemanticErrorZ*)(orig & ~1);
+	LDKCResult_NoneSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneSemanticErrorZ), "LDKCResult_NoneSemanticErrorZ");
+	*ret_conv = CResult_NoneSemanticErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-static inline uintptr_t C2Tuple_PublicKeyTypeZ_clone_ptr(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR arg) {
-	LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ");
-	*ret_conv = C2Tuple_PublicKeyTypeZ_clone(arg);
-	return ((uintptr_t)ret_conv);
-}
-intptr_t  __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone_ptr"))) TS_C2Tuple_PublicKeyTypeZ_clone_ptr(uint32_t arg) {
-	LDKC2Tuple_PublicKeyTypeZ* arg_conv = (LDKC2Tuple_PublicKeyTypeZ*)(arg & ~1);
-	intptr_t ret_val = C2Tuple_PublicKeyTypeZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_ok"))) TS_CResult_InvoiceSemanticErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone"))) TS_C2Tuple_PublicKeyTypeZ_clone(uint32_t orig) {
-	LDKC2Tuple_PublicKeyTypeZ* orig_conv = (LDKC2Tuple_PublicKeyTypeZ*)(orig & ~1);
-	LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ");
-	*ret_conv = C2Tuple_PublicKeyTypeZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_err"))) TS_CResult_InvoiceSemanticErrorZ_err(uint32_t e) {
+	LDKSemanticError e_conv = LDKSemanticError_from_js(e);
+	LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ");
+	*ret_conv = CResult_InvoiceSemanticErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_new"))) TS_C2Tuple_PublicKeyTypeZ_new(int8_tArray a, uint32_t b) {
-	LDKPublicKey a_ref;
-	CHECK(a->arr_len == 33);
-	memcpy(a_ref.compressed_form, a->elems, 33); FREE(a);
-	void* b_ptr = (void*)(((uintptr_t)b) & ~1);
-	CHECK_ACCESS(b_ptr);
-	LDKType b_conv = *(LDKType*)(b_ptr);
-	LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ");
-	*ret_conv = C2Tuple_PublicKeyTypeZ_new(a_ref, b_conv);
-	return ((uintptr_t)ret_conv);
+jboolean  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_is_ok"))) TS_CResult_InvoiceSemanticErrorZ_is_ok(uint32_t o) {
+	LDKCResult_InvoiceSemanticErrorZ* o_conv = (LDKCResult_InvoiceSemanticErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_InvoiceSemanticErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_free"))) TS_C2Tuple_PublicKeyTypeZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_free"))) TS_CResult_InvoiceSemanticErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC2Tuple_PublicKeyTypeZ _res_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(_res_ptr);
+	LDKCResult_InvoiceSemanticErrorZ _res_conv = *(LDKCResult_InvoiceSemanticErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	C2Tuple_PublicKeyTypeZ_free(_res_conv);
+	CResult_InvoiceSemanticErrorZ_free(_res_conv);
 }
 
-void  __attribute__((export_name("TS_CVec_C2Tuple_PublicKeyTypeZZ_free"))) TS_CVec_C2Tuple_PublicKeyTypeZZ_free(uint32_tArray _res) {
-	LDKCVec_C2Tuple_PublicKeyTypeZZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKCVec_C2Tuple_PublicKeyTypeZZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t z = 0; z < _res_constr.datalen; z++) {
-		uint32_t _res_conv_25 = _res_vals[z];
-		void* _res_conv_25_ptr = (void*)(((uintptr_t)_res_conv_25) & ~1);
-		CHECK_ACCESS(_res_conv_25_ptr);
-		LDKC2Tuple_PublicKeyTypeZ _res_conv_25_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(_res_conv_25_ptr);
-		FREE((void*)_res_conv_25);
-		_res_constr.data[z] = _res_conv_25_conv;
-	}
-	CVec_C2Tuple_PublicKeyTypeZZ_free(_res_constr);
+static inline uintptr_t CResult_InvoiceSemanticErrorZ_clone_ptr(LDKCResult_InvoiceSemanticErrorZ *NONNULL_PTR arg) {
+	LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ");
+	*ret_conv = CResult_InvoiceSemanticErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone_ptr"))) TS_CResult_InvoiceSemanticErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_InvoiceSemanticErrorZ* arg_conv = (LDKCResult_InvoiceSemanticErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_InvoiceSemanticErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_boolLightningErrorZ_ok"))) TS_CResult_boolLightningErrorZ_ok(jboolean o) {
-	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
-	*ret_conv = CResult_boolLightningErrorZ_ok(o);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceSemanticErrorZ_clone"))) TS_CResult_InvoiceSemanticErrorZ_clone(uint32_t orig) {
+	LDKCResult_InvoiceSemanticErrorZ* orig_conv = (LDKCResult_InvoiceSemanticErrorZ*)(orig & ~1);
+	LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ");
+	*ret_conv = CResult_InvoiceSemanticErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_boolLightningErrorZ_err"))) TS_CResult_boolLightningErrorZ_err(uint32_t e) {
-	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 (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_ok"))) TS_CResult_DescriptionCreationErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_boolLightningErrorZ_is_ok"))) TS_CResult_boolLightningErrorZ_is_ok(uint32_t o) {
-	LDKCResult_boolLightningErrorZ* o_conv = (LDKCResult_boolLightningErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_boolLightningErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_err"))) TS_CResult_DescriptionCreationErrorZ_err(uint32_t e) {
+	LDKCreationError e_conv = LDKCreationError_from_js(e);
+	LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ");
+	*ret_conv = CResult_DescriptionCreationErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_boolLightningErrorZ_free"))) TS_CResult_boolLightningErrorZ_free(uint32_t _res) {
+jboolean  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_is_ok"))) TS_CResult_DescriptionCreationErrorZ_is_ok(uint32_t o) {
+	LDKCResult_DescriptionCreationErrorZ* o_conv = (LDKCResult_DescriptionCreationErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_DescriptionCreationErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_free"))) TS_CResult_DescriptionCreationErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_boolLightningErrorZ _res_conv = *(LDKCResult_boolLightningErrorZ*)(_res_ptr);
+	LDKCResult_DescriptionCreationErrorZ _res_conv = *(LDKCResult_DescriptionCreationErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_boolLightningErrorZ_free(_res_conv);
+	CResult_DescriptionCreationErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_boolLightningErrorZ_clone_ptr(LDKCResult_boolLightningErrorZ *NONNULL_PTR arg) {
-	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
-	*ret_conv = CResult_boolLightningErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_DescriptionCreationErrorZ_clone_ptr(LDKCResult_DescriptionCreationErrorZ *NONNULL_PTR arg) {
+	LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ");
+	*ret_conv = CResult_DescriptionCreationErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone_ptr"))) TS_CResult_boolLightningErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_boolLightningErrorZ* arg_conv = (LDKCResult_boolLightningErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_boolLightningErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone_ptr"))) TS_CResult_DescriptionCreationErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_DescriptionCreationErrorZ* arg_conv = (LDKCResult_DescriptionCreationErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_DescriptionCreationErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_boolLightningErrorZ_clone"))) TS_CResult_boolLightningErrorZ_clone(uint32_t orig) {
-	LDKCResult_boolLightningErrorZ* orig_conv = (LDKCResult_boolLightningErrorZ*)(orig & ~1);
-	LDKCResult_boolLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolLightningErrorZ), "LDKCResult_boolLightningErrorZ");
-	*ret_conv = CResult_boolLightningErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_DescriptionCreationErrorZ_clone"))) TS_CResult_DescriptionCreationErrorZ_clone(uint32_t orig) {
+	LDKCResult_DescriptionCreationErrorZ* orig_conv = (LDKCResult_DescriptionCreationErrorZ*)(orig & ~1);
+	LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ");
+	*ret_conv = CResult_DescriptionCreationErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-static inline uintptr_t C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ *NONNULL_PTR arg) {
-	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ");
-	*ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(arg);
-	return ((uintptr_t)ret_conv);
-}
-intptr_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(uint32_t arg) {
-	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* arg_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(arg & ~1);
-	intptr_t ret_val = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_ok"))) TS_CResult_PrivateRouteCreationErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(uint32_t orig) {
-	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* orig_conv = (LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(orig & ~1);
-	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ");
-	*ret_conv = C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_clone(orig_conv);
-	return ((uintptr_t)ret_conv);
+uint32_t  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_err"))) TS_CResult_PrivateRouteCreationErrorZ_err(uint32_t e) {
+	LDKCreationError e_conv = LDKCreationError_from_js(e);
+	LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ");
+	*ret_conv = CResult_PrivateRouteCreationErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_new(uint32_t a, uint32_t b, uint32_t c) {
-	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);
-	return ((uintptr_t)ret_conv);
+jboolean  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_is_ok"))) TS_CResult_PrivateRouteCreationErrorZ_is_ok(uint32_t o) {
+	LDKCResult_PrivateRouteCreationErrorZ* o_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_PrivateRouteCreationErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free"))) TS_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_free"))) TS_CResult_PrivateRouteCreationErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(_res_ptr);
+	LDKCResult_PrivateRouteCreationErrorZ _res_conv = *(LDKCResult_PrivateRouteCreationErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ_free(_res_conv);
+	CResult_PrivateRouteCreationErrorZ_free(_res_conv);
 }
 
-void  __attribute__((export_name("TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free"))) TS_CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(uint32_tArray _res) {
-	LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ), "LDKCVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t h = 0; h < _res_constr.datalen; h++) {
-		uint32_t _res_conv_59 = _res_vals[h];
-		void* _res_conv_59_ptr = (void*)(((uintptr_t)_res_conv_59) & ~1);
-		CHECK_ACCESS(_res_conv_59_ptr);
-		LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ _res_conv_59_conv = *(LDKC3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZ*)(_res_conv_59_ptr);
-		FREE((void*)_res_conv_59);
-		_res_constr.data[h] = _res_conv_59_conv;
-	}
-	CVec_C3Tuple_ChannelAnnouncementChannelUpdateChannelUpdateZZ_free(_res_constr);
+static inline uintptr_t CResult_PrivateRouteCreationErrorZ_clone_ptr(LDKCResult_PrivateRouteCreationErrorZ *NONNULL_PTR arg) {
+	LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ");
+	*ret_conv = CResult_PrivateRouteCreationErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-
-void  __attribute__((export_name("TS_CVec_NodeAnnouncementZ_free"))) TS_CVec_NodeAnnouncementZ_free(uint32_tArray _res) {
-	LDKCVec_NodeAnnouncementZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKNodeAnnouncement), "LDKCVec_NodeAnnouncementZ Elements");
-	else
-		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t s = 0; s < _res_constr.datalen; s++) {
-		uint32_t _res_conv_18 = _res_vals[s];
-		LDKNodeAnnouncement _res_conv_18_conv;
-		_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);
+uint32_t  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone_ptr"))) TS_CResult_PrivateRouteCreationErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_PrivateRouteCreationErrorZ* arg_conv = (LDKCResult_PrivateRouteCreationErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_PrivateRouteCreationErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CVec_PublicKeyZ_free"))) TS_CVec_PublicKeyZ_free(ptrArray _res) {
-	LDKCVec_PublicKeyZ _res_constr;
-	_res_constr.datalen = _res->arr_len;
-	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKPublicKey), "LDKCVec_PublicKeyZ Elements");
-	else
-		_res_constr.data = NULL;
-	int8_tArray* _res_vals = (void*) _res->elems /* XXX _res leaks */;
-	for (size_t m = 0; m < _res_constr.datalen; m++) {
-		int8_tArray _res_conv_12 = _res_vals[m];
-		LDKPublicKey _res_conv_12_ref;
-		CHECK(_res_conv_12->arr_len == 33);
-		memcpy(_res_conv_12_ref.compressed_form, _res_conv_12->elems, 33); FREE(_res_conv_12);
-		_res_constr.data[m] = _res_conv_12_ref;
-	}
-	CVec_PublicKeyZ_free(_res_constr);
+uint32_t  __attribute__((export_name("TS_CResult_PrivateRouteCreationErrorZ_clone"))) 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");
+	*ret_conv = CResult_PrivateRouteCreationErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_ok(int8_tArray o) {
-	LDKCVec_u8Z o_ref;
-	o_ref.datalen = o->arr_len;
-	o_ref.data = MALLOC(o_ref.datalen, "LDKCVec_u8Z Bytes");
-	memcpy(o_ref.data, o->elems, o_ref.datalen); FREE(o);
-	LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ");
-	*ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_ok(o_ref);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_StringErrorZ_ok"))) TS_CResult_StringErrorZ_ok(jstring o) {
+	LDKStr o_conv = str_ref_to_owned_c(o);
+	LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ");
+	*ret_conv = CResult_StringErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_err(uint32_t e) {
-	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 (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_StringErrorZ_err"))) TS_CResult_StringErrorZ_err(uint32_t e) {
+	LDKSecp256k1Error e_conv = LDKSecp256k1Error_from_js(e);
+	LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ");
+	*ret_conv = CResult_StringErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok(uint32_t o) {
-	LDKCResult_CVec_u8ZPeerHandleErrorZ* o_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_CVec_u8ZPeerHandleErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_StringErrorZ_is_ok"))) TS_CResult_StringErrorZ_is_ok(uint32_t o) {
+	LDKCResult_StringErrorZ* o_conv = (LDKCResult_StringErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_StringErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_free"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_StringErrorZ_free"))) TS_CResult_StringErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_CVec_u8ZPeerHandleErrorZ _res_conv = *(LDKCResult_CVec_u8ZPeerHandleErrorZ*)(_res_ptr);
+	LDKCResult_StringErrorZ _res_conv = *(LDKCResult_StringErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_CVec_u8ZPeerHandleErrorZ_free(_res_conv);
+	CResult_StringErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR arg) {
-	LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ");
-	*ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_StringErrorZ_clone_ptr(LDKCResult_StringErrorZ *NONNULL_PTR arg) {
+	LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ");
+	*ret_conv = CResult_StringErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_CVec_u8ZPeerHandleErrorZ* arg_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_StringErrorZ_clone_ptr"))) TS_CResult_StringErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_StringErrorZ* arg_conv = (LDKCResult_StringErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_StringErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone(uint32_t orig) {
-	LDKCResult_CVec_u8ZPeerHandleErrorZ* orig_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(orig & ~1);
-	LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ");
-	*ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_StringErrorZ_clone"))) TS_CResult_StringErrorZ_clone(uint32_t orig) {
+	LDKCResult_StringErrorZ* orig_conv = (LDKCResult_StringErrorZ*)(orig & ~1);
+	LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ");
+	*ret_conv = CResult_StringErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_ok"))) TS_CResult_NonePeerHandleErrorZ_ok() {
-	LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ");
-	*ret_conv = CResult_NonePeerHandleErrorZ_ok();
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_ok(uint32_t o) {
+	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);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_err"))) TS_CResult_NonePeerHandleErrorZ_err(uint32_t e) {
-	LDKPeerHandleError e_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_err"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_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 = PeerHandleError_clone(&e_conv);
-	LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ");
-	*ret_conv = CResult_NonePeerHandleErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	e_conv = DecodeError_clone(&e_conv);
+	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ");
+	*ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_is_ok"))) TS_CResult_NonePeerHandleErrorZ_is_ok(uint32_t o) {
-	LDKCResult_NonePeerHandleErrorZ* o_conv = (LDKCResult_NonePeerHandleErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NonePeerHandleErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_free"))) TS_CResult_NonePeerHandleErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NonePeerHandleErrorZ _res_conv = *(LDKCResult_NonePeerHandleErrorZ*)(_res_ptr);
+	LDKCResult_ChannelMonitorUpdateDecodeErrorZ _res_conv = *(LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_NonePeerHandleErrorZ_free(_res_conv);
+	CResult_ChannelMonitorUpdateDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_NonePeerHandleErrorZ_clone_ptr(LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR arg) {
-	LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ");
-	*ret_conv = CResult_NonePeerHandleErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelMonitorUpdateDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ");
+	*ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone_ptr"))) TS_CResult_NonePeerHandleErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_NonePeerHandleErrorZ* arg_conv = (LDKCResult_NonePeerHandleErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NonePeerHandleErrorZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone"))) TS_CResult_NonePeerHandleErrorZ_clone(uint32_t orig) {
-	LDKCResult_NonePeerHandleErrorZ* orig_conv = (LDKCResult_NonePeerHandleErrorZ*)(orig & ~1);
-	LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ");
-	*ret_conv = CResult_NonePeerHandleErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_ok"))) TS_CResult_boolPeerHandleErrorZ_ok(jboolean o) {
-	LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ");
-	*ret_conv = CResult_boolPeerHandleErrorZ_ok(o);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelMonitorUpdateDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelMonitorUpdateDecodeErrorZ*)(orig & ~1);
+	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ");
+	*ret_conv = CResult_ChannelMonitorUpdateDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_err"))) TS_CResult_boolPeerHandleErrorZ_err(uint32_t e) {
-	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 (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_COption_MonitorEventZ_some"))) TS_COption_MonitorEventZ_some(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKMonitorEvent o_conv = *(LDKMonitorEvent*)(o_ptr);
+	o_conv = MonitorEvent_clone((LDKMonitorEvent*)(((uintptr_t)o) & ~1));
+	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
+	*ret_copy = COption_MonitorEventZ_some(o_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_is_ok"))) TS_CResult_boolPeerHandleErrorZ_is_ok(uint32_t o) {
-	LDKCResult_boolPeerHandleErrorZ* o_conv = (LDKCResult_boolPeerHandleErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_boolPeerHandleErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_COption_MonitorEventZ_none"))) TS_COption_MonitorEventZ_none() {
+	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
+	*ret_copy = COption_MonitorEventZ_none();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_free"))) TS_CResult_boolPeerHandleErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_COption_MonitorEventZ_free"))) TS_COption_MonitorEventZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_boolPeerHandleErrorZ _res_conv = *(LDKCResult_boolPeerHandleErrorZ*)(_res_ptr);
+	LDKCOption_MonitorEventZ _res_conv = *(LDKCOption_MonitorEventZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_boolPeerHandleErrorZ_free(_res_conv);
+	COption_MonitorEventZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_boolPeerHandleErrorZ_clone_ptr(LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR arg) {
-	LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ");
-	*ret_conv = CResult_boolPeerHandleErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t COption_MonitorEventZ_clone_ptr(LDKCOption_MonitorEventZ *NONNULL_PTR arg) {
+	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
+	*ret_copy = COption_MonitorEventZ_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone_ptr"))) TS_CResult_boolPeerHandleErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_boolPeerHandleErrorZ* arg_conv = (LDKCResult_boolPeerHandleErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_boolPeerHandleErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_COption_MonitorEventZ_clone_ptr"))) TS_COption_MonitorEventZ_clone_ptr(uint32_t arg) {
+	LDKCOption_MonitorEventZ* arg_conv = (LDKCOption_MonitorEventZ*)arg;
+	uint32_t ret_conv = COption_MonitorEventZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone"))) TS_CResult_boolPeerHandleErrorZ_clone(uint32_t orig) {
-	LDKCResult_boolPeerHandleErrorZ* orig_conv = (LDKCResult_boolPeerHandleErrorZ*)(orig & ~1);
-	LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ");
-	*ret_conv = CResult_boolPeerHandleErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_COption_MonitorEventZ_clone"))) TS_COption_MonitorEventZ_clone(uint32_t orig) {
+	LDKCOption_MonitorEventZ* orig_conv = (LDKCOption_MonitorEventZ*)orig;
+	LDKCOption_MonitorEventZ *ret_copy = MALLOC(sizeof(LDKCOption_MonitorEventZ), "LDKCOption_MonitorEventZ");
+	*ret_copy = COption_MonitorEventZ_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_ok"))) TS_CResult_NodeIdDecodeErrorZ_ok(uint32_t 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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKCOption_MonitorEventZ o_conv = *(LDKCOption_MonitorEventZ*)(o_ptr);
+	o_conv = COption_MonitorEventZ_clone((LDKCOption_MonitorEventZ*)(((uintptr_t)o) & ~1));
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
+	*ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_err"))) TS_CResult_NodeIdDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_err"))) 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_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
-	*ret_conv = CResult_NodeIdDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
+	*ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_is_ok"))) TS_CResult_NodeIdDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_NodeIdDecodeErrorZ* o_conv = (LDKCResult_NodeIdDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NodeIdDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* o_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_free"))) TS_CResult_NodeIdDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_free"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NodeIdDecodeErrorZ _res_conv = *(LDKCResult_NodeIdDecodeErrorZ*)(_res_ptr);
+	LDKCResult_COption_MonitorEventZDecodeErrorZ _res_conv = *(LDKCResult_COption_MonitorEventZDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_NodeIdDecodeErrorZ_free(_res_conv);
+	CResult_COption_MonitorEventZDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_NodeIdDecodeErrorZ_clone_ptr(LDKCResult_NodeIdDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
-	*ret_conv = CResult_NodeIdDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(LDKCResult_COption_MonitorEventZDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
+	*ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone_ptr"))) TS_CResult_NodeIdDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_NodeIdDecodeErrorZ* arg_conv = (LDKCResult_NodeIdDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NodeIdDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* arg_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NodeIdDecodeErrorZ_clone"))) TS_CResult_NodeIdDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_NodeIdDecodeErrorZ* orig_conv = (LDKCResult_NodeIdDecodeErrorZ*)(orig & ~1);
-	LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
-	*ret_conv = CResult_NodeIdDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_COption_MonitorEventZDecodeErrorZ_clone"))) TS_CResult_COption_MonitorEventZDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* orig_conv = (LDKCResult_COption_MonitorEventZDecodeErrorZ*)(orig & ~1);
+	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
+	*ret_conv = CResult_COption_MonitorEventZDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_ok(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKCOption_NetworkUpdateZ o_conv = *(LDKCOption_NetworkUpdateZ*)(o_ptr);
-	o_conv = COption_NetworkUpdateZ_clone((LDKCOption_NetworkUpdateZ*)(((uintptr_t)o) & ~1));
-	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
-	*ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_ok"))) 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);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_err"))) TS_CResult_HTLCUpdateDecodeErrorZ_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 (uintptr_t)ret_conv;
+	LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ");
+	*ret_conv = CResult_HTLCUpdateDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* o_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_COption_NetworkUpdateZDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_is_ok"))) TS_CResult_HTLCUpdateDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_HTLCUpdateDecodeErrorZ* o_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_HTLCUpdateDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_free"))) TS_CResult_HTLCUpdateDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_COption_NetworkUpdateZDecodeErrorZ _res_conv = *(LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(_res_ptr);
+	LDKCResult_HTLCUpdateDecodeErrorZ _res_conv = *(LDKCResult_HTLCUpdateDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_COption_NetworkUpdateZDecodeErrorZ_free(_res_conv);
+	CResult_HTLCUpdateDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(LDKCResult_COption_NetworkUpdateZDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
-	*ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_HTLCUpdateDecodeErrorZ_clone_ptr(LDKCResult_HTLCUpdateDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ");
+	*ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* arg_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_COption_NetworkUpdateZDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_HTLCUpdateDecodeErrorZ* arg_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone"))) TS_CResult_COption_NetworkUpdateZDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* orig_conv = (LDKCResult_COption_NetworkUpdateZDecodeErrorZ*)(orig & ~1);
-	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
-	*ret_conv = CResult_COption_NetworkUpdateZDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_HTLCUpdateDecodeErrorZ_clone"))) TS_CResult_HTLCUpdateDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_HTLCUpdateDecodeErrorZ* orig_conv = (LDKCResult_HTLCUpdateDecodeErrorZ*)(orig & ~1);
+	LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ");
+	*ret_conv = CResult_HTLCUpdateDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_AccessZ_some"))) TS_COption_AccessZ_some(uint32_t o) {
-	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
-	CHECK_ACCESS(o_ptr);
-	LDKAccess o_conv = *(LDKAccess*)(o_ptr);
-	LDKCOption_AccessZ *ret_copy = MALLOC(sizeof(LDKCOption_AccessZ), "LDKCOption_AccessZ");
-	*ret_copy = COption_AccessZ_some(o_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+static inline uintptr_t C2Tuple_OutPointScriptZ_clone_ptr(LDKC2Tuple_OutPointScriptZ *NONNULL_PTR arg) {
+	LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ");
+	*ret_conv = C2Tuple_OutPointScriptZ_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone_ptr"))) TS_C2Tuple_OutPointScriptZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_OutPointScriptZ* arg_conv = (LDKC2Tuple_OutPointScriptZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_OutPointScriptZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_AccessZ_none"))) TS_COption_AccessZ_none() {
-	LDKCOption_AccessZ *ret_copy = MALLOC(sizeof(LDKCOption_AccessZ), "LDKCOption_AccessZ");
-	*ret_copy = COption_AccessZ_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_clone"))) TS_C2Tuple_OutPointScriptZ_clone(uint32_t orig) {
+	LDKC2Tuple_OutPointScriptZ* orig_conv = (LDKC2Tuple_OutPointScriptZ*)(orig & ~1);
+	LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ");
+	*ret_conv = C2Tuple_OutPointScriptZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_COption_AccessZ_free"))) TS_COption_AccessZ_free(uint32_t _res) {
+uint32_t  __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_new"))) TS_C2Tuple_OutPointScriptZ_new(uint32_t a, int8_tArray b) {
+	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 = b->arr_len;
+	b_ref.data = MALLOC(b_ref.datalen, "LDKCVec_u8Z Bytes");
+	memcpy(b_ref.data, b->elems, b_ref.datalen); FREE(b);
+	LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ");
+	*ret_conv = C2Tuple_OutPointScriptZ_new(a_conv, b_ref);
+	return ((uint32_t)ret_conv);
+}
+
+void  __attribute__((export_name("TS_C2Tuple_OutPointScriptZ_free"))) TS_C2Tuple_OutPointScriptZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCOption_AccessZ _res_conv = *(LDKCOption_AccessZ*)(_res_ptr);
+	LDKC2Tuple_OutPointScriptZ _res_conv = *(LDKC2Tuple_OutPointScriptZ*)(_res_ptr);
 	FREE((void*)_res);
-	COption_AccessZ_free(_res_conv);
+	C2Tuple_OutPointScriptZ_free(_res_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_ok(uint32_t o) {
-	LDKChannelUpdateInfo 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 = ChannelUpdateInfo_clone(&o_conv);
-	LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ");
-	*ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t C2Tuple_u32ScriptZ_clone_ptr(LDKC2Tuple_u32ScriptZ *NONNULL_PTR arg) {
+	LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ");
+	*ret_conv = C2Tuple_u32ScriptZ_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone_ptr"))) TS_C2Tuple_u32ScriptZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_u32ScriptZ* arg_conv = (LDKC2Tuple_u32ScriptZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_u32ScriptZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_err"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_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_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ");
-	*ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_u32ScriptZ_clone"))) TS_C2Tuple_u32ScriptZ_clone(uint32_t orig) {
+	LDKC2Tuple_u32ScriptZ* orig_conv = (LDKC2Tuple_u32ScriptZ*)(orig & ~1);
+	LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ");
+	*ret_conv = C2Tuple_u32ScriptZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-jboolean  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_ChannelUpdateInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelUpdateInfoDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_C2Tuple_u32ScriptZ_new"))) TS_C2Tuple_u32ScriptZ_new(int32_t a, int8_tArray b) {
+	LDKCVec_u8Z b_ref;
+	b_ref.datalen = b->arr_len;
+	b_ref.data = MALLOC(b_ref.datalen, "LDKCVec_u8Z Bytes");
+	memcpy(b_ref.data, b->elems, b_ref.datalen); FREE(b);
+	LDKC2Tuple_u32ScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32ScriptZ), "LDKC2Tuple_u32ScriptZ");
+	*ret_conv = C2Tuple_u32ScriptZ_new(a, b_ref);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_free"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C2Tuple_u32ScriptZ_free"))) TS_C2Tuple_u32ScriptZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ChannelUpdateInfoDecodeErrorZ _res_conv = *(LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(_res_ptr);
+	LDKC2Tuple_u32ScriptZ _res_conv = *(LDKC2Tuple_u32ScriptZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_ChannelUpdateInfoDecodeErrorZ_free(_res_conv);
+	C2Tuple_u32ScriptZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateInfoDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ");
-	*ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_ChannelUpdateInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelUpdateInfoDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+void  __attribute__((export_name("TS_CVec_C2Tuple_u32ScriptZZ_free"))) TS_CVec_C2Tuple_u32ScriptZZ_free(uint32_tArray _res) {
+	LDKCVec_C2Tuple_u32ScriptZZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_u32ScriptZ), "LDKCVec_C2Tuple_u32ScriptZZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t v = 0; v < _res_constr.datalen; v++) {
+		uint32_t _res_conv_21 = _res_vals[v];
+		void* _res_conv_21_ptr = (void*)(((uintptr_t)_res_conv_21) & ~1);
+		CHECK_ACCESS(_res_conv_21_ptr);
+		LDKC2Tuple_u32ScriptZ _res_conv_21_conv = *(LDKC2Tuple_u32ScriptZ*)(_res_conv_21_ptr);
+		FREE((void*)_res_conv_21);
+		_res_constr.data[v] = _res_conv_21_conv;
+	}
+	FREE(_res);
+	CVec_C2Tuple_u32ScriptZZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateInfoDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_ChannelUpdateInfoDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateInfoDecodeErrorZ*)(orig & ~1);
-	LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ");
-	*ret_conv = CResult_ChannelUpdateInfoDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ *NONNULL_PTR arg) {
+	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ");
+	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(arg);
+	return ((uint32_t)ret_conv);
 }
-
-uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_err"))) TS_CResult_ChannelInfoDecodeErrorZ_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_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ");
-	*ret_conv = CResult_ChannelInfoDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(uint32_t orig) {
+	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(orig & ~1);
+	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ");
+	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-jboolean  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_is_ok"))) TS_CResult_ChannelInfoDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_ChannelInfoDecodeErrorZ* o_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelInfoDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(int8_tArray a, uint32_tArray b) {
+	LDKThirtyTwoBytes a_ref;
+	CHECK(a->arr_len == 32);
+	memcpy(a_ref.data, a->elems, 32); FREE(a);
+	LDKCVec_C2Tuple_u32ScriptZZ b_constr;
+	b_constr.datalen = b->arr_len;
+	if (b_constr.datalen > 0)
+		b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKC2Tuple_u32ScriptZ), "LDKCVec_C2Tuple_u32ScriptZZ Elements");
+	else
+		b_constr.data = NULL;
+	uint32_t* b_vals = b->elems;
+	for (size_t v = 0; v < b_constr.datalen; v++) {
+		uint32_t b_conv_21 = b_vals[v];
+		void* b_conv_21_ptr = (void*)(((uintptr_t)b_conv_21) & ~1);
+		CHECK_ACCESS(b_conv_21_ptr);
+		LDKC2Tuple_u32ScriptZ b_conv_21_conv = *(LDKC2Tuple_u32ScriptZ*)(b_conv_21_ptr);
+		b_conv_21_conv = C2Tuple_u32ScriptZ_clone((LDKC2Tuple_u32ScriptZ*)(((uintptr_t)b_conv_21) & ~1));
+		b_constr.data[v] = b_conv_21_conv;
+	}
+	FREE(b);
+	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ");
+	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_new(a_ref, b_constr);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_free"))) TS_CResult_ChannelInfoDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free"))) TS_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_ChannelInfoDecodeErrorZ _res_conv = *(LDKCResult_ChannelInfoDecodeErrorZ*)(_res_ptr);
+	LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_ChannelInfoDecodeErrorZ_free(_res_conv);
+	C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_ChannelInfoDecodeErrorZ_clone_ptr(LDKCResult_ChannelInfoDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ");
-	*ret_conv = CResult_ChannelInfoDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(uint32_tArray _res) {
+	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t o = 0; o < _res_constr.datalen; o++) {
+		uint32_t _res_conv_40 = _res_vals[o];
+		void* _res_conv_40_ptr = (void*)(((uintptr_t)_res_conv_40) & ~1);
+		CHECK_ACCESS(_res_conv_40_ptr);
+		LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ _res_conv_40_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ*)(_res_conv_40_ptr);
+		FREE((void*)_res_conv_40);
+		_res_constr.data[o] = _res_conv_40_conv;
+	}
+	FREE(_res);
+	CVec_C2Tuple_TxidCVec_C2Tuple_u32ScriptZZZZ_free(_res_constr);
 }
-intptr_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_ChannelInfoDecodeErrorZ* arg_conv = (LDKCResult_ChannelInfoDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelInfoDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+
+void  __attribute__((export_name("TS_CVec_EventZ_free"))) TS_CVec_EventZ_free(uint32_tArray _res) {
+	LDKCVec_EventZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKEvent), "LDKCVec_EventZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t h = 0; h < _res_constr.datalen; h++) {
+		uint32_t _res_conv_7 = _res_vals[h];
+		void* _res_conv_7_ptr = (void*)(((uintptr_t)_res_conv_7) & ~1);
+		CHECK_ACCESS(_res_conv_7_ptr);
+		LDKEvent _res_conv_7_conv = *(LDKEvent*)(_res_conv_7_ptr);
+		FREE((void*)_res_conv_7);
+		_res_constr.data[h] = _res_conv_7_conv;
+	}
+	FREE(_res);
+	CVec_EventZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_ChannelInfoDecodeErrorZ_clone"))) 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");
-	*ret_conv = CResult_ChannelInfoDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_TransactionZ_free"))) TS_CVec_TransactionZ_free(ptrArray _res) {
+	LDKCVec_TransactionZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKTransaction), "LDKCVec_TransactionZ Elements");
+	else
+		_res_constr.data = NULL;
+	int8_tArray* _res_vals = (void*) _res->elems;
+	for (size_t m = 0; m < _res_constr.datalen; m++) {
+		int8_tArray _res_conv_12 = _res_vals[m];
+		LDKTransaction _res_conv_12_ref;
+		_res_conv_12_ref.datalen = _res_conv_12->arr_len;
+		_res_conv_12_ref.data = MALLOC(_res_conv_12_ref.datalen, "LDKTransaction Bytes");
+		memcpy(_res_conv_12_ref.data, _res_conv_12->elems, _res_conv_12_ref.datalen); FREE(_res_conv_12);
+		_res_conv_12_ref.data_is_owned = true;
+		_res_constr.data[m] = _res_conv_12_ref;
+	}
+	FREE(_res);
+	CVec_TransactionZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t C2Tuple_u32TxOutZ_clone_ptr(LDKC2Tuple_u32TxOutZ *NONNULL_PTR arg) {
+	LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ");
+	*ret_conv = C2Tuple_u32TxOutZ_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone_ptr"))) TS_C2Tuple_u32TxOutZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_u32TxOutZ* arg_conv = (LDKC2Tuple_u32TxOutZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_u32TxOutZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_err"))) TS_CResult_RoutingFeesDecodeErrorZ_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_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ");
-	*ret_conv = CResult_RoutingFeesDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_u32TxOutZ_clone"))) TS_C2Tuple_u32TxOutZ_clone(uint32_t orig) {
+	LDKC2Tuple_u32TxOutZ* orig_conv = (LDKC2Tuple_u32TxOutZ*)(orig & ~1);
+	LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ");
+	*ret_conv = C2Tuple_u32TxOutZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-jboolean  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_is_ok"))) TS_CResult_RoutingFeesDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_RoutingFeesDecodeErrorZ* o_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_RoutingFeesDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_C2Tuple_u32TxOutZ_new"))) TS_C2Tuple_u32TxOutZ_new(int32_t a, uint32_t b) {
+	void* b_ptr = (void*)(((uintptr_t)b) & ~1);
+	CHECK_ACCESS(b_ptr);
+	LDKTxOut b_conv = *(LDKTxOut*)(b_ptr);
+	b_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)b) & ~1));
+	LDKC2Tuple_u32TxOutZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_u32TxOutZ), "LDKC2Tuple_u32TxOutZ");
+	*ret_conv = C2Tuple_u32TxOutZ_new(a, b_conv);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_free"))) TS_CResult_RoutingFeesDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C2Tuple_u32TxOutZ_free"))) TS_C2Tuple_u32TxOutZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_RoutingFeesDecodeErrorZ _res_conv = *(LDKCResult_RoutingFeesDecodeErrorZ*)(_res_ptr);
+	LDKC2Tuple_u32TxOutZ _res_conv = *(LDKC2Tuple_u32TxOutZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_RoutingFeesDecodeErrorZ_free(_res_conv);
+	C2Tuple_u32TxOutZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_RoutingFeesDecodeErrorZ_clone_ptr(LDKCResult_RoutingFeesDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ");
-	*ret_conv = CResult_RoutingFeesDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr"))) TS_CResult_RoutingFeesDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_RoutingFeesDecodeErrorZ* arg_conv = (LDKCResult_RoutingFeesDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_RoutingFeesDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+void  __attribute__((export_name("TS_CVec_C2Tuple_u32TxOutZZ_free"))) TS_CVec_C2Tuple_u32TxOutZZ_free(uint32_tArray _res) {
+	LDKCVec_C2Tuple_u32TxOutZZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_u32TxOutZ), "LDKCVec_C2Tuple_u32TxOutZZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t u = 0; u < _res_constr.datalen; u++) {
+		uint32_t _res_conv_20 = _res_vals[u];
+		void* _res_conv_20_ptr = (void*)(((uintptr_t)_res_conv_20) & ~1);
+		CHECK_ACCESS(_res_conv_20_ptr);
+		LDKC2Tuple_u32TxOutZ _res_conv_20_conv = *(LDKC2Tuple_u32TxOutZ*)(_res_conv_20_ptr);
+		FREE((void*)_res_conv_20);
+		_res_constr.data[u] = _res_conv_20_conv;
+	}
+	FREE(_res);
+	CVec_C2Tuple_u32TxOutZZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_RoutingFeesDecodeErrorZ_clone"))) 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");
-	*ret_conv = CResult_RoutingFeesDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ *NONNULL_PTR arg) {
+	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ");
+	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(arg);
+	return ((uint32_t)ret_conv);
 }
-
-uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* arg_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_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_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ");
-	*ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(uint32_t orig) {
+	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* orig_conv = (LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(orig & ~1);
+	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ");
+	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
 }
 
-jboolean  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NodeAnnouncementInfoDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(int8_tArray a, uint32_tArray b) {
+	LDKThirtyTwoBytes a_ref;
+	CHECK(a->arr_len == 32);
+	memcpy(a_ref.data, a->elems, 32); FREE(a);
+	LDKCVec_C2Tuple_u32TxOutZZ b_constr;
+	b_constr.datalen = b->arr_len;
+	if (b_constr.datalen > 0)
+		b_constr.data = MALLOC(b_constr.datalen * sizeof(LDKC2Tuple_u32TxOutZ), "LDKCVec_C2Tuple_u32TxOutZZ Elements");
+	else
+		b_constr.data = NULL;
+	uint32_t* b_vals = b->elems;
+	for (size_t u = 0; u < b_constr.datalen; u++) {
+		uint32_t b_conv_20 = b_vals[u];
+		void* b_conv_20_ptr = (void*)(((uintptr_t)b_conv_20) & ~1);
+		CHECK_ACCESS(b_conv_20_ptr);
+		LDKC2Tuple_u32TxOutZ b_conv_20_conv = *(LDKC2Tuple_u32TxOutZ*)(b_conv_20_ptr);
+		b_conv_20_conv = C2Tuple_u32TxOutZ_clone((LDKC2Tuple_u32TxOutZ*)(((uintptr_t)b_conv_20) & ~1));
+		b_constr.data[u] = b_conv_20_conv;
+	}
+	FREE(b);
+	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ");
+	*ret_conv = C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_new(a_ref, b_constr);
+	return ((uint32_t)ret_conv);
 }
 
-void  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free"))) TS_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NodeAnnouncementInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(_res_ptr);
+	LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_NodeAnnouncementInfoDecodeErrorZ_free(_res_conv);
-}
-
-static inline uintptr_t CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementInfoDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ");
-	*ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
-}
-intptr_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NodeAnnouncementInfoDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementInfoDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementInfoDecodeErrorZ*)(orig & ~1);
-	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ");
-	*ret_conv = CResult_NodeAnnouncementInfoDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ_free(_res_conv);
 }
 
-void  __attribute__((export_name("TS_CVec_u64Z_free"))) TS_CVec_u64Z_free(int64_tArray _res) {
-	LDKCVec_u64Z _res_constr;
+void  __attribute__((export_name("TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free"))) TS_CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(uint32_tArray _res) {
+	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ _res_constr;
 	_res_constr.datalen = _res->arr_len;
 	if (_res_constr.datalen > 0)
-		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements");
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ Elements");
 	else
 		_res_constr.data = NULL;
-	int64_t* _res_vals = _res->elems /* XXX _res leaks */;
-	for (size_t i = 0; i < _res_constr.datalen; i++) {
-		int64_t _res_conv_8 = _res_vals[i];
-		_res_constr.data[i] = _res_conv_8;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t n = 0; n < _res_constr.datalen; n++) {
+		uint32_t _res_conv_39 = _res_vals[n];
+		void* _res_conv_39_ptr = (void*)(((uintptr_t)_res_conv_39) & ~1);
+		CHECK_ACCESS(_res_conv_39_ptr);
+		LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ _res_conv_39_conv = *(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ*)(_res_conv_39_ptr);
+		FREE((void*)_res_conv_39);
+		_res_constr.data[n] = _res_conv_39_conv;
 	}
-	CVec_u64Z_free(_res_constr);
+	FREE(_res);
+	CVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_ok"))) TS_CResult_NodeInfoDecodeErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_CVec_BalanceZ_free"))) TS_CVec_BalanceZ_free(uint32_tArray _res) {
+	LDKCVec_BalanceZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKBalance), "LDKCVec_BalanceZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t j = 0; j < _res_constr.datalen; j++) {
+		uint32_t _res_conv_9 = _res_vals[j];
+		void* _res_conv_9_ptr = (void*)(((uintptr_t)_res_conv_9) & ~1);
+		CHECK_ACCESS(_res_conv_9_ptr);
+		LDKBalance _res_conv_9_conv = *(LDKBalance*)(_res_conv_9_ptr);
+		FREE((void*)_res_conv_9);
+		_res_constr.data[j] = _res_conv_9_conv;
+	}
+	FREE(_res);
+	CVec_BalanceZ_free(_res_constr);
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_err"))) TS_CResult_NodeInfoDecodeErrorZ_err(uint32_t e) {
+static inline uintptr_t C2Tuple_BlockHashChannelMonitorZ_clone_ptr(LDKC2Tuple_BlockHashChannelMonitorZ *NONNULL_PTR arg) {
+	LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ");
+	*ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_BlockHashChannelMonitorZ* arg_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_clone"))) TS_C2Tuple_BlockHashChannelMonitorZ_clone(uint32_t orig) {
+	LDKC2Tuple_BlockHashChannelMonitorZ* orig_conv = (LDKC2Tuple_BlockHashChannelMonitorZ*)(orig & ~1);
+	LDKC2Tuple_BlockHashChannelMonitorZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_BlockHashChannelMonitorZ), "LDKC2Tuple_BlockHashChannelMonitorZ");
+	*ret_conv = C2Tuple_BlockHashChannelMonitorZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_new"))) TS_C2Tuple_BlockHashChannelMonitorZ_new(int8_tArray a, uint32_t b) {
+	LDKThirtyTwoBytes a_ref;
+	CHECK(a->arr_len == 32);
+	memcpy(a_ref.data, a->elems, 32); FREE(a);
+	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);
+	return ((uint32_t)ret_conv);
+}
+
+void  __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_free"))) TS_C2Tuple_BlockHashChannelMonitorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKC2Tuple_BlockHashChannelMonitorZ _res_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(_res_ptr);
+	FREE((void*)_res);
+	C2Tuple_BlockHashChannelMonitorZ_free(_res_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKC2Tuple_BlockHashChannelMonitorZ o_conv = *(LDKC2Tuple_BlockHashChannelMonitorZ*)(o_ptr);
+	o_conv = C2Tuple_BlockHashChannelMonitorZ_clone((LDKC2Tuple_BlockHashChannelMonitorZ*)(((uintptr_t)o) & ~1));
+	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ");
+	*ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_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_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ");
-	*ret_conv = CResult_NodeInfoDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ");
+	*ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_is_ok"))) TS_CResult_NodeInfoDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_NodeInfoDecodeErrorZ* o_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NodeInfoDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* o_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_free"))) TS_CResult_NodeInfoDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NodeInfoDecodeErrorZ _res_conv = *(LDKCResult_NodeInfoDecodeErrorZ*)(_res_ptr);
+	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ _res_conv = *(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_NodeInfoDecodeErrorZ_free(_res_conv);
+	CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_NodeInfoDecodeErrorZ_clone_ptr(LDKCResult_NodeInfoDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ");
-	*ret_conv = CResult_NodeInfoDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ");
+	*ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone_ptr"))) TS_CResult_NodeInfoDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_NodeInfoDecodeErrorZ* arg_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NodeInfoDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* arg_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NodeInfoDecodeErrorZ_clone"))) TS_CResult_NodeInfoDecodeErrorZ_clone(uint32_t orig) {
-	LDKCResult_NodeInfoDecodeErrorZ* orig_conv = (LDKCResult_NodeInfoDecodeErrorZ*)(orig & ~1);
-	LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ");
-	*ret_conv = CResult_NodeInfoDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone"))) TS_CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* orig_conv = (LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ*)(orig & ~1);
+	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ");
+	*ret_conv = CResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_ok(uint32_t o) {
-	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);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t C2Tuple_PublicKeyTypeZ_clone_ptr(LDKC2Tuple_PublicKeyTypeZ *NONNULL_PTR arg) {
+	LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ");
+	*ret_conv = C2Tuple_PublicKeyTypeZ_clone(arg);
+	return ((uint32_t)ret_conv);
+}
+uint32_t  __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone_ptr"))) TS_C2Tuple_PublicKeyTypeZ_clone_ptr(uint32_t arg) {
+	LDKC2Tuple_PublicKeyTypeZ* arg_conv = (LDKC2Tuple_PublicKeyTypeZ*)(arg & ~1);
+	uint32_t ret_conv = C2Tuple_PublicKeyTypeZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_err"))) TS_CResult_NetworkGraphDecodeErrorZ_err(uint32_t e) {
-	LDKDecodeError e_conv;
+uint32_t  __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_clone"))) TS_C2Tuple_PublicKeyTypeZ_clone(uint32_t orig) {
+	LDKC2Tuple_PublicKeyTypeZ* orig_conv = (LDKC2Tuple_PublicKeyTypeZ*)(orig & ~1);
+	LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ");
+	*ret_conv = C2Tuple_PublicKeyTypeZ_clone(orig_conv);
+	return ((uint32_t)ret_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_new"))) TS_C2Tuple_PublicKeyTypeZ_new(int8_tArray a, uint32_t b) {
+	LDKPublicKey a_ref;
+	CHECK(a->arr_len == 33);
+	memcpy(a_ref.compressed_form, a->elems, 33); FREE(a);
+	void* b_ptr = (void*)(((uintptr_t)b) & ~1);
+	CHECK_ACCESS(b_ptr);
+	LDKType b_conv = *(LDKType*)(b_ptr);
+	if (b_conv.free == LDKType_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKType_JCalls_cloned(&b_conv);
+	}
+	LDKC2Tuple_PublicKeyTypeZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKC2Tuple_PublicKeyTypeZ");
+	*ret_conv = C2Tuple_PublicKeyTypeZ_new(a_ref, b_conv);
+	return ((uint32_t)ret_conv);
+}
+
+void  __attribute__((export_name("TS_C2Tuple_PublicKeyTypeZ_free"))) TS_C2Tuple_PublicKeyTypeZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKC2Tuple_PublicKeyTypeZ _res_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(_res_ptr);
+	FREE((void*)_res);
+	C2Tuple_PublicKeyTypeZ_free(_res_conv);
+}
+
+void  __attribute__((export_name("TS_CVec_C2Tuple_PublicKeyTypeZZ_free"))) TS_CVec_C2Tuple_PublicKeyTypeZZ_free(uint32_tArray _res) {
+	LDKCVec_C2Tuple_PublicKeyTypeZZ _res_constr;
+	_res_constr.datalen = _res->arr_len;
+	if (_res_constr.datalen > 0)
+		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKC2Tuple_PublicKeyTypeZ), "LDKCVec_C2Tuple_PublicKeyTypeZZ Elements");
+	else
+		_res_constr.data = NULL;
+	uint32_t* _res_vals = _res->elems;
+	for (size_t z = 0; z < _res_constr.datalen; z++) {
+		uint32_t _res_conv_25 = _res_vals[z];
+		void* _res_conv_25_ptr = (void*)(((uintptr_t)_res_conv_25) & ~1);
+		CHECK_ACCESS(_res_conv_25_ptr);
+		LDKC2Tuple_PublicKeyTypeZ _res_conv_25_conv = *(LDKC2Tuple_PublicKeyTypeZ*)(_res_conv_25_ptr);
+		FREE((void*)_res_conv_25);
+		_res_constr.data[z] = _res_conv_25_conv;
+	}
+	FREE(_res);
+	CVec_C2Tuple_PublicKeyTypeZZ_free(_res_constr);
+}
+
+uint32_t  __attribute__((export_name("TS_COption_NetAddressZ_some"))) TS_COption_NetAddressZ_some(uint32_t o) {
+	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
+	CHECK_ACCESS(o_ptr);
+	LDKNetAddress o_conv = *(LDKNetAddress*)(o_ptr);
+	o_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o) & ~1));
+	LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ");
+	*ret_copy = COption_NetAddressZ_some(o_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_COption_NetAddressZ_none"))) TS_COption_NetAddressZ_none() {
+	LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ");
+	*ret_copy = COption_NetAddressZ_none();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_COption_NetAddressZ_free"))) TS_COption_NetAddressZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCOption_NetAddressZ _res_conv = *(LDKCOption_NetAddressZ*)(_res_ptr);
+	FREE((void*)_res);
+	COption_NetAddressZ_free(_res_conv);
+}
+
+static inline uintptr_t COption_NetAddressZ_clone_ptr(LDKCOption_NetAddressZ *NONNULL_PTR arg) {
+	LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ");
+	*ret_copy = COption_NetAddressZ_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+uint32_t  __attribute__((export_name("TS_COption_NetAddressZ_clone_ptr"))) TS_COption_NetAddressZ_clone_ptr(uint32_t arg) {
+	LDKCOption_NetAddressZ* arg_conv = (LDKCOption_NetAddressZ*)arg;
+	uint32_t ret_conv = COption_NetAddressZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_COption_NetAddressZ_clone"))) TS_COption_NetAddressZ_clone(uint32_t orig) {
+	LDKCOption_NetAddressZ* orig_conv = (LDKCOption_NetAddressZ*)orig;
+	LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ");
+	*ret_copy = COption_NetAddressZ_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_ok(int8_tArray o) {
+	LDKCVec_u8Z o_ref;
+	o_ref.datalen = o->arr_len;
+	o_ref.data = MALLOC(o_ref.datalen, "LDKCVec_u8Z Bytes");
+	memcpy(o_ref.data, o->elems, o_ref.datalen); FREE(o);
+	LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ");
+	*ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_ok(o_ref);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_err"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_err(uint32_t e) {
+	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 = DecodeError_clone(&e_conv);
-	LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ");
-	*ret_conv = CResult_NetworkGraphDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	e_conv = PeerHandleError_clone(&e_conv);
+	LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ");
+	*ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_is_ok"))) TS_CResult_NetworkGraphDecodeErrorZ_is_ok(uint32_t o) {
-	LDKCResult_NetworkGraphDecodeErrorZ* o_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NetworkGraphDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+jboolean  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_is_ok(uint32_t o) {
+	LDKCResult_CVec_u8ZPeerHandleErrorZ* o_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_free"))) TS_CResult_NetworkGraphDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_free"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_NetworkGraphDecodeErrorZ _res_conv = *(LDKCResult_NetworkGraphDecodeErrorZ*)(_res_ptr);
+	LDKCResult_CVec_u8ZPeerHandleErrorZ _res_conv = *(LDKCResult_CVec_u8ZPeerHandleErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_NetworkGraphDecodeErrorZ_free(_res_conv);
+	CResult_CVec_u8ZPeerHandleErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_NetworkGraphDecodeErrorZ_clone_ptr(LDKCResult_NetworkGraphDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ");
-	*ret_conv = CResult_NetworkGraphDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(LDKCResult_CVec_u8ZPeerHandleErrorZ *NONNULL_PTR arg) {
+	LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ");
+	*ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_clone_ptr"))) TS_CResult_NetworkGraphDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_NetworkGraphDecodeErrorZ* arg_conv = (LDKCResult_NetworkGraphDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NetworkGraphDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_CVec_u8ZPeerHandleErrorZ* arg_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_NetworkGraphDecodeErrorZ_clone"))) 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");
-	*ret_conv = CResult_NetworkGraphDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_CVec_u8ZPeerHandleErrorZ_clone"))) TS_CResult_CVec_u8ZPeerHandleErrorZ_clone(uint32_t orig) {
+	LDKCResult_CVec_u8ZPeerHandleErrorZ* orig_conv = (LDKCResult_CVec_u8ZPeerHandleErrorZ*)(orig & ~1);
+	LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ");
+	*ret_conv = CResult_CVec_u8ZPeerHandleErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_CVec_NetAddressZZ_some"))) TS_COption_CVec_NetAddressZZ_some(uint32_tArray o) {
-	LDKCVec_NetAddressZ o_constr;
-	o_constr.datalen = o->arr_len;
-	if (o_constr.datalen > 0)
-		o_constr.data = MALLOC(o_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements");
-	else
-		o_constr.data = NULL;
-	uint32_t* o_vals = o->elems /* XXX o leaks */;
-	for (size_t m = 0; m < o_constr.datalen; m++) {
-		uint32_t o_conv_12 = o_vals[m];
-		void* o_conv_12_ptr = (void*)(((uintptr_t)o_conv_12) & ~1);
-		CHECK_ACCESS(o_conv_12_ptr);
-		LDKNetAddress o_conv_12_conv = *(LDKNetAddress*)(o_conv_12_ptr);
-		o_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o_conv_12) & ~1));
-		o_constr.data[m] = o_conv_12_conv;
-	}
-	LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ");
-	*ret_copy = COption_CVec_NetAddressZZ_some(o_constr);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_ok"))) TS_CResult_NonePeerHandleErrorZ_ok() {
+	LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ");
+	*ret_conv = CResult_NonePeerHandleErrorZ_ok();
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_CVec_NetAddressZZ_none"))) TS_COption_CVec_NetAddressZZ_none() {
-	LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ");
-	*ret_copy = COption_CVec_NetAddressZZ_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_err"))) TS_CResult_NonePeerHandleErrorZ_err(uint32_t e) {
+	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 (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_COption_CVec_NetAddressZZ_free"))) TS_COption_CVec_NetAddressZZ_free(uint32_t _res) {
+jboolean  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_is_ok"))) TS_CResult_NonePeerHandleErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NonePeerHandleErrorZ* o_conv = (LDKCResult_NonePeerHandleErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_NonePeerHandleErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_free"))) TS_CResult_NonePeerHandleErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCOption_CVec_NetAddressZZ _res_conv = *(LDKCOption_CVec_NetAddressZZ*)(_res_ptr);
+	LDKCResult_NonePeerHandleErrorZ _res_conv = *(LDKCResult_NonePeerHandleErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	COption_CVec_NetAddressZZ_free(_res_conv);
+	CResult_NonePeerHandleErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t COption_CVec_NetAddressZZ_clone_ptr(LDKCOption_CVec_NetAddressZZ *NONNULL_PTR arg) {
-	LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ");
-	*ret_copy = COption_CVec_NetAddressZZ_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+static inline uintptr_t CResult_NonePeerHandleErrorZ_clone_ptr(LDKCResult_NonePeerHandleErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ");
+	*ret_conv = CResult_NonePeerHandleErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone_ptr"))) TS_COption_CVec_NetAddressZZ_clone_ptr(uint32_t arg) {
-	LDKCOption_CVec_NetAddressZZ* arg_conv = (LDKCOption_CVec_NetAddressZZ*)arg;
-	intptr_t ret_val = COption_CVec_NetAddressZZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone_ptr"))) TS_CResult_NonePeerHandleErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NonePeerHandleErrorZ* arg_conv = (LDKCResult_NonePeerHandleErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NonePeerHandleErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_COption_CVec_NetAddressZZ_clone"))) TS_COption_CVec_NetAddressZZ_clone(uint32_t orig) {
-	LDKCOption_CVec_NetAddressZZ* orig_conv = (LDKCOption_CVec_NetAddressZZ*)orig;
-	LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ");
-	*ret_copy = COption_CVec_NetAddressZZ_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
+uint32_t  __attribute__((export_name("TS_CResult_NonePeerHandleErrorZ_clone"))) TS_CResult_NonePeerHandleErrorZ_clone(uint32_t orig) {
+	LDKCResult_NonePeerHandleErrorZ* orig_conv = (LDKCResult_NonePeerHandleErrorZ*)(orig & ~1);
+	LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ");
+	*ret_conv = CResult_NonePeerHandleErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_ok"))) TS_CResult_boolPeerHandleErrorZ_ok(jboolean o) {
+	LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ");
+	*ret_conv = CResult_boolPeerHandleErrorZ_ok(o);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_err"))) TS_CResult_boolPeerHandleErrorZ_err(uint32_t e) {
+	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 (uint32_t)ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_is_ok"))) TS_CResult_boolPeerHandleErrorZ_is_ok(uint32_t o) {
+	LDKCResult_boolPeerHandleErrorZ* o_conv = (LDKCResult_boolPeerHandleErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_boolPeerHandleErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_free"))) TS_CResult_boolPeerHandleErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_boolPeerHandleErrorZ _res_conv = *(LDKCResult_boolPeerHandleErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_boolPeerHandleErrorZ_free(_res_conv);
+}
+
+static inline uintptr_t CResult_boolPeerHandleErrorZ_clone_ptr(LDKCResult_boolPeerHandleErrorZ *NONNULL_PTR arg) {
+	LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ");
+	*ret_conv = CResult_boolPeerHandleErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone_ptr"))) TS_CResult_boolPeerHandleErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_boolPeerHandleErrorZ* arg_conv = (LDKCResult_boolPeerHandleErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_boolPeerHandleErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_boolPeerHandleErrorZ_clone"))) TS_CResult_boolPeerHandleErrorZ_clone(uint32_t orig) {
+	LDKCResult_boolPeerHandleErrorZ* orig_conv = (LDKCResult_boolPeerHandleErrorZ*)(orig & ~1);
+	LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ");
+	*ret_conv = CResult_boolPeerHandleErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_NoneErrorZ_ok"))) TS_CResult_NoneErrorZ_ok() {
+	LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ");
+	*ret_conv = CResult_NoneErrorZ_ok();
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_NoneErrorZ_err"))) TS_CResult_NoneErrorZ_err(uint32_t e) {
+	LDKIOError e_conv = LDKIOError_from_js(e);
+	LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ");
+	*ret_conv = CResult_NoneErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_CResult_NoneErrorZ_is_ok"))) TS_CResult_NoneErrorZ_is_ok(uint32_t o) {
+	LDKCResult_NoneErrorZ* o_conv = (LDKCResult_NoneErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_NoneErrorZ_is_ok(o_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_CResult_NoneErrorZ_free"))) TS_CResult_NoneErrorZ_free(uint32_t _res) {
+	if ((_res & 1) != 0) return;
+	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
+	CHECK_ACCESS(_res_ptr);
+	LDKCResult_NoneErrorZ _res_conv = *(LDKCResult_NoneErrorZ*)(_res_ptr);
+	FREE((void*)_res);
+	CResult_NoneErrorZ_free(_res_conv);
+}
+
+static inline uintptr_t CResult_NoneErrorZ_clone_ptr(LDKCResult_NoneErrorZ *NONNULL_PTR arg) {
+	LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ");
+	*ret_conv = CResult_NoneErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
+}
+uint32_t  __attribute__((export_name("TS_CResult_NoneErrorZ_clone_ptr"))) TS_CResult_NoneErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_NoneErrorZ* arg_conv = (LDKCResult_NoneErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_NoneErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_CResult_NoneErrorZ_clone"))) TS_CResult_NoneErrorZ_clone(uint32_t orig) {
+	LDKCResult_NoneErrorZ* orig_conv = (LDKCResult_NoneErrorZ*)(orig & ~1);
+	LDKCResult_NoneErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneErrorZ), "LDKCResult_NoneErrorZ");
+	*ret_conv = CResult_NoneErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_ok"))) TS_CResult_NetAddressDecodeErrorZ_ok(uint32_t o) {
@@ -17047,7 +18168,7 @@ uint32_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_ok"))) T
 	o_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)o) & ~1));
 	LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ");
 	*ret_conv = CResult_NetAddressDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_err"))) TS_CResult_NetAddressDecodeErrorZ_err(uint32_t e) {
@@ -17058,13 +18179,13 @@ uint32_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_err")))
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ");
 	*ret_conv = CResult_NetAddressDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_is_ok"))) TS_CResult_NetAddressDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_NetAddressDecodeErrorZ* o_conv = (LDKCResult_NetAddressDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NetAddressDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_NetAddressDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_free"))) TS_CResult_NetAddressDecodeErrorZ_free(uint32_t _res) {
@@ -17079,19 +18200,19 @@ void  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_free"))) TS_
 static inline uintptr_t CResult_NetAddressDecodeErrorZ_clone_ptr(LDKCResult_NetAddressDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ");
 	*ret_conv = CResult_NetAddressDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone_ptr"))) TS_CResult_NetAddressDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone_ptr"))) TS_CResult_NetAddressDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_NetAddressDecodeErrorZ* arg_conv = (LDKCResult_NetAddressDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NetAddressDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_NetAddressDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_NetAddressDecodeErrorZ_clone"))) TS_CResult_NetAddressDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_NetAddressDecodeErrorZ* orig_conv = (LDKCResult_NetAddressDecodeErrorZ*)(orig & ~1);
 	LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ");
 	*ret_conv = CResult_NetAddressDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_UpdateAddHTLCZ_free(uint32_tArray _res) {
@@ -17101,7 +18222,7 @@ void  __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_Update
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateAddHTLC), "LDKCVec_UpdateAddHTLCZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t p = 0; p < _res_constr.datalen; p++) {
 		uint32_t _res_conv_15 = _res_vals[p];
 		LDKUpdateAddHTLC _res_conv_15_conv;
@@ -17110,6 +18231,7 @@ void  __attribute__((export_name("TS_CVec_UpdateAddHTLCZ_free"))) TS_CVec_Update
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_15_conv);
 		_res_constr.data[p] = _res_conv_15_conv;
 	}
+	FREE(_res);
 	CVec_UpdateAddHTLCZ_free(_res_constr);
 }
 
@@ -17120,7 +18242,7 @@ void  __attribute__((export_name("TS_CVec_UpdateFulfillHTLCZ_free"))) TS_CVec_Up
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFulfillHTLC), "LDKCVec_UpdateFulfillHTLCZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t t = 0; t < _res_constr.datalen; t++) {
 		uint32_t _res_conv_19 = _res_vals[t];
 		LDKUpdateFulfillHTLC _res_conv_19_conv;
@@ -17129,6 +18251,7 @@ void  __attribute__((export_name("TS_CVec_UpdateFulfillHTLCZ_free"))) TS_CVec_Up
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_19_conv);
 		_res_constr.data[t] = _res_conv_19_conv;
 	}
+	FREE(_res);
 	CVec_UpdateFulfillHTLCZ_free(_res_constr);
 }
 
@@ -17139,7 +18262,7 @@ void  __attribute__((export_name("TS_CVec_UpdateFailHTLCZ_free"))) TS_CVec_Updat
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFailHTLC), "LDKCVec_UpdateFailHTLCZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t q = 0; q < _res_constr.datalen; q++) {
 		uint32_t _res_conv_16 = _res_vals[q];
 		LDKUpdateFailHTLC _res_conv_16_conv;
@@ -17148,6 +18271,7 @@ void  __attribute__((export_name("TS_CVec_UpdateFailHTLCZ_free"))) TS_CVec_Updat
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_16_conv);
 		_res_constr.data[q] = _res_conv_16_conv;
 	}
+	FREE(_res);
 	CVec_UpdateFailHTLCZ_free(_res_constr);
 }
 
@@ -17158,7 +18282,7 @@ void  __attribute__((export_name("TS_CVec_UpdateFailMalformedHTLCZ_free"))) TS_C
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKUpdateFailMalformedHTLC), "LDKCVec_UpdateFailMalformedHTLCZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t z = 0; z < _res_constr.datalen; z++) {
 		uint32_t _res_conv_25 = _res_vals[z];
 		LDKUpdateFailMalformedHTLC _res_conv_25_conv;
@@ -17167,6 +18291,7 @@ void  __attribute__((export_name("TS_CVec_UpdateFailMalformedHTLCZ_free"))) TS_C
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_25_conv);
 		_res_constr.data[z] = _res_conv_25_conv;
 	}
+	FREE(_res);
 	CVec_UpdateFailMalformedHTLCZ_free(_res_constr);
 }
 
@@ -17178,7 +18303,7 @@ uint32_t  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_ok"))
 	o_conv = AcceptChannel_clone(&o_conv);
 	LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ");
 	*ret_conv = CResult_AcceptChannelDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_err"))) TS_CResult_AcceptChannelDecodeErrorZ_err(uint32_t e) {
@@ -17189,13 +18314,13 @@ uint32_t  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_err")
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ");
 	*ret_conv = CResult_AcceptChannelDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_is_ok"))) TS_CResult_AcceptChannelDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_AcceptChannelDecodeErrorZ* o_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_AcceptChannelDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_AcceptChannelDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_free"))) TS_CResult_AcceptChannelDecodeErrorZ_free(uint32_t _res) {
@@ -17210,19 +18335,19 @@ void  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_free")))
 static inline uintptr_t CResult_AcceptChannelDecodeErrorZ_clone_ptr(LDKCResult_AcceptChannelDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ");
 	*ret_conv = CResult_AcceptChannelDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr"))) TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr"))) TS_CResult_AcceptChannelDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_AcceptChannelDecodeErrorZ* arg_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_AcceptChannelDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_AcceptChannelDecodeErrorZ_clone"))) TS_CResult_AcceptChannelDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_AcceptChannelDecodeErrorZ* orig_conv = (LDKCResult_AcceptChannelDecodeErrorZ*)(orig & ~1);
 	LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ");
 	*ret_conv = CResult_AcceptChannelDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_ok(uint32_t o) {
@@ -17233,7 +18358,7 @@ uint32_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErr
 	o_conv = AnnouncementSignatures_clone(&o_conv);
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ");
 	*ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_err"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_err(uint32_t e) {
@@ -17244,13 +18369,13 @@ uint32_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErr
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ");
 	*ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* o_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_free"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_free(uint32_t _res) {
@@ -17265,19 +18390,19 @@ void  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_
 static inline uintptr_t CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(LDKCResult_AnnouncementSignaturesDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ");
 	*ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* arg_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone"))) TS_CResult_AnnouncementSignaturesDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* orig_conv = (LDKCResult_AnnouncementSignaturesDecodeErrorZ*)(orig & ~1);
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ");
 	*ret_conv = CResult_AnnouncementSignaturesDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_ok(uint32_t o) {
@@ -17288,7 +18413,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_
 	o_conv = ChannelReestablish_clone(&o_conv);
 	LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ");
 	*ret_conv = CResult_ChannelReestablishDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_err"))) TS_CResult_ChannelReestablishDecodeErrorZ_err(uint32_t e) {
@@ -17299,13 +18424,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ");
 	*ret_conv = CResult_ChannelReestablishDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_is_ok"))) TS_CResult_ChannelReestablishDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ChannelReestablishDecodeErrorZ* o_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelReestablishDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ChannelReestablishDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_free"))) TS_CResult_ChannelReestablishDecodeErrorZ_free(uint32_t _res) {
@@ -17320,19 +18445,19 @@ void  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_free
 static inline uintptr_t CResult_ChannelReestablishDecodeErrorZ_clone_ptr(LDKCResult_ChannelReestablishDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ");
 	*ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ChannelReestablishDecodeErrorZ* arg_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelReestablishDecodeErrorZ_clone"))) TS_CResult_ChannelReestablishDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelReestablishDecodeErrorZ* orig_conv = (LDKCResult_ChannelReestablishDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ");
 	*ret_conv = CResult_ChannelReestablishDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_ok(uint32_t o) {
@@ -17343,7 +18468,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_ok"))
 	o_conv = ClosingSigned_clone(&o_conv);
 	LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_err"))) TS_CResult_ClosingSignedDecodeErrorZ_err(uint32_t e) {
@@ -17354,13 +18479,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_err")
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ClosingSignedDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ClosingSignedDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ClosingSignedDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_free"))) TS_CResult_ClosingSignedDecodeErrorZ_free(uint32_t _res) {
@@ -17375,19 +18500,19 @@ void  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_free")))
 static inline uintptr_t CResult_ClosingSignedDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ClosingSignedDecodeErrorZ* arg_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ClosingSignedDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedDecodeErrorZ_clone"))) TS_CResult_ClosingSignedDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ClosingSignedDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(uint32_t o) {
@@ -17398,7 +18523,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErro
 	o_conv = ClosingSignedFeeRange_clone(&o_conv);
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_err(uint32_t e) {
@@ -17409,13 +18534,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErro
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* o_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_free(uint32_t _res) {
@@ -17430,19 +18555,19 @@ void  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_f
 static inline uintptr_t CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* arg_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone"))) TS_CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* orig_conv = (LDKCResult_ClosingSignedFeeRangeDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ");
 	*ret_conv = CResult_ClosingSignedFeeRangeDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_ok(uint32_t o) {
@@ -17453,7 +18578,7 @@ uint32_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_ok
 	o_conv = CommitmentSigned_clone(&o_conv);
 	LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ");
 	*ret_conv = CResult_CommitmentSignedDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_err"))) TS_CResult_CommitmentSignedDecodeErrorZ_err(uint32_t e) {
@@ -17464,13 +18589,13 @@ uint32_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_er
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ");
 	*ret_conv = CResult_CommitmentSignedDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_is_ok"))) TS_CResult_CommitmentSignedDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_CommitmentSignedDecodeErrorZ* o_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_CommitmentSignedDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_CommitmentSignedDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_free"))) TS_CResult_CommitmentSignedDecodeErrorZ_free(uint32_t _res) {
@@ -17485,19 +18610,19 @@ void  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_free")
 static inline uintptr_t CResult_CommitmentSignedDecodeErrorZ_clone_ptr(LDKCResult_CommitmentSignedDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ");
 	*ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_CommitmentSignedDecodeErrorZ* arg_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_CommitmentSignedDecodeErrorZ_clone"))) TS_CResult_CommitmentSignedDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_CommitmentSignedDecodeErrorZ* orig_conv = (LDKCResult_CommitmentSignedDecodeErrorZ*)(orig & ~1);
 	LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ");
 	*ret_conv = CResult_CommitmentSignedDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_ok(uint32_t o) {
@@ -17508,7 +18633,7 @@ uint32_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_ok")
 	o_conv = FundingCreated_clone(&o_conv);
 	LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ");
 	*ret_conv = CResult_FundingCreatedDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_err"))) TS_CResult_FundingCreatedDecodeErrorZ_err(uint32_t e) {
@@ -17519,13 +18644,13 @@ uint32_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_err"
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ");
 	*ret_conv = CResult_FundingCreatedDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_is_ok"))) TS_CResult_FundingCreatedDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_FundingCreatedDecodeErrorZ* o_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_FundingCreatedDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_FundingCreatedDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_free"))) TS_CResult_FundingCreatedDecodeErrorZ_free(uint32_t _res) {
@@ -17540,19 +18665,19 @@ void  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_free")))
 static inline uintptr_t CResult_FundingCreatedDecodeErrorZ_clone_ptr(LDKCResult_FundingCreatedDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ");
 	*ret_conv = CResult_FundingCreatedDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingCreatedDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_FundingCreatedDecodeErrorZ* arg_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_FundingCreatedDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_FundingCreatedDecodeErrorZ_clone"))) TS_CResult_FundingCreatedDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_FundingCreatedDecodeErrorZ* orig_conv = (LDKCResult_FundingCreatedDecodeErrorZ*)(orig & ~1);
 	LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ");
 	*ret_conv = CResult_FundingCreatedDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_ok"))) TS_CResult_FundingSignedDecodeErrorZ_ok(uint32_t o) {
@@ -17563,7 +18688,7 @@ uint32_t  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_ok"))
 	o_conv = FundingSigned_clone(&o_conv);
 	LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ");
 	*ret_conv = CResult_FundingSignedDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_err"))) TS_CResult_FundingSignedDecodeErrorZ_err(uint32_t e) {
@@ -17574,13 +18699,13 @@ uint32_t  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_err")
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ");
 	*ret_conv = CResult_FundingSignedDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_is_ok"))) TS_CResult_FundingSignedDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_FundingSignedDecodeErrorZ* o_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_FundingSignedDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_FundingSignedDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_free"))) TS_CResult_FundingSignedDecodeErrorZ_free(uint32_t _res) {
@@ -17595,74 +18720,74 @@ void  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_free")))
 static inline uintptr_t CResult_FundingSignedDecodeErrorZ_clone_ptr(LDKCResult_FundingSignedDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ");
 	*ret_conv = CResult_FundingSignedDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingSignedDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingSignedDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_FundingSignedDecodeErrorZ* arg_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_FundingSignedDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_FundingSignedDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_FundingSignedDecodeErrorZ_clone"))) TS_CResult_FundingSignedDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_FundingSignedDecodeErrorZ* orig_conv = (LDKCResult_FundingSignedDecodeErrorZ*)(orig & ~1);
 	LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ");
 	*ret_conv = CResult_FundingSignedDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_ok"))) TS_CResult_FundingLockedDecodeErrorZ_ok(uint32_t o) {
-	LDKFundingLocked o_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_ok(uint32_t o) {
+	LDKChannelReady 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);
-	return (uintptr_t)ret_conv;
+	o_conv = ChannelReady_clone(&o_conv);
+	LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ");
+	*ret_conv = CResult_ChannelReadyDecodeErrorZ_ok(o_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_err"))) TS_CResult_FundingLockedDecodeErrorZ_err(uint32_t e) {
+uint32_t  __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_err"))) TS_CResult_ChannelReadyDecodeErrorZ_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_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ");
-	*ret_conv = CResult_FundingLockedDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ");
+	*ret_conv = CResult_ChannelReadyDecodeErrorZ_err(e_conv);
+	return (uint32_t)ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_is_ok"))) 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;
+jboolean  __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_is_ok"))) TS_CResult_ChannelReadyDecodeErrorZ_is_ok(uint32_t o) {
+	LDKCResult_ChannelReadyDecodeErrorZ* o_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(o & ~1);
+	jboolean ret_conv = CResult_ChannelReadyDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_free"))) TS_CResult_FundingLockedDecodeErrorZ_free(uint32_t _res) {
+void  __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_free"))) TS_CResult_ChannelReadyDecodeErrorZ_free(uint32_t _res) {
 	if ((_res & 1) != 0) return;
 	void* _res_ptr = (void*)(((uintptr_t)_res) & ~1);
 	CHECK_ACCESS(_res_ptr);
-	LDKCResult_FundingLockedDecodeErrorZ _res_conv = *(LDKCResult_FundingLockedDecodeErrorZ*)(_res_ptr);
+	LDKCResult_ChannelReadyDecodeErrorZ _res_conv = *(LDKCResult_ChannelReadyDecodeErrorZ*)(_res_ptr);
 	FREE((void*)_res);
-	CResult_FundingLockedDecodeErrorZ_free(_res_conv);
+	CResult_ChannelReadyDecodeErrorZ_free(_res_conv);
 }
 
-static inline uintptr_t CResult_FundingLockedDecodeErrorZ_clone_ptr(LDKCResult_FundingLockedDecodeErrorZ *NONNULL_PTR arg) {
-	LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ");
-	*ret_conv = CResult_FundingLockedDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+static inline uintptr_t CResult_ChannelReadyDecodeErrorZ_clone_ptr(LDKCResult_ChannelReadyDecodeErrorZ *NONNULL_PTR arg) {
+	LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ");
+	*ret_conv = CResult_ChannelReadyDecodeErrorZ_clone(arg);
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_clone_ptr"))) TS_CResult_FundingLockedDecodeErrorZ_clone_ptr(uint32_t arg) {
-	LDKCResult_FundingLockedDecodeErrorZ* arg_conv = (LDKCResult_FundingLockedDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_FundingLockedDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelReadyDecodeErrorZ_clone_ptr(uint32_t arg) {
+	LDKCResult_ChannelReadyDecodeErrorZ* arg_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(arg & ~1);
+	uint32_t ret_conv = CResult_ChannelReadyDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_CResult_FundingLockedDecodeErrorZ_clone"))) 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");
-	*ret_conv = CResult_FundingLockedDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_CResult_ChannelReadyDecodeErrorZ_clone"))) TS_CResult_ChannelReadyDecodeErrorZ_clone(uint32_t orig) {
+	LDKCResult_ChannelReadyDecodeErrorZ* orig_conv = (LDKCResult_ChannelReadyDecodeErrorZ*)(orig & ~1);
+	LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ");
+	*ret_conv = CResult_ChannelReadyDecodeErrorZ_clone(orig_conv);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_ok"))) TS_CResult_InitDecodeErrorZ_ok(uint32_t o) {
@@ -17673,7 +18798,7 @@ uint32_t  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_ok"))) TS_CRes
 	o_conv = Init_clone(&o_conv);
 	LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ");
 	*ret_conv = CResult_InitDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_err"))) TS_CResult_InitDecodeErrorZ_err(uint32_t e) {
@@ -17684,13 +18809,13 @@ uint32_t  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_err"))) TS_CRe
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ");
 	*ret_conv = CResult_InitDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_is_ok"))) TS_CResult_InitDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_InitDecodeErrorZ* o_conv = (LDKCResult_InitDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_InitDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_InitDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_free"))) TS_CResult_InitDecodeErrorZ_free(uint32_t _res) {
@@ -17705,19 +18830,19 @@ void  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_free"))) TS_CResul
 static inline uintptr_t CResult_InitDecodeErrorZ_clone_ptr(LDKCResult_InitDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ");
 	*ret_conv = CResult_InitDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone_ptr"))) TS_CResult_InitDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone_ptr"))) TS_CResult_InitDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_InitDecodeErrorZ* arg_conv = (LDKCResult_InitDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_InitDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_InitDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_InitDecodeErrorZ_clone"))) TS_CResult_InitDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_InitDecodeErrorZ* orig_conv = (LDKCResult_InitDecodeErrorZ*)(orig & ~1);
 	LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ");
 	*ret_conv = CResult_InitDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_ok"))) TS_CResult_OpenChannelDecodeErrorZ_ok(uint32_t o) {
@@ -17728,7 +18853,7 @@ uint32_t  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_ok")))
 	o_conv = OpenChannel_clone(&o_conv);
 	LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ");
 	*ret_conv = CResult_OpenChannelDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_err"))) TS_CResult_OpenChannelDecodeErrorZ_err(uint32_t e) {
@@ -17739,13 +18864,13 @@ uint32_t  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_err")))
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ");
 	*ret_conv = CResult_OpenChannelDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_is_ok"))) TS_CResult_OpenChannelDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_OpenChannelDecodeErrorZ* o_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_OpenChannelDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_OpenChannelDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_free"))) TS_CResult_OpenChannelDecodeErrorZ_free(uint32_t _res) {
@@ -17760,19 +18885,19 @@ void  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_free"))) TS
 static inline uintptr_t CResult_OpenChannelDecodeErrorZ_clone_ptr(LDKCResult_OpenChannelDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ");
 	*ret_conv = CResult_OpenChannelDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone_ptr"))) TS_CResult_OpenChannelDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone_ptr"))) TS_CResult_OpenChannelDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_OpenChannelDecodeErrorZ* arg_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_OpenChannelDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_OpenChannelDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_OpenChannelDecodeErrorZ_clone"))) TS_CResult_OpenChannelDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_OpenChannelDecodeErrorZ* orig_conv = (LDKCResult_OpenChannelDecodeErrorZ*)(orig & ~1);
 	LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ");
 	*ret_conv = CResult_OpenChannelDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_ok(uint32_t o) {
@@ -17783,7 +18908,7 @@ uint32_t  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_ok")))
 	o_conv = RevokeAndACK_clone(&o_conv);
 	LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ");
 	*ret_conv = CResult_RevokeAndACKDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_err"))) TS_CResult_RevokeAndACKDecodeErrorZ_err(uint32_t e) {
@@ -17794,13 +18919,13 @@ uint32_t  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_err"))
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ");
 	*ret_conv = CResult_RevokeAndACKDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_is_ok"))) TS_CResult_RevokeAndACKDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_RevokeAndACKDecodeErrorZ* o_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_RevokeAndACKDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_RevokeAndACKDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_free"))) TS_CResult_RevokeAndACKDecodeErrorZ_free(uint32_t _res) {
@@ -17815,19 +18940,19 @@ void  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_free"))) T
 static inline uintptr_t CResult_RevokeAndACKDecodeErrorZ_clone_ptr(LDKCResult_RevokeAndACKDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ");
 	*ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_RevokeAndACKDecodeErrorZ* arg_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_RevokeAndACKDecodeErrorZ_clone"))) TS_CResult_RevokeAndACKDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_RevokeAndACKDecodeErrorZ* orig_conv = (LDKCResult_RevokeAndACKDecodeErrorZ*)(orig & ~1);
 	LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ");
 	*ret_conv = CResult_RevokeAndACKDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_ok"))) TS_CResult_ShutdownDecodeErrorZ_ok(uint32_t o) {
@@ -17838,7 +18963,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_ok"))) TS_
 	o_conv = Shutdown_clone(&o_conv);
 	LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ");
 	*ret_conv = CResult_ShutdownDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_err"))) TS_CResult_ShutdownDecodeErrorZ_err(uint32_t e) {
@@ -17849,13 +18974,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_err"))) TS
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ");
 	*ret_conv = CResult_ShutdownDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_is_ok"))) TS_CResult_ShutdownDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ShutdownDecodeErrorZ* o_conv = (LDKCResult_ShutdownDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ShutdownDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ShutdownDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_free"))) TS_CResult_ShutdownDecodeErrorZ_free(uint32_t _res) {
@@ -17870,19 +18995,19 @@ void  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_free"))) TS_CR
 static inline uintptr_t CResult_ShutdownDecodeErrorZ_clone_ptr(LDKCResult_ShutdownDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ");
 	*ret_conv = CResult_ShutdownDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone_ptr"))) TS_CResult_ShutdownDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ShutdownDecodeErrorZ* arg_conv = (LDKCResult_ShutdownDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ShutdownDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ShutdownDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ShutdownDecodeErrorZ_clone"))) TS_CResult_ShutdownDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ShutdownDecodeErrorZ* orig_conv = (LDKCResult_ShutdownDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ");
 	*ret_conv = CResult_ShutdownDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_ok(uint32_t o) {
@@ -17893,7 +19018,7 @@ uint32_t  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_ok")
 	o_conv = UpdateFailHTLC_clone(&o_conv);
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_err(uint32_t e) {
@@ -17904,13 +19029,13 @@ uint32_t  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_err"
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_UpdateFailHTLCDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_free(uint32_t _res) {
@@ -17925,19 +19050,19 @@ void  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_free")))
 static inline uintptr_t CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailHTLCDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFailHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFailHTLCDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailHTLCDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailHTLCDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(uint32_t o) {
@@ -17948,7 +19073,7 @@ uint32_t  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeEr
 	o_conv = UpdateFailMalformedHTLC_clone(&o_conv);
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(uint32_t e) {
@@ -17959,13 +19084,13 @@ uint32_t  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeEr
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_free(uint32_t _res) {
@@ -17980,19 +19105,19 @@ void  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ
 static inline uintptr_t CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFailMalformedHTLCDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_ok(uint32_t o) {
@@ -18003,7 +19128,7 @@ uint32_t  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_ok"))) TS
 	o_conv = UpdateFee_clone(&o_conv);
 	LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ");
 	*ret_conv = CResult_UpdateFeeDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_err"))) TS_CResult_UpdateFeeDecodeErrorZ_err(uint32_t e) {
@@ -18014,13 +19139,13 @@ uint32_t  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_err"))) T
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ");
 	*ret_conv = CResult_UpdateFeeDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_is_ok"))) TS_CResult_UpdateFeeDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_UpdateFeeDecodeErrorZ* o_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_UpdateFeeDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_UpdateFeeDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_free"))) TS_CResult_UpdateFeeDecodeErrorZ_free(uint32_t _res) {
@@ -18035,19 +19160,19 @@ void  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_free"))) TS_C
 static inline uintptr_t CResult_UpdateFeeDecodeErrorZ_clone_ptr(LDKCResult_UpdateFeeDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ");
 	*ret_conv = CResult_UpdateFeeDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFeeDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_UpdateFeeDecodeErrorZ* arg_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_UpdateFeeDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFeeDecodeErrorZ_clone"))) TS_CResult_UpdateFeeDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UpdateFeeDecodeErrorZ* orig_conv = (LDKCResult_UpdateFeeDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ");
 	*ret_conv = CResult_UpdateFeeDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_ok(uint32_t o) {
@@ -18058,7 +19183,7 @@ uint32_t  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_o
 	o_conv = UpdateFulfillHTLC_clone(&o_conv);
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_err(uint32_t e) {
@@ -18069,13 +19194,13 @@ uint32_t  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_e
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free(uint32_t _res) {
@@ -18090,19 +19215,19 @@ void  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_free"
 static inline uintptr_t CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateFulfillHTLCDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateFulfillHTLCDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateFulfillHTLCDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateFulfillHTLCDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_ok(uint32_t o) {
@@ -18113,7 +19238,7 @@ uint32_t  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_ok"))
 	o_conv = UpdateAddHTLC_clone(&o_conv);
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_err"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_err(uint32_t e) {
@@ -18124,13 +19249,13 @@ uint32_t  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_err")
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* o_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_UpdateAddHTLCDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_free"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_free(uint32_t _res) {
@@ -18145,19 +19270,19 @@ void  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_free")))
 static inline uintptr_t CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(LDKCResult_UpdateAddHTLCDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* arg_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UpdateAddHTLCDecodeErrorZ_clone"))) TS_CResult_UpdateAddHTLCDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* orig_conv = (LDKCResult_UpdateAddHTLCDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ");
 	*ret_conv = CResult_UpdateAddHTLCDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_ok"))) TS_CResult_PingDecodeErrorZ_ok(uint32_t o) {
@@ -18168,7 +19293,7 @@ uint32_t  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_ok"))) TS_CRes
 	o_conv = Ping_clone(&o_conv);
 	LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ");
 	*ret_conv = CResult_PingDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_err"))) TS_CResult_PingDecodeErrorZ_err(uint32_t e) {
@@ -18179,13 +19304,13 @@ uint32_t  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_err"))) TS_CRe
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ");
 	*ret_conv = CResult_PingDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_is_ok"))) TS_CResult_PingDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_PingDecodeErrorZ* o_conv = (LDKCResult_PingDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PingDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_PingDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_free"))) TS_CResult_PingDecodeErrorZ_free(uint32_t _res) {
@@ -18200,19 +19325,19 @@ void  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_free"))) TS_CResul
 static inline uintptr_t CResult_PingDecodeErrorZ_clone_ptr(LDKCResult_PingDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ");
 	*ret_conv = CResult_PingDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone_ptr"))) TS_CResult_PingDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone_ptr"))) TS_CResult_PingDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_PingDecodeErrorZ* arg_conv = (LDKCResult_PingDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PingDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_PingDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PingDecodeErrorZ_clone"))) TS_CResult_PingDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_PingDecodeErrorZ* orig_conv = (LDKCResult_PingDecodeErrorZ*)(orig & ~1);
 	LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ");
 	*ret_conv = CResult_PingDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_ok"))) TS_CResult_PongDecodeErrorZ_ok(uint32_t o) {
@@ -18223,7 +19348,7 @@ uint32_t  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_ok"))) TS_CRes
 	o_conv = Pong_clone(&o_conv);
 	LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ");
 	*ret_conv = CResult_PongDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_err"))) TS_CResult_PongDecodeErrorZ_err(uint32_t e) {
@@ -18234,13 +19359,13 @@ uint32_t  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_err"))) TS_CRe
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ");
 	*ret_conv = CResult_PongDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_is_ok"))) TS_CResult_PongDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_PongDecodeErrorZ* o_conv = (LDKCResult_PongDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_PongDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_PongDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_free"))) TS_CResult_PongDecodeErrorZ_free(uint32_t _res) {
@@ -18255,19 +19380,19 @@ void  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_free"))) TS_CResul
 static inline uintptr_t CResult_PongDecodeErrorZ_clone_ptr(LDKCResult_PongDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ");
 	*ret_conv = CResult_PongDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone_ptr"))) TS_CResult_PongDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone_ptr"))) TS_CResult_PongDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_PongDecodeErrorZ* arg_conv = (LDKCResult_PongDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_PongDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_PongDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_PongDecodeErrorZ_clone"))) TS_CResult_PongDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_PongDecodeErrorZ* orig_conv = (LDKCResult_PongDecodeErrorZ*)(orig & ~1);
 	LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ");
 	*ret_conv = CResult_PongDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(uint32_t o) {
@@ -18278,7 +19403,7 @@ uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDeco
 	o_conv = UnsignedChannelAnnouncement_clone(&o_conv);
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(uint32_t e) {
@@ -18289,13 +19414,13 @@ uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDeco
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_free(uint32_t _res) {
@@ -18310,19 +19435,19 @@ void  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeEr
 static inline uintptr_t CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone"))) TS_CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_UnsignedChannelAnnouncementDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_ok(uint32_t o) {
@@ -18333,7 +19458,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ
 	o_conv = ChannelAnnouncement_clone(&o_conv);
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_err"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_err(uint32_t e) {
@@ -18344,13 +19469,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* o_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelAnnouncementDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_free"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_free(uint32_t _res) {
@@ -18365,19 +19490,19 @@ void  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_fre
 static inline uintptr_t CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_ChannelAnnouncementDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelAnnouncementDecodeErrorZ_clone"))) TS_CResult_ChannelAnnouncementDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_ChannelAnnouncementDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_ChannelAnnouncementDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_ok(uint32_t o) {
@@ -18388,7 +19513,7 @@ uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErro
 	o_conv = UnsignedChannelUpdate_clone(&o_conv);
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ");
 	*ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_err(uint32_t e) {
@@ -18399,13 +19524,13 @@ uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErro
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ");
 	*ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_free(uint32_t _res) {
@@ -18420,19 +19545,19 @@ void  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_f
 static inline uintptr_t CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_UnsignedChannelUpdateDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ");
 	*ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* arg_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone"))) TS_CResult_UnsignedChannelUpdateDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_UnsignedChannelUpdateDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ");
 	*ret_conv = CResult_UnsignedChannelUpdateDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_ok(uint32_t o) {
@@ -18443,7 +19568,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_ok"))
 	o_conv = ChannelUpdate_clone(&o_conv);
 	LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ");
 	*ret_conv = CResult_ChannelUpdateDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_err"))) TS_CResult_ChannelUpdateDecodeErrorZ_err(uint32_t e) {
@@ -18454,13 +19579,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_err")
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ");
 	*ret_conv = CResult_ChannelUpdateDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_is_ok"))) TS_CResult_ChannelUpdateDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ChannelUpdateDecodeErrorZ* o_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ChannelUpdateDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ChannelUpdateDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_free"))) TS_CResult_ChannelUpdateDecodeErrorZ_free(uint32_t _res) {
@@ -18475,19 +19600,19 @@ void  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_free")))
 static inline uintptr_t CResult_ChannelUpdateDecodeErrorZ_clone_ptr(LDKCResult_ChannelUpdateDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ");
 	*ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ChannelUpdateDecodeErrorZ* arg_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ChannelUpdateDecodeErrorZ_clone"))) TS_CResult_ChannelUpdateDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ChannelUpdateDecodeErrorZ* orig_conv = (LDKCResult_ChannelUpdateDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ");
 	*ret_conv = CResult_ChannelUpdateDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_ok(uint32_t o) {
@@ -18498,7 +19623,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_ok")))
 	o_conv = ErrorMessage_clone(&o_conv);
 	LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ");
 	*ret_conv = CResult_ErrorMessageDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_err"))) TS_CResult_ErrorMessageDecodeErrorZ_err(uint32_t e) {
@@ -18509,13 +19634,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_err"))
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ");
 	*ret_conv = CResult_ErrorMessageDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_is_ok"))) TS_CResult_ErrorMessageDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ErrorMessageDecodeErrorZ* o_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ErrorMessageDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ErrorMessageDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_free"))) TS_CResult_ErrorMessageDecodeErrorZ_free(uint32_t _res) {
@@ -18530,19 +19655,19 @@ void  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_free"))) T
 static inline uintptr_t CResult_ErrorMessageDecodeErrorZ_clone_ptr(LDKCResult_ErrorMessageDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ");
 	*ret_conv = CResult_ErrorMessageDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr"))) TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr"))) TS_CResult_ErrorMessageDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ErrorMessageDecodeErrorZ* arg_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ErrorMessageDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ErrorMessageDecodeErrorZ_clone"))) TS_CResult_ErrorMessageDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ErrorMessageDecodeErrorZ* orig_conv = (LDKCResult_ErrorMessageDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ");
 	*ret_conv = CResult_ErrorMessageDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_ok"))) TS_CResult_WarningMessageDecodeErrorZ_ok(uint32_t o) {
@@ -18553,7 +19678,7 @@ uint32_t  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_ok")
 	o_conv = WarningMessage_clone(&o_conv);
 	LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ");
 	*ret_conv = CResult_WarningMessageDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_err"))) TS_CResult_WarningMessageDecodeErrorZ_err(uint32_t e) {
@@ -18564,13 +19689,13 @@ uint32_t  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_err"
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ");
 	*ret_conv = CResult_WarningMessageDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_is_ok"))) TS_CResult_WarningMessageDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_WarningMessageDecodeErrorZ* o_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_WarningMessageDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_WarningMessageDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_free"))) TS_CResult_WarningMessageDecodeErrorZ_free(uint32_t _res) {
@@ -18585,19 +19710,19 @@ void  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_free")))
 static inline uintptr_t CResult_WarningMessageDecodeErrorZ_clone_ptr(LDKCResult_WarningMessageDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ");
 	*ret_conv = CResult_WarningMessageDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone_ptr"))) TS_CResult_WarningMessageDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone_ptr"))) TS_CResult_WarningMessageDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_WarningMessageDecodeErrorZ* arg_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_WarningMessageDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_WarningMessageDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_WarningMessageDecodeErrorZ_clone"))) TS_CResult_WarningMessageDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_WarningMessageDecodeErrorZ* orig_conv = (LDKCResult_WarningMessageDecodeErrorZ*)(orig & ~1);
 	LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ");
 	*ret_conv = CResult_WarningMessageDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(uint32_t o) {
@@ -18608,7 +19733,7 @@ uint32_t  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeE
 	o_conv = UnsignedNodeAnnouncement_clone(&o_conv);
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(uint32_t e) {
@@ -18619,13 +19744,13 @@ uint32_t  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeE
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_free(uint32_t _res) {
@@ -18640,19 +19765,19 @@ void  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeError
 static inline uintptr_t CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone"))) TS_CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ*)(orig & ~1);
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_UnsignedNodeAnnouncementDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_ok(uint32_t o) {
@@ -18663,7 +19788,7 @@ uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_ok
 	o_conv = NodeAnnouncement_clone(&o_conv);
 	LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_NodeAnnouncementDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_err"))) TS_CResult_NodeAnnouncementDecodeErrorZ_err(uint32_t e) {
@@ -18674,13 +19799,13 @@ uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_er
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_NodeAnnouncementDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok"))) TS_CResult_NodeAnnouncementDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_NodeAnnouncementDecodeErrorZ* o_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_NodeAnnouncementDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_NodeAnnouncementDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_free"))) TS_CResult_NodeAnnouncementDecodeErrorZ_free(uint32_t _res) {
@@ -18695,19 +19820,19 @@ void  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_free")
 static inline uintptr_t CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(LDKCResult_NodeAnnouncementDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_NodeAnnouncementDecodeErrorZ* arg_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_NodeAnnouncementDecodeErrorZ_clone"))) TS_CResult_NodeAnnouncementDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_NodeAnnouncementDecodeErrorZ* orig_conv = (LDKCResult_NodeAnnouncementDecodeErrorZ*)(orig & ~1);
 	LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ");
 	*ret_conv = CResult_NodeAnnouncementDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_ok(uint32_t o) {
@@ -18718,7 +19843,7 @@ uint32_t  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeError
 	o_conv = QueryShortChannelIds_clone(&o_conv);
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ");
 	*ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_err"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_err(uint32_t e) {
@@ -18729,13 +19854,13 @@ uint32_t  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeError
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ");
 	*ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* o_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_free"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_free(uint32_t _res) {
@@ -18750,19 +19875,19 @@ void  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_fr
 static inline uintptr_t CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(LDKCResult_QueryShortChannelIdsDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ");
 	*ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* arg_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone"))) TS_CResult_QueryShortChannelIdsDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* orig_conv = (LDKCResult_QueryShortChannelIdsDecodeErrorZ*)(orig & ~1);
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ");
 	*ret_conv = CResult_QueryShortChannelIdsDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(uint32_t o) {
@@ -18773,7 +19898,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeEr
 	o_conv = ReplyShortChannelIdsEnd_clone(&o_conv);
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ");
 	*ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(uint32_t e) {
@@ -18784,13 +19909,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeEr
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ");
 	*ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* o_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_free(uint32_t _res) {
@@ -18805,19 +19930,19 @@ void  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ
 static inline uintptr_t CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ");
 	*ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* arg_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone"))) TS_CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* orig_conv = (LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ");
 	*ret_conv = CResult_ReplyShortChannelIdsEndDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_ok(uint32_t o) {
@@ -18828,7 +19953,7 @@ uint32_t  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_o
 	o_conv = QueryChannelRange_clone(&o_conv);
 	LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ");
 	*ret_conv = CResult_QueryChannelRangeDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_err"))) TS_CResult_QueryChannelRangeDecodeErrorZ_err(uint32_t e) {
@@ -18839,13 +19964,13 @@ uint32_t  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_e
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ");
 	*ret_conv = CResult_QueryChannelRangeDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_QueryChannelRangeDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_QueryChannelRangeDecodeErrorZ* o_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_QueryChannelRangeDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_QueryChannelRangeDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_free"))) TS_CResult_QueryChannelRangeDecodeErrorZ_free(uint32_t _res) {
@@ -18860,19 +19985,19 @@ void  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_free"
 static inline uintptr_t CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_QueryChannelRangeDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ");
 	*ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_QueryChannelRangeDecodeErrorZ* arg_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_QueryChannelRangeDecodeErrorZ_clone"))) TS_CResult_QueryChannelRangeDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_QueryChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_QueryChannelRangeDecodeErrorZ*)(orig & ~1);
 	LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ");
 	*ret_conv = CResult_QueryChannelRangeDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_ok(uint32_t o) {
@@ -18883,7 +20008,7 @@ uint32_t  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_o
 	o_conv = ReplyChannelRange_clone(&o_conv);
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ");
 	*ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_err"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_err(uint32_t e) {
@@ -18894,13 +20019,13 @@ uint32_t  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_e
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ");
 	*ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* o_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_ReplyChannelRangeDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_free"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_free(uint32_t _res) {
@@ -18915,19 +20040,19 @@ void  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_free"
 static inline uintptr_t CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(LDKCResult_ReplyChannelRangeDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ");
 	*ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* arg_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_ReplyChannelRangeDecodeErrorZ_clone"))) TS_CResult_ReplyChannelRangeDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* orig_conv = (LDKCResult_ReplyChannelRangeDecodeErrorZ*)(orig & ~1);
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ");
 	*ret_conv = CResult_ReplyChannelRangeDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_ok(uint32_t o) {
@@ -18938,7 +20063,7 @@ uint32_t  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErro
 	o_conv = GossipTimestampFilter_clone(&o_conv);
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ");
 	*ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_err"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_err(uint32_t e) {
@@ -18949,13 +20074,13 @@ uint32_t  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErro
 	e_conv = DecodeError_clone(&e_conv);
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ");
 	*ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_is_ok(uint32_t o) {
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* o_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_GossipTimestampFilterDecodeErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_free"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_free(uint32_t _res) {
@@ -18970,19 +20095,19 @@ void  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_f
 static inline uintptr_t CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(LDKCResult_GossipTimestampFilterDecodeErrorZ *NONNULL_PTR arg) {
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ");
 	*ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone(arg);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* arg_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_GossipTimestampFilterDecodeErrorZ_clone"))) TS_CResult_GossipTimestampFilterDecodeErrorZ_clone(uint32_t orig) {
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* orig_conv = (LDKCResult_GossipTimestampFilterDecodeErrorZ*)(orig & ~1);
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ");
 	*ret_conv = CResult_GossipTimestampFilterDecodeErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_ok(uint32_t o) {
@@ -18993,7 +20118,7 @@ uint32_t  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_ok"
 	o_conv = Invoice_clone(&o_conv);
 	LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ");
 	*ret_conv = CResult_InvoiceSignOrCreationErrorZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_err"))) TS_CResult_InvoiceSignOrCreationErrorZ_err(uint32_t e) {
@@ -19003,13 +20128,13 @@ uint32_t  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_err
 	e_conv = SignOrCreationError_clone((LDKSignOrCreationError*)(((uintptr_t)e) & ~1));
 	LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ");
 	*ret_conv = CResult_InvoiceSignOrCreationErrorZ_err(e_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_is_ok"))) TS_CResult_InvoiceSignOrCreationErrorZ_is_ok(uint32_t o) {
 	LDKCResult_InvoiceSignOrCreationErrorZ* o_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(o & ~1);
-	jboolean ret_val = CResult_InvoiceSignOrCreationErrorZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_InvoiceSignOrCreationErrorZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_free"))) TS_CResult_InvoiceSignOrCreationErrorZ_free(uint32_t _res) {
@@ -19024,35 +20149,39 @@ void  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_free"))
 static inline uintptr_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 (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
-intptr_t  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone_ptr(uint32_t arg) {
 	LDKCResult_InvoiceSignOrCreationErrorZ* arg_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(arg & ~1);
-	intptr_t ret_val = CResult_InvoiceSignOrCreationErrorZ_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CResult_InvoiceSignOrCreationErrorZ_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_InvoiceSignOrCreationErrorZ_clone"))) TS_CResult_InvoiceSignOrCreationErrorZ_clone(uint32_t orig) {
 	LDKCResult_InvoiceSignOrCreationErrorZ* orig_conv = (LDKCResult_InvoiceSignOrCreationErrorZ*)(orig & ~1);
 	LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ");
 	*ret_conv = CResult_InvoiceSignOrCreationErrorZ_clone(orig_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_FilterZ_some"))) TS_COption_FilterZ_some(uint32_t o) {
 	void* o_ptr = (void*)(((uintptr_t)o) & ~1);
 	CHECK_ACCESS(o_ptr);
 	LDKFilter o_conv = *(LDKFilter*)(o_ptr);
+	if (o_conv.free == LDKFilter_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKFilter_JCalls_cloned(&o_conv);
+	}
 	LDKCOption_FilterZ *ret_copy = MALLOC(sizeof(LDKCOption_FilterZ), "LDKCOption_FilterZ");
 	*ret_copy = COption_FilterZ_some(o_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_COption_FilterZ_none"))) TS_COption_FilterZ_none() {
 	LDKCOption_FilterZ *ret_copy = MALLOC(sizeof(LDKCOption_FilterZ), "LDKCOption_FilterZ");
 	*ret_copy = COption_FilterZ_none();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19073,19 +20202,19 @@ uint32_t  __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_ok"))
 	// WARNING: we need a move here but no clone is available for LDKLockedChannelMonitor
 	LDKCResult_LockedChannelMonitorNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_LockedChannelMonitorNoneZ), "LDKCResult_LockedChannelMonitorNoneZ");
 	*ret_conv = CResult_LockedChannelMonitorNoneZ_ok(o_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_err"))) TS_CResult_LockedChannelMonitorNoneZ_err() {
 	LDKCResult_LockedChannelMonitorNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_LockedChannelMonitorNoneZ), "LDKCResult_LockedChannelMonitorNoneZ");
 	*ret_conv = CResult_LockedChannelMonitorNoneZ_err();
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_is_ok"))) TS_CResult_LockedChannelMonitorNoneZ_is_ok(uint32_t o) {
 	LDKCResult_LockedChannelMonitorNoneZ* o_conv = (LDKCResult_LockedChannelMonitorNoneZ*)(o & ~1);
-	jboolean ret_val = CResult_LockedChannelMonitorNoneZ_is_ok(o_conv);
-	return ret_val;
+	jboolean ret_conv = CResult_LockedChannelMonitorNoneZ_is_ok(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CResult_LockedChannelMonitorNoneZ_free"))) TS_CResult_LockedChannelMonitorNoneZ_free(uint32_t _res) {
@@ -19104,7 +20233,7 @@ void  __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_f
 		_res_constr.data = MALLOC(_res_constr.datalen * sizeof(LDKOutPoint), "LDKCVec_OutPointZ Elements");
 	else
 		_res_constr.data = NULL;
-	uint32_t* _res_vals = _res->elems /* XXX _res leaks */;
+	uint32_t* _res_vals = _res->elems;
 	for (size_t k = 0; k < _res_constr.datalen; k++) {
 		uint32_t _res_conv_10 = _res_vals[k];
 		LDKOutPoint _res_conv_10_conv;
@@ -19113,6 +20242,7 @@ void  __attribute__((export_name("TS_CVec_OutPointZ_free"))) TS_CVec_OutPointZ_f
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(_res_conv_10_conv);
 		_res_constr.data[k] = _res_conv_10_conv;
 	}
+	FREE(_res);
 	CVec_OutPointZ_free(_res_constr);
 }
 
@@ -19128,20 +20258,20 @@ void  __attribute__((export_name("TS_PaymentPurpose_free"))) TS_PaymentPurpose_f
 static inline uintptr_t PaymentPurpose_clone_ptr(LDKPaymentPurpose *NONNULL_PTR arg) {
 	LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose");
 	*ret_copy = PaymentPurpose_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_PaymentPurpose_clone_ptr"))) TS_PaymentPurpose_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_PaymentPurpose_clone_ptr"))) TS_PaymentPurpose_clone_ptr(uint32_t arg) {
 	LDKPaymentPurpose* arg_conv = (LDKPaymentPurpose*)arg;
-	intptr_t ret_val = PaymentPurpose_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = PaymentPurpose_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PaymentPurpose_clone"))) TS_PaymentPurpose_clone(uint32_t orig) {
 	LDKPaymentPurpose* orig_conv = (LDKPaymentPurpose*)orig;
 	LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose");
 	*ret_copy = PaymentPurpose_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19154,7 +20284,7 @@ uint32_t  __attribute__((export_name("TS_PaymentPurpose_invoice_payment"))) TS_P
 	memcpy(payment_secret_ref.data, payment_secret->elems, 32); FREE(payment_secret);
 	LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose");
 	*ret_copy = PaymentPurpose_invoice_payment(payment_preimage_ref, payment_secret_ref);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19164,10 +20294,29 @@ uint32_t  __attribute__((export_name("TS_PaymentPurpose_spontaneous_payment")))
 	memcpy(a_ref.data, a->elems, 32); FREE(a);
 	LDKPaymentPurpose *ret_copy = MALLOC(sizeof(LDKPaymentPurpose), "LDKPaymentPurpose");
 	*ret_copy = PaymentPurpose_spontaneous_payment(a_ref);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
+int8_tArray  __attribute__((export_name("TS_PaymentPurpose_write"))) TS_PaymentPurpose_write(uint32_t obj) {
+	LDKPaymentPurpose* obj_conv = (LDKPaymentPurpose*)obj;
+	LDKCVec_u8Z ret_var = PaymentPurpose_write(obj_conv);
+	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+uint32_t  __attribute__((export_name("TS_PaymentPurpose_read"))) TS_PaymentPurpose_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = ser->arr_len;
+	ser_ref.data = ser->elems;
+	LDKCResult_PaymentPurposeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPurposeDecodeErrorZ), "LDKCResult_PaymentPurposeDecodeErrorZ");
+	*ret_conv = PaymentPurpose_read(ser_ref);
+	FREE(ser);
+	return (uint32_t)ret_conv;
+}
+
 void  __attribute__((export_name("TS_ClosureReason_free"))) TS_ClosureReason_free(uint32_t this_ptr) {
 	if ((this_ptr & 1) != 0) return;
 	void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1);
@@ -19180,20 +20329,20 @@ void  __attribute__((export_name("TS_ClosureReason_free"))) TS_ClosureReason_fre
 static inline uintptr_t ClosureReason_clone_ptr(LDKClosureReason *NONNULL_PTR arg) {
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
 	*ret_copy = ClosureReason_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ClosureReason_clone_ptr"))) TS_ClosureReason_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ClosureReason_clone_ptr"))) TS_ClosureReason_clone_ptr(uint32_t arg) {
 	LDKClosureReason* arg_conv = (LDKClosureReason*)arg;
-	intptr_t ret_val = ClosureReason_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ClosureReason_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosureReason_clone"))) TS_ClosureReason_clone(uint32_t orig) {
 	LDKClosureReason* orig_conv = (LDKClosureReason*)orig;
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
 	*ret_copy = ClosureReason_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19201,35 +20350,35 @@ uint32_t  __attribute__((export_name("TS_ClosureReason_counterparty_force_closed
 	LDKStr peer_msg_conv = str_ref_to_owned_c(peer_msg);
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
 	*ret_copy = ClosureReason_counterparty_force_closed(peer_msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosureReason_holder_force_closed"))) TS_ClosureReason_holder_force_closed() {
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
 	*ret_copy = ClosureReason_holder_force_closed();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosureReason_cooperative_closure"))) TS_ClosureReason_cooperative_closure() {
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
 	*ret_copy = ClosureReason_cooperative_closure();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosureReason_commitment_tx_confirmed"))) TS_ClosureReason_commitment_tx_confirmed() {
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
 	*ret_copy = ClosureReason_commitment_tx_confirmed();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosureReason_funding_timed_out"))) TS_ClosureReason_funding_timed_out() {
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
 	*ret_copy = ClosureReason_funding_timed_out();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19237,21 +20386,21 @@ uint32_t  __attribute__((export_name("TS_ClosureReason_processing_error"))) TS_C
 	LDKStr err_conv = str_ref_to_owned_c(err);
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
 	*ret_copy = ClosureReason_processing_error(err_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosureReason_disconnected_peer"))) TS_ClosureReason_disconnected_peer() {
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
 	*ret_copy = ClosureReason_disconnected_peer();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosureReason_outdated_channel_manager"))) TS_ClosureReason_outdated_channel_manager() {
 	LDKClosureReason *ret_copy = MALLOC(sizeof(LDKClosureReason), "LDKClosureReason");
 	*ret_copy = ClosureReason_outdated_channel_manager();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19267,10 +20416,11 @@ int8_tArray  __attribute__((export_name("TS_ClosureReason_write"))) TS_ClosureRe
 uint32_t  __attribute__((export_name("TS_ClosureReason_read"))) TS_ClosureReason_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_COption_ClosureReasonZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_ClosureReasonZDecodeErrorZ), "LDKCResult_COption_ClosureReasonZDecodeErrorZ");
 	*ret_conv = ClosureReason_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_Event_free"))) TS_Event_free(uint32_t this_ptr) {
@@ -19285,38 +20435,55 @@ void  __attribute__((export_name("TS_Event_free"))) TS_Event_free(uint32_t this_
 static inline uintptr_t Event_clone_ptr(LDKEvent *NONNULL_PTR arg) {
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
 	*ret_copy = Event_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Event_clone_ptr"))) TS_Event_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Event_clone_ptr"))) TS_Event_clone_ptr(uint32_t arg) {
 	LDKEvent* arg_conv = (LDKEvent*)arg;
-	intptr_t ret_val = Event_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Event_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Event_clone"))) TS_Event_clone(uint32_t orig) {
 	LDKEvent* orig_conv = (LDKEvent*)orig;
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
 	*ret_copy = Event_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_Event_funding_generation_ready"))) TS_Event_funding_generation_ready(int8_tArray temporary_channel_id, int64_t channel_value_satoshis, int8_tArray output_script, int64_t user_channel_id) {
+uint32_t  __attribute__((export_name("TS_Event_funding_generation_ready"))) TS_Event_funding_generation_ready(int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t channel_value_satoshis, int8_tArray output_script, int64_t user_channel_id) {
 	LDKThirtyTwoBytes temporary_channel_id_ref;
 	CHECK(temporary_channel_id->arr_len == 32);
 	memcpy(temporary_channel_id_ref.data, temporary_channel_id->elems, 32); FREE(temporary_channel_id);
+	LDKPublicKey counterparty_node_id_ref;
+	CHECK(counterparty_node_id->arr_len == 33);
+	memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id);
 	LDKCVec_u8Z output_script_ref;
 	output_script_ref.datalen = output_script->arr_len;
 	output_script_ref.data = MALLOC(output_script_ref.datalen, "LDKCVec_u8Z Bytes");
 	memcpy(output_script_ref.data, output_script->elems, output_script_ref.datalen); FREE(output_script);
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
-	*ret_copy = Event_funding_generation_ready(temporary_channel_id_ref, channel_value_satoshis, output_script_ref, user_channel_id);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	*ret_copy = Event_funding_generation_ready(temporary_channel_id_ref, counterparty_node_id_ref, channel_value_satoshis, output_script_ref, user_channel_id);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_Event_payment_received"))) TS_Event_payment_received(int8_tArray payment_hash, int64_t amount_msat, uint32_t purpose) {
+	LDKThirtyTwoBytes payment_hash_ref;
+	CHECK(payment_hash->arr_len == 32);
+	memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash);
+	void* purpose_ptr = (void*)(((uintptr_t)purpose) & ~1);
+	CHECK_ACCESS(purpose_ptr);
+	LDKPaymentPurpose purpose_conv = *(LDKPaymentPurpose*)(purpose_ptr);
+	purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uintptr_t)purpose) & ~1));
+	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
+	*ret_copy = Event_payment_received(payment_hash_ref, amount_msat, purpose_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_Event_payment_received"))) TS_Event_payment_received(int8_tArray payment_hash, int64_t amt, uint32_t purpose) {
+uint32_t  __attribute__((export_name("TS_Event_payment_claimed"))) TS_Event_payment_claimed(int8_tArray payment_hash, int64_t amount_msat, uint32_t purpose) {
 	LDKThirtyTwoBytes payment_hash_ref;
 	CHECK(payment_hash->arr_len == 32);
 	memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash);
@@ -19325,8 +20492,8 @@ uint32_t  __attribute__((export_name("TS_Event_payment_received"))) TS_Event_pay
 	LDKPaymentPurpose purpose_conv = *(LDKPaymentPurpose*)(purpose_ptr);
 	purpose_conv = PaymentPurpose_clone((LDKPaymentPurpose*)(((uintptr_t)purpose) & ~1));
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
-	*ret_copy = Event_payment_received(payment_hash_ref, amt, purpose_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	*ret_copy = Event_payment_claimed(payment_hash_ref, amount_msat, purpose_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19346,7 +20513,50 @@ uint32_t  __attribute__((export_name("TS_Event_payment_sent"))) TS_Event_payment
 	fee_paid_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)fee_paid_msat) & ~1));
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
 	*ret_copy = Event_payment_sent(payment_id_ref, payment_preimage_ref, payment_hash_ref, fee_paid_msat_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_Event_payment_failed"))) TS_Event_payment_failed(int8_tArray payment_id, int8_tArray payment_hash) {
+	LDKThirtyTwoBytes payment_id_ref;
+	CHECK(payment_id->arr_len == 32);
+	memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id);
+	LDKThirtyTwoBytes payment_hash_ref;
+	CHECK(payment_hash->arr_len == 32);
+	memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash);
+	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
+	*ret_copy = Event_payment_failed(payment_id_ref, payment_hash_ref);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Event_payment_path_successful(int8_tArray payment_id, int8_tArray payment_hash, uint32_tArray path) {
+	LDKThirtyTwoBytes payment_id_ref;
+	CHECK(payment_id->arr_len == 32);
+	memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id);
+	LDKThirtyTwoBytes payment_hash_ref;
+	CHECK(payment_hash->arr_len == 32);
+	memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash);
+	LDKCVec_RouteHopZ path_constr;
+	path_constr.datalen = path->arr_len;
+	if (path_constr.datalen > 0)
+		path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
+	else
+		path_constr.data = NULL;
+	uint32_t* path_vals = path->elems;
+	for (size_t k = 0; k < path_constr.datalen; k++) {
+		uint32_t path_conv_10 = path_vals[k];
+		LDKRouteHop path_conv_10_conv;
+		path_conv_10_conv.inner = (void*)(path_conv_10 & (~1));
+		path_conv_10_conv.is_owned = (path_conv_10 & 1) || (path_conv_10 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(path_conv_10_conv);
+		path_conv_10_conv = RouteHop_clone(&path_conv_10_conv);
+		path_constr.data[k] = path_conv_10_conv;
+	}
+	FREE(path);
+	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
+	*ret_copy = Event_payment_path_successful(payment_id_ref, payment_hash_ref, path_constr);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19367,7 +20577,7 @@ uint32_t  __attribute__((export_name("TS_Event_payment_path_failed"))) TS_Event_
 		path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
 	else
 		path_constr.data = NULL;
-	uint32_t* path_vals = path->elems /* XXX path leaks */;
+	uint32_t* path_vals = path->elems;
 	for (size_t k = 0; k < path_constr.datalen; k++) {
 		uint32_t path_conv_10 = path_vals[k];
 		LDKRouteHop path_conv_10_conv;
@@ -19377,6 +20587,7 @@ uint32_t  __attribute__((export_name("TS_Event_payment_path_failed"))) TS_Event_
 		path_conv_10_conv = RouteHop_clone(&path_conv_10_conv);
 		path_constr.data[k] = path_conv_10_conv;
 	}
+	FREE(path);
 	void* short_channel_id_ptr = (void*)(((uintptr_t)short_channel_id) & ~1);
 	CHECK_ACCESS(short_channel_id_ptr);
 	LDKCOption_u64Z short_channel_id_conv = *(LDKCOption_u64Z*)(short_channel_id_ptr);
@@ -19388,27 +20599,14 @@ uint32_t  __attribute__((export_name("TS_Event_payment_path_failed"))) TS_Event_
 	retry_conv = RouteParameters_clone(&retry_conv);
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
 	*ret_copy = Event_payment_path_failed(payment_id_ref, payment_hash_ref, rejected_by_dest, network_update_conv, all_paths_failed, path_constr, short_channel_id_conv, retry_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
-}
-
-uint32_t  __attribute__((export_name("TS_Event_payment_failed"))) TS_Event_payment_failed(int8_tArray payment_id, int8_tArray payment_hash) {
-	LDKThirtyTwoBytes payment_id_ref;
-	CHECK(payment_id->arr_len == 32);
-	memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id);
-	LDKThirtyTwoBytes payment_hash_ref;
-	CHECK(payment_hash->arr_len == 32);
-	memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash);
-	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
-	*ret_copy = Event_payment_failed(payment_id_ref, payment_hash_ref);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_Event_pending_htlcs_forwardable"))) TS_Event_pending_htlcs_forwardable(int64_t time_forwardable) {
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
 	*ret_copy = Event_pending_htlcs_forwardable(time_forwardable);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19419,7 +20617,7 @@ uint32_t  __attribute__((export_name("TS_Event_spendable_outputs"))) TS_Event_sp
 		outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements");
 	else
 		outputs_constr.data = NULL;
-	uint32_t* outputs_vals = outputs->elems /* XXX outputs leaks */;
+	uint32_t* outputs_vals = outputs->elems;
 	for (size_t b = 0; b < outputs_constr.datalen; b++) {
 		uint32_t outputs_conv_27 = outputs_vals[b];
 		void* outputs_conv_27_ptr = (void*)(((uintptr_t)outputs_conv_27) & ~1);
@@ -19428,20 +20626,27 @@ uint32_t  __attribute__((export_name("TS_Event_spendable_outputs"))) TS_Event_sp
 		outputs_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)outputs_conv_27) & ~1));
 		outputs_constr.data[b] = outputs_conv_27_conv;
 	}
+	FREE(outputs);
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
 	*ret_copy = Event_spendable_outputs(outputs_constr);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_Event_payment_forwarded"))) TS_Event_payment_forwarded(uint32_t fee_earned_msat, jboolean claim_from_onchain_tx) {
+uint32_t  __attribute__((export_name("TS_Event_payment_forwarded"))) TS_Event_payment_forwarded(int8_tArray prev_channel_id, int8_tArray next_channel_id, uint32_t fee_earned_msat, jboolean claim_from_onchain_tx) {
+	LDKThirtyTwoBytes prev_channel_id_ref;
+	CHECK(prev_channel_id->arr_len == 32);
+	memcpy(prev_channel_id_ref.data, prev_channel_id->elems, 32); FREE(prev_channel_id);
+	LDKThirtyTwoBytes next_channel_id_ref;
+	CHECK(next_channel_id->arr_len == 32);
+	memcpy(next_channel_id_ref.data, next_channel_id->elems, 32); FREE(next_channel_id);
 	void* fee_earned_msat_ptr = (void*)(((uintptr_t)fee_earned_msat) & ~1);
 	CHECK_ACCESS(fee_earned_msat_ptr);
 	LDKCOption_u64Z fee_earned_msat_conv = *(LDKCOption_u64Z*)(fee_earned_msat_ptr);
 	fee_earned_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)fee_earned_msat) & ~1));
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
-	*ret_copy = Event_payment_forwarded(fee_earned_msat_conv, claim_from_onchain_tx);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	*ret_copy = Event_payment_forwarded(prev_channel_id_ref, next_channel_id_ref, fee_earned_msat_conv, claim_from_onchain_tx);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19455,7 +20660,7 @@ uint32_t  __attribute__((export_name("TS_Event_channel_closed"))) TS_Event_chann
 	reason_conv = ClosureReason_clone((LDKClosureReason*)(((uintptr_t)reason) & ~1));
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
 	*ret_copy = Event_channel_closed(channel_id_ref, user_channel_id, reason_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19470,49 +20675,25 @@ uint32_t  __attribute__((export_name("TS_Event_discard_funding"))) TS_Event_disc
 	transaction_ref.data_is_owned = true;
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
 	*ret_copy = Event_discard_funding(channel_id_ref, transaction_ref);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
-	return ret_ref;
-}
-
-uint32_t  __attribute__((export_name("TS_Event_payment_path_successful"))) TS_Event_payment_path_successful(int8_tArray payment_id, int8_tArray payment_hash, uint32_tArray path) {
-	LDKThirtyTwoBytes payment_id_ref;
-	CHECK(payment_id->arr_len == 32);
-	memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id);
-	LDKThirtyTwoBytes payment_hash_ref;
-	CHECK(payment_hash->arr_len == 32);
-	memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash);
-	LDKCVec_RouteHopZ path_constr;
-	path_constr.datalen = path->arr_len;
-	if (path_constr.datalen > 0)
-		path_constr.data = MALLOC(path_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
-	else
-		path_constr.data = NULL;
-	uint32_t* path_vals = path->elems /* XXX path leaks */;
-	for (size_t k = 0; k < path_constr.datalen; k++) {
-		uint32_t path_conv_10 = path_vals[k];
-		LDKRouteHop path_conv_10_conv;
-		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);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_Event_open_channel_request"))) TS_Event_open_channel_request(int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t funding_satoshis, int64_t push_msat) {
+uint32_t  __attribute__((export_name("TS_Event_open_channel_request"))) TS_Event_open_channel_request(int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t funding_satoshis, int64_t push_msat, uint32_t channel_type) {
 	LDKThirtyTwoBytes temporary_channel_id_ref;
 	CHECK(temporary_channel_id->arr_len == 32);
 	memcpy(temporary_channel_id_ref.data, temporary_channel_id->elems, 32); FREE(temporary_channel_id);
 	LDKPublicKey counterparty_node_id_ref;
 	CHECK(counterparty_node_id->arr_len == 33);
 	memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id);
+	LDKChannelTypeFeatures channel_type_conv;
+	channel_type_conv.inner = (void*)(channel_type & (~1));
+	channel_type_conv.is_owned = (channel_type & 1) || (channel_type == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_type_conv);
+	channel_type_conv = ChannelTypeFeatures_clone(&channel_type_conv);
 	LDKEvent *ret_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
-	*ret_copy = Event_open_channel_request(temporary_channel_id_ref, counterparty_node_id_ref, funding_satoshis, push_msat);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	*ret_copy = Event_open_channel_request(temporary_channel_id_ref, counterparty_node_id_ref, funding_satoshis, push_msat, channel_type_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19528,10 +20709,11 @@ int8_tArray  __attribute__((export_name("TS_Event_write"))) TS_Event_write(uint3
 uint32_t  __attribute__((export_name("TS_Event_read"))) TS_Event_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_COption_EventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_EventZDecodeErrorZ), "LDKCResult_COption_EventZDecodeErrorZ");
 	*ret_conv = Event_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_MessageSendEvent_free"))) TS_MessageSendEvent_free(uint32_t this_ptr) {
@@ -19546,20 +20728,20 @@ void  __attribute__((export_name("TS_MessageSendEvent_free"))) TS_MessageSendEve
 static inline uintptr_t MessageSendEvent_clone_ptr(LDKMessageSendEvent *NONNULL_PTR arg) {
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_MessageSendEvent_clone_ptr"))) TS_MessageSendEvent_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_MessageSendEvent_clone_ptr"))) TS_MessageSendEvent_clone_ptr(uint32_t arg) {
 	LDKMessageSendEvent* arg_conv = (LDKMessageSendEvent*)arg;
-	intptr_t ret_val = MessageSendEvent_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = MessageSendEvent_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_MessageSendEvent_clone"))) TS_MessageSendEvent_clone(uint32_t orig) {
 	LDKMessageSendEvent* orig_conv = (LDKMessageSendEvent*)orig;
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19574,7 +20756,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_accept_channel"))
 	msg_conv = AcceptChannel_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_accept_channel(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19589,7 +20771,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_open_channel")))
 	msg_conv = OpenChannel_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_open_channel(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19604,7 +20786,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_funding_created")
 	msg_conv = FundingCreated_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_funding_created(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19619,22 +20801,22 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_funding_signed"))
 	msg_conv = FundingSigned_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_funding_signed(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_funding_locked"))) TS_MessageSendEvent_send_funding_locked(int8_tArray node_id, uint32_t msg) {
+uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_channel_ready"))) TS_MessageSendEvent_send_channel_ready(int8_tArray node_id, uint32_t msg) {
 	LDKPublicKey node_id_ref;
 	CHECK(node_id->arr_len == 33);
 	memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id);
-	LDKFundingLocked msg_conv;
+	LDKChannelReady 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);
+	msg_conv = ChannelReady_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
-	*ret_copy = MessageSendEvent_send_funding_locked(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	*ret_copy = MessageSendEvent_send_channel_ready(node_id_ref, msg_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19649,7 +20831,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_announcement_sign
 	msg_conv = AnnouncementSignatures_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_announcement_signatures(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19664,7 +20846,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_update_htlcs"))) TS_Me
 	updates_conv = CommitmentUpdate_clone(&updates_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_update_htlcs(node_id_ref, updates_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19679,7 +20861,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_revoke_and_ack"))
 	msg_conv = RevokeAndACK_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_revoke_and_ack(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19694,7 +20876,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_closing_signed"))
 	msg_conv = ClosingSigned_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_closing_signed(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19709,7 +20891,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_shutdown"))) TS_M
 	msg_conv = Shutdown_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_shutdown(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19724,7 +20906,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_channel_reestabli
 	msg_conv = ChannelReestablish_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_channel_reestablish(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19741,7 +20923,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_anno
 	update_msg_conv = ChannelUpdate_clone(&update_msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_broadcast_channel_announcement(msg_conv, update_msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19753,7 +20935,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_broadcast_node_announc
 	msg_conv = NodeAnnouncement_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_broadcast_node_announcement(msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19765,7 +20947,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_broadcast_channel_upda
 	msg_conv = ChannelUpdate_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_broadcast_channel_update(msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19780,7 +20962,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_channel_update"))
 	msg_conv = ChannelUpdate_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_channel_update(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19794,7 +20976,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_handle_error"))) TS_Me
 	action_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)action) & ~1));
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_handle_error(node_id_ref, action_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19809,7 +20991,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_channel_range_que
 	msg_conv = QueryChannelRange_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_channel_range_query(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19824,7 +21006,7 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_short_ids_query")
 	msg_conv = QueryShortChannelIds_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_short_ids_query(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19839,7 +21021,22 @@ uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_reply_channel_ran
 	msg_conv = ReplyChannelRange_clone(&msg_conv);
 	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
 	*ret_copy = MessageSendEvent_send_reply_channel_range(node_id_ref, msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_MessageSendEvent_send_gossip_timestamp_filter"))) TS_MessageSendEvent_send_gossip_timestamp_filter(int8_tArray node_id, uint32_t msg) {
+	LDKPublicKey node_id_ref;
+	CHECK(node_id->arr_len == 33);
+	memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id);
+	LDKGossipTimestampFilter msg_conv;
+	msg_conv.inner = (void*)(msg & (~1));
+	msg_conv.is_owned = (msg & 1) || (msg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
+	msg_conv = GossipTimestampFilter_clone(&msg_conv);
+	LDKMessageSendEvent *ret_copy = MALLOC(sizeof(LDKMessageSendEvent), "LDKMessageSendEvent");
+	*ret_copy = MessageSendEvent_send_gossip_timestamp_filter(node_id_ref, msg_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19882,20 +21079,20 @@ void  __attribute__((export_name("TS_APIError_free"))) TS_APIError_free(uint32_t
 static inline uintptr_t APIError_clone_ptr(LDKAPIError *NONNULL_PTR arg) {
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = APIError_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_APIError_clone_ptr"))) TS_APIError_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_APIError_clone_ptr"))) TS_APIError_clone_ptr(uint32_t arg) {
 	LDKAPIError* arg_conv = (LDKAPIError*)arg;
-	intptr_t ret_val = APIError_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = APIError_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_APIError_clone"))) TS_APIError_clone(uint32_t orig) {
 	LDKAPIError* orig_conv = (LDKAPIError*)orig;
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = APIError_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19903,7 +21100,7 @@ uint32_t  __attribute__((export_name("TS_APIError_apimisuse_error"))) TS_APIErro
 	LDKStr err_conv = str_ref_to_owned_c(err);
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = APIError_apimisuse_error(err_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19911,7 +21108,7 @@ uint32_t  __attribute__((export_name("TS_APIError_fee_rate_too_high"))) TS_APIEr
 	LDKStr err_conv = str_ref_to_owned_c(err);
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = APIError_fee_rate_too_high(err_conv, feerate);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19919,7 +21116,7 @@ uint32_t  __attribute__((export_name("TS_APIError_route_error"))) TS_APIError_ro
 	LDKStr err_conv = str_ref_to_owned_c(err);
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = APIError_route_error(err_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19927,14 +21124,14 @@ uint32_t  __attribute__((export_name("TS_APIError_channel_unavailable"))) TS_API
 	LDKStr err_conv = str_ref_to_owned_c(err);
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = APIError_channel_unavailable(err_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_APIError_monitor_update_failed"))) TS_APIError_monitor_update_failed() {
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = APIError_monitor_update_failed();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -19946,68 +21143,120 @@ uint32_t  __attribute__((export_name("TS_APIError_incompatible_shutdown_script")
 	script_conv = ShutdownScript_clone(&script_conv);
 	LDKAPIError *ret_copy = MALLOC(sizeof(LDKAPIError), "LDKAPIError");
 	*ret_copy = APIError_incompatible_shutdown_script(script_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_BigSize_free"))) TS_BigSize_free(uint32_t this_obj) {
+	LDKBigSize this_obj_conv;
+	this_obj_conv.inner = (void*)(this_obj & (~1));
+	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
+	BigSize_free(this_obj_conv);
+}
+
+int64_t  __attribute__((export_name("TS_BigSize_get_a"))) TS_BigSize_get_a(uint32_t this_ptr) {
+	LDKBigSize this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	int64_t ret_conv = BigSize_get_a(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_BigSize_set_a"))) TS_BigSize_set_a(uint32_t this_ptr, int64_t val) {
+	LDKBigSize this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	BigSize_set_a(&this_ptr_conv, val);
+}
+
+uint32_t  __attribute__((export_name("TS_BigSize_new"))) TS_BigSize_new(int64_t a_arg) {
+	LDKBigSize ret_var = BigSize_new(a_arg);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_sign"))) TS_sign(int8_tArray msg, int8_tArray sk) {
 	LDKu8slice msg_ref;
 	msg_ref.datalen = msg->arr_len;
-	msg_ref.data = msg->elems /* XXX msg leaks */;
+	msg_ref.data = msg->elems;
 	unsigned char sk_arr[32];
 	CHECK(sk->arr_len == 32);
 	memcpy(sk_arr, sk->elems, 32); FREE(sk);
 	unsigned char (*sk_ref)[32] = &sk_arr;
 	LDKCResult_StringErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StringErrorZ), "LDKCResult_StringErrorZ");
 	*ret_conv = sign(msg_ref, sk_ref);
-	return (uintptr_t)ret_conv;
+	FREE(msg);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_recover_pk"))) TS_recover_pk(int8_tArray msg, jstring sig) {
 	LDKu8slice msg_ref;
 	msg_ref.datalen = msg->arr_len;
-	msg_ref.data = msg->elems /* XXX msg leaks */;
+	msg_ref.data = msg->elems;
 	LDKStr sig_conv = str_ref_to_owned_c(sig);
 	LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ");
 	*ret_conv = recover_pk(msg_ref, sig_conv);
-	return (uintptr_t)ret_conv;
+	FREE(msg);
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_verify"))) TS_verify(int8_tArray msg, jstring sig, int8_tArray pk) {
 	LDKu8slice msg_ref;
 	msg_ref.datalen = msg->arr_len;
-	msg_ref.data = msg->elems /* XXX msg leaks */;
+	msg_ref.data = msg->elems;
 	LDKStr sig_conv = str_ref_to_owned_c(sig);
 	LDKPublicKey pk_ref;
 	CHECK(pk->arr_len == 33);
 	memcpy(pk_ref.compressed_form, pk->elems, 33); FREE(pk);
-	jboolean ret_val = verify(msg_ref, sig_conv, pk_ref);
-	return ret_val;
+	jboolean ret_conv = verify(msg_ref, sig_conv, pk_ref);
+	FREE(msg);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_construct_invoice_preimage"))) TS_construct_invoice_preimage(int8_tArray hrp_bytes, ptrArray data_without_signature) {
 	LDKu8slice hrp_bytes_ref;
 	hrp_bytes_ref.datalen = hrp_bytes->arr_len;
-	hrp_bytes_ref.data = hrp_bytes->elems /* XXX hrp_bytes leaks */;
+	hrp_bytes_ref.data = hrp_bytes->elems;
 	LDKCVec_u5Z data_without_signature_constr;
 	data_without_signature_constr.datalen = data_without_signature->arr_len;
 	if (data_without_signature_constr.datalen > 0)
 		data_without_signature_constr.data = MALLOC(data_without_signature_constr.datalen * sizeof(LDKu5), "LDKCVec_u5Z Elements");
 	else
 		data_without_signature_constr.data = NULL;
-	int8_t* data_without_signature_vals = (void*) data_without_signature->elems /* XXX data_without_signature leaks */;
+	int8_t* data_without_signature_vals = (void*) data_without_signature->elems;
 	for (size_t h = 0; h < data_without_signature_constr.datalen; h++) {
 		int8_t data_without_signature_conv_7 = data_without_signature_vals[h];
 		
 		data_without_signature_constr.data[h] = (LDKu5){ ._0 = data_without_signature_conv_7 };
 	}
+	FREE(data_without_signature);
 	LDKCVec_u8Z ret_var = construct_invoice_preimage(hrp_bytes_ref, data_without_signature_constr);
 	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
 	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
 	CVec_u8Z_free(ret_var);
+	FREE(hrp_bytes);
 	return ret_arr;
 }
 
+void  __attribute__((export_name("TS_Persister_free"))) TS_Persister_free(uint32_t this_ptr) {
+	if ((this_ptr & 1) != 0) return;
+	void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1);
+	CHECK_ACCESS(this_ptr_ptr);
+	LDKPersister this_ptr_conv = *(LDKPersister*)(this_ptr_ptr);
+	FREE((void*)this_ptr);
+	Persister_free(this_ptr_conv);
+}
+
 uint32_t  __attribute__((export_name("TS_Level_clone"))) TS_Level_clone(uint32_t orig) {
 	LDKLevel* orig_conv = (LDKLevel*)(orig & ~1);
 	uint32_t ret_conv = LDKLevel_to_js(Level_clone(orig_conv));
@@ -20047,14 +21296,14 @@ uint32_t  __attribute__((export_name("TS_Level_error"))) TS_Level_error() {
 jboolean  __attribute__((export_name("TS_Level_eq"))) TS_Level_eq(uint32_t a, uint32_t b) {
 	LDKLevel* a_conv = (LDKLevel*)(a & ~1);
 	LDKLevel* b_conv = (LDKLevel*)(b & ~1);
-	jboolean ret_val = Level_eq(a_conv, b_conv);
-	return ret_val;
+	jboolean ret_conv = Level_eq(a_conv, b_conv);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_Level_hash"))) TS_Level_hash(uint32_t o) {
 	LDKLevel* o_conv = (LDKLevel*)(o & ~1);
-	int64_t ret_val = Level_hash(o_conv);
-	return ret_val;
+	int64_t ret_conv = Level_hash(o_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Level_max"))) TS_Level_max() {
@@ -20153,8 +21402,8 @@ int32_t  __attribute__((export_name("TS_Record_get_line"))) TS_Record_get_line(u
 	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;
+	int32_t ret_conv = Record_get_line(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_Record_set_line"))) TS_Record_set_line(uint32_t this_ptr, int32_t val) {
@@ -20167,7 +21416,7 @@ void  __attribute__((export_name("TS_Record_set_line"))) TS_Record_set_line(uint
 
 static inline uintptr_t Record_clone_ptr(LDKRecord *NONNULL_PTR arg) {
 	LDKRecord ret_var = Record_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20177,13 +21426,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Record_clone_ptr"))) TS_Record_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Record_clone_ptr"))) TS_Record_clone_ptr(uint32_t arg) {
 	LDKRecord arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = Record_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Record_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Record_clone"))) TS_Record_clone(uint32_t orig) {
@@ -20192,7 +21441,7 @@ uint32_t  __attribute__((export_name("TS_Record_clone"))) TS_Record_clone(uint32
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRecord ret_var = Record_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20225,8 +21474,8 @@ int32_t  __attribute__((export_name("TS_ChannelHandshakeConfig_get_minimum_depth
 	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;
+	int32_t ret_conv = ChannelHandshakeConfig_get_minimum_depth(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeConfig_set_minimum_depth"))) TS_ChannelHandshakeConfig_set_minimum_depth(uint32_t this_ptr, int32_t val) {
@@ -20242,8 +21491,8 @@ int16_t  __attribute__((export_name("TS_ChannelHandshakeConfig_get_our_to_self_d
 	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;
+	int16_t ret_conv = ChannelHandshakeConfig_get_our_to_self_delay(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_to_self_delay"))) TS_ChannelHandshakeConfig_set_our_to_self_delay(uint32_t this_ptr, int16_t val) {
@@ -20259,8 +21508,8 @@ int64_t  __attribute__((export_name("TS_ChannelHandshakeConfig_get_our_htlc_mini
 	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;
+	int64_t ret_conv = ChannelHandshakeConfig_get_our_htlc_minimum_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_htlc_minimum_msat"))) TS_ChannelHandshakeConfig_set_our_htlc_minimum_msat(uint32_t this_ptr, int64_t val) {
@@ -20271,9 +21520,77 @@ void  __attribute__((export_name("TS_ChannelHandshakeConfig_set_our_htlc_minimum
 	ChannelHandshakeConfig_set_our_htlc_minimum_msat(&this_ptr_conv, val);
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelHandshakeConfig_new"))) TS_ChannelHandshakeConfig_new(int32_t minimum_depth_arg, int16_t our_to_self_delay_arg, int64_t our_htlc_minimum_msat_arg) {
-	LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg);
-	uintptr_t ret_ref = 0;
+int8_t  __attribute__((export_name("TS_ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel"))) TS_ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(uint32_t this_ptr) {
+	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);
+	int8_t ret_conv = ChannelHandshakeConfig_get_max_inbound_htlc_value_in_flight_percent_of_channel(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel"))) TS_ChannelHandshakeConfig_set_max_inbound_htlc_value_in_flight_percent_of_channel(uint32_t this_ptr, int8_t val) {
+	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_max_inbound_htlc_value_in_flight_percent_of_channel(&this_ptr_conv, val);
+}
+
+jboolean  __attribute__((export_name("TS_ChannelHandshakeConfig_get_negotiate_scid_privacy"))) TS_ChannelHandshakeConfig_get_negotiate_scid_privacy(uint32_t this_ptr) {
+	LDKChannelHandshakeConfig this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	jboolean ret_conv = ChannelHandshakeConfig_get_negotiate_scid_privacy(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelHandshakeConfig_set_negotiate_scid_privacy"))) TS_ChannelHandshakeConfig_set_negotiate_scid_privacy(uint32_t this_ptr, jboolean val) {
+	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_negotiate_scid_privacy(&this_ptr_conv, val);
+}
+
+jboolean  __attribute__((export_name("TS_ChannelHandshakeConfig_get_announced_channel"))) TS_ChannelHandshakeConfig_get_announced_channel(uint32_t this_ptr) {
+	LDKChannelHandshakeConfig this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	jboolean ret_conv = ChannelHandshakeConfig_get_announced_channel(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelHandshakeConfig_set_announced_channel"))) TS_ChannelHandshakeConfig_set_announced_channel(uint32_t this_ptr, jboolean val) {
+	LDKChannelHandshakeConfig this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	ChannelHandshakeConfig_set_announced_channel(&this_ptr_conv, val);
+}
+
+jboolean  __attribute__((export_name("TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(uint32_t this_ptr) {
+	LDKChannelHandshakeConfig this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	jboolean ret_conv = ChannelHandshakeConfig_get_commit_upfront_shutdown_pubkey(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey"))) TS_ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(uint32_t this_ptr, jboolean val) {
+	LDKChannelHandshakeConfig this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	ChannelHandshakeConfig_set_commit_upfront_shutdown_pubkey(&this_ptr_conv, val);
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelHandshakeConfig_new"))) TS_ChannelHandshakeConfig_new(int32_t minimum_depth_arg, int16_t our_to_self_delay_arg, int64_t our_htlc_minimum_msat_arg, int8_t max_inbound_htlc_value_in_flight_percent_of_channel_arg, jboolean negotiate_scid_privacy_arg, jboolean announced_channel_arg, jboolean commit_upfront_shutdown_pubkey_arg) {
+	LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg, max_inbound_htlc_value_in_flight_percent_of_channel_arg, negotiate_scid_privacy_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20286,7 +21603,7 @@ uint32_t  __attribute__((export_name("TS_ChannelHandshakeConfig_new"))) TS_Chann
 
 static inline uintptr_t ChannelHandshakeConfig_clone_ptr(LDKChannelHandshakeConfig *NONNULL_PTR arg) {
 	LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20296,13 +21613,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelHandshakeConfig_clone_ptr"))) TS_ChannelHandshakeConfig_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelHandshakeConfig_clone_ptr"))) TS_ChannelHandshakeConfig_clone_ptr(uint32_t arg) {
 	LDKChannelHandshakeConfig arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelHandshakeConfig_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelHandshakeConfig_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelHandshakeConfig_clone"))) TS_ChannelHandshakeConfig_clone(uint32_t orig) {
@@ -20311,7 +21628,7 @@ uint32_t  __attribute__((export_name("TS_ChannelHandshakeConfig_clone"))) TS_Cha
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20324,7 +21641,7 @@ uint32_t  __attribute__((export_name("TS_ChannelHandshakeConfig_clone"))) TS_Cha
 
 uint32_t  __attribute__((export_name("TS_ChannelHandshakeConfig_default"))) TS_ChannelHandshakeConfig_default() {
 	LDKChannelHandshakeConfig ret_var = ChannelHandshakeConfig_default();
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20348,8 +21665,8 @@ int64_t  __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_funding_s
 	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;
+	int64_t ret_conv = ChannelHandshakeLimits_get_min_funding_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_funding_satoshis"))) TS_ChannelHandshakeLimits_set_min_funding_satoshis(uint32_t this_ptr, int64_t val) {
@@ -20360,13 +21677,30 @@ void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_funding_sato
 	ChannelHandshakeLimits_set_min_funding_satoshis(&this_ptr_conv, val);
 }
 
+int64_t  __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_funding_satoshis"))) TS_ChannelHandshakeLimits_get_max_funding_satoshis(uint32_t this_ptr) {
+	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_conv = ChannelHandshakeLimits_get_max_funding_satoshis(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_funding_satoshis"))) TS_ChannelHandshakeLimits_set_max_funding_satoshis(uint32_t this_ptr, int64_t val) {
+	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_funding_satoshis(&this_ptr_conv, val);
+}
+
 int64_t  __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_htlc_minimum_msat"))) TS_ChannelHandshakeLimits_get_max_htlc_minimum_msat(uint32_t this_ptr) {
 	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;
+	int64_t ret_conv = ChannelHandshakeLimits_get_max_htlc_minimum_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_htlc_minimum_msat"))) TS_ChannelHandshakeLimits_set_max_htlc_minimum_msat(uint32_t this_ptr, int64_t val) {
@@ -20382,8 +21716,8 @@ int64_t  __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_max_htlc_
 	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;
+	int64_t ret_conv = ChannelHandshakeLimits_get_min_max_htlc_value_in_flight_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat"))) TS_ChannelHandshakeLimits_set_min_max_htlc_value_in_flight_msat(uint32_t this_ptr, int64_t val) {
@@ -20399,8 +21733,8 @@ int64_t  __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_channel_r
 	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;
+	int64_t ret_conv = ChannelHandshakeLimits_get_max_channel_reserve_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_channel_reserve_satoshis"))) TS_ChannelHandshakeLimits_set_max_channel_reserve_satoshis(uint32_t this_ptr, int64_t val) {
@@ -20416,8 +21750,8 @@ int16_t  __attribute__((export_name("TS_ChannelHandshakeLimits_get_min_max_accep
 	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;
+	int16_t ret_conv = ChannelHandshakeLimits_get_min_max_accepted_htlcs(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_min_max_accepted_htlcs"))) TS_ChannelHandshakeLimits_set_min_max_accepted_htlcs(uint32_t this_ptr, int16_t val) {
@@ -20433,8 +21767,8 @@ int32_t  __attribute__((export_name("TS_ChannelHandshakeLimits_get_max_minimum_d
 	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;
+	int32_t ret_conv = ChannelHandshakeLimits_get_max_minimum_depth(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_minimum_depth"))) TS_ChannelHandshakeLimits_set_max_minimum_depth(uint32_t this_ptr, int32_t val) {
@@ -20445,13 +21779,30 @@ void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_max_minimum_dept
 	ChannelHandshakeLimits_set_max_minimum_depth(&this_ptr_conv, val);
 }
 
+jboolean  __attribute__((export_name("TS_ChannelHandshakeLimits_get_trust_own_funding_0conf"))) TS_ChannelHandshakeLimits_get_trust_own_funding_0conf(uint32_t this_ptr) {
+	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_conv = ChannelHandshakeLimits_get_trust_own_funding_0conf(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_trust_own_funding_0conf"))) TS_ChannelHandshakeLimits_set_trust_own_funding_0conf(uint32_t this_ptr, jboolean val) {
+	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_trust_own_funding_0conf(&this_ptr_conv, val);
+}
+
 jboolean  __attribute__((export_name("TS_ChannelHandshakeLimits_get_force_announced_channel_preference"))) TS_ChannelHandshakeLimits_get_force_announced_channel_preference(uint32_t this_ptr) {
 	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;
+	jboolean ret_conv = ChannelHandshakeLimits_get_force_announced_channel_preference(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_force_announced_channel_preference"))) TS_ChannelHandshakeLimits_set_force_announced_channel_preference(uint32_t this_ptr, jboolean val) {
@@ -20467,8 +21818,8 @@ int16_t  __attribute__((export_name("TS_ChannelHandshakeLimits_get_their_to_self
 	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;
+	int16_t ret_conv = ChannelHandshakeLimits_get_their_to_self_delay(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_their_to_self_delay"))) TS_ChannelHandshakeLimits_set_their_to_self_delay(uint32_t this_ptr, int16_t val) {
@@ -20479,9 +21830,9 @@ void  __attribute__((export_name("TS_ChannelHandshakeLimits_set_their_to_self_de
 	ChannelHandshakeLimits_set_their_to_self_delay(&this_ptr_conv, val);
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelHandshakeLimits_new"))) TS_ChannelHandshakeLimits_new(int64_t min_funding_satoshis_arg, int64_t max_htlc_minimum_msat_arg, int64_t min_max_htlc_value_in_flight_msat_arg, int64_t max_channel_reserve_satoshis_arg, int16_t min_max_accepted_htlcs_arg, int32_t max_minimum_depth_arg, jboolean force_announced_channel_preference_arg, int16_t their_to_self_delay_arg) {
-	LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_htlc_minimum_msat_arg, min_max_htlc_value_in_flight_msat_arg, max_channel_reserve_satoshis_arg, min_max_accepted_htlcs_arg, max_minimum_depth_arg, force_announced_channel_preference_arg, their_to_self_delay_arg);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_ChannelHandshakeLimits_new"))) TS_ChannelHandshakeLimits_new(int64_t min_funding_satoshis_arg, int64_t max_funding_satoshis_arg, int64_t max_htlc_minimum_msat_arg, int64_t min_max_htlc_value_in_flight_msat_arg, int64_t max_channel_reserve_satoshis_arg, int16_t min_max_accepted_htlcs_arg, int32_t max_minimum_depth_arg, jboolean trust_own_funding_0conf_arg, jboolean force_announced_channel_preference_arg, int16_t their_to_self_delay_arg) {
+	LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_new(min_funding_satoshis_arg, max_funding_satoshis_arg, max_htlc_minimum_msat_arg, min_max_htlc_value_in_flight_msat_arg, max_channel_reserve_satoshis_arg, min_max_accepted_htlcs_arg, max_minimum_depth_arg, trust_own_funding_0conf_arg, force_announced_channel_preference_arg, their_to_self_delay_arg);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20494,7 +21845,7 @@ uint32_t  __attribute__((export_name("TS_ChannelHandshakeLimits_new"))) TS_Chann
 
 static inline uintptr_t ChannelHandshakeLimits_clone_ptr(LDKChannelHandshakeLimits *NONNULL_PTR arg) {
 	LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20504,13 +21855,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelHandshakeLimits_clone_ptr"))) TS_ChannelHandshakeLimits_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelHandshakeLimits_clone_ptr"))) TS_ChannelHandshakeLimits_clone_ptr(uint32_t arg) {
 	LDKChannelHandshakeLimits arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelHandshakeLimits_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelHandshakeLimits_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelHandshakeLimits_clone"))) TS_ChannelHandshakeLimits_clone(uint32_t orig) {
@@ -20519,7 +21870,7 @@ uint32_t  __attribute__((export_name("TS_ChannelHandshakeLimits_clone"))) TS_Cha
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20532,7 +21883,7 @@ uint32_t  __attribute__((export_name("TS_ChannelHandshakeLimits_clone"))) TS_Cha
 
 uint32_t  __attribute__((export_name("TS_ChannelHandshakeLimits_default"))) TS_ChannelHandshakeLimits_default() {
 	LDKChannelHandshakeLimits ret_var = ChannelHandshakeLimits_default();
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20556,8 +21907,8 @@ int32_t  __attribute__((export_name("TS_ChannelConfig_get_forwarding_fee_proport
 	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;
+	int32_t ret_conv = ChannelConfig_get_forwarding_fee_proportional_millionths(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelConfig_set_forwarding_fee_proportional_millionths"))) TS_ChannelConfig_set_forwarding_fee_proportional_millionths(uint32_t this_ptr, int32_t val) {
@@ -20573,8 +21924,8 @@ int32_t  __attribute__((export_name("TS_ChannelConfig_get_forwarding_fee_base_ms
 	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;
+	int32_t ret_conv = ChannelConfig_get_forwarding_fee_base_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelConfig_set_forwarding_fee_base_msat"))) TS_ChannelConfig_set_forwarding_fee_base_msat(uint32_t this_ptr, int32_t val) {
@@ -20590,8 +21941,8 @@ int16_t  __attribute__((export_name("TS_ChannelConfig_get_cltv_expiry_delta")))
 	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;
+	int16_t ret_conv = ChannelConfig_get_cltv_expiry_delta(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelConfig_set_cltv_expiry_delta"))) TS_ChannelConfig_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) {
@@ -20602,47 +21953,13 @@ void  __attribute__((export_name("TS_ChannelConfig_set_cltv_expiry_delta"))) TS_
 	ChannelConfig_set_cltv_expiry_delta(&this_ptr_conv, val);
 }
 
-jboolean  __attribute__((export_name("TS_ChannelConfig_get_announced_channel"))) TS_ChannelConfig_get_announced_channel(uint32_t this_ptr) {
-	LDKChannelConfig this_ptr_conv;
-	this_ptr_conv.inner = (void*)(this_ptr & (~1));
-	this_ptr_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	jboolean ret_val = ChannelConfig_get_announced_channel(&this_ptr_conv);
-	return ret_val;
-}
-
-void  __attribute__((export_name("TS_ChannelConfig_set_announced_channel"))) TS_ChannelConfig_set_announced_channel(uint32_t this_ptr, jboolean val) {
-	LDKChannelConfig this_ptr_conv;
-	this_ptr_conv.inner = (void*)(this_ptr & (~1));
-	this_ptr_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	ChannelConfig_set_announced_channel(&this_ptr_conv, val);
-}
-
-jboolean  __attribute__((export_name("TS_ChannelConfig_get_commit_upfront_shutdown_pubkey"))) TS_ChannelConfig_get_commit_upfront_shutdown_pubkey(uint32_t this_ptr) {
-	LDKChannelConfig this_ptr_conv;
-	this_ptr_conv.inner = (void*)(this_ptr & (~1));
-	this_ptr_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	jboolean ret_val = ChannelConfig_get_commit_upfront_shutdown_pubkey(&this_ptr_conv);
-	return ret_val;
-}
-
-void  __attribute__((export_name("TS_ChannelConfig_set_commit_upfront_shutdown_pubkey"))) TS_ChannelConfig_set_commit_upfront_shutdown_pubkey(uint32_t this_ptr, jboolean val) {
-	LDKChannelConfig this_ptr_conv;
-	this_ptr_conv.inner = (void*)(this_ptr & (~1));
-	this_ptr_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	ChannelConfig_set_commit_upfront_shutdown_pubkey(&this_ptr_conv, val);
-}
-
 int64_t  __attribute__((export_name("TS_ChannelConfig_get_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_get_max_dust_htlc_exposure_msat(uint32_t this_ptr) {
 	LDKChannelConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	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;
+	int64_t ret_conv = ChannelConfig_get_max_dust_htlc_exposure_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelConfig_set_max_dust_htlc_exposure_msat"))) TS_ChannelConfig_set_max_dust_htlc_exposure_msat(uint32_t this_ptr, int64_t val) {
@@ -20658,8 +21975,8 @@ int64_t  __attribute__((export_name("TS_ChannelConfig_get_force_close_avoidance_
 	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;
+	int64_t ret_conv = ChannelConfig_get_force_close_avoidance_max_fee_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelConfig_set_force_close_avoidance_max_fee_satoshis"))) TS_ChannelConfig_set_force_close_avoidance_max_fee_satoshis(uint32_t this_ptr, int64_t val) {
@@ -20670,9 +21987,9 @@ void  __attribute__((export_name("TS_ChannelConfig_set_force_close_avoidance_max
 	ChannelConfig_set_force_close_avoidance_max_fee_satoshis(&this_ptr_conv, val);
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelConfig_new"))) TS_ChannelConfig_new(int32_t forwarding_fee_proportional_millionths_arg, int32_t forwarding_fee_base_msat_arg, int16_t cltv_expiry_delta_arg, jboolean announced_channel_arg, jboolean commit_upfront_shutdown_pubkey_arg, int64_t max_dust_htlc_exposure_msat_arg, int64_t force_close_avoidance_max_fee_satoshis_arg) {
-	LDKChannelConfig ret_var = ChannelConfig_new(forwarding_fee_proportional_millionths_arg, forwarding_fee_base_msat_arg, cltv_expiry_delta_arg, announced_channel_arg, commit_upfront_shutdown_pubkey_arg, max_dust_htlc_exposure_msat_arg, force_close_avoidance_max_fee_satoshis_arg);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_ChannelConfig_new"))) TS_ChannelConfig_new(int32_t forwarding_fee_proportional_millionths_arg, int32_t forwarding_fee_base_msat_arg, int16_t cltv_expiry_delta_arg, int64_t max_dust_htlc_exposure_msat_arg, int64_t force_close_avoidance_max_fee_satoshis_arg) {
+	LDKChannelConfig ret_var = ChannelConfig_new(forwarding_fee_proportional_millionths_arg, forwarding_fee_base_msat_arg, cltv_expiry_delta_arg, max_dust_htlc_exposure_msat_arg, force_close_avoidance_max_fee_satoshis_arg);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20685,7 +22002,7 @@ uint32_t  __attribute__((export_name("TS_ChannelConfig_new"))) TS_ChannelConfig_
 
 static inline uintptr_t ChannelConfig_clone_ptr(LDKChannelConfig *NONNULL_PTR arg) {
 	LDKChannelConfig ret_var = ChannelConfig_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20695,13 +22012,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelConfig_clone_ptr"))) TS_ChannelConfig_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelConfig_clone_ptr"))) TS_ChannelConfig_clone_ptr(uint32_t arg) {
 	LDKChannelConfig arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelConfig_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelConfig_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelConfig_clone"))) TS_ChannelConfig_clone(uint32_t orig) {
@@ -20710,7 +22027,7 @@ uint32_t  __attribute__((export_name("TS_ChannelConfig_clone"))) TS_ChannelConfi
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelConfig ret_var = ChannelConfig_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20723,7 +22040,7 @@ uint32_t  __attribute__((export_name("TS_ChannelConfig_clone"))) TS_ChannelConfi
 
 uint32_t  __attribute__((export_name("TS_ChannelConfig_default"))) TS_ChannelConfig_default() {
 	LDKChannelConfig ret_var = ChannelConfig_default();
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20749,10 +22066,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelConfig_write"))) TS_ChannelCo
 uint32_t  __attribute__((export_name("TS_ChannelConfig_read"))) TS_ChannelConfig_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelConfigDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelConfigDecodeErrorZ), "LDKCResult_ChannelConfigDecodeErrorZ");
 	*ret_conv = ChannelConfig_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_UserConfig_free"))) TS_UserConfig_free(uint32_t this_obj) {
@@ -20763,13 +22081,13 @@ void  __attribute__((export_name("TS_UserConfig_free"))) TS_UserConfig_free(uint
 	UserConfig_free(this_obj_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_UserConfig_get_own_channel_config"))) TS_UserConfig_get_own_channel_config(uint32_t this_ptr) {
+uint32_t  __attribute__((export_name("TS_UserConfig_get_channel_handshake_config"))) TS_UserConfig_get_channel_handshake_config(uint32_t this_ptr) {
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	LDKChannelHandshakeConfig ret_var = UserConfig_get_own_channel_config(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	LDKChannelHandshakeConfig ret_var = UserConfig_get_channel_handshake_config(&this_ptr_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20780,7 +22098,7 @@ uint32_t  __attribute__((export_name("TS_UserConfig_get_own_channel_config"))) T
 	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_UserConfig_set_own_channel_config"))) TS_UserConfig_set_own_channel_config(uint32_t this_ptr, uint32_t val) {
+void  __attribute__((export_name("TS_UserConfig_set_channel_handshake_config"))) TS_UserConfig_set_channel_handshake_config(uint32_t this_ptr, uint32_t val) {
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
@@ -20790,16 +22108,16 @@ void  __attribute__((export_name("TS_UserConfig_set_own_channel_config"))) TS_Us
 	val_conv.is_owned = (val & 1) || (val == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelHandshakeConfig_clone(&val_conv);
-	UserConfig_set_own_channel_config(&this_ptr_conv, val_conv);
+	UserConfig_set_channel_handshake_config(&this_ptr_conv, val_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_UserConfig_get_peer_channel_config_limits"))) TS_UserConfig_get_peer_channel_config_limits(uint32_t this_ptr) {
+uint32_t  __attribute__((export_name("TS_UserConfig_get_channel_handshake_limits"))) TS_UserConfig_get_channel_handshake_limits(uint32_t this_ptr) {
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	LDKChannelHandshakeLimits ret_var = UserConfig_get_peer_channel_config_limits(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	LDKChannelHandshakeLimits ret_var = UserConfig_get_channel_handshake_limits(&this_ptr_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20810,7 +22128,7 @@ uint32_t  __attribute__((export_name("TS_UserConfig_get_peer_channel_config_limi
 	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_UserConfig_set_peer_channel_config_limits"))) TS_UserConfig_set_peer_channel_config_limits(uint32_t this_ptr, uint32_t val) {
+void  __attribute__((export_name("TS_UserConfig_set_channel_handshake_limits"))) TS_UserConfig_set_channel_handshake_limits(uint32_t this_ptr, uint32_t val) {
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
@@ -20820,16 +22138,16 @@ void  __attribute__((export_name("TS_UserConfig_set_peer_channel_config_limits")
 	val_conv.is_owned = (val & 1) || (val == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelHandshakeLimits_clone(&val_conv);
-	UserConfig_set_peer_channel_config_limits(&this_ptr_conv, val_conv);
+	UserConfig_set_channel_handshake_limits(&this_ptr_conv, val_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_UserConfig_get_channel_options"))) TS_UserConfig_get_channel_options(uint32_t this_ptr) {
+uint32_t  __attribute__((export_name("TS_UserConfig_get_channel_config"))) TS_UserConfig_get_channel_config(uint32_t this_ptr) {
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	LDKChannelConfig ret_var = UserConfig_get_channel_options(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	LDKChannelConfig ret_var = UserConfig_get_channel_config(&this_ptr_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20840,7 +22158,7 @@ uint32_t  __attribute__((export_name("TS_UserConfig_get_channel_options"))) TS_U
 	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_UserConfig_set_channel_options"))) TS_UserConfig_set_channel_options(uint32_t this_ptr, uint32_t val) {
+void  __attribute__((export_name("TS_UserConfig_set_channel_config"))) TS_UserConfig_set_channel_config(uint32_t this_ptr, uint32_t val) {
 	LDKUserConfig this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
@@ -20850,7 +22168,7 @@ void  __attribute__((export_name("TS_UserConfig_set_channel_options"))) TS_UserC
 	val_conv.is_owned = (val & 1) || (val == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
 	val_conv = ChannelConfig_clone(&val_conv);
-	UserConfig_set_channel_options(&this_ptr_conv, val_conv);
+	UserConfig_set_channel_config(&this_ptr_conv, val_conv);
 }
 
 jboolean  __attribute__((export_name("TS_UserConfig_get_accept_forwards_to_priv_channels"))) TS_UserConfig_get_accept_forwards_to_priv_channels(uint32_t this_ptr) {
@@ -20858,8 +22176,8 @@ jboolean  __attribute__((export_name("TS_UserConfig_get_accept_forwards_to_priv_
 	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;
+	jboolean ret_conv = UserConfig_get_accept_forwards_to_priv_channels(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UserConfig_set_accept_forwards_to_priv_channels"))) TS_UserConfig_set_accept_forwards_to_priv_channels(uint32_t this_ptr, jboolean val) {
@@ -20875,8 +22193,8 @@ jboolean  __attribute__((export_name("TS_UserConfig_get_accept_inbound_channels"
 	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;
+	jboolean ret_conv = UserConfig_get_accept_inbound_channels(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UserConfig_set_accept_inbound_channels"))) TS_UserConfig_set_accept_inbound_channels(uint32_t this_ptr, jboolean val) {
@@ -20892,8 +22210,8 @@ jboolean  __attribute__((export_name("TS_UserConfig_get_manually_accept_inbound_
 	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_manually_accept_inbound_channels(&this_ptr_conv);
-	return ret_val;
+	jboolean ret_conv = UserConfig_get_manually_accept_inbound_channels(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UserConfig_set_manually_accept_inbound_channels"))) TS_UserConfig_set_manually_accept_inbound_channels(uint32_t this_ptr, jboolean val) {
@@ -20904,24 +22222,24 @@ void  __attribute__((export_name("TS_UserConfig_set_manually_accept_inbound_chan
 	UserConfig_set_manually_accept_inbound_channels(&this_ptr_conv, val);
 }
 
-uint32_t  __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(uint32_t own_channel_config_arg, uint32_t peer_channel_config_limits_arg, uint32_t channel_options_arg, jboolean accept_forwards_to_priv_channels_arg, jboolean accept_inbound_channels_arg, jboolean manually_accept_inbound_channels_arg) {
-	LDKChannelHandshakeConfig own_channel_config_arg_conv;
-	own_channel_config_arg_conv.inner = (void*)(own_channel_config_arg & (~1));
-	own_channel_config_arg_conv.is_owned = (own_channel_config_arg & 1) || (own_channel_config_arg == 0);
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(own_channel_config_arg_conv);
-	own_channel_config_arg_conv = ChannelHandshakeConfig_clone(&own_channel_config_arg_conv);
-	LDKChannelHandshakeLimits peer_channel_config_limits_arg_conv;
-	peer_channel_config_limits_arg_conv.inner = (void*)(peer_channel_config_limits_arg & (~1));
-	peer_channel_config_limits_arg_conv.is_owned = (peer_channel_config_limits_arg & 1) || (peer_channel_config_limits_arg == 0);
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(peer_channel_config_limits_arg_conv);
-	peer_channel_config_limits_arg_conv = ChannelHandshakeLimits_clone(&peer_channel_config_limits_arg_conv);
-	LDKChannelConfig channel_options_arg_conv;
-	channel_options_arg_conv.inner = (void*)(channel_options_arg & (~1));
-	channel_options_arg_conv.is_owned = (channel_options_arg & 1) || (channel_options_arg == 0);
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_options_arg_conv);
-	channel_options_arg_conv = ChannelConfig_clone(&channel_options_arg_conv);
-	LDKUserConfig ret_var = UserConfig_new(own_channel_config_arg_conv, peer_channel_config_limits_arg_conv, channel_options_arg_conv, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg);
-	uintptr_t ret_ref = 0;
+uint32_t  __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(uint32_t channel_handshake_config_arg, uint32_t channel_handshake_limits_arg, uint32_t channel_config_arg, jboolean accept_forwards_to_priv_channels_arg, jboolean accept_inbound_channels_arg, jboolean manually_accept_inbound_channels_arg) {
+	LDKChannelHandshakeConfig channel_handshake_config_arg_conv;
+	channel_handshake_config_arg_conv.inner = (void*)(channel_handshake_config_arg & (~1));
+	channel_handshake_config_arg_conv.is_owned = (channel_handshake_config_arg & 1) || (channel_handshake_config_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_handshake_config_arg_conv);
+	channel_handshake_config_arg_conv = ChannelHandshakeConfig_clone(&channel_handshake_config_arg_conv);
+	LDKChannelHandshakeLimits channel_handshake_limits_arg_conv;
+	channel_handshake_limits_arg_conv.inner = (void*)(channel_handshake_limits_arg & (~1));
+	channel_handshake_limits_arg_conv.is_owned = (channel_handshake_limits_arg & 1) || (channel_handshake_limits_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_handshake_limits_arg_conv);
+	channel_handshake_limits_arg_conv = ChannelHandshakeLimits_clone(&channel_handshake_limits_arg_conv);
+	LDKChannelConfig channel_config_arg_conv;
+	channel_config_arg_conv.inner = (void*)(channel_config_arg & (~1));
+	channel_config_arg_conv.is_owned = (channel_config_arg & 1) || (channel_config_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_config_arg_conv);
+	channel_config_arg_conv = ChannelConfig_clone(&channel_config_arg_conv);
+	LDKUserConfig ret_var = UserConfig_new(channel_handshake_config_arg_conv, channel_handshake_limits_arg_conv, channel_config_arg_conv, accept_forwards_to_priv_channels_arg, accept_inbound_channels_arg, manually_accept_inbound_channels_arg);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20934,7 +22252,7 @@ uint32_t  __attribute__((export_name("TS_UserConfig_new"))) TS_UserConfig_new(ui
 
 static inline uintptr_t UserConfig_clone_ptr(LDKUserConfig *NONNULL_PTR arg) {
 	LDKUserConfig ret_var = UserConfig_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20944,13 +22262,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_UserConfig_clone_ptr"))) TS_UserConfig_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_UserConfig_clone_ptr"))) TS_UserConfig_clone_ptr(uint32_t arg) {
 	LDKUserConfig arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = UserConfig_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = UserConfig_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_UserConfig_clone"))) TS_UserConfig_clone(uint32_t orig) {
@@ -20959,7 +22277,7 @@ uint32_t  __attribute__((export_name("TS_UserConfig_clone"))) TS_UserConfig_clon
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUserConfig ret_var = UserConfig_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20972,7 +22290,7 @@ uint32_t  __attribute__((export_name("TS_UserConfig_clone"))) TS_UserConfig_clon
 
 uint32_t  __attribute__((export_name("TS_UserConfig_default"))) TS_UserConfig_default() {
 	LDKUserConfig ret_var = UserConfig_default();
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -20993,7 +22311,7 @@ void  __attribute__((export_name("TS_BestBlock_free"))) TS_BestBlock_free(uint32
 
 static inline uintptr_t BestBlock_clone_ptr(LDKBestBlock *NONNULL_PTR arg) {
 	LDKBestBlock ret_var = BestBlock_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21003,13 +22321,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_BestBlock_clone_ptr"))) TS_BestBlock_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_BestBlock_clone_ptr"))) TS_BestBlock_clone_ptr(uint32_t arg) {
 	LDKBestBlock arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = BestBlock_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = BestBlock_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_BestBlock_clone"))) TS_BestBlock_clone(uint32_t orig) {
@@ -21018,7 +22336,7 @@ uint32_t  __attribute__((export_name("TS_BestBlock_clone"))) TS_BestBlock_clone(
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKBestBlock ret_var = BestBlock_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21032,7 +22350,7 @@ uint32_t  __attribute__((export_name("TS_BestBlock_clone"))) TS_BestBlock_clone(
 uint32_t  __attribute__((export_name("TS_BestBlock_from_genesis"))) TS_BestBlock_from_genesis(uint32_t network) {
 	LDKNetwork network_conv = LDKNetwork_from_js(network);
 	LDKBestBlock ret_var = BestBlock_from_genesis(network_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21048,7 +22366,7 @@ uint32_t  __attribute__((export_name("TS_BestBlock_new"))) TS_BestBlock_new(int8
 	CHECK(block_hash->arr_len == 32);
 	memcpy(block_hash_ref.data, block_hash->elems, 32); FREE(block_hash);
 	LDKBestBlock ret_var = BestBlock_new(block_hash_ref, height);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21074,8 +22392,8 @@ int32_t  __attribute__((export_name("TS_BestBlock_height"))) TS_BestBlock_height
 	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;
+	int32_t ret_conv = BestBlock_height(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_AccessError_clone"))) TS_AccessError_clone(uint32_t orig) {
@@ -21190,7 +22508,7 @@ uint32_t  __attribute__((export_name("TS_WatchedOutput_get_outpoint"))) TS_Watch
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint ret_var = WatchedOutput_get_outpoint(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21251,7 +22569,7 @@ uint32_t  __attribute__((export_name("TS_WatchedOutput_new"))) TS_WatchedOutput_
 	script_pubkey_arg_ref.data = MALLOC(script_pubkey_arg_ref.datalen, "LDKCVec_u8Z Bytes");
 	memcpy(script_pubkey_arg_ref.data, script_pubkey_arg->elems, script_pubkey_arg_ref.datalen); FREE(script_pubkey_arg);
 	LDKWatchedOutput ret_var = WatchedOutput_new(block_hash_arg_ref, outpoint_arg_conv, script_pubkey_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21264,7 +22582,7 @@ uint32_t  __attribute__((export_name("TS_WatchedOutput_new"))) TS_WatchedOutput_
 
 static inline uintptr_t WatchedOutput_clone_ptr(LDKWatchedOutput *NONNULL_PTR arg) {
 	LDKWatchedOutput ret_var = WatchedOutput_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21274,13 +22592,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_WatchedOutput_clone_ptr"))) TS_WatchedOutput_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_WatchedOutput_clone_ptr"))) TS_WatchedOutput_clone_ptr(uint32_t arg) {
 	LDKWatchedOutput arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = WatchedOutput_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = WatchedOutput_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_WatchedOutput_clone"))) TS_WatchedOutput_clone(uint32_t orig) {
@@ -21289,7 +22607,7 @@ uint32_t  __attribute__((export_name("TS_WatchedOutput_clone"))) TS_WatchedOutpu
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKWatchedOutput ret_var = WatchedOutput_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21305,8 +22623,8 @@ int64_t  __attribute__((export_name("TS_WatchedOutput_hash"))) TS_WatchedOutput_
 	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;
+	int64_t ret_conv = WatchedOutput_hash(&o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_BroadcasterInterface_free"))) TS_BroadcasterInterface_free(uint32_t this_ptr) {
@@ -21342,8 +22660,8 @@ uint32_t  __attribute__((export_name("TS_ConfirmationTarget_high_priority"))) TS
 jboolean  __attribute__((export_name("TS_ConfirmationTarget_eq"))) TS_ConfirmationTarget_eq(uint32_t a, uint32_t b) {
 	LDKConfirmationTarget* a_conv = (LDKConfirmationTarget*)(a & ~1);
 	LDKConfirmationTarget* b_conv = (LDKConfirmationTarget*)(b & ~1);
-	jboolean ret_val = ConfirmationTarget_eq(a_conv, b_conv);
-	return ret_val;
+	jboolean ret_conv = ConfirmationTarget_eq(a_conv, b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_FeeEstimator_free"))) TS_FeeEstimator_free(uint32_t this_ptr) {
@@ -21365,7 +22683,7 @@ void  __attribute__((export_name("TS_MonitorUpdateId_free"))) TS_MonitorUpdateId
 
 static inline uintptr_t MonitorUpdateId_clone_ptr(LDKMonitorUpdateId *NONNULL_PTR arg) {
 	LDKMonitorUpdateId ret_var = MonitorUpdateId_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21375,13 +22693,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_MonitorUpdateId_clone_ptr"))) TS_MonitorUpdateId_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_MonitorUpdateId_clone_ptr"))) TS_MonitorUpdateId_clone_ptr(uint32_t arg) {
 	LDKMonitorUpdateId arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = MonitorUpdateId_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = MonitorUpdateId_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_MonitorUpdateId_clone"))) TS_MonitorUpdateId_clone(uint32_t orig) {
@@ -21390,7 +22708,7 @@ uint32_t  __attribute__((export_name("TS_MonitorUpdateId_clone"))) TS_MonitorUpd
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKMonitorUpdateId ret_var = MonitorUpdateId_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21406,8 +22724,8 @@ int64_t  __attribute__((export_name("TS_MonitorUpdateId_hash"))) TS_MonitorUpdat
 	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;
+	int64_t ret_conv = MonitorUpdateId_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_MonitorUpdateId_eq"))) TS_MonitorUpdateId_eq(uint32_t a, uint32_t b) {
@@ -21419,8 +22737,8 @@ jboolean  __attribute__((export_name("TS_MonitorUpdateId_eq"))) TS_MonitorUpdate
 	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;
+	jboolean ret_conv = MonitorUpdateId_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_Persist_free"))) TS_Persist_free(uint32_t this_ptr) {
@@ -21455,21 +22773,41 @@ uint32_t  __attribute__((export_name("TS_ChainMonitor_new"))) TS_ChainMonitor_ne
 	// WARNING: we may need a move here but no clone is available for LDKCOption_FilterZ
 	if (chain_source_conv.tag == LDKCOption_FilterZ_Some) {
 		// Manually implement clone for Java trait instances
+		if (chain_source_conv.some.free == LDKFilter_JCalls_free) {
+			// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+			LDKFilter_JCalls_cloned(&chain_source_conv.some);
+		}
 	}
 	void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1);
 	CHECK_ACCESS(broadcaster_ptr);
 	LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr);
+	if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv);
+	}
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	void* feeest_ptr = (void*)(((uintptr_t)feeest) & ~1);
 	CHECK_ACCESS(feeest_ptr);
 	LDKFeeEstimator feeest_conv = *(LDKFeeEstimator*)(feeest_ptr);
+	if (feeest_conv.free == LDKFeeEstimator_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKFeeEstimator_JCalls_cloned(&feeest_conv);
+	}
 	void* persister_ptr = (void*)(((uintptr_t)persister) & ~1);
 	CHECK_ACCESS(persister_ptr);
 	LDKPersist persister_conv = *(LDKPersist*)(persister_ptr);
+	if (persister_conv.free == LDKPersist_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKPersist_JCalls_cloned(&persister_conv);
+	}
 	LDKChainMonitor ret_var = ChainMonitor_new(chain_source_conv, broadcaster_conv, logger_conv, feeest_conv, persister_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21491,7 +22829,7 @@ uint32_tArray  __attribute__((export_name("TS_ChainMonitor_get_claimable_balance
 		ignored_channels_constr.data = MALLOC(ignored_channels_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements");
 	else
 		ignored_channels_constr.data = NULL;
-	uint32_t* ignored_channels_vals = ignored_channels->elems /* XXX ignored_channels leaks */;
+	uint32_t* ignored_channels_vals = ignored_channels->elems;
 	for (size_t q = 0; q < ignored_channels_constr.datalen; q++) {
 		uint32_t ignored_channels_conv_16 = ignored_channels_vals[q];
 		LDKChannelDetails ignored_channels_conv_16_conv;
@@ -21501,6 +22839,7 @@ uint32_tArray  __attribute__((export_name("TS_ChainMonitor_get_claimable_balance
 		ignored_channels_conv_16_conv = ChannelDetails_clone(&ignored_channels_conv_16_conv);
 		ignored_channels_constr.data[q] = ignored_channels_conv_16_conv;
 	}
+	FREE(ignored_channels);
 	LDKCVec_BalanceZ ret_var = ChainMonitor_get_claimable_balances(&this_arg_conv, ignored_channels_constr);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__);
@@ -21508,7 +22847,7 @@ uint32_tArray  __attribute__((export_name("TS_ChainMonitor_get_claimable_balance
 	for (size_t j = 0; j < ret_var.datalen; j++) {
 		LDKBalance *ret_conv_9_copy = MALLOC(sizeof(LDKBalance), "LDKBalance");
 		*ret_conv_9_copy = ret_var.data[j];
-		uintptr_t ret_conv_9_ref = (uintptr_t)ret_conv_9_copy;
+		uint32_t ret_conv_9_ref = (uintptr_t)ret_conv_9_copy;
 		ret_arr_ptr[j] = ret_conv_9_ref;
 	}
 	
@@ -21528,7 +22867,7 @@ uint32_t  __attribute__((export_name("TS_ChainMonitor_get_monitor"))) TS_ChainMo
 	funding_txo_conv = OutPoint_clone(&funding_txo_conv);
 	LDKCResult_LockedChannelMonitorNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_LockedChannelMonitorNoneZ), "LDKCResult_LockedChannelMonitorNoneZ");
 	*ret_conv = ChainMonitor_get_monitor(&this_arg_conv, funding_txo_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_tArray  __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_ChainMonitor_list_monitors(uint32_t this_arg) {
@@ -21542,7 +22881,7 @@ uint32_tArray  __attribute__((export_name("TS_ChainMonitor_list_monitors"))) TS_
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t k = 0; k < ret_var.datalen; k++) {
 		LDKOutPoint ret_conv_10_var = ret_var.data[k];
-		uintptr_t ret_conv_10_ref = 0;
+		uint32_t ret_conv_10_ref = 0;
 		CHECK((((uintptr_t)ret_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_10_var);
@@ -21574,7 +22913,7 @@ uint32_t  __attribute__((export_name("TS_ChainMonitor_channel_monitor_updated"))
 	completed_update_id_conv = MonitorUpdateId_clone(&completed_update_id_conv);
 	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
 	*ret_conv = ChainMonitor_channel_monitor_updated(&this_arg_conv, funding_txo_conv, completed_update_id_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChainMonitor_as_Listen"))) TS_ChainMonitor_as_Listen(uint32_t this_arg) {
@@ -21584,7 +22923,7 @@ uint32_t  __attribute__((export_name("TS_ChainMonitor_as_Listen"))) TS_ChainMoni
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKListen* ret_ret = MALLOC(sizeof(LDKListen), "LDKListen");
 	*ret_ret = ChainMonitor_as_Listen(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_ChainMonitor_as_Confirm"))) TS_ChainMonitor_as_Confirm(uint32_t this_arg) {
@@ -21594,7 +22933,7 @@ uint32_t  __attribute__((export_name("TS_ChainMonitor_as_Confirm"))) TS_ChainMon
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKConfirm* ret_ret = MALLOC(sizeof(LDKConfirm), "LDKConfirm");
 	*ret_ret = ChainMonitor_as_Confirm(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_ChainMonitor_as_Watch"))) TS_ChainMonitor_as_Watch(uint32_t this_arg) {
@@ -21604,7 +22943,7 @@ uint32_t  __attribute__((export_name("TS_ChainMonitor_as_Watch"))) TS_ChainMonit
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKWatch* ret_ret = MALLOC(sizeof(LDKWatch), "LDKWatch");
 	*ret_ret = ChainMonitor_as_Watch(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_ChainMonitor_as_EventsProvider"))) TS_ChainMonitor_as_EventsProvider(uint32_t this_arg) {
@@ -21614,7 +22953,7 @@ uint32_t  __attribute__((export_name("TS_ChainMonitor_as_EventsProvider"))) TS_C
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKEventsProvider* ret_ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider");
 	*ret_ret = ChainMonitor_as_EventsProvider(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 void  __attribute__((export_name("TS_ChannelMonitorUpdate_free"))) TS_ChannelMonitorUpdate_free(uint32_t this_obj) {
@@ -21630,8 +22969,8 @@ int64_t  __attribute__((export_name("TS_ChannelMonitorUpdate_get_update_id"))) T
 	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;
+	int64_t ret_conv = ChannelMonitorUpdate_get_update_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelMonitorUpdate_set_update_id"))) TS_ChannelMonitorUpdate_set_update_id(uint32_t this_ptr, int64_t val) {
@@ -21644,7 +22983,7 @@ void  __attribute__((export_name("TS_ChannelMonitorUpdate_set_update_id"))) TS_C
 
 static inline uintptr_t ChannelMonitorUpdate_clone_ptr(LDKChannelMonitorUpdate *NONNULL_PTR arg) {
 	LDKChannelMonitorUpdate ret_var = ChannelMonitorUpdate_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21654,13 +22993,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelMonitorUpdate_clone_ptr"))) TS_ChannelMonitorUpdate_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelMonitorUpdate_clone_ptr"))) TS_ChannelMonitorUpdate_clone_ptr(uint32_t arg) {
 	LDKChannelMonitorUpdate arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelMonitorUpdate_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelMonitorUpdate_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelMonitorUpdate_clone"))) TS_ChannelMonitorUpdate_clone(uint32_t orig) {
@@ -21669,7 +23008,7 @@ uint32_t  __attribute__((export_name("TS_ChannelMonitorUpdate_clone"))) TS_Chann
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelMonitorUpdate ret_var = ChannelMonitorUpdate_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21695,10 +23034,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelMonitorUpdate_write"))) TS_Ch
 uint32_t  __attribute__((export_name("TS_ChannelMonitorUpdate_read"))) TS_ChannelMonitorUpdate_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelMonitorUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelMonitorUpdateDecodeErrorZ), "LDKCResult_ChannelMonitorUpdateDecodeErrorZ");
 	*ret_conv = ChannelMonitorUpdate_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_MonitorEvent_free"))) TS_MonitorEvent_free(uint32_t this_ptr) {
@@ -21713,20 +23053,20 @@ void  __attribute__((export_name("TS_MonitorEvent_free"))) TS_MonitorEvent_free(
 static inline uintptr_t MonitorEvent_clone_ptr(LDKMonitorEvent *NONNULL_PTR arg) {
 	LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
 	*ret_copy = MonitorEvent_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_MonitorEvent_clone_ptr"))) TS_MonitorEvent_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_MonitorEvent_clone_ptr"))) TS_MonitorEvent_clone_ptr(uint32_t arg) {
 	LDKMonitorEvent* arg_conv = (LDKMonitorEvent*)arg;
-	intptr_t ret_val = MonitorEvent_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = MonitorEvent_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_MonitorEvent_clone"))) TS_MonitorEvent_clone(uint32_t orig) {
 	LDKMonitorEvent* orig_conv = (LDKMonitorEvent*)orig;
 	LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
 	*ret_copy = MonitorEvent_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -21738,7 +23078,7 @@ uint32_t  __attribute__((export_name("TS_MonitorEvent_htlcevent"))) TS_MonitorEv
 	a_conv = HTLCUpdate_clone(&a_conv);
 	LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
 	*ret_copy = MonitorEvent_htlcevent(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -21750,7 +23090,7 @@ uint32_t  __attribute__((export_name("TS_MonitorEvent_commitment_tx_confirmed"))
 	a_conv = OutPoint_clone(&a_conv);
 	LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
 	*ret_copy = MonitorEvent_commitment_tx_confirmed(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -21762,7 +23102,7 @@ uint32_t  __attribute__((export_name("TS_MonitorEvent_update_completed"))) TS_Mo
 	funding_txo_conv = OutPoint_clone(&funding_txo_conv);
 	LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
 	*ret_copy = MonitorEvent_update_completed(funding_txo_conv, monitor_update_id);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -21774,7 +23114,7 @@ uint32_t  __attribute__((export_name("TS_MonitorEvent_update_failed"))) TS_Monit
 	a_conv = OutPoint_clone(&a_conv);
 	LDKMonitorEvent *ret_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
 	*ret_copy = MonitorEvent_update_failed(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -21790,10 +23130,11 @@ int8_tArray  __attribute__((export_name("TS_MonitorEvent_write"))) TS_MonitorEve
 uint32_t  __attribute__((export_name("TS_MonitorEvent_read"))) TS_MonitorEvent_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_COption_MonitorEventZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_MonitorEventZDecodeErrorZ), "LDKCResult_COption_MonitorEventZDecodeErrorZ");
 	*ret_conv = MonitorEvent_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_HTLCUpdate_free"))) TS_HTLCUpdate_free(uint32_t this_obj) {
@@ -21806,7 +23147,7 @@ void  __attribute__((export_name("TS_HTLCUpdate_free"))) TS_HTLCUpdate_free(uint
 
 static inline uintptr_t HTLCUpdate_clone_ptr(LDKHTLCUpdate *NONNULL_PTR arg) {
 	LDKHTLCUpdate ret_var = HTLCUpdate_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21816,13 +23157,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_HTLCUpdate_clone_ptr"))) TS_HTLCUpdate_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_HTLCUpdate_clone_ptr"))) TS_HTLCUpdate_clone_ptr(uint32_t arg) {
 	LDKHTLCUpdate arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = HTLCUpdate_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = HTLCUpdate_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_HTLCUpdate_clone"))) TS_HTLCUpdate_clone(uint32_t orig) {
@@ -21831,7 +23172,7 @@ uint32_t  __attribute__((export_name("TS_HTLCUpdate_clone"))) TS_HTLCUpdate_clon
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKHTLCUpdate ret_var = HTLCUpdate_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21857,10 +23198,11 @@ int8_tArray  __attribute__((export_name("TS_HTLCUpdate_write"))) TS_HTLCUpdate_w
 uint32_t  __attribute__((export_name("TS_HTLCUpdate_read"))) TS_HTLCUpdate_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_HTLCUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCUpdateDecodeErrorZ), "LDKCResult_HTLCUpdateDecodeErrorZ");
 	*ret_conv = HTLCUpdate_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_Balance_free"))) TS_Balance_free(uint32_t this_ptr) {
@@ -21875,56 +23217,56 @@ void  __attribute__((export_name("TS_Balance_free"))) TS_Balance_free(uint32_t t
 static inline uintptr_t Balance_clone_ptr(LDKBalance *NONNULL_PTR arg) {
 	LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance");
 	*ret_copy = Balance_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Balance_clone_ptr"))) TS_Balance_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Balance_clone_ptr"))) TS_Balance_clone_ptr(uint32_t arg) {
 	LDKBalance* arg_conv = (LDKBalance*)arg;
-	intptr_t ret_val = Balance_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Balance_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Balance_clone"))) TS_Balance_clone(uint32_t orig) {
 	LDKBalance* orig_conv = (LDKBalance*)orig;
 	LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance");
 	*ret_copy = Balance_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_Balance_claimable_on_channel_close"))) TS_Balance_claimable_on_channel_close(int64_t claimable_amount_satoshis) {
 	LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance");
 	*ret_copy = Balance_claimable_on_channel_close(claimable_amount_satoshis);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_Balance_claimable_awaiting_confirmations"))) TS_Balance_claimable_awaiting_confirmations(int64_t claimable_amount_satoshis, int32_t confirmation_height) {
 	LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance");
 	*ret_copy = Balance_claimable_awaiting_confirmations(claimable_amount_satoshis, confirmation_height);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_Balance_contentious_claimable"))) TS_Balance_contentious_claimable(int64_t claimable_amount_satoshis, int32_t timeout_height) {
 	LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance");
 	*ret_copy = Balance_contentious_claimable(claimable_amount_satoshis, timeout_height);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_Balance_maybe_claimable_htlcawaiting_timeout"))) TS_Balance_maybe_claimable_htlcawaiting_timeout(int64_t claimable_amount_satoshis, int32_t claimable_height) {
 	LDKBalance *ret_copy = MALLOC(sizeof(LDKBalance), "LDKBalance");
 	*ret_copy = Balance_maybe_claimable_htlcawaiting_timeout(claimable_amount_satoshis, claimable_height);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 jboolean  __attribute__((export_name("TS_Balance_eq"))) TS_Balance_eq(uint32_t a, uint32_t b) {
 	LDKBalance* a_conv = (LDKBalance*)a;
 	LDKBalance* b_conv = (LDKBalance*)b;
-	jboolean ret_val = Balance_eq(a_conv, b_conv);
-	return ret_val;
+	jboolean ret_conv = Balance_eq(a_conv, b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelMonitor_free"))) TS_ChannelMonitor_free(uint32_t this_obj) {
@@ -21937,7 +23279,7 @@ void  __attribute__((export_name("TS_ChannelMonitor_free"))) TS_ChannelMonitor_f
 
 static inline uintptr_t ChannelMonitor_clone_ptr(LDKChannelMonitor *NONNULL_PTR arg) {
 	LDKChannelMonitor ret_var = ChannelMonitor_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -21947,13 +23289,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelMonitor_clone_ptr"))) TS_ChannelMonitor_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelMonitor_clone_ptr"))) TS_ChannelMonitor_clone_ptr(uint32_t arg) {
 	LDKChannelMonitor arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelMonitor_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelMonitor_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelMonitor_clone"))) TS_ChannelMonitor_clone(uint32_t orig) {
@@ -21962,7 +23304,7 @@ uint32_t  __attribute__((export_name("TS_ChannelMonitor_clone"))) TS_ChannelMoni
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelMonitor ret_var = ChannelMonitor_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22005,7 +23347,7 @@ uint32_t  __attribute__((export_name("TS_ChannelMonitor_update_monitor"))) TS_Ch
 	LDKLogger* logger_conv = (LDKLogger*)logger_ptr;
 	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
 	*ret_conv = ChannelMonitor_update_monitor(&this_arg_conv, &updates_conv, broadcaster_conv, fee_estimator_conv, logger_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_ChannelMonitor_get_latest_update_id"))) TS_ChannelMonitor_get_latest_update_id(uint32_t this_arg) {
@@ -22013,8 +23355,8 @@ int64_t  __attribute__((export_name("TS_ChannelMonitor_get_latest_update_id")))
 	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;
+	int64_t ret_conv = ChannelMonitor_get_latest_update_id(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelMonitor_get_funding_txo"))) TS_ChannelMonitor_get_funding_txo(uint32_t this_arg) {
@@ -22024,7 +23366,7 @@ uint32_t  __attribute__((export_name("TS_ChannelMonitor_get_funding_txo"))) TS_C
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKC2Tuple_OutPointScriptZ* ret_conv = MALLOC(sizeof(LDKC2Tuple_OutPointScriptZ), "LDKC2Tuple_OutPointScriptZ");
 	*ret_conv = ChannelMonitor_get_funding_txo(&this_arg_conv);
-	return ((uintptr_t)ret_conv);
+	return ((uint32_t)ret_conv);
 }
 
 uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_get_outputs_to_watch"))) TS_ChannelMonitor_get_outputs_to_watch(uint32_t this_arg) {
@@ -22039,7 +23381,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_get_outputs_to_watc
 	for (size_t o = 0; o < ret_var.datalen; o++) {
 		LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ* ret_conv_40_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32ScriptZZZ");
 		*ret_conv_40_conv = ret_var.data[o];
-		ret_arr_ptr[o] = ((uintptr_t)ret_conv_40_conv);
+		ret_arr_ptr[o] = ((uint32_t)ret_conv_40_conv);
 	}
 	
 	FREE(ret_var.data);
@@ -22069,7 +23411,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi
 	for (size_t o = 0; o < ret_var.datalen; o++) {
 		LDKMonitorEvent *ret_conv_14_copy = MALLOC(sizeof(LDKMonitorEvent), "LDKMonitorEvent");
 		*ret_conv_14_copy = ret_var.data[o];
-		uintptr_t ret_conv_14_ref = (uintptr_t)ret_conv_14_copy;
+		uint32_t ret_conv_14_ref = (uintptr_t)ret_conv_14_copy;
 		ret_arr_ptr[o] = ret_conv_14_ref;
 	}
 	
@@ -22089,7 +23431,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_get_and_clear_pendi
 	for (size_t h = 0; h < ret_var.datalen; h++) {
 		LDKEvent *ret_conv_7_copy = MALLOC(sizeof(LDKEvent), "LDKEvent");
 		*ret_conv_7_copy = ret_var.data[h];
-		uintptr_t ret_conv_7_ref = (uintptr_t)ret_conv_7_copy;
+		uint32_t ret_conv_7_ref = (uintptr_t)ret_conv_7_copy;
 		ret_arr_ptr[h] = ret_conv_7_ref;
 	}
 	
@@ -22136,7 +23478,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_block_connected")))
 		txdata_constr.data = MALLOC(txdata_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements");
 	else
 		txdata_constr.data = NULL;
-	uint32_t* txdata_vals = txdata->elems /* XXX txdata leaks */;
+	uint32_t* txdata_vals = txdata->elems;
 	for (size_t c = 0; c < txdata_constr.datalen; c++) {
 		uint32_t txdata_conv_28 = txdata_vals[c];
 		void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1);
@@ -22145,15 +23487,28 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_block_connected")))
 		txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1));
 		txdata_constr.data[c] = txdata_conv_28_conv;
 	}
+	FREE(txdata);
 	void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1);
 	CHECK_ACCESS(broadcaster_ptr);
 	LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr);
+	if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv);
+	}
 	void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1);
 	CHECK_ACCESS(fee_estimator_ptr);
 	LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr);
+	if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv);
+	}
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_block_connected(&this_arg_conv, header_ref, txdata_constr, height, broadcaster_conv, fee_estimator_conv, logger_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__);
@@ -22161,7 +23516,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_block_connected")))
 	for (size_t n = 0; n < ret_var.datalen; n++) {
 		LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ");
 		*ret_conv_39_conv = ret_var.data[n];
-		ret_arr_ptr[n] = ((uintptr_t)ret_conv_39_conv);
+		ret_arr_ptr[n] = ((uint32_t)ret_conv_39_conv);
 	}
 	
 	FREE(ret_var.data);
@@ -22180,12 +23535,24 @@ void  __attribute__((export_name("TS_ChannelMonitor_block_disconnected"))) TS_Ch
 	void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1);
 	CHECK_ACCESS(broadcaster_ptr);
 	LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr);
+	if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv);
+	}
 	void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1);
 	CHECK_ACCESS(fee_estimator_ptr);
 	LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr);
+	if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv);
+	}
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	ChannelMonitor_block_disconnected(&this_arg_conv, header_ref, height, broadcaster_conv, fee_estimator_conv, logger_conv);
 }
 
@@ -22204,7 +23571,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_transactions_confir
 		txdata_constr.data = MALLOC(txdata_constr.datalen * sizeof(LDKC2Tuple_usizeTransactionZ), "LDKCVec_C2Tuple_usizeTransactionZZ Elements");
 	else
 		txdata_constr.data = NULL;
-	uint32_t* txdata_vals = txdata->elems /* XXX txdata leaks */;
+	uint32_t* txdata_vals = txdata->elems;
 	for (size_t c = 0; c < txdata_constr.datalen; c++) {
 		uint32_t txdata_conv_28 = txdata_vals[c];
 		void* txdata_conv_28_ptr = (void*)(((uintptr_t)txdata_conv_28) & ~1);
@@ -22213,15 +23580,28 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_transactions_confir
 		txdata_conv_28_conv = C2Tuple_usizeTransactionZ_clone((LDKC2Tuple_usizeTransactionZ*)(((uintptr_t)txdata_conv_28) & ~1));
 		txdata_constr.data[c] = txdata_conv_28_conv;
 	}
+	FREE(txdata);
 	void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1);
 	CHECK_ACCESS(broadcaster_ptr);
 	LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr);
+	if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv);
+	}
 	void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1);
 	CHECK_ACCESS(fee_estimator_ptr);
 	LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr);
+	if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv);
+	}
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_transactions_confirmed(&this_arg_conv, header_ref, txdata_constr, height, broadcaster_conv, fee_estimator_conv, logger_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__);
@@ -22229,7 +23609,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_transactions_confir
 	for (size_t n = 0; n < ret_var.datalen; n++) {
 		LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ");
 		*ret_conv_39_conv = ret_var.data[n];
-		ret_arr_ptr[n] = ((uintptr_t)ret_conv_39_conv);
+		ret_arr_ptr[n] = ((uint32_t)ret_conv_39_conv);
 	}
 	
 	FREE(ret_var.data);
@@ -22248,12 +23628,24 @@ void  __attribute__((export_name("TS_ChannelMonitor_transaction_unconfirmed")))
 	void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1);
 	CHECK_ACCESS(broadcaster_ptr);
 	LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr);
+	if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv);
+	}
 	void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1);
 	CHECK_ACCESS(fee_estimator_ptr);
 	LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr);
+	if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv);
+	}
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	ChannelMonitor_transaction_unconfirmed(&this_arg_conv, txid_ref, broadcaster_conv, fee_estimator_conv, logger_conv);
 }
 
@@ -22269,12 +23661,24 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_best_block_updated"
 	void* broadcaster_ptr = (void*)(((uintptr_t)broadcaster) & ~1);
 	CHECK_ACCESS(broadcaster_ptr);
 	LDKBroadcasterInterface broadcaster_conv = *(LDKBroadcasterInterface*)(broadcaster_ptr);
+	if (broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKBroadcasterInterface_JCalls_cloned(&broadcaster_conv);
+	}
 	void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1);
 	CHECK_ACCESS(fee_estimator_ptr);
 	LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr);
+	if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv);
+	}
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	LDKCVec_C2Tuple_TxidCVec_C2Tuple_u32TxOutZZZZ ret_var = ChannelMonitor_best_block_updated(&this_arg_conv, header_ref, height, broadcaster_conv, fee_estimator_conv, logger_conv);
 	uint32_tArray ret_arr = NULL;
 	ret_arr = init_uint32_tArray(ret_var.datalen, __LINE__);
@@ -22282,7 +23686,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_best_block_updated"
 	for (size_t n = 0; n < ret_var.datalen; n++) {
 		LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ* ret_conv_39_conv = MALLOC(sizeof(LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ), "LDKC2Tuple_TxidCVec_C2Tuple_u32TxOutZZZ");
 		*ret_conv_39_conv = ret_var.data[n];
-		ret_arr_ptr[n] = ((uintptr_t)ret_conv_39_conv);
+		ret_arr_ptr[n] = ((uint32_t)ret_conv_39_conv);
 	}
 	
 	FREE(ret_var.data);
@@ -22314,7 +23718,7 @@ uint32_t  __attribute__((export_name("TS_ChannelMonitor_current_best_block"))) T
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKBestBlock ret_var = ChannelMonitor_current_best_block(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22337,7 +23741,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_get_claimable_balan
 	for (size_t j = 0; j < ret_var.datalen; j++) {
 		LDKBalance *ret_conv_9_copy = MALLOC(sizeof(LDKBalance), "LDKBalance");
 		*ret_conv_9_copy = ret_var.data[j];
-		uintptr_t ret_conv_9_ref = (uintptr_t)ret_conv_9_copy;
+		uint32_t ret_conv_9_ref = (uintptr_t)ret_conv_9_copy;
 		ret_arr_ptr[j] = ret_conv_9_ref;
 	}
 	
@@ -22348,13 +23752,14 @@ uint32_tArray  __attribute__((export_name("TS_ChannelMonitor_get_claimable_balan
 uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelMonitorZ_read"))) TS_C2Tuple_BlockHashChannelMonitorZ_read(int8_tArray ser, uint32_t arg) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	void* arg_ptr = (void*)(((uintptr_t)arg) & ~1);
 	if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); }
 	LDKKeysInterface* arg_conv = (LDKKeysInterface*)arg_ptr;
 	LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelMonitorZDecodeErrorZ");
 	*ret_conv = C2Tuple_BlockHashChannelMonitorZ_read(ser_ref, arg_conv);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_OutPoint_free"))) TS_OutPoint_free(uint32_t this_obj) {
@@ -22391,8 +23796,8 @@ int16_t  __attribute__((export_name("TS_OutPoint_get_index"))) TS_OutPoint_get_i
 	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;
+	int16_t ret_conv = OutPoint_get_index(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OutPoint_set_index"))) TS_OutPoint_set_index(uint32_t this_ptr, int16_t val) {
@@ -22408,7 +23813,7 @@ uint32_t  __attribute__((export_name("TS_OutPoint_new"))) TS_OutPoint_new(int8_t
 	CHECK(txid_arg->arr_len == 32);
 	memcpy(txid_arg_ref.data, txid_arg->elems, 32); FREE(txid_arg);
 	LDKOutPoint ret_var = OutPoint_new(txid_arg_ref, index_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22421,7 +23826,7 @@ uint32_t  __attribute__((export_name("TS_OutPoint_new"))) TS_OutPoint_new(int8_t
 
 static inline uintptr_t OutPoint_clone_ptr(LDKOutPoint *NONNULL_PTR arg) {
 	LDKOutPoint ret_var = OutPoint_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22431,13 +23836,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_OutPoint_clone_ptr"))) TS_OutPoint_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_OutPoint_clone_ptr"))) TS_OutPoint_clone_ptr(uint32_t arg) {
 	LDKOutPoint arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = OutPoint_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = OutPoint_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_OutPoint_clone"))) TS_OutPoint_clone(uint32_t orig) {
@@ -22446,7 +23851,7 @@ uint32_t  __attribute__((export_name("TS_OutPoint_clone"))) TS_OutPoint_clone(ui
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKOutPoint ret_var = OutPoint_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22466,8 +23871,8 @@ jboolean  __attribute__((export_name("TS_OutPoint_eq"))) TS_OutPoint_eq(uint32_t
 	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;
+	jboolean ret_conv = OutPoint_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_OutPoint_hash"))) TS_OutPoint_hash(uint32_t o) {
@@ -22475,8 +23880,8 @@ int64_t  __attribute__((export_name("TS_OutPoint_hash"))) TS_OutPoint_hash(uint3
 	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;
+	int64_t ret_conv = OutPoint_hash(&o_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_OutPoint_to_channel_id"))) TS_OutPoint_to_channel_id(uint32_t this_arg) {
@@ -22504,10 +23909,11 @@ int8_tArray  __attribute__((export_name("TS_OutPoint_write"))) TS_OutPoint_write
 uint32_t  __attribute__((export_name("TS_OutPoint_read"))) TS_OutPoint_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_OutPointDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OutPointDecodeErrorZ), "LDKCResult_OutPointDecodeErrorZ");
 	*ret_conv = OutPoint_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_free"))) TS_DelayedPaymentOutputDescriptor_free(uint32_t this_obj) {
@@ -22524,7 +23930,7 @@ uint32_t  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_outp
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint ret_var = DelayedPaymentOutputDescriptor_get_outpoint(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22574,8 +23980,8 @@ int16_t  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_to_se
 	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;
+	int16_t ret_conv = DelayedPaymentOutputDescriptor_get_to_self_delay(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_to_self_delay"))) TS_DelayedPaymentOutputDescriptor_set_to_self_delay(uint32_t this_ptr, int16_t val) {
@@ -22645,8 +24051,8 @@ int64_t  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_get_chann
 	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;
+	int64_t ret_conv = DelayedPaymentOutputDescriptor_get_channel_value_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_set_channel_value_satoshis"))) TS_DelayedPaymentOutputDescriptor_set_channel_value_satoshis(uint32_t this_ptr, int64_t val) {
@@ -22677,7 +24083,7 @@ uint32_t  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_new")))
 	CHECK(channel_keys_id_arg->arr_len == 32);
 	memcpy(channel_keys_id_arg_ref.data, channel_keys_id_arg->elems, 32); FREE(channel_keys_id_arg);
 	LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_new(outpoint_arg_conv, per_commitment_point_arg_ref, to_self_delay_arg, output_arg_conv, revocation_pubkey_arg_ref, channel_keys_id_arg_ref, channel_value_satoshis_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22690,7 +24096,7 @@ uint32_t  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_new")))
 
 static inline uintptr_t DelayedPaymentOutputDescriptor_clone_ptr(LDKDelayedPaymentOutputDescriptor *NONNULL_PTR arg) {
 	LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22700,13 +24106,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone_ptr"))) TS_DelayedPaymentOutputDescriptor_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone_ptr"))) TS_DelayedPaymentOutputDescriptor_clone_ptr(uint32_t arg) {
 	LDKDelayedPaymentOutputDescriptor arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = DelayedPaymentOutputDescriptor_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = DelayedPaymentOutputDescriptor_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone"))) TS_DelayedPaymentOutputDescriptor_clone(uint32_t orig) {
@@ -22715,7 +24121,7 @@ uint32_t  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_clone"))
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKDelayedPaymentOutputDescriptor ret_var = DelayedPaymentOutputDescriptor_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22741,10 +24147,11 @@ int8_tArray  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_write
 uint32_t  __attribute__((export_name("TS_DelayedPaymentOutputDescriptor_read"))) TS_DelayedPaymentOutputDescriptor_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_DelayedPaymentOutputDescriptorDecodeErrorZ");
 	*ret_conv = DelayedPaymentOutputDescriptor_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_free"))) TS_StaticPaymentOutputDescriptor_free(uint32_t this_obj) {
@@ -22761,7 +24168,7 @@ uint32_t  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_outpo
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint ret_var = StaticPaymentOutputDescriptor_get_outpoint(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22823,8 +24230,8 @@ int64_t  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_get_channe
 	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;
+	int64_t ret_conv = StaticPaymentOutputDescriptor_get_channel_value_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_set_channel_value_satoshis"))) TS_StaticPaymentOutputDescriptor_set_channel_value_satoshis(uint32_t this_ptr, int64_t val) {
@@ -22849,7 +24256,7 @@ uint32_t  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_new"))) T
 	CHECK(channel_keys_id_arg->arr_len == 32);
 	memcpy(channel_keys_id_arg_ref.data, channel_keys_id_arg->elems, 32); FREE(channel_keys_id_arg);
 	LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_new(outpoint_arg_conv, output_arg_conv, channel_keys_id_arg_ref, channel_value_satoshis_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22862,7 +24269,7 @@ uint32_t  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_new"))) T
 
 static inline uintptr_t StaticPaymentOutputDescriptor_clone_ptr(LDKStaticPaymentOutputDescriptor *NONNULL_PTR arg) {
 	LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22872,13 +24279,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone_ptr"))) TS_StaticPaymentOutputDescriptor_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone_ptr"))) TS_StaticPaymentOutputDescriptor_clone_ptr(uint32_t arg) {
 	LDKStaticPaymentOutputDescriptor arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = StaticPaymentOutputDescriptor_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = StaticPaymentOutputDescriptor_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone"))) TS_StaticPaymentOutputDescriptor_clone(uint32_t orig) {
@@ -22887,7 +24294,7 @@ uint32_t  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_clone")))
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKStaticPaymentOutputDescriptor ret_var = StaticPaymentOutputDescriptor_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -22913,10 +24320,11 @@ int8_tArray  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_write"
 uint32_t  __attribute__((export_name("TS_StaticPaymentOutputDescriptor_read"))) TS_StaticPaymentOutputDescriptor_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ), "LDKCResult_StaticPaymentOutputDescriptorDecodeErrorZ");
 	*ret_conv = StaticPaymentOutputDescriptor_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_SpendableOutputDescriptor_free"))) TS_SpendableOutputDescriptor_free(uint32_t this_ptr) {
@@ -22931,20 +24339,20 @@ void  __attribute__((export_name("TS_SpendableOutputDescriptor_free"))) TS_Spend
 static inline uintptr_t SpendableOutputDescriptor_clone_ptr(LDKSpendableOutputDescriptor *NONNULL_PTR arg) {
 	LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor");
 	*ret_copy = SpendableOutputDescriptor_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_SpendableOutputDescriptor_clone_ptr"))) TS_SpendableOutputDescriptor_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_SpendableOutputDescriptor_clone_ptr"))) TS_SpendableOutputDescriptor_clone_ptr(uint32_t arg) {
 	LDKSpendableOutputDescriptor* arg_conv = (LDKSpendableOutputDescriptor*)arg;
-	intptr_t ret_val = SpendableOutputDescriptor_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = SpendableOutputDescriptor_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_SpendableOutputDescriptor_clone"))) TS_SpendableOutputDescriptor_clone(uint32_t orig) {
 	LDKSpendableOutputDescriptor* orig_conv = (LDKSpendableOutputDescriptor*)orig;
 	LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor");
 	*ret_copy = SpendableOutputDescriptor_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -22960,7 +24368,7 @@ uint32_t  __attribute__((export_name("TS_SpendableOutputDescriptor_static_output
 	output_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)output) & ~1));
 	LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor");
 	*ret_copy = SpendableOutputDescriptor_static_output(outpoint_conv, output_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -22972,7 +24380,7 @@ uint32_t  __attribute__((export_name("TS_SpendableOutputDescriptor_delayed_payme
 	a_conv = DelayedPaymentOutputDescriptor_clone(&a_conv);
 	LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor");
 	*ret_copy = SpendableOutputDescriptor_delayed_payment_output(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -22984,7 +24392,7 @@ uint32_t  __attribute__((export_name("TS_SpendableOutputDescriptor_static_paymen
 	a_conv = StaticPaymentOutputDescriptor_clone(&a_conv);
 	LDKSpendableOutputDescriptor *ret_copy = MALLOC(sizeof(LDKSpendableOutputDescriptor), "LDKSpendableOutputDescriptor");
 	*ret_copy = SpendableOutputDescriptor_static_payment_output(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -23000,10 +24408,11 @@ int8_tArray  __attribute__((export_name("TS_SpendableOutputDescriptor_write")))
 uint32_t  __attribute__((export_name("TS_SpendableOutputDescriptor_read"))) TS_SpendableOutputDescriptor_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_SpendableOutputDescriptorDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SpendableOutputDescriptorDecodeErrorZ), "LDKCResult_SpendableOutputDescriptorDecodeErrorZ");
 	*ret_conv = SpendableOutputDescriptor_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_BaseSign_free"))) TS_BaseSign_free(uint32_t this_ptr) {
@@ -23018,14 +24427,14 @@ void  __attribute__((export_name("TS_BaseSign_free"))) TS_BaseSign_free(uint32_t
 static inline uintptr_t Sign_clone_ptr(LDKSign *NONNULL_PTR arg) {
 	LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign");
 	*ret_ret = Sign_clone(arg);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
-intptr_t  __attribute__((export_name("TS_Sign_clone_ptr"))) TS_Sign_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Sign_clone_ptr"))) TS_Sign_clone_ptr(uint32_t arg) {
 	void* arg_ptr = (void*)(((uintptr_t)arg) & ~1);
 	if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); }
 	LDKSign* arg_conv = (LDKSign*)arg_ptr;
-	intptr_t ret_val = Sign_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Sign_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Sign_clone"))) TS_Sign_clone(uint32_t orig) {
@@ -23034,7 +24443,7 @@ uint32_t  __attribute__((export_name("TS_Sign_clone"))) TS_Sign_clone(uint32_t o
 	LDKSign* orig_conv = (LDKSign*)orig_ptr;
 	LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign");
 	*ret_ret = Sign_clone(orig_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 void  __attribute__((export_name("TS_Sign_free"))) TS_Sign_free(uint32_t this_ptr) {
@@ -23207,7 +24616,7 @@ void  __attribute__((export_name("TS_InMemorySigner_set_commitment_seed"))) TS_I
 
 static inline uintptr_t InMemorySigner_clone_ptr(LDKInMemorySigner *NONNULL_PTR arg) {
 	LDKInMemorySigner ret_var = InMemorySigner_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23217,13 +24626,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_InMemorySigner_clone_ptr"))) TS_InMemorySigner_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_InMemorySigner_clone_ptr"))) TS_InMemorySigner_clone_ptr(uint32_t arg) {
 	LDKInMemorySigner arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = InMemorySigner_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = InMemorySigner_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_InMemorySigner_clone"))) TS_InMemorySigner_clone(uint32_t orig) {
@@ -23232,7 +24641,7 @@ uint32_t  __attribute__((export_name("TS_InMemorySigner_clone"))) TS_InMemorySig
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInMemorySigner ret_var = InMemorySigner_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23269,7 +24678,7 @@ uint32_t  __attribute__((export_name("TS_InMemorySigner_new"))) TS_InMemorySigne
 	CHECK(channel_keys_id->arr_len == 32);
 	memcpy(channel_keys_id_ref.data, channel_keys_id->elems, 32); FREE(channel_keys_id);
 	LDKInMemorySigner ret_var = InMemorySigner_new(node_secret_ref, funding_key_ref, revocation_base_key_ref, payment_key_ref, delayed_payment_base_key_ref, htlc_base_key_ref, commitment_seed_ref, channel_value_satoshis, channel_keys_id_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23286,7 +24695,7 @@ uint32_t  __attribute__((export_name("TS_InMemorySigner_counterparty_pubkeys")))
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelPublicKeys ret_var = InMemorySigner_counterparty_pubkeys(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23302,8 +24711,8 @@ int16_t  __attribute__((export_name("TS_InMemorySigner_counterparty_selected_con
 	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;
+	int16_t ret_conv = InMemorySigner_counterparty_selected_contest_delay(&this_arg_conv);
+	return ret_conv;
 }
 
 int16_t  __attribute__((export_name("TS_InMemorySigner_holder_selected_contest_delay"))) TS_InMemorySigner_holder_selected_contest_delay(uint32_t this_arg) {
@@ -23311,8 +24720,8 @@ int16_t  __attribute__((export_name("TS_InMemorySigner_holder_selected_contest_d
 	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;
+	int16_t ret_conv = InMemorySigner_holder_selected_contest_delay(&this_arg_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_InMemorySigner_is_outbound"))) TS_InMemorySigner_is_outbound(uint32_t this_arg) {
@@ -23320,8 +24729,8 @@ jboolean  __attribute__((export_name("TS_InMemorySigner_is_outbound"))) TS_InMem
 	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;
+	jboolean ret_conv = InMemorySigner_is_outbound(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_InMemorySigner_funding_outpoint"))) TS_InMemorySigner_funding_outpoint(uint32_t this_arg) {
@@ -23330,7 +24739,7 @@ uint32_t  __attribute__((export_name("TS_InMemorySigner_funding_outpoint"))) TS_
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKOutPoint ret_var = InMemorySigner_funding_outpoint(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23347,7 +24756,7 @@ uint32_t  __attribute__((export_name("TS_InMemorySigner_get_channel_parameters")
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelTransactionParameters ret_var = InMemorySigner_get_channel_parameters(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23363,11 +24772,11 @@ jboolean  __attribute__((export_name("TS_InMemorySigner_opt_anchors"))) TS_InMem
 	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;
+	jboolean ret_conv = InMemorySigner_opt_anchors(&this_arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_InMemorySigner_sign_counterparty_payment_input"))) TS_InMemorySigner_sign_counterparty_payment_input(uint32_t this_arg, int8_tArray spend_tx, intptr_t input_idx, uint32_t descriptor) {
+uint32_t  __attribute__((export_name("TS_InMemorySigner_sign_counterparty_payment_input"))) TS_InMemorySigner_sign_counterparty_payment_input(uint32_t this_arg, int8_tArray spend_tx, uint32_t input_idx, uint32_t descriptor) {
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -23383,10 +24792,10 @@ uint32_t  __attribute__((export_name("TS_InMemorySigner_sign_counterparty_paymen
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(descriptor_conv);
 	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
 	*ret_conv = InMemorySigner_sign_counterparty_payment_input(&this_arg_conv, spend_tx_ref, input_idx, &descriptor_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_InMemorySigner_sign_dynamic_p2wsh_input"))) TS_InMemorySigner_sign_dynamic_p2wsh_input(uint32_t this_arg, int8_tArray spend_tx, intptr_t input_idx, uint32_t descriptor) {
+uint32_t  __attribute__((export_name("TS_InMemorySigner_sign_dynamic_p2wsh_input"))) TS_InMemorySigner_sign_dynamic_p2wsh_input(uint32_t this_arg, int8_tArray spend_tx, uint32_t input_idx, uint32_t descriptor) {
 	LDKInMemorySigner this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -23402,7 +24811,7 @@ uint32_t  __attribute__((export_name("TS_InMemorySigner_sign_dynamic_p2wsh_input
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(descriptor_conv);
 	LDKCResult_CVec_CVec_u8ZZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_CVec_u8ZZNoneZ), "LDKCResult_CVec_CVec_u8ZZNoneZ");
 	*ret_conv = InMemorySigner_sign_dynamic_p2wsh_input(&this_arg_conv, spend_tx_ref, input_idx, &descriptor_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_InMemorySigner_as_BaseSign"))) TS_InMemorySigner_as_BaseSign(uint32_t this_arg) {
@@ -23412,7 +24821,7 @@ uint32_t  __attribute__((export_name("TS_InMemorySigner_as_BaseSign"))) TS_InMem
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKBaseSign* ret_ret = MALLOC(sizeof(LDKBaseSign), "LDKBaseSign");
 	*ret_ret = InMemorySigner_as_BaseSign(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_InMemorySigner_as_Sign"))) TS_InMemorySigner_as_Sign(uint32_t this_arg) {
@@ -23422,7 +24831,7 @@ uint32_t  __attribute__((export_name("TS_InMemorySigner_as_Sign"))) TS_InMemoryS
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKSign* ret_ret = MALLOC(sizeof(LDKSign), "LDKSign");
 	*ret_ret = InMemorySigner_as_Sign(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 int8_tArray  __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemorySigner_write(uint32_t obj) {
@@ -23440,13 +24849,14 @@ int8_tArray  __attribute__((export_name("TS_InMemorySigner_write"))) TS_InMemory
 uint32_t  __attribute__((export_name("TS_InMemorySigner_read"))) TS_InMemorySigner_read(int8_tArray ser, int8_tArray arg) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKSecretKey arg_ref;
 	CHECK(arg->arr_len == 32);
 	memcpy(arg_ref.bytes, arg->elems, 32); FREE(arg);
 	LDKCResult_InMemorySignerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InMemorySignerDecodeErrorZ), "LDKCResult_InMemorySignerDecodeErrorZ");
 	*ret_conv = InMemorySigner_read(ser_ref, arg_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_KeysManager_free"))) TS_KeysManager_free(uint32_t this_obj) {
@@ -23463,7 +24873,7 @@ uint32_t  __attribute__((export_name("TS_KeysManager_new"))) TS_KeysManager_new(
 	memcpy(seed_arr, seed->elems, 32); FREE(seed);
 	unsigned char (*seed_ref)[32] = &seed_arr;
 	LDKKeysManager ret_var = KeysManager_new(seed_ref, starting_time_secs, starting_time_nanos);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23484,7 +24894,7 @@ uint32_t  __attribute__((export_name("TS_KeysManager_derive_channel_keys"))) TS_
 	memcpy(params_arr, params->elems, 32); FREE(params);
 	unsigned char (*params_ref)[32] = &params_arr;
 	LDKInMemorySigner ret_var = KeysManager_derive_channel_keys(&this_arg_conv, channel_value_satoshis, params_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23506,7 +24916,7 @@ uint32_t  __attribute__((export_name("TS_KeysManager_spend_spendable_outputs")))
 		descriptors_constr.data = MALLOC(descriptors_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements");
 	else
 		descriptors_constr.data = NULL;
-	uint32_t* descriptors_vals = descriptors->elems /* XXX descriptors leaks */;
+	uint32_t* descriptors_vals = descriptors->elems;
 	for (size_t b = 0; b < descriptors_constr.datalen; b++) {
 		uint32_t descriptors_conv_27 = descriptors_vals[b];
 		void* descriptors_conv_27_ptr = (void*)(((uintptr_t)descriptors_conv_27) & ~1);
@@ -23515,13 +24925,14 @@ uint32_t  __attribute__((export_name("TS_KeysManager_spend_spendable_outputs")))
 		descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)descriptors_conv_27) & ~1));
 		descriptors_constr.data[b] = descriptors_conv_27_conv;
 	}
+	FREE(descriptors);
 	LDKCVec_TxOutZ outputs_constr;
 	outputs_constr.datalen = outputs->arr_len;
 	if (outputs_constr.datalen > 0)
 		outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements");
 	else
 		outputs_constr.data = NULL;
-	uint32_t* outputs_vals = outputs->elems /* XXX outputs leaks */;
+	uint32_t* outputs_vals = outputs->elems;
 	for (size_t h = 0; h < outputs_constr.datalen; h++) {
 		uint32_t outputs_conv_7 = outputs_vals[h];
 		void* outputs_conv_7_ptr = (void*)(((uintptr_t)outputs_conv_7) & ~1);
@@ -23530,13 +24941,14 @@ uint32_t  __attribute__((export_name("TS_KeysManager_spend_spendable_outputs")))
 		outputs_conv_7_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)outputs_conv_7) & ~1));
 		outputs_constr.data[h] = outputs_conv_7_conv;
 	}
+	FREE(outputs);
 	LDKCVec_u8Z change_destination_script_ref;
 	change_destination_script_ref.datalen = change_destination_script->arr_len;
 	change_destination_script_ref.data = MALLOC(change_destination_script_ref.datalen, "LDKCVec_u8Z Bytes");
 	memcpy(change_destination_script_ref.data, change_destination_script->elems, change_destination_script_ref.datalen); FREE(change_destination_script);
 	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
 	*ret_conv = KeysManager_spend_spendable_outputs(&this_arg_conv, descriptors_constr, outputs_constr, change_destination_script_ref, feerate_sat_per_1000_weight);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_KeysManager_as_KeysInterface"))) TS_KeysManager_as_KeysInterface(uint32_t this_arg) {
@@ -23546,7 +24958,7 @@ uint32_t  __attribute__((export_name("TS_KeysManager_as_KeysInterface"))) TS_Key
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKKeysInterface* ret_ret = MALLOC(sizeof(LDKKeysInterface), "LDKKeysInterface");
 	*ret_ret = KeysManager_as_KeysInterface(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 void  __attribute__((export_name("TS_PhantomKeysManager_free"))) TS_PhantomKeysManager_free(uint32_t this_obj) {
@@ -23564,7 +24976,7 @@ uint32_t  __attribute__((export_name("TS_PhantomKeysManager_as_KeysInterface")))
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKKeysInterface* ret_ret = MALLOC(sizeof(LDKKeysInterface), "LDKKeysInterface");
 	*ret_ret = PhantomKeysManager_as_KeysInterface(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_PhantomKeysManager_new"))) TS_PhantomKeysManager_new(int8_tArray seed, int64_t starting_time_secs, int32_t starting_time_nanos, int8_tArray cross_node_seed) {
@@ -23577,7 +24989,7 @@ uint32_t  __attribute__((export_name("TS_PhantomKeysManager_new"))) TS_PhantomKe
 	memcpy(cross_node_seed_arr, cross_node_seed->elems, 32); FREE(cross_node_seed);
 	unsigned char (*cross_node_seed_ref)[32] = &cross_node_seed_arr;
 	LDKPhantomKeysManager ret_var = PhantomKeysManager_new(seed_ref, starting_time_secs, starting_time_nanos, cross_node_seed_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23599,7 +25011,7 @@ uint32_t  __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outp
 		descriptors_constr.data = MALLOC(descriptors_constr.datalen * sizeof(LDKSpendableOutputDescriptor), "LDKCVec_SpendableOutputDescriptorZ Elements");
 	else
 		descriptors_constr.data = NULL;
-	uint32_t* descriptors_vals = descriptors->elems /* XXX descriptors leaks */;
+	uint32_t* descriptors_vals = descriptors->elems;
 	for (size_t b = 0; b < descriptors_constr.datalen; b++) {
 		uint32_t descriptors_conv_27 = descriptors_vals[b];
 		void* descriptors_conv_27_ptr = (void*)(((uintptr_t)descriptors_conv_27) & ~1);
@@ -23608,13 +25020,14 @@ uint32_t  __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outp
 		descriptors_conv_27_conv = SpendableOutputDescriptor_clone((LDKSpendableOutputDescriptor*)(((uintptr_t)descriptors_conv_27) & ~1));
 		descriptors_constr.data[b] = descriptors_conv_27_conv;
 	}
+	FREE(descriptors);
 	LDKCVec_TxOutZ outputs_constr;
 	outputs_constr.datalen = outputs->arr_len;
 	if (outputs_constr.datalen > 0)
 		outputs_constr.data = MALLOC(outputs_constr.datalen * sizeof(LDKTxOut), "LDKCVec_TxOutZ Elements");
 	else
 		outputs_constr.data = NULL;
-	uint32_t* outputs_vals = outputs->elems /* XXX outputs leaks */;
+	uint32_t* outputs_vals = outputs->elems;
 	for (size_t h = 0; h < outputs_constr.datalen; h++) {
 		uint32_t outputs_conv_7 = outputs_vals[h];
 		void* outputs_conv_7_ptr = (void*)(((uintptr_t)outputs_conv_7) & ~1);
@@ -23623,13 +25036,14 @@ uint32_t  __attribute__((export_name("TS_PhantomKeysManager_spend_spendable_outp
 		outputs_conv_7_conv = TxOut_clone((LDKTxOut*)(((uintptr_t)outputs_conv_7) & ~1));
 		outputs_constr.data[h] = outputs_conv_7_conv;
 	}
+	FREE(outputs);
 	LDKCVec_u8Z change_destination_script_ref;
 	change_destination_script_ref.datalen = change_destination_script->arr_len;
 	change_destination_script_ref.data = MALLOC(change_destination_script_ref.datalen, "LDKCVec_u8Z Bytes");
 	memcpy(change_destination_script_ref.data, change_destination_script->elems, change_destination_script_ref.datalen); FREE(change_destination_script);
 	LDKCResult_TransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TransactionNoneZ), "LDKCResult_TransactionNoneZ");
 	*ret_conv = PhantomKeysManager_spend_spendable_outputs(&this_arg_conv, descriptors_constr, outputs_constr, change_destination_script_ref, feerate_sat_per_1000_weight);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PhantomKeysManager_derive_channel_keys"))) TS_PhantomKeysManager_derive_channel_keys(uint32_t this_arg, int64_t channel_value_satoshis, int8_tArray params) {
@@ -23642,7 +25056,7 @@ uint32_t  __attribute__((export_name("TS_PhantomKeysManager_derive_channel_keys"
 	memcpy(params_arr, params->elems, 32); FREE(params);
 	unsigned char (*params_ref)[32] = &params_arr;
 	LDKInMemorySigner ret_var = PhantomKeysManager_derive_channel_keys(&this_arg_conv, channel_value_satoshis, params_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23693,7 +25107,7 @@ uint32_t  __attribute__((export_name("TS_ChainParameters_get_best_block"))) TS_C
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKBestBlock ret_var = ChainParameters_get_best_block(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23725,7 +25139,7 @@ uint32_t  __attribute__((export_name("TS_ChainParameters_new"))) TS_ChainParamet
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(best_block_arg_conv);
 	best_block_arg_conv = BestBlock_clone(&best_block_arg_conv);
 	LDKChainParameters ret_var = ChainParameters_new(network_arg_conv, best_block_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23738,7 +25152,7 @@ uint32_t  __attribute__((export_name("TS_ChainParameters_new"))) TS_ChainParamet
 
 static inline uintptr_t ChainParameters_clone_ptr(LDKChainParameters *NONNULL_PTR arg) {
 	LDKChainParameters ret_var = ChainParameters_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23748,13 +25162,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChainParameters_clone_ptr"))) TS_ChainParameters_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChainParameters_clone_ptr"))) TS_ChainParameters_clone_ptr(uint32_t arg) {
 	LDKChainParameters arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChainParameters_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChainParameters_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChainParameters_clone"))) TS_ChainParameters_clone(uint32_t orig) {
@@ -23763,7 +25177,7 @@ uint32_t  __attribute__((export_name("TS_ChainParameters_clone"))) TS_ChainParam
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChainParameters ret_var = ChainParameters_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23787,8 +25201,8 @@ int32_t  __attribute__((export_name("TS_CounterpartyForwardingInfo_get_fee_base_
 	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;
+	int32_t ret_conv = CounterpartyForwardingInfo_get_fee_base_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CounterpartyForwardingInfo_set_fee_base_msat"))) TS_CounterpartyForwardingInfo_set_fee_base_msat(uint32_t this_ptr, int32_t val) {
@@ -23804,8 +25218,8 @@ int32_t  __attribute__((export_name("TS_CounterpartyForwardingInfo_get_fee_propo
 	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;
+	int32_t ret_conv = CounterpartyForwardingInfo_get_fee_proportional_millionths(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CounterpartyForwardingInfo_set_fee_proportional_millionths"))) TS_CounterpartyForwardingInfo_set_fee_proportional_millionths(uint32_t this_ptr, int32_t val) {
@@ -23821,8 +25235,8 @@ int16_t  __attribute__((export_name("TS_CounterpartyForwardingInfo_get_cltv_expi
 	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;
+	int16_t ret_conv = CounterpartyForwardingInfo_get_cltv_expiry_delta(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CounterpartyForwardingInfo_set_cltv_expiry_delta"))) TS_CounterpartyForwardingInfo_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) {
@@ -23835,7 +25249,7 @@ void  __attribute__((export_name("TS_CounterpartyForwardingInfo_set_cltv_expiry_
 
 uint32_t  __attribute__((export_name("TS_CounterpartyForwardingInfo_new"))) TS_CounterpartyForwardingInfo_new(int32_t fee_base_msat_arg, int32_t fee_proportional_millionths_arg, int16_t cltv_expiry_delta_arg) {
 	LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_new(fee_base_msat_arg, fee_proportional_millionths_arg, cltv_expiry_delta_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23848,7 +25262,7 @@ uint32_t  __attribute__((export_name("TS_CounterpartyForwardingInfo_new"))) TS_C
 
 static inline uintptr_t CounterpartyForwardingInfo_clone_ptr(LDKCounterpartyForwardingInfo *NONNULL_PTR arg) {
 	LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23858,13 +25272,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_CounterpartyForwardingInfo_clone_ptr"))) TS_CounterpartyForwardingInfo_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CounterpartyForwardingInfo_clone_ptr"))) TS_CounterpartyForwardingInfo_clone_ptr(uint32_t arg) {
 	LDKCounterpartyForwardingInfo arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = CounterpartyForwardingInfo_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CounterpartyForwardingInfo_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CounterpartyForwardingInfo_clone"))) TS_CounterpartyForwardingInfo_clone(uint32_t orig) {
@@ -23873,7 +25287,7 @@ uint32_t  __attribute__((export_name("TS_CounterpartyForwardingInfo_clone"))) TS
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCounterpartyForwardingInfo ret_var = CounterpartyForwardingInfo_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23919,7 +25333,7 @@ uint32_t  __attribute__((export_name("TS_ChannelCounterparty_get_features"))) TS
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKInitFeatures ret_var = ChannelCounterparty_get_features(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -23948,8 +25362,8 @@ int64_t  __attribute__((export_name("TS_ChannelCounterparty_get_unspendable_puni
 	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;
+	int64_t ret_conv = ChannelCounterparty_get_unspendable_punishment_reserve(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelCounterparty_set_unspendable_punishment_reserve"))) TS_ChannelCounterparty_set_unspendable_punishment_reserve(uint32_t this_ptr, int64_t val) {
@@ -23966,7 +25380,7 @@ uint32_t  __attribute__((export_name("TS_ChannelCounterparty_get_forwarding_info
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCounterpartyForwardingInfo ret_var = ChannelCounterparty_get_forwarding_info(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -23992,7 +25406,53 @@ void  __attribute__((export_name("TS_ChannelCounterparty_set_forwarding_info")))
 	ChannelCounterparty_set_forwarding_info(&this_ptr_conv, val_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelCounterparty_new"))) TS_ChannelCounterparty_new(int8_tArray node_id_arg, uint32_t features_arg, int64_t unspendable_punishment_reserve_arg, uint32_t forwarding_info_arg) {
+uint32_t  __attribute__((export_name("TS_ChannelCounterparty_get_outbound_htlc_minimum_msat"))) TS_ChannelCounterparty_get_outbound_htlc_minimum_msat(uint32_t this_ptr) {
+	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);
+	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
+	*ret_copy = ChannelCounterparty_get_outbound_htlc_minimum_msat(&this_ptr_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelCounterparty_set_outbound_htlc_minimum_msat"))) TS_ChannelCounterparty_set_outbound_htlc_minimum_msat(uint32_t this_ptr, uint32_t val) {
+	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);
+	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
+	CHECK_ACCESS(val_ptr);
+	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
+	val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1));
+	ChannelCounterparty_set_outbound_htlc_minimum_msat(&this_ptr_conv, val_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelCounterparty_get_outbound_htlc_maximum_msat"))) TS_ChannelCounterparty_get_outbound_htlc_maximum_msat(uint32_t this_ptr) {
+	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);
+	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
+	*ret_copy = ChannelCounterparty_get_outbound_htlc_maximum_msat(&this_ptr_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelCounterparty_set_outbound_htlc_maximum_msat"))) TS_ChannelCounterparty_set_outbound_htlc_maximum_msat(uint32_t this_ptr, uint32_t val) {
+	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);
+	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
+	CHECK_ACCESS(val_ptr);
+	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
+	val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1));
+	ChannelCounterparty_set_outbound_htlc_maximum_msat(&this_ptr_conv, val_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelCounterparty_new"))) TS_ChannelCounterparty_new(int8_tArray node_id_arg, uint32_t features_arg, int64_t unspendable_punishment_reserve_arg, uint32_t forwarding_info_arg, uint32_t outbound_htlc_minimum_msat_arg, uint32_t outbound_htlc_maximum_msat_arg) {
 	LDKPublicKey node_id_arg_ref;
 	CHECK(node_id_arg->arr_len == 33);
 	memcpy(node_id_arg_ref.compressed_form, node_id_arg->elems, 33); FREE(node_id_arg);
@@ -24006,8 +25466,16 @@ uint32_t  __attribute__((export_name("TS_ChannelCounterparty_new"))) TS_ChannelC
 	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);
-	uintptr_t ret_ref = 0;
+	void* outbound_htlc_minimum_msat_arg_ptr = (void*)(((uintptr_t)outbound_htlc_minimum_msat_arg) & ~1);
+	CHECK_ACCESS(outbound_htlc_minimum_msat_arg_ptr);
+	LDKCOption_u64Z outbound_htlc_minimum_msat_arg_conv = *(LDKCOption_u64Z*)(outbound_htlc_minimum_msat_arg_ptr);
+	outbound_htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)outbound_htlc_minimum_msat_arg) & ~1));
+	void* outbound_htlc_maximum_msat_arg_ptr = (void*)(((uintptr_t)outbound_htlc_maximum_msat_arg) & ~1);
+	CHECK_ACCESS(outbound_htlc_maximum_msat_arg_ptr);
+	LDKCOption_u64Z outbound_htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(outbound_htlc_maximum_msat_arg_ptr);
+	outbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)outbound_htlc_maximum_msat_arg) & ~1));
+	LDKChannelCounterparty ret_var = ChannelCounterparty_new(node_id_arg_ref, features_arg_conv, unspendable_punishment_reserve_arg, forwarding_info_arg_conv, outbound_htlc_minimum_msat_arg_conv, outbound_htlc_maximum_msat_arg_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24020,7 +25488,7 @@ uint32_t  __attribute__((export_name("TS_ChannelCounterparty_new"))) TS_ChannelC
 
 static inline uintptr_t ChannelCounterparty_clone_ptr(LDKChannelCounterparty *NONNULL_PTR arg) {
 	LDKChannelCounterparty ret_var = ChannelCounterparty_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24030,13 +25498,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelCounterparty_clone_ptr"))) TS_ChannelCounterparty_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelCounterparty_clone_ptr"))) TS_ChannelCounterparty_clone_ptr(uint32_t arg) {
 	LDKChannelCounterparty arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelCounterparty_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelCounterparty_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelCounterparty_clone"))) TS_ChannelCounterparty_clone(uint32_t orig) {
@@ -24045,7 +25513,7 @@ uint32_t  __attribute__((export_name("TS_ChannelCounterparty_clone"))) TS_Channe
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelCounterparty ret_var = ChannelCounterparty_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24091,7 +25559,7 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_get_counterparty"))) TS_
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelCounterparty ret_var = ChannelDetails_get_counterparty(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24121,7 +25589,7 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_get_funding_txo"))) TS_C
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint ret_var = ChannelDetails_get_funding_txo(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -24147,6 +25615,38 @@ void  __attribute__((export_name("TS_ChannelDetails_set_funding_txo"))) TS_Chann
 	ChannelDetails_set_funding_txo(&this_ptr_conv, val_conv);
 }
 
+uint32_t  __attribute__((export_name("TS_ChannelDetails_get_channel_type"))) TS_ChannelDetails_get_channel_type(uint32_t this_ptr) {
+	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);
+	LDKChannelTypeFeatures ret_var = ChannelDetails_get_channel_type(&this_ptr_conv);
+	uint32_t ret_ref = 0;
+	if ((uintptr_t)ret_var.inner > 4096) {
+		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+		ret_ref = (uintptr_t)ret_var.inner;
+		if (ret_var.is_owned) {
+			ret_ref |= 1;
+		}
+	}
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelDetails_set_channel_type"))) TS_ChannelDetails_set_channel_type(uint32_t this_ptr, uint32_t val) {
+	LDKChannelDetails this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	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);
+	ChannelDetails_set_channel_type(&this_ptr_conv, val_conv);
+}
+
 uint32_t  __attribute__((export_name("TS_ChannelDetails_get_short_channel_id"))) TS_ChannelDetails_get_short_channel_id(uint32_t this_ptr) {
 	LDKChannelDetails this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
@@ -24154,7 +25654,7 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_get_short_channel_id")))
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = ChannelDetails_get_short_channel_id(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -24170,13 +25670,59 @@ void  __attribute__((export_name("TS_ChannelDetails_set_short_channel_id"))) TS_
 	ChannelDetails_set_short_channel_id(&this_ptr_conv, val_conv);
 }
 
+uint32_t  __attribute__((export_name("TS_ChannelDetails_get_outbound_scid_alias"))) TS_ChannelDetails_get_outbound_scid_alias(uint32_t this_ptr) {
+	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_outbound_scid_alias(&this_ptr_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelDetails_set_outbound_scid_alias"))) TS_ChannelDetails_set_outbound_scid_alias(uint32_t this_ptr, uint32_t val) {
+	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*)(((uintptr_t)val) & ~1);
+	CHECK_ACCESS(val_ptr);
+	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
+	val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1));
+	ChannelDetails_set_outbound_scid_alias(&this_ptr_conv, val_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelDetails_get_inbound_scid_alias"))) TS_ChannelDetails_get_inbound_scid_alias(uint32_t this_ptr) {
+	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_inbound_scid_alias(&this_ptr_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelDetails_set_inbound_scid_alias"))) TS_ChannelDetails_set_inbound_scid_alias(uint32_t this_ptr, uint32_t val) {
+	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*)(((uintptr_t)val) & ~1);
+	CHECK_ACCESS(val_ptr);
+	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
+	val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1));
+	ChannelDetails_set_inbound_scid_alias(&this_ptr_conv, val_conv);
+}
+
 int64_t  __attribute__((export_name("TS_ChannelDetails_get_channel_value_satoshis"))) TS_ChannelDetails_get_channel_value_satoshis(uint32_t this_ptr) {
 	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;
+	int64_t ret_conv = ChannelDetails_get_channel_value_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelDetails_set_channel_value_satoshis"))) TS_ChannelDetails_set_channel_value_satoshis(uint32_t this_ptr, int64_t val) {
@@ -24194,7 +25740,7 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_get_unspendable_punishme
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = ChannelDetails_get_unspendable_punishment_reserve(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -24215,8 +25761,8 @@ int64_t  __attribute__((export_name("TS_ChannelDetails_get_user_channel_id"))) T
 	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;
+	int64_t ret_conv = ChannelDetails_get_user_channel_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelDetails_set_user_channel_id"))) TS_ChannelDetails_set_user_channel_id(uint32_t this_ptr, int64_t val) {
@@ -24232,8 +25778,8 @@ int64_t  __attribute__((export_name("TS_ChannelDetails_get_balance_msat"))) TS_C
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int64_t ret_val = ChannelDetails_get_balance_msat(&this_ptr_conv);
-	return ret_val;
+	int64_t ret_conv = ChannelDetails_get_balance_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelDetails_set_balance_msat"))) TS_ChannelDetails_set_balance_msat(uint32_t this_ptr, int64_t val) {
@@ -24249,8 +25795,8 @@ int64_t  __attribute__((export_name("TS_ChannelDetails_get_outbound_capacity_msa
 	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;
+	int64_t ret_conv = ChannelDetails_get_outbound_capacity_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelDetails_set_outbound_capacity_msat"))) TS_ChannelDetails_set_outbound_capacity_msat(uint32_t this_ptr, int64_t val) {
@@ -24261,13 +25807,30 @@ void  __attribute__((export_name("TS_ChannelDetails_set_outbound_capacity_msat")
 	ChannelDetails_set_outbound_capacity_msat(&this_ptr_conv, val);
 }
 
+int64_t  __attribute__((export_name("TS_ChannelDetails_get_next_outbound_htlc_limit_msat"))) TS_ChannelDetails_get_next_outbound_htlc_limit_msat(uint32_t this_ptr) {
+	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_conv = ChannelDetails_get_next_outbound_htlc_limit_msat(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelDetails_set_next_outbound_htlc_limit_msat"))) TS_ChannelDetails_set_next_outbound_htlc_limit_msat(uint32_t this_ptr, int64_t val) {
+	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_next_outbound_htlc_limit_msat(&this_ptr_conv, val);
+}
+
 int64_t  __attribute__((export_name("TS_ChannelDetails_get_inbound_capacity_msat"))) TS_ChannelDetails_get_inbound_capacity_msat(uint32_t this_ptr) {
 	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;
+	int64_t ret_conv = ChannelDetails_get_inbound_capacity_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelDetails_set_inbound_capacity_msat"))) TS_ChannelDetails_set_inbound_capacity_msat(uint32_t this_ptr, int64_t val) {
@@ -24285,7 +25848,7 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_get_confirmations_requir
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z");
 	*ret_copy = ChannelDetails_get_confirmations_required(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -24308,7 +25871,7 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_get_force_close_spend_de
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u16Z *ret_copy = MALLOC(sizeof(LDKCOption_u16Z), "LDKCOption_u16Z");
 	*ret_copy = ChannelDetails_get_force_close_spend_delay(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -24329,8 +25892,8 @@ jboolean  __attribute__((export_name("TS_ChannelDetails_get_is_outbound"))) TS_C
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	jboolean ret_val = ChannelDetails_get_is_outbound(&this_ptr_conv);
-	return ret_val;
+	jboolean ret_conv = ChannelDetails_get_is_outbound(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelDetails_set_is_outbound"))) TS_ChannelDetails_set_is_outbound(uint32_t this_ptr, jboolean val) {
@@ -24341,21 +25904,21 @@ void  __attribute__((export_name("TS_ChannelDetails_set_is_outbound"))) TS_Chann
 	ChannelDetails_set_is_outbound(&this_ptr_conv, val);
 }
 
-jboolean  __attribute__((export_name("TS_ChannelDetails_get_is_funding_locked"))) TS_ChannelDetails_get_is_funding_locked(uint32_t this_ptr) {
+jboolean  __attribute__((export_name("TS_ChannelDetails_get_is_channel_ready"))) TS_ChannelDetails_get_is_channel_ready(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);
-	jboolean ret_val = ChannelDetails_get_is_funding_locked(&this_ptr_conv);
-	return ret_val;
+	jboolean ret_conv = ChannelDetails_get_is_channel_ready(&this_ptr_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_ChannelDetails_set_is_funding_locked"))) TS_ChannelDetails_set_is_funding_locked(uint32_t this_ptr, jboolean val) {
+void  __attribute__((export_name("TS_ChannelDetails_set_is_channel_ready"))) TS_ChannelDetails_set_is_channel_ready(uint32_t this_ptr, jboolean 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_is_funding_locked(&this_ptr_conv, val);
+	ChannelDetails_set_is_channel_ready(&this_ptr_conv, val);
 }
 
 jboolean  __attribute__((export_name("TS_ChannelDetails_get_is_usable"))) TS_ChannelDetails_get_is_usable(uint32_t this_ptr) {
@@ -24363,8 +25926,8 @@ jboolean  __attribute__((export_name("TS_ChannelDetails_get_is_usable"))) TS_Cha
 	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;
+	jboolean ret_conv = ChannelDetails_get_is_usable(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelDetails_set_is_usable"))) TS_ChannelDetails_set_is_usable(uint32_t this_ptr, jboolean val) {
@@ -24380,8 +25943,8 @@ jboolean  __attribute__((export_name("TS_ChannelDetails_get_is_public"))) TS_Cha
 	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;
+	jboolean ret_conv = ChannelDetails_get_is_public(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelDetails_set_is_public"))) TS_ChannelDetails_set_is_public(uint32_t this_ptr, jboolean val) {
@@ -24392,7 +25955,85 @@ void  __attribute__((export_name("TS_ChannelDetails_set_is_public"))) TS_Channel
 	ChannelDetails_set_is_public(&this_ptr_conv, val);
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetails_new(int8_tArray channel_id_arg, uint32_t counterparty_arg, uint32_t funding_txo_arg, uint32_t short_channel_id_arg, int64_t channel_value_satoshis_arg, uint32_t unspendable_punishment_reserve_arg, int64_t user_channel_id_arg, int64_t balance_msat_arg, int64_t outbound_capacity_msat_arg, int64_t inbound_capacity_msat_arg, uint32_t confirmations_required_arg, uint32_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_funding_locked_arg, jboolean is_usable_arg, jboolean is_public_arg) {
+uint32_t  __attribute__((export_name("TS_ChannelDetails_get_inbound_htlc_minimum_msat"))) TS_ChannelDetails_get_inbound_htlc_minimum_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);
+	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
+	*ret_copy = ChannelDetails_get_inbound_htlc_minimum_msat(&this_ptr_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_minimum_msat"))) TS_ChannelDetails_set_inbound_htlc_minimum_msat(uint32_t this_ptr, uint32_t val) {
+	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*)(((uintptr_t)val) & ~1);
+	CHECK_ACCESS(val_ptr);
+	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
+	val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1));
+	ChannelDetails_set_inbound_htlc_minimum_msat(&this_ptr_conv, val_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelDetails_get_inbound_htlc_maximum_msat"))) TS_ChannelDetails_get_inbound_htlc_maximum_msat(uint32_t this_ptr) {
+	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_inbound_htlc_maximum_msat(&this_ptr_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelDetails_set_inbound_htlc_maximum_msat"))) TS_ChannelDetails_set_inbound_htlc_maximum_msat(uint32_t this_ptr, uint32_t val) {
+	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*)(((uintptr_t)val) & ~1);
+	CHECK_ACCESS(val_ptr);
+	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
+	val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1));
+	ChannelDetails_set_inbound_htlc_maximum_msat(&this_ptr_conv, val_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelDetails_get_config"))) TS_ChannelDetails_get_config(uint32_t this_ptr) {
+	LDKChannelDetails this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKChannelConfig ret_var = ChannelDetails_get_config(&this_ptr_conv);
+	uint32_t ret_ref = 0;
+	if ((uintptr_t)ret_var.inner > 4096) {
+		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+		ret_ref = (uintptr_t)ret_var.inner;
+		if (ret_var.is_owned) {
+			ret_ref |= 1;
+		}
+	}
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelDetails_set_config"))) TS_ChannelDetails_set_config(uint32_t this_ptr, uint32_t val) {
+	LDKChannelDetails this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKChannelConfig val_conv;
+	val_conv.inner = (void*)(val & (~1));
+	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
+	val_conv = ChannelConfig_clone(&val_conv);
+	ChannelDetails_set_config(&this_ptr_conv, val_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetails_new(int8_tArray channel_id_arg, uint32_t counterparty_arg, uint32_t funding_txo_arg, uint32_t channel_type_arg, uint32_t short_channel_id_arg, uint32_t outbound_scid_alias_arg, uint32_t inbound_scid_alias_arg, int64_t channel_value_satoshis_arg, uint32_t unspendable_punishment_reserve_arg, int64_t user_channel_id_arg, int64_t balance_msat_arg, int64_t outbound_capacity_msat_arg, int64_t next_outbound_htlc_limit_msat_arg, int64_t inbound_capacity_msat_arg, uint32_t confirmations_required_arg, uint32_t force_close_spend_delay_arg, jboolean is_outbound_arg, jboolean is_channel_ready_arg, jboolean is_usable_arg, jboolean is_public_arg, uint32_t inbound_htlc_minimum_msat_arg, uint32_t inbound_htlc_maximum_msat_arg, uint32_t config_arg) {
 	LDKThirtyTwoBytes channel_id_arg_ref;
 	CHECK(channel_id_arg->arr_len == 32);
 	memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg);
@@ -24406,10 +26047,23 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetail
 	funding_txo_arg_conv.is_owned = (funding_txo_arg & 1) || (funding_txo_arg == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(funding_txo_arg_conv);
 	funding_txo_arg_conv = OutPoint_clone(&funding_txo_arg_conv);
+	LDKChannelTypeFeatures channel_type_arg_conv;
+	channel_type_arg_conv.inner = (void*)(channel_type_arg & (~1));
+	channel_type_arg_conv.is_owned = (channel_type_arg & 1) || (channel_type_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_type_arg_conv);
+	channel_type_arg_conv = ChannelTypeFeatures_clone(&channel_type_arg_conv);
 	void* short_channel_id_arg_ptr = (void*)(((uintptr_t)short_channel_id_arg) & ~1);
 	CHECK_ACCESS(short_channel_id_arg_ptr);
 	LDKCOption_u64Z short_channel_id_arg_conv = *(LDKCOption_u64Z*)(short_channel_id_arg_ptr);
 	short_channel_id_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id_arg) & ~1));
+	void* outbound_scid_alias_arg_ptr = (void*)(((uintptr_t)outbound_scid_alias_arg) & ~1);
+	CHECK_ACCESS(outbound_scid_alias_arg_ptr);
+	LDKCOption_u64Z outbound_scid_alias_arg_conv = *(LDKCOption_u64Z*)(outbound_scid_alias_arg_ptr);
+	outbound_scid_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)outbound_scid_alias_arg) & ~1));
+	void* inbound_scid_alias_arg_ptr = (void*)(((uintptr_t)inbound_scid_alias_arg) & ~1);
+	CHECK_ACCESS(inbound_scid_alias_arg_ptr);
+	LDKCOption_u64Z inbound_scid_alias_arg_conv = *(LDKCOption_u64Z*)(inbound_scid_alias_arg_ptr);
+	inbound_scid_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)inbound_scid_alias_arg) & ~1));
 	void* unspendable_punishment_reserve_arg_ptr = (void*)(((uintptr_t)unspendable_punishment_reserve_arg) & ~1);
 	CHECK_ACCESS(unspendable_punishment_reserve_arg_ptr);
 	LDKCOption_u64Z unspendable_punishment_reserve_arg_conv = *(LDKCOption_u64Z*)(unspendable_punishment_reserve_arg_ptr);
@@ -24421,8 +26075,21 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetail
 	CHECK_ACCESS(force_close_spend_delay_arg_ptr);
 	LDKCOption_u16Z force_close_spend_delay_arg_conv = *(LDKCOption_u16Z*)(force_close_spend_delay_arg_ptr);
 	force_close_spend_delay_arg_conv = COption_u16Z_clone((LDKCOption_u16Z*)(((uintptr_t)force_close_spend_delay_arg) & ~1));
-	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);
-	uintptr_t ret_ref = 0;
+	void* inbound_htlc_minimum_msat_arg_ptr = (void*)(((uintptr_t)inbound_htlc_minimum_msat_arg) & ~1);
+	CHECK_ACCESS(inbound_htlc_minimum_msat_arg_ptr);
+	LDKCOption_u64Z inbound_htlc_minimum_msat_arg_conv = *(LDKCOption_u64Z*)(inbound_htlc_minimum_msat_arg_ptr);
+	inbound_htlc_minimum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)inbound_htlc_minimum_msat_arg) & ~1));
+	void* inbound_htlc_maximum_msat_arg_ptr = (void*)(((uintptr_t)inbound_htlc_maximum_msat_arg) & ~1);
+	CHECK_ACCESS(inbound_htlc_maximum_msat_arg_ptr);
+	LDKCOption_u64Z inbound_htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(inbound_htlc_maximum_msat_arg_ptr);
+	inbound_htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)inbound_htlc_maximum_msat_arg) & ~1));
+	LDKChannelConfig config_arg_conv;
+	config_arg_conv.inner = (void*)(config_arg & (~1));
+	config_arg_conv.is_owned = (config_arg & 1) || (config_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(config_arg_conv);
+	config_arg_conv = ChannelConfig_clone(&config_arg_conv);
+	LDKChannelDetails ret_var = ChannelDetails_new(channel_id_arg_ref, counterparty_arg_conv, funding_txo_arg_conv, channel_type_arg_conv, short_channel_id_arg_conv, outbound_scid_alias_arg_conv, inbound_scid_alias_arg_conv, channel_value_satoshis_arg, unspendable_punishment_reserve_arg_conv, user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, next_outbound_htlc_limit_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg_conv, force_close_spend_delay_arg_conv, is_outbound_arg, is_channel_ready_arg, is_usable_arg, is_public_arg, inbound_htlc_minimum_msat_arg_conv, inbound_htlc_maximum_msat_arg_conv, config_arg_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24435,7 +26102,7 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_new"))) TS_ChannelDetail
 
 static inline uintptr_t ChannelDetails_clone_ptr(LDKChannelDetails *NONNULL_PTR arg) {
 	LDKChannelDetails ret_var = ChannelDetails_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24445,13 +26112,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelDetails_clone_ptr"))) TS_ChannelDetails_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelDetails_clone_ptr"))) TS_ChannelDetails_clone_ptr(uint32_t arg) {
 	LDKChannelDetails arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelDetails_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelDetails_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelDetails_clone"))) TS_ChannelDetails_clone(uint32_t orig) {
@@ -24460,7 +26127,7 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_clone"))) TS_ChannelDeta
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelDetails ret_var = ChannelDetails_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24471,6 +26138,28 @@ uint32_t  __attribute__((export_name("TS_ChannelDetails_clone"))) TS_ChannelDeta
 	return ret_ref;
 }
 
+uint32_t  __attribute__((export_name("TS_ChannelDetails_get_inbound_payment_scid"))) TS_ChannelDetails_get_inbound_payment_scid(uint32_t this_arg) {
+	LDKChannelDetails 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 = ChannelDetails_get_inbound_payment_scid(&this_arg_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelDetails_get_outbound_payment_scid"))) TS_ChannelDetails_get_outbound_payment_scid(uint32_t this_arg) {
+	LDKChannelDetails 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 = ChannelDetails_get_outbound_payment_scid(&this_arg_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
 void  __attribute__((export_name("TS_PaymentSendFailure_free"))) TS_PaymentSendFailure_free(uint32_t this_ptr) {
 	if ((this_ptr & 1) != 0) return;
 	void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1);
@@ -24483,20 +26172,20 @@ void  __attribute__((export_name("TS_PaymentSendFailure_free"))) TS_PaymentSendF
 static inline uintptr_t PaymentSendFailure_clone_ptr(LDKPaymentSendFailure *NONNULL_PTR arg) {
 	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
 	*ret_copy = PaymentSendFailure_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_PaymentSendFailure_clone_ptr"))) TS_PaymentSendFailure_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_PaymentSendFailure_clone_ptr"))) TS_PaymentSendFailure_clone_ptr(uint32_t arg) {
 	LDKPaymentSendFailure* arg_conv = (LDKPaymentSendFailure*)arg;
-	intptr_t ret_val = PaymentSendFailure_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = PaymentSendFailure_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PaymentSendFailure_clone"))) TS_PaymentSendFailure_clone(uint32_t orig) {
 	LDKPaymentSendFailure* orig_conv = (LDKPaymentSendFailure*)orig;
 	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
 	*ret_copy = PaymentSendFailure_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -24507,7 +26196,7 @@ uint32_t  __attribute__((export_name("TS_PaymentSendFailure_parameter_error")))
 	a_conv = APIError_clone((LDKAPIError*)(((uintptr_t)a) & ~1));
 	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
 	*ret_copy = PaymentSendFailure_parameter_error(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -24518,7 +26207,7 @@ uint32_t  __attribute__((export_name("TS_PaymentSendFailure_path_parameter_error
 		a_constr.data = MALLOC(a_constr.datalen * sizeof(LDKCResult_NoneAPIErrorZ), "LDKCVec_CResult_NoneAPIErrorZZ Elements");
 	else
 		a_constr.data = NULL;
-	uint32_t* a_vals = a->elems /* XXX a leaks */;
+	uint32_t* a_vals = a->elems;
 	for (size_t w = 0; w < a_constr.datalen; w++) {
 		uint32_t a_conv_22 = a_vals[w];
 		void* a_conv_22_ptr = (void*)(((uintptr_t)a_conv_22) & ~1);
@@ -24527,9 +26216,10 @@ uint32_t  __attribute__((export_name("TS_PaymentSendFailure_path_parameter_error
 		a_conv_22_conv = CResult_NoneAPIErrorZ_clone((LDKCResult_NoneAPIErrorZ*)(((uintptr_t)a_conv_22) & ~1));
 		a_constr.data[w] = a_conv_22_conv;
 	}
+	FREE(a);
 	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
 	*ret_copy = PaymentSendFailure_path_parameter_error(a_constr);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -24540,7 +26230,7 @@ uint32_t  __attribute__((export_name("TS_PaymentSendFailure_all_failed_retry_saf
 		a_constr.data = MALLOC(a_constr.datalen * sizeof(LDKAPIError), "LDKCVec_APIErrorZ Elements");
 	else
 		a_constr.data = NULL;
-	uint32_t* a_vals = a->elems /* XXX a leaks */;
+	uint32_t* a_vals = a->elems;
 	for (size_t k = 0; k < a_constr.datalen; k++) {
 		uint32_t a_conv_10 = a_vals[k];
 		void* a_conv_10_ptr = (void*)(((uintptr_t)a_conv_10) & ~1);
@@ -24549,9 +26239,10 @@ uint32_t  __attribute__((export_name("TS_PaymentSendFailure_all_failed_retry_saf
 		a_conv_10_conv = APIError_clone((LDKAPIError*)(((uintptr_t)a_conv_10) & ~1));
 		a_constr.data[k] = a_conv_10_conv;
 	}
+	FREE(a);
 	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
 	*ret_copy = PaymentSendFailure_all_failed_retry_safe(a_constr);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -24562,7 +26253,7 @@ uint32_t  __attribute__((export_name("TS_PaymentSendFailure_partial_failure")))
 		results_constr.data = MALLOC(results_constr.datalen * sizeof(LDKCResult_NoneAPIErrorZ), "LDKCVec_CResult_NoneAPIErrorZZ Elements");
 	else
 		results_constr.data = NULL;
-	uint32_t* results_vals = results->elems /* XXX results leaks */;
+	uint32_t* results_vals = results->elems;
 	for (size_t w = 0; w < results_constr.datalen; w++) {
 		uint32_t results_conv_22 = results_vals[w];
 		void* results_conv_22_ptr = (void*)(((uintptr_t)results_conv_22) & ~1);
@@ -24570,6 +26261,7 @@ uint32_t  __attribute__((export_name("TS_PaymentSendFailure_partial_failure")))
 		LDKCResult_NoneAPIErrorZ results_conv_22_conv = *(LDKCResult_NoneAPIErrorZ*)(results_conv_22_ptr);
 		results_constr.data[w] = results_conv_22_conv;
 	}
+	FREE(results);
 	LDKRouteParameters failed_paths_retry_conv;
 	failed_paths_retry_conv.inner = (void*)(failed_paths_retry & (~1));
 	failed_paths_retry_conv.is_owned = (failed_paths_retry & 1) || (failed_paths_retry == 0);
@@ -24580,7 +26272,7 @@ uint32_t  __attribute__((export_name("TS_PaymentSendFailure_partial_failure")))
 	memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id);
 	LDKPaymentSendFailure *ret_copy = MALLOC(sizeof(LDKPaymentSendFailure), "LDKPaymentSendFailure");
 	*ret_copy = PaymentSendFailure_partial_failure(results_constr, failed_paths_retry_conv, payment_id_ref);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -24603,7 +26295,7 @@ uint32_tArray  __attribute__((export_name("TS_PhantomRouteHints_get_channels")))
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t q = 0; q < ret_var.datalen; q++) {
 		LDKChannelDetails ret_conv_16_var = ret_var.data[q];
-		uintptr_t ret_conv_16_ref = 0;
+		uint32_t ret_conv_16_ref = 0;
 		CHECK((((uintptr_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var);
@@ -24629,7 +26321,7 @@ void  __attribute__((export_name("TS_PhantomRouteHints_set_channels"))) TS_Phant
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements");
 	else
 		val_constr.data = NULL;
-	uint32_t* val_vals = val->elems /* XXX val leaks */;
+	uint32_t* val_vals = val->elems;
 	for (size_t q = 0; q < val_constr.datalen; q++) {
 		uint32_t val_conv_16 = val_vals[q];
 		LDKChannelDetails val_conv_16_conv;
@@ -24639,6 +26331,7 @@ void  __attribute__((export_name("TS_PhantomRouteHints_set_channels"))) TS_Phant
 		val_conv_16_conv = ChannelDetails_clone(&val_conv_16_conv);
 		val_constr.data[q] = val_conv_16_conv;
 	}
+	FREE(val);
 	PhantomRouteHints_set_channels(&this_ptr_conv, val_constr);
 }
 
@@ -24647,8 +26340,8 @@ int64_t  __attribute__((export_name("TS_PhantomRouteHints_get_phantom_scid"))) T
 	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 = PhantomRouteHints_get_phantom_scid(&this_ptr_conv);
-	return ret_val;
+	int64_t ret_conv = PhantomRouteHints_get_phantom_scid(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_PhantomRouteHints_set_phantom_scid"))) TS_PhantomRouteHints_set_phantom_scid(uint32_t this_ptr, int64_t val) {
@@ -24687,7 +26380,7 @@ uint32_t  __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRou
 		channels_arg_constr.data = MALLOC(channels_arg_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements");
 	else
 		channels_arg_constr.data = NULL;
-	uint32_t* channels_arg_vals = channels_arg->elems /* XXX channels_arg leaks */;
+	uint32_t* channels_arg_vals = channels_arg->elems;
 	for (size_t q = 0; q < channels_arg_constr.datalen; q++) {
 		uint32_t channels_arg_conv_16 = channels_arg_vals[q];
 		LDKChannelDetails channels_arg_conv_16_conv;
@@ -24697,11 +26390,12 @@ uint32_t  __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRou
 		channels_arg_conv_16_conv = ChannelDetails_clone(&channels_arg_conv_16_conv);
 		channels_arg_constr.data[q] = channels_arg_conv_16_conv;
 	}
+	FREE(channels_arg);
 	LDKPublicKey real_node_pubkey_arg_ref;
 	CHECK(real_node_pubkey_arg->arr_len == 33);
 	memcpy(real_node_pubkey_arg_ref.compressed_form, real_node_pubkey_arg->elems, 33); FREE(real_node_pubkey_arg);
 	LDKPhantomRouteHints ret_var = PhantomRouteHints_new(channels_arg_constr, phantom_scid_arg, real_node_pubkey_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24714,7 +26408,7 @@ uint32_t  __attribute__((export_name("TS_PhantomRouteHints_new"))) TS_PhantomRou
 
 static inline uintptr_t PhantomRouteHints_clone_ptr(LDKPhantomRouteHints *NONNULL_PTR arg) {
 	LDKPhantomRouteHints ret_var = PhantomRouteHints_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24724,13 +26418,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_PhantomRouteHints_clone_ptr"))) TS_PhantomRouteHints_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_PhantomRouteHints_clone_ptr"))) TS_PhantomRouteHints_clone_ptr(uint32_t arg) {
 	LDKPhantomRouteHints arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = PhantomRouteHints_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = PhantomRouteHints_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PhantomRouteHints_clone"))) TS_PhantomRouteHints_clone(uint32_t orig) {
@@ -24739,7 +26433,7 @@ uint32_t  __attribute__((export_name("TS_PhantomRouteHints_clone"))) TS_PhantomR
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPhantomRouteHints ret_var = PhantomRouteHints_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24754,18 +26448,38 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_new"))) TS_ChannelManage
 	void* fee_est_ptr = (void*)(((uintptr_t)fee_est) & ~1);
 	CHECK_ACCESS(fee_est_ptr);
 	LDKFeeEstimator fee_est_conv = *(LDKFeeEstimator*)(fee_est_ptr);
+	if (fee_est_conv.free == LDKFeeEstimator_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKFeeEstimator_JCalls_cloned(&fee_est_conv);
+	}
 	void* chain_monitor_ptr = (void*)(((uintptr_t)chain_monitor) & ~1);
 	CHECK_ACCESS(chain_monitor_ptr);
 	LDKWatch chain_monitor_conv = *(LDKWatch*)(chain_monitor_ptr);
+	if (chain_monitor_conv.free == LDKWatch_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKWatch_JCalls_cloned(&chain_monitor_conv);
+	}
 	void* tx_broadcaster_ptr = (void*)(((uintptr_t)tx_broadcaster) & ~1);
 	CHECK_ACCESS(tx_broadcaster_ptr);
 	LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)(tx_broadcaster_ptr);
+	if (tx_broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKBroadcasterInterface_JCalls_cloned(&tx_broadcaster_conv);
+	}
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1);
 	CHECK_ACCESS(keys_manager_ptr);
 	LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr);
+	if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKKeysInterface_JCalls_cloned(&keys_manager_conv);
+	}
 	LDKUserConfig config_conv;
 	config_conv.inner = (void*)(config & (~1));
 	config_conv.is_owned = (config & 1) || (config == 0);
@@ -24777,7 +26491,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_new"))) TS_ChannelManage
 	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);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24794,7 +26508,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_get_current_default_conf
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKUserConfig ret_var = ChannelManager_get_current_default_configuration(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -24820,7 +26534,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_create_channel"))) TS_Ch
 	override_config_conv = UserConfig_clone(&override_config_conv);
 	LDKCResult__u832APIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult__u832APIErrorZ), "LDKCResult__u832APIErrorZ");
 	*ret_conv = ChannelManager_create_channel(&this_arg_conv, their_network_key_ref, channel_value_satoshis, push_msat, user_channel_id, override_config_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_tArray  __attribute__((export_name("TS_ChannelManager_list_channels"))) TS_ChannelManager_list_channels(uint32_t this_arg) {
@@ -24834,7 +26548,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelManager_list_channels"))) T
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t q = 0; q < ret_var.datalen; q++) {
 		LDKChannelDetails ret_conv_16_var = ret_var.data[q];
-		uintptr_t ret_conv_16_ref = 0;
+		uint32_t ret_conv_16_ref = 0;
 		CHECK((((uintptr_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var);
@@ -24860,7 +26574,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelManager_list_usable_channel
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t q = 0; q < ret_var.datalen; q++) {
 		LDKChannelDetails ret_conv_16_var = ret_var.data[q];
-		uintptr_t ret_conv_16_ref = 0;
+		uint32_t ret_conv_16_ref = 0;
 		CHECK((((uintptr_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var);
@@ -24875,7 +26589,7 @@ uint32_tArray  __attribute__((export_name("TS_ChannelManager_list_usable_channel
 	return ret_arr;
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelManager_close_channel"))) TS_ChannelManager_close_channel(uint32_t this_arg, int8_tArray channel_id) {
+uint32_t  __attribute__((export_name("TS_ChannelManager_close_channel"))) TS_ChannelManager_close_channel(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -24884,12 +26598,15 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_close_channel"))) TS_Cha
 	CHECK(channel_id->arr_len == 32);
 	memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id);
 	unsigned char (*channel_id_ref)[32] = &channel_id_arr;
+	LDKPublicKey counterparty_node_id_ref;
+	CHECK(counterparty_node_id->arr_len == 33);
+	memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id);
 	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
-	*ret_conv = ChannelManager_close_channel(&this_arg_conv, channel_id_ref);
-	return (uintptr_t)ret_conv;
+	*ret_conv = ChannelManager_close_channel(&this_arg_conv, channel_id_ref, counterparty_node_id_ref);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelManager_close_channel_with_target_feerate"))) TS_ChannelManager_close_channel_with_target_feerate(uint32_t this_arg, int8_tArray channel_id, int32_t target_feerate_sats_per_1000_weight) {
+uint32_t  __attribute__((export_name("TS_ChannelManager_close_channel_with_target_feerate"))) TS_ChannelManager_close_channel_with_target_feerate(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id, int32_t target_feerate_sats_per_1000_weight) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -24898,12 +26615,15 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_close_channel_with_targe
 	CHECK(channel_id->arr_len == 32);
 	memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id);
 	unsigned char (*channel_id_ref)[32] = &channel_id_arr;
+	LDKPublicKey counterparty_node_id_ref;
+	CHECK(counterparty_node_id->arr_len == 33);
+	memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id);
 	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
-	*ret_conv = ChannelManager_close_channel_with_target_feerate(&this_arg_conv, channel_id_ref, target_feerate_sats_per_1000_weight);
-	return (uintptr_t)ret_conv;
+	*ret_conv = ChannelManager_close_channel_with_target_feerate(&this_arg_conv, channel_id_ref, counterparty_node_id_ref, target_feerate_sats_per_1000_weight);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelManager_force_close_channel"))) TS_ChannelManager_force_close_channel(uint32_t this_arg, int8_tArray channel_id) {
+uint32_t  __attribute__((export_name("TS_ChannelManager_force_close_broadcasting_latest_txn"))) TS_ChannelManager_force_close_broadcasting_latest_txn(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -24912,17 +26632,45 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_force_close_channel")))
 	CHECK(channel_id->arr_len == 32);
 	memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id);
 	unsigned char (*channel_id_ref)[32] = &channel_id_arr;
+	LDKPublicKey counterparty_node_id_ref;
+	CHECK(counterparty_node_id->arr_len == 33);
+	memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id);
 	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
-	*ret_conv = ChannelManager_force_close_channel(&this_arg_conv, channel_id_ref);
-	return (uintptr_t)ret_conv;
+	*ret_conv = ChannelManager_force_close_broadcasting_latest_txn(&this_arg_conv, channel_id_ref, counterparty_node_id_ref);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_ChannelManager_force_close_all_channels"))) TS_ChannelManager_force_close_all_channels(uint32_t this_arg) {
+uint32_t  __attribute__((export_name("TS_ChannelManager_force_close_without_broadcasting_txn"))) TS_ChannelManager_force_close_without_broadcasting_txn(uint32_t this_arg, int8_tArray channel_id, int8_tArray counterparty_node_id) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
-	ChannelManager_force_close_all_channels(&this_arg_conv);
+	unsigned char channel_id_arr[32];
+	CHECK(channel_id->arr_len == 32);
+	memcpy(channel_id_arr, channel_id->elems, 32); FREE(channel_id);
+	unsigned char (*channel_id_ref)[32] = &channel_id_arr;
+	LDKPublicKey counterparty_node_id_ref;
+	CHECK(counterparty_node_id->arr_len == 33);
+	memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id);
+	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
+	*ret_conv = ChannelManager_force_close_without_broadcasting_txn(&this_arg_conv, channel_id_ref, counterparty_node_id_ref);
+	return (uint32_t)ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn"))) TS_ChannelManager_force_close_all_channels_broadcasting_latest_txn(uint32_t this_arg) {
+	LDKChannelManager this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	ChannelManager_force_close_all_channels_broadcasting_latest_txn(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_ChannelManager_force_close_all_channels_without_broadcasting_txn"))) TS_ChannelManager_force_close_all_channels_without_broadcasting_txn(uint32_t this_arg) {
+	LDKChannelManager this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	ChannelManager_force_close_all_channels_without_broadcasting_txn(&this_arg_conv);
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_send_payment"))) TS_ChannelManager_send_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_hash, int8_tArray payment_secret) {
@@ -24942,7 +26690,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_send_payment"))) TS_Chan
 	memcpy(payment_secret_ref.data, payment_secret->elems, 32); FREE(payment_secret);
 	LDKCResult_PaymentIdPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentSendFailureZ), "LDKCResult_PaymentIdPaymentSendFailureZ");
 	*ret_conv = ChannelManager_send_payment(&this_arg_conv, &route_conv, payment_hash_ref, payment_secret_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_retry_payment"))) TS_ChannelManager_retry_payment(uint32_t this_arg, uint32_t route, int8_tArray payment_id) {
@@ -24959,7 +26707,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_retry_payment"))) TS_Cha
 	memcpy(payment_id_ref.data, payment_id->elems, 32); FREE(payment_id);
 	LDKCResult_NonePaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePaymentSendFailureZ), "LDKCResult_NonePaymentSendFailureZ");
 	*ret_conv = ChannelManager_retry_payment(&this_arg_conv, &route_conv, payment_id_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelManager_abandon_payment"))) TS_ChannelManager_abandon_payment(uint32_t this_arg, int8_tArray payment_id) {
@@ -24987,10 +26735,10 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_send_spontaneous_payment
 	memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage);
 	LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ), "LDKCResult_C2Tuple_PaymentHashPaymentIdZPaymentSendFailureZ");
 	*ret_conv = ChannelManager_send_spontaneous_payment(&this_arg_conv, &route_conv, payment_preimage_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelManager_funding_transaction_generated"))) TS_ChannelManager_funding_transaction_generated(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray funding_transaction) {
+uint32_t  __attribute__((export_name("TS_ChannelManager_funding_transaction_generated"))) TS_ChannelManager_funding_transaction_generated(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int8_tArray funding_transaction) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -24999,14 +26747,17 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_funding_transaction_gene
 	CHECK(temporary_channel_id->arr_len == 32);
 	memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); FREE(temporary_channel_id);
 	unsigned char (*temporary_channel_id_ref)[32] = &temporary_channel_id_arr;
+	LDKPublicKey counterparty_node_id_ref;
+	CHECK(counterparty_node_id->arr_len == 33);
+	memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id);
 	LDKTransaction funding_transaction_ref;
 	funding_transaction_ref.datalen = funding_transaction->arr_len;
 	funding_transaction_ref.data = MALLOC(funding_transaction_ref.datalen, "LDKTransaction Bytes");
 	memcpy(funding_transaction_ref.data, funding_transaction->elems, funding_transaction_ref.datalen); FREE(funding_transaction);
 	funding_transaction_ref.data_is_owned = true;
 	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
-	*ret_conv = ChannelManager_funding_transaction_generated(&this_arg_conv, temporary_channel_id_ref, funding_transaction_ref);
-	return (uintptr_t)ret_conv;
+	*ret_conv = ChannelManager_funding_transaction_generated(&this_arg_conv, temporary_channel_id_ref, counterparty_node_id_ref, funding_transaction_ref);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement"))) TS_ChannelManager_broadcast_node_announcement(uint32_t this_arg, int8_tArray rgb, int8_tArray alias, uint32_tArray addresses) {
@@ -25026,7 +26777,7 @@ void  __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement"
 		addresses_constr.data = MALLOC(addresses_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements");
 	else
 		addresses_constr.data = NULL;
-	uint32_t* addresses_vals = addresses->elems /* XXX addresses leaks */;
+	uint32_t* addresses_vals = addresses->elems;
 	for (size_t m = 0; m < addresses_constr.datalen; m++) {
 		uint32_t addresses_conv_12 = addresses_vals[m];
 		void* addresses_conv_12_ptr = (void*)(((uintptr_t)addresses_conv_12) & ~1);
@@ -25034,9 +26785,42 @@ void  __attribute__((export_name("TS_ChannelManager_broadcast_node_announcement"
 		LDKNetAddress addresses_conv_12_conv = *(LDKNetAddress*)(addresses_conv_12_ptr);
 		addresses_constr.data[m] = addresses_conv_12_conv;
 	}
+	FREE(addresses);
 	ChannelManager_broadcast_node_announcement(&this_arg_conv, rgb_ref, alias_ref, addresses_constr);
 }
 
+uint32_t  __attribute__((export_name("TS_ChannelManager_update_channel_config"))) TS_ChannelManager_update_channel_config(uint32_t this_arg, int8_tArray counterparty_node_id, ptrArray channel_ids, uint32_t config) {
+	LDKChannelManager this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	LDKPublicKey counterparty_node_id_ref;
+	CHECK(counterparty_node_id->arr_len == 33);
+	memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id);
+	LDKCVec_ThirtyTwoBytesZ channel_ids_constr;
+	channel_ids_constr.datalen = channel_ids->arr_len;
+	if (channel_ids_constr.datalen > 0)
+		channel_ids_constr.data = MALLOC(channel_ids_constr.datalen * sizeof(LDKThirtyTwoBytes), "LDKCVec_ThirtyTwoBytesZ Elements");
+	else
+		channel_ids_constr.data = NULL;
+	int8_tArray* channel_ids_vals = (void*) channel_ids->elems;
+	for (size_t m = 0; m < channel_ids_constr.datalen; m++) {
+		int8_tArray channel_ids_conv_12 = channel_ids_vals[m];
+		LDKThirtyTwoBytes channel_ids_conv_12_ref;
+		CHECK(channel_ids_conv_12->arr_len == 32);
+		memcpy(channel_ids_conv_12_ref.data, channel_ids_conv_12->elems, 32); FREE(channel_ids_conv_12);
+		channel_ids_constr.data[m] = channel_ids_conv_12_ref;
+	}
+	FREE(channel_ids);
+	LDKChannelConfig config_conv;
+	config_conv.inner = (void*)(config & (~1));
+	config_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(config_conv);
+	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
+	*ret_conv = ChannelManager_update_channel_config(&this_arg_conv, counterparty_node_id_ref, channel_ids_constr, &config_conv);
+	return (uint32_t)ret_conv;
+}
+
 void  __attribute__((export_name("TS_ChannelManager_process_pending_htlc_forwards"))) TS_ChannelManager_process_pending_htlc_forwards(uint32_t this_arg) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
@@ -25053,7 +26837,7 @@ void  __attribute__((export_name("TS_ChannelManager_timer_tick_occurred"))) TS_C
 	ChannelManager_timer_tick_occurred(&this_arg_conv);
 }
 
-jboolean  __attribute__((export_name("TS_ChannelManager_fail_htlc_backwards"))) TS_ChannelManager_fail_htlc_backwards(uint32_t this_arg, int8_tArray payment_hash) {
+void  __attribute__((export_name("TS_ChannelManager_fail_htlc_backwards"))) TS_ChannelManager_fail_htlc_backwards(uint32_t this_arg, int8_tArray payment_hash) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -25062,11 +26846,10 @@ jboolean  __attribute__((export_name("TS_ChannelManager_fail_htlc_backwards")))
 	CHECK(payment_hash->arr_len == 32);
 	memcpy(payment_hash_arr, payment_hash->elems, 32); FREE(payment_hash);
 	unsigned char (*payment_hash_ref)[32] = &payment_hash_arr;
-	jboolean ret_val = ChannelManager_fail_htlc_backwards(&this_arg_conv, payment_hash_ref);
-	return ret_val;
+	ChannelManager_fail_htlc_backwards(&this_arg_conv, payment_hash_ref);
 }
 
-jboolean  __attribute__((export_name("TS_ChannelManager_claim_funds"))) TS_ChannelManager_claim_funds(uint32_t this_arg, int8_tArray payment_preimage) {
+void  __attribute__((export_name("TS_ChannelManager_claim_funds"))) TS_ChannelManager_claim_funds(uint32_t this_arg, int8_tArray payment_preimage) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -25074,8 +26857,7 @@ jboolean  __attribute__((export_name("TS_ChannelManager_claim_funds"))) TS_Chann
 	LDKThirtyTwoBytes payment_preimage_ref;
 	CHECK(payment_preimage->arr_len == 32);
 	memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage);
-	jboolean ret_val = ChannelManager_claim_funds(&this_arg_conv, payment_preimage_ref);
-	return ret_val;
+	ChannelManager_claim_funds(&this_arg_conv, payment_preimage_ref);
 }
 
 int8_tArray  __attribute__((export_name("TS_ChannelManager_get_our_node_id"))) TS_ChannelManager_get_our_node_id(uint32_t this_arg) {
@@ -25088,7 +26870,24 @@ int8_tArray  __attribute__((export_name("TS_ChannelManager_get_our_node_id"))) T
 	return ret_arr;
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelManager_accept_inbound_channel"))) TS_ChannelManager_accept_inbound_channel(uint32_t this_arg, int8_tArray temporary_channel_id) {
+uint32_t  __attribute__((export_name("TS_ChannelManager_accept_inbound_channel"))) TS_ChannelManager_accept_inbound_channel(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t user_channel_id) {
+	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(temporary_channel_id->arr_len == 32);
+	memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); FREE(temporary_channel_id);
+	unsigned char (*temporary_channel_id_ref)[32] = &temporary_channel_id_arr;
+	LDKPublicKey counterparty_node_id_ref;
+	CHECK(counterparty_node_id->arr_len == 33);
+	memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id);
+	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
+	*ret_conv = ChannelManager_accept_inbound_channel(&this_arg_conv, temporary_channel_id_ref, counterparty_node_id_ref, user_channel_id);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelManager_accept_inbound_channel_from_trusted_peer_0conf"))) TS_ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(uint32_t this_arg, int8_tArray temporary_channel_id, int8_tArray counterparty_node_id, int64_t user_channel_id) {
 	LDKChannelManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -25097,9 +26896,12 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_accept_inbound_channel")
 	CHECK(temporary_channel_id->arr_len == 32);
 	memcpy(temporary_channel_id_arr, temporary_channel_id->elems, 32); FREE(temporary_channel_id);
 	unsigned char (*temporary_channel_id_ref)[32] = &temporary_channel_id_arr;
+	LDKPublicKey counterparty_node_id_ref;
+	CHECK(counterparty_node_id->arr_len == 33);
+	memcpy(counterparty_node_id_ref.compressed_form, counterparty_node_id->elems, 33); FREE(counterparty_node_id);
 	LDKCResult_NoneAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneAPIErrorZ), "LDKCResult_NoneAPIErrorZ");
-	*ret_conv = ChannelManager_accept_inbound_channel(&this_arg_conv, temporary_channel_id_ref);
-	return (uintptr_t)ret_conv;
+	*ret_conv = ChannelManager_accept_inbound_channel_from_trusted_peer_0conf(&this_arg_conv, temporary_channel_id_ref, counterparty_node_id_ref, user_channel_id);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_create_inbound_payment"))) TS_ChannelManager_create_inbound_payment(uint32_t this_arg, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs) {
@@ -25113,7 +26915,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_create_inbound_payment")
 	min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)min_value_msat) & ~1));
 	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
 	*ret_conv = ChannelManager_create_inbound_payment(&this_arg_conv, min_value_msat_conv, invoice_expiry_delta_secs);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_create_inbound_payment_legacy"))) TS_ChannelManager_create_inbound_payment_legacy(uint32_t this_arg, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs) {
@@ -25127,7 +26929,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_create_inbound_payment_l
 	min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)min_value_msat) & ~1));
 	LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZAPIErrorZ");
 	*ret_conv = ChannelManager_create_inbound_payment_legacy(&this_arg_conv, min_value_msat_conv, invoice_expiry_delta_secs);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_create_inbound_payment_for_hash"))) TS_ChannelManager_create_inbound_payment_for_hash(uint32_t this_arg, int8_tArray payment_hash, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs) {
@@ -25144,7 +26946,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_create_inbound_payment_f
 	min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)min_value_msat) & ~1));
 	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
 	*ret_conv = ChannelManager_create_inbound_payment_for_hash(&this_arg_conv, payment_hash_ref, min_value_msat_conv, invoice_expiry_delta_secs);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_create_inbound_payment_for_hash_legacy"))) TS_ChannelManager_create_inbound_payment_for_hash_legacy(uint32_t this_arg, int8_tArray payment_hash, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs) {
@@ -25161,7 +26963,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_create_inbound_payment_f
 	min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)min_value_msat) & ~1));
 	LDKCResult_PaymentSecretAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretAPIErrorZ), "LDKCResult_PaymentSecretAPIErrorZ");
 	*ret_conv = ChannelManager_create_inbound_payment_for_hash_legacy(&this_arg_conv, payment_hash_ref, min_value_msat_conv, invoice_expiry_delta_secs);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_get_payment_preimage"))) TS_ChannelManager_get_payment_preimage(uint32_t this_arg, int8_tArray payment_hash, int8_tArray payment_secret) {
@@ -25177,7 +26979,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_get_payment_preimage")))
 	memcpy(payment_secret_ref.data, payment_secret->elems, 32); FREE(payment_secret);
 	LDKCResult_PaymentPreimageAPIErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentPreimageAPIErrorZ), "LDKCResult_PaymentPreimageAPIErrorZ");
 	*ret_conv = ChannelManager_get_payment_preimage(&this_arg_conv, payment_hash_ref, payment_secret_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_ChannelManager_get_phantom_scid"))) TS_ChannelManager_get_phantom_scid(uint32_t this_arg) {
@@ -25185,8 +26987,8 @@ int64_t  __attribute__((export_name("TS_ChannelManager_get_phantom_scid"))) TS_C
 	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 = ChannelManager_get_phantom_scid(&this_arg_conv);
-	return ret_val;
+	int64_t ret_conv = ChannelManager_get_phantom_scid(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_get_phantom_route_hints"))) TS_ChannelManager_get_phantom_route_hints(uint32_t this_arg) {
@@ -25195,7 +26997,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_get_phantom_route_hints"
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKPhantomRouteHints ret_var = ChannelManager_get_phantom_route_hints(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25213,7 +27015,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_as_MessageSendEventsProv
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider");
 	*ret_ret = ChannelManager_as_MessageSendEventsProvider(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_as_EventsProvider"))) TS_ChannelManager_as_EventsProvider(uint32_t this_arg) {
@@ -25223,7 +27025,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_as_EventsProvider"))) TS
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKEventsProvider* ret_ret = MALLOC(sizeof(LDKEventsProvider), "LDKEventsProvider");
 	*ret_ret = ChannelManager_as_EventsProvider(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_as_Listen"))) TS_ChannelManager_as_Listen(uint32_t this_arg) {
@@ -25233,7 +27035,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_as_Listen"))) TS_Channel
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKListen* ret_ret = MALLOC(sizeof(LDKListen), "LDKListen");
 	*ret_ret = ChannelManager_as_Listen(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_as_Confirm"))) TS_ChannelManager_as_Confirm(uint32_t this_arg) {
@@ -25243,7 +27045,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_as_Confirm"))) TS_Channe
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKConfirm* ret_ret = MALLOC(sizeof(LDKConfirm), "LDKConfirm");
 	*ret_ret = ChannelManager_as_Confirm(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 void  __attribute__((export_name("TS_ChannelManager_await_persistable_update"))) TS_ChannelManager_await_persistable_update(uint32_t this_arg) {
@@ -25260,7 +27062,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_current_best_block"))) T
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKBestBlock ret_var = ChannelManager_current_best_block(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25278,7 +27080,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_as_ChannelMessageHandler
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelMessageHandler* ret_ret = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler");
 	*ret_ret = ChannelManager_as_ChannelMessageHandler(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 int8_tArray  __attribute__((export_name("TS_CounterpartyForwardingInfo_write"))) TS_CounterpartyForwardingInfo_write(uint32_t obj) {
@@ -25296,10 +27098,11 @@ int8_tArray  __attribute__((export_name("TS_CounterpartyForwardingInfo_write")))
 uint32_t  __attribute__((export_name("TS_CounterpartyForwardingInfo_read"))) TS_CounterpartyForwardingInfo_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_CounterpartyForwardingInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyForwardingInfoDecodeErrorZ), "LDKCResult_CounterpartyForwardingInfoDecodeErrorZ");
 	*ret_conv = CounterpartyForwardingInfo_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ChannelCounterparty_write"))) TS_ChannelCounterparty_write(uint32_t obj) {
@@ -25317,10 +27120,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelCounterparty_write"))) TS_Cha
 uint32_t  __attribute__((export_name("TS_ChannelCounterparty_read"))) TS_ChannelCounterparty_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelCounterpartyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelCounterpartyDecodeErrorZ), "LDKCResult_ChannelCounterpartyDecodeErrorZ");
 	*ret_conv = ChannelCounterparty_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ChannelDetails_write"))) TS_ChannelDetails_write(uint32_t obj) {
@@ -25338,10 +27142,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelDetails_write"))) TS_ChannelD
 uint32_t  __attribute__((export_name("TS_ChannelDetails_read"))) TS_ChannelDetails_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelDetailsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelDetailsDecodeErrorZ), "LDKCResult_ChannelDetailsDecodeErrorZ");
 	*ret_conv = ChannelDetails_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_PhantomRouteHints_write"))) TS_PhantomRouteHints_write(uint32_t obj) {
@@ -25359,10 +27164,11 @@ int8_tArray  __attribute__((export_name("TS_PhantomRouteHints_write"))) TS_Phant
 uint32_t  __attribute__((export_name("TS_PhantomRouteHints_read"))) TS_PhantomRouteHints_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_PhantomRouteHintsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PhantomRouteHintsDecodeErrorZ), "LDKCResult_PhantomRouteHintsDecodeErrorZ");
 	*ret_conv = PhantomRouteHints_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ChannelManager_write"))) TS_ChannelManager_write(uint32_t obj) {
@@ -25391,7 +27197,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManagerReadArgs_get_keys_manager
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
-	uintptr_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_keys_manager(&this_ptr_conv)) | 1;
+	uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_keys_manager(&this_ptr_conv)) | 1;
 	return ret_ret;
 }
 
@@ -25403,6 +27209,10 @@ void  __attribute__((export_name("TS_ChannelManagerReadArgs_set_keys_manager")))
 	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKKeysInterface val_conv = *(LDKKeysInterface*)(val_ptr);
+	if (val_conv.free == LDKKeysInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKKeysInterface_JCalls_cloned(&val_conv);
+	}
 	ChannelManagerReadArgs_set_keys_manager(&this_ptr_conv, val_conv);
 }
 
@@ -25412,7 +27222,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManagerReadArgs_get_fee_estimato
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
-	uintptr_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_fee_estimator(&this_ptr_conv)) | 1;
+	uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_fee_estimator(&this_ptr_conv)) | 1;
 	return ret_ret;
 }
 
@@ -25424,6 +27234,10 @@ void  __attribute__((export_name("TS_ChannelManagerReadArgs_set_fee_estimator"))
 	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKFeeEstimator val_conv = *(LDKFeeEstimator*)(val_ptr);
+	if (val_conv.free == LDKFeeEstimator_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKFeeEstimator_JCalls_cloned(&val_conv);
+	}
 	ChannelManagerReadArgs_set_fee_estimator(&this_ptr_conv, val_conv);
 }
 
@@ -25433,7 +27247,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManagerReadArgs_get_chain_monito
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
-	uintptr_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_chain_monitor(&this_ptr_conv)) | 1;
+	uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_chain_monitor(&this_ptr_conv)) | 1;
 	return ret_ret;
 }
 
@@ -25445,6 +27259,10 @@ void  __attribute__((export_name("TS_ChannelManagerReadArgs_set_chain_monitor"))
 	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKWatch val_conv = *(LDKWatch*)(val_ptr);
+	if (val_conv.free == LDKWatch_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKWatch_JCalls_cloned(&val_conv);
+	}
 	ChannelManagerReadArgs_set_chain_monitor(&this_ptr_conv, val_conv);
 }
 
@@ -25454,7 +27272,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManagerReadArgs_get_tx_broadcast
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
-	uintptr_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_tx_broadcaster(&this_ptr_conv)) | 1;
+	uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_tx_broadcaster(&this_ptr_conv)) | 1;
 	return ret_ret;
 }
 
@@ -25466,6 +27284,10 @@ void  __attribute__((export_name("TS_ChannelManagerReadArgs_set_tx_broadcaster")
 	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKBroadcasterInterface val_conv = *(LDKBroadcasterInterface*)(val_ptr);
+	if (val_conv.free == LDKBroadcasterInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKBroadcasterInterface_JCalls_cloned(&val_conv);
+	}
 	ChannelManagerReadArgs_set_tx_broadcaster(&this_ptr_conv, val_conv);
 }
 
@@ -25475,7 +27297,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManagerReadArgs_get_logger"))) T
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
-	uintptr_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_logger(&this_ptr_conv)) | 1;
+	uint32_t ret_ret = ((uintptr_t)ChannelManagerReadArgs_get_logger(&this_ptr_conv)) | 1;
 	return ret_ret;
 }
 
@@ -25487,6 +27309,10 @@ void  __attribute__((export_name("TS_ChannelManagerReadArgs_set_logger"))) TS_Ch
 	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKLogger val_conv = *(LDKLogger*)(val_ptr);
+	if (val_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&val_conv);
+	}
 	ChannelManagerReadArgs_set_logger(&this_ptr_conv, val_conv);
 }
 
@@ -25496,7 +27322,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManagerReadArgs_get_default_conf
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUserConfig ret_var = ChannelManagerReadArgs_get_default_config(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25524,18 +27350,38 @@ uint32_t  __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_Chann
 	void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1);
 	CHECK_ACCESS(keys_manager_ptr);
 	LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr);
+	if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKKeysInterface_JCalls_cloned(&keys_manager_conv);
+	}
 	void* fee_estimator_ptr = (void*)(((uintptr_t)fee_estimator) & ~1);
 	CHECK_ACCESS(fee_estimator_ptr);
 	LDKFeeEstimator fee_estimator_conv = *(LDKFeeEstimator*)(fee_estimator_ptr);
+	if (fee_estimator_conv.free == LDKFeeEstimator_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKFeeEstimator_JCalls_cloned(&fee_estimator_conv);
+	}
 	void* chain_monitor_ptr = (void*)(((uintptr_t)chain_monitor) & ~1);
 	CHECK_ACCESS(chain_monitor_ptr);
 	LDKWatch chain_monitor_conv = *(LDKWatch*)(chain_monitor_ptr);
+	if (chain_monitor_conv.free == LDKWatch_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKWatch_JCalls_cloned(&chain_monitor_conv);
+	}
 	void* tx_broadcaster_ptr = (void*)(((uintptr_t)tx_broadcaster) & ~1);
 	CHECK_ACCESS(tx_broadcaster_ptr);
 	LDKBroadcasterInterface tx_broadcaster_conv = *(LDKBroadcasterInterface*)(tx_broadcaster_ptr);
+	if (tx_broadcaster_conv.free == LDKBroadcasterInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKBroadcasterInterface_JCalls_cloned(&tx_broadcaster_conv);
+	}
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	LDKUserConfig default_config_conv;
 	default_config_conv.inner = (void*)(default_config & (~1));
 	default_config_conv.is_owned = (default_config & 1) || (default_config == 0);
@@ -25547,7 +27393,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_Chann
 		channel_monitors_constr.data = MALLOC(channel_monitors_constr.datalen * sizeof(LDKChannelMonitor), "LDKCVec_ChannelMonitorZ Elements");
 	else
 		channel_monitors_constr.data = NULL;
-	uint32_t* channel_monitors_vals = channel_monitors->elems /* XXX channel_monitors leaks */;
+	uint32_t* channel_monitors_vals = channel_monitors->elems;
 	for (size_t q = 0; q < channel_monitors_constr.datalen; q++) {
 		uint32_t channel_monitors_conv_16 = channel_monitors_vals[q];
 		LDKChannelMonitor channel_monitors_conv_16_conv;
@@ -25556,8 +27402,9 @@ uint32_t  __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_Chann
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_monitors_conv_16_conv);
 		channel_monitors_constr.data[q] = channel_monitors_conv_16_conv;
 	}
+	FREE(channel_monitors);
 	LDKChannelManagerReadArgs ret_var = ChannelManagerReadArgs_new(keys_manager_conv, fee_estimator_conv, chain_monitor_conv, tx_broadcaster_conv, logger_conv, default_config_conv, channel_monitors_constr);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25571,7 +27418,7 @@ uint32_t  __attribute__((export_name("TS_ChannelManagerReadArgs_new"))) TS_Chann
 uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_read"))) TS_C2Tuple_BlockHashChannelManagerZ_read(int8_tArray ser, uint32_t arg) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKChannelManagerReadArgs arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = (arg & 1) || (arg == 0);
@@ -25579,7 +27426,67 @@ uint32_t  __attribute__((export_name("TS_C2Tuple_BlockHashChannelManagerZ_read")
 	// WARNING: we need a move here but no clone is available for LDKChannelManagerReadArgs
 	LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ), "LDKCResult_C2Tuple_BlockHashChannelManagerZDecodeErrorZ");
 	*ret_conv = C2Tuple_BlockHashChannelManagerZ_read(ser_ref, arg_conv);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
+}
+
+void  __attribute__((export_name("TS_ExpandedKey_free"))) TS_ExpandedKey_free(uint32_t this_obj) {
+	LDKExpandedKey this_obj_conv;
+	this_obj_conv.inner = (void*)(this_obj & (~1));
+	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
+	ExpandedKey_free(this_obj_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_ExpandedKey_new"))) TS_ExpandedKey_new(int8_tArray key_material) {
+	unsigned char key_material_arr[32];
+	CHECK(key_material->arr_len == 32);
+	memcpy(key_material_arr, key_material->elems, 32); FREE(key_material);
+	unsigned char (*key_material_ref)[32] = &key_material_arr;
+	LDKExpandedKey ret_var = ExpandedKey_new(key_material_ref);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_create"))) TS_create(uint32_t keys, uint32_t min_value_msat, int32_t invoice_expiry_delta_secs, uint32_t keys_manager, int64_t current_time) {
+	LDKExpandedKey keys_conv;
+	keys_conv.inner = (void*)(keys & (~1));
+	keys_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(keys_conv);
+	void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1);
+	CHECK_ACCESS(min_value_msat_ptr);
+	LDKCOption_u64Z min_value_msat_conv = *(LDKCOption_u64Z*)(min_value_msat_ptr);
+	min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)min_value_msat) & ~1));
+	void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1);
+	if (!(keys_manager & 1)) { CHECK_ACCESS(keys_manager_ptr); }
+	LDKKeysInterface* keys_manager_conv = (LDKKeysInterface*)keys_manager_ptr;
+	LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ), "LDKCResult_C2Tuple_PaymentHashPaymentSecretZNoneZ");
+	*ret_conv = create(&keys_conv, min_value_msat_conv, invoice_expiry_delta_secs, keys_manager_conv, current_time);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_create_from_hash"))) TS_create_from_hash(uint32_t keys, uint32_t min_value_msat, int8_tArray payment_hash, int32_t invoice_expiry_delta_secs, int64_t current_time) {
+	LDKExpandedKey keys_conv;
+	keys_conv.inner = (void*)(keys & (~1));
+	keys_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(keys_conv);
+	void* min_value_msat_ptr = (void*)(((uintptr_t)min_value_msat) & ~1);
+	CHECK_ACCESS(min_value_msat_ptr);
+	LDKCOption_u64Z min_value_msat_conv = *(LDKCOption_u64Z*)(min_value_msat_ptr);
+	min_value_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)min_value_msat) & ~1));
+	LDKThirtyTwoBytes payment_hash_ref;
+	CHECK(payment_hash->arr_len == 32);
+	memcpy(payment_hash_ref.data, payment_hash->elems, 32); FREE(payment_hash);
+	LDKCResult_PaymentSecretNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentSecretNoneZ), "LDKCResult_PaymentSecretNoneZ");
+	*ret_conv = create_from_hash(&keys_conv, min_value_msat_conv, payment_hash_ref, invoice_expiry_delta_secs, current_time);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_DecodeError_free"))) TS_DecodeError_free(uint32_t this_obj) {
@@ -25592,7 +27499,7 @@ void  __attribute__((export_name("TS_DecodeError_free"))) TS_DecodeError_free(ui
 
 static inline uintptr_t DecodeError_clone_ptr(LDKDecodeError *NONNULL_PTR arg) {
 	LDKDecodeError ret_var = DecodeError_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25602,13 +27509,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_DecodeError_clone_ptr"))) TS_DecodeError_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_DecodeError_clone_ptr"))) TS_DecodeError_clone_ptr(uint32_t arg) {
 	LDKDecodeError arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = DecodeError_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = DecodeError_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_DecodeError_clone"))) TS_DecodeError_clone(uint32_t orig) {
@@ -25617,7 +27524,7 @@ uint32_t  __attribute__((export_name("TS_DecodeError_clone"))) TS_DecodeError_cl
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKDecodeError ret_var = DecodeError_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25642,7 +27549,7 @@ uint32_t  __attribute__((export_name("TS_Init_get_features"))) TS_Init_get_featu
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKInitFeatures ret_var = Init_get_features(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25666,14 +27573,40 @@ void  __attribute__((export_name("TS_Init_set_features"))) TS_Init_set_features(
 	Init_set_features(&this_ptr_conv, val_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_Init_new"))) TS_Init_new(uint32_t features_arg) {
+uint32_t  __attribute__((export_name("TS_Init_get_remote_network_address"))) TS_Init_get_remote_network_address(uint32_t this_ptr) {
+	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);
+	LDKCOption_NetAddressZ *ret_copy = MALLOC(sizeof(LDKCOption_NetAddressZ), "LDKCOption_NetAddressZ");
+	*ret_copy = Init_get_remote_network_address(&this_ptr_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_Init_set_remote_network_address"))) TS_Init_set_remote_network_address(uint32_t this_ptr, uint32_t val) {
+	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);
+	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
+	CHECK_ACCESS(val_ptr);
+	LDKCOption_NetAddressZ val_conv = *(LDKCOption_NetAddressZ*)(val_ptr);
+	val_conv = COption_NetAddressZ_clone((LDKCOption_NetAddressZ*)(((uintptr_t)val) & ~1));
+	Init_set_remote_network_address(&this_ptr_conv, val_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_Init_new"))) TS_Init_new(uint32_t features_arg, uint32_t remote_network_address_arg) {
 	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);
-	uintptr_t ret_ref = 0;
+	void* remote_network_address_arg_ptr = (void*)(((uintptr_t)remote_network_address_arg) & ~1);
+	CHECK_ACCESS(remote_network_address_arg_ptr);
+	LDKCOption_NetAddressZ remote_network_address_arg_conv = *(LDKCOption_NetAddressZ*)(remote_network_address_arg_ptr);
+	LDKInit ret_var = Init_new(features_arg_conv, remote_network_address_arg_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25686,7 +27619,7 @@ uint32_t  __attribute__((export_name("TS_Init_new"))) TS_Init_new(uint32_t featu
 
 static inline uintptr_t Init_clone_ptr(LDKInit *NONNULL_PTR arg) {
 	LDKInit ret_var = Init_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25696,13 +27629,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Init_clone_ptr"))) TS_Init_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Init_clone_ptr"))) TS_Init_clone_ptr(uint32_t arg) {
 	LDKInit arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = Init_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Init_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Init_clone"))) TS_Init_clone(uint32_t orig) {
@@ -25711,7 +27644,7 @@ uint32_t  __attribute__((export_name("TS_Init_clone"))) TS_Init_clone(uint32_t o
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInit ret_var = Init_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25777,7 +27710,7 @@ uint32_t  __attribute__((export_name("TS_ErrorMessage_new"))) TS_ErrorMessage_ne
 	memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg);
 	LDKStr data_arg_conv = str_ref_to_owned_c(data_arg);
 	LDKErrorMessage ret_var = ErrorMessage_new(channel_id_arg_ref, data_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25790,7 +27723,7 @@ uint32_t  __attribute__((export_name("TS_ErrorMessage_new"))) TS_ErrorMessage_ne
 
 static inline uintptr_t ErrorMessage_clone_ptr(LDKErrorMessage *NONNULL_PTR arg) {
 	LDKErrorMessage ret_var = ErrorMessage_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25800,13 +27733,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ErrorMessage_clone_ptr"))) TS_ErrorMessage_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ErrorMessage_clone_ptr"))) TS_ErrorMessage_clone_ptr(uint32_t arg) {
 	LDKErrorMessage arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ErrorMessage_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ErrorMessage_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ErrorMessage_clone"))) TS_ErrorMessage_clone(uint32_t orig) {
@@ -25815,7 +27748,7 @@ uint32_t  __attribute__((export_name("TS_ErrorMessage_clone"))) TS_ErrorMessage_
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKErrorMessage ret_var = ErrorMessage_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25881,7 +27814,7 @@ uint32_t  __attribute__((export_name("TS_WarningMessage_new"))) TS_WarningMessag
 	memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg);
 	LDKStr data_arg_conv = str_ref_to_owned_c(data_arg);
 	LDKWarningMessage ret_var = WarningMessage_new(channel_id_arg_ref, data_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25894,7 +27827,7 @@ uint32_t  __attribute__((export_name("TS_WarningMessage_new"))) TS_WarningMessag
 
 static inline uintptr_t WarningMessage_clone_ptr(LDKWarningMessage *NONNULL_PTR arg) {
 	LDKWarningMessage ret_var = WarningMessage_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25904,13 +27837,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_WarningMessage_clone_ptr"))) TS_WarningMessage_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_WarningMessage_clone_ptr"))) TS_WarningMessage_clone_ptr(uint32_t arg) {
 	LDKWarningMessage arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = WarningMessage_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = WarningMessage_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_WarningMessage_clone"))) TS_WarningMessage_clone(uint32_t orig) {
@@ -25919,7 +27852,7 @@ uint32_t  __attribute__((export_name("TS_WarningMessage_clone"))) TS_WarningMess
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKWarningMessage ret_var = WarningMessage_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25943,8 +27876,8 @@ int16_t  __attribute__((export_name("TS_Ping_get_ponglen"))) TS_Ping_get_ponglen
 	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;
+	int16_t ret_conv = Ping_get_ponglen(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_Ping_set_ponglen"))) TS_Ping_set_ponglen(uint32_t this_ptr, int16_t val) {
@@ -25960,8 +27893,8 @@ int16_t  __attribute__((export_name("TS_Ping_get_byteslen"))) TS_Ping_get_bytesl
 	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;
+	int16_t ret_conv = Ping_get_byteslen(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_Ping_set_byteslen"))) TS_Ping_set_byteslen(uint32_t this_ptr, int16_t val) {
@@ -25974,7 +27907,7 @@ void  __attribute__((export_name("TS_Ping_set_byteslen"))) TS_Ping_set_byteslen(
 
 uint32_t  __attribute__((export_name("TS_Ping_new"))) TS_Ping_new(int16_t ponglen_arg, int16_t byteslen_arg) {
 	LDKPing ret_var = Ping_new(ponglen_arg, byteslen_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25987,7 +27920,7 @@ uint32_t  __attribute__((export_name("TS_Ping_new"))) TS_Ping_new(int16_t pongle
 
 static inline uintptr_t Ping_clone_ptr(LDKPing *NONNULL_PTR arg) {
 	LDKPing ret_var = Ping_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -25997,13 +27930,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Ping_clone_ptr"))) TS_Ping_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Ping_clone_ptr"))) TS_Ping_clone_ptr(uint32_t arg) {
 	LDKPing arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = Ping_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Ping_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Ping_clone"))) TS_Ping_clone(uint32_t orig) {
@@ -26012,7 +27945,7 @@ uint32_t  __attribute__((export_name("TS_Ping_clone"))) TS_Ping_clone(uint32_t o
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPing ret_var = Ping_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -26036,8 +27969,8 @@ int16_t  __attribute__((export_name("TS_Pong_get_byteslen"))) TS_Pong_get_bytesl
 	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;
+	int16_t ret_conv = Pong_get_byteslen(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_Pong_set_byteslen"))) TS_Pong_set_byteslen(uint32_t this_ptr, int16_t val) {
@@ -26050,7 +27983,7 @@ void  __attribute__((export_name("TS_Pong_set_byteslen"))) TS_Pong_set_byteslen(
 
 uint32_t  __attribute__((export_name("TS_Pong_new"))) TS_Pong_new(int16_t byteslen_arg) {
 	LDKPong ret_var = Pong_new(byteslen_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -26063,7 +27996,7 @@ uint32_t  __attribute__((export_name("TS_Pong_new"))) TS_Pong_new(int16_t bytesl
 
 static inline uintptr_t Pong_clone_ptr(LDKPong *NONNULL_PTR arg) {
 	LDKPong ret_var = Pong_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -26073,13 +28006,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Pong_clone_ptr"))) TS_Pong_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Pong_clone_ptr"))) TS_Pong_clone_ptr(uint32_t arg) {
 	LDKPong arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = Pong_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Pong_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Pong_clone"))) TS_Pong_clone(uint32_t orig) {
@@ -26088,7 +28021,7 @@ uint32_t  __attribute__((export_name("TS_Pong_clone"))) TS_Pong_clone(uint32_t o
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPong ret_var = Pong_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -26154,8 +28087,8 @@ int64_t  __attribute__((export_name("TS_OpenChannel_get_funding_satoshis"))) TS_
 	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;
+	int64_t ret_conv = OpenChannel_get_funding_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OpenChannel_set_funding_satoshis"))) TS_OpenChannel_set_funding_satoshis(uint32_t this_ptr, int64_t val) {
@@ -26171,8 +28104,8 @@ int64_t  __attribute__((export_name("TS_OpenChannel_get_push_msat"))) TS_OpenCha
 	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;
+	int64_t ret_conv = OpenChannel_get_push_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OpenChannel_set_push_msat"))) TS_OpenChannel_set_push_msat(uint32_t this_ptr, int64_t val) {
@@ -26188,8 +28121,8 @@ int64_t  __attribute__((export_name("TS_OpenChannel_get_dust_limit_satoshis")))
 	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;
+	int64_t ret_conv = OpenChannel_get_dust_limit_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OpenChannel_set_dust_limit_satoshis"))) TS_OpenChannel_set_dust_limit_satoshis(uint32_t this_ptr, int64_t val) {
@@ -26205,8 +28138,8 @@ int64_t  __attribute__((export_name("TS_OpenChannel_get_max_htlc_value_in_flight
 	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;
+	int64_t ret_conv = OpenChannel_get_max_htlc_value_in_flight_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OpenChannel_set_max_htlc_value_in_flight_msat"))) TS_OpenChannel_set_max_htlc_value_in_flight_msat(uint32_t this_ptr, int64_t val) {
@@ -26222,8 +28155,8 @@ int64_t  __attribute__((export_name("TS_OpenChannel_get_channel_reserve_satoshis
 	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;
+	int64_t ret_conv = OpenChannel_get_channel_reserve_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OpenChannel_set_channel_reserve_satoshis"))) TS_OpenChannel_set_channel_reserve_satoshis(uint32_t this_ptr, int64_t val) {
@@ -26239,8 +28172,8 @@ int64_t  __attribute__((export_name("TS_OpenChannel_get_htlc_minimum_msat"))) TS
 	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;
+	int64_t ret_conv = OpenChannel_get_htlc_minimum_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OpenChannel_set_htlc_minimum_msat"))) TS_OpenChannel_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) {
@@ -26256,8 +28189,8 @@ int32_t  __attribute__((export_name("TS_OpenChannel_get_feerate_per_kw"))) TS_Op
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int32_t ret_val = OpenChannel_get_feerate_per_kw(&this_ptr_conv);
-	return ret_val;
+	int32_t ret_conv = OpenChannel_get_feerate_per_kw(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OpenChannel_set_feerate_per_kw"))) TS_OpenChannel_set_feerate_per_kw(uint32_t this_ptr, int32_t val) {
@@ -26273,8 +28206,8 @@ int16_t  __attribute__((export_name("TS_OpenChannel_get_to_self_delay"))) TS_Ope
 	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;
+	int16_t ret_conv = OpenChannel_get_to_self_delay(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OpenChannel_set_to_self_delay"))) TS_OpenChannel_set_to_self_delay(uint32_t this_ptr, int16_t val) {
@@ -26290,8 +28223,8 @@ int16_t  __attribute__((export_name("TS_OpenChannel_get_max_accepted_htlcs"))) T
 	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;
+	int16_t ret_conv = OpenChannel_get_max_accepted_htlcs(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OpenChannel_set_max_accepted_htlcs"))) TS_OpenChannel_set_max_accepted_htlcs(uint32_t this_ptr, int16_t val) {
@@ -26433,8 +28366,8 @@ int8_t  __attribute__((export_name("TS_OpenChannel_get_channel_flags"))) TS_Open
 	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;
+	int8_t ret_conv = OpenChannel_get_channel_flags(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_OpenChannel_set_channel_flags"))) TS_OpenChannel_set_channel_flags(uint32_t this_ptr, int8_t val) {
@@ -26451,7 +28384,7 @@ uint32_t  __attribute__((export_name("TS_OpenChannel_get_channel_type"))) TS_Ope
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelTypeFeatures ret_var = OpenChannel_get_channel_type(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -26479,7 +28412,7 @@ void  __attribute__((export_name("TS_OpenChannel_set_channel_type"))) TS_OpenCha
 
 static inline uintptr_t OpenChannel_clone_ptr(LDKOpenChannel *NONNULL_PTR arg) {
 	LDKOpenChannel ret_var = OpenChannel_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -26489,13 +28422,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_OpenChannel_clone_ptr"))) TS_OpenChannel_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_OpenChannel_clone_ptr"))) TS_OpenChannel_clone_ptr(uint32_t arg) {
 	LDKOpenChannel arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = OpenChannel_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = OpenChannel_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_OpenChannel_clone"))) TS_OpenChannel_clone(uint32_t orig) {
@@ -26504,7 +28437,7 @@ uint32_t  __attribute__((export_name("TS_OpenChannel_clone"))) TS_OpenChannel_cl
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKOpenChannel ret_var = OpenChannel_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -26549,8 +28482,8 @@ int64_t  __attribute__((export_name("TS_AcceptChannel_get_dust_limit_satoshis"))
 	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;
+	int64_t ret_conv = AcceptChannel_get_dust_limit_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_AcceptChannel_set_dust_limit_satoshis"))) TS_AcceptChannel_set_dust_limit_satoshis(uint32_t this_ptr, int64_t val) {
@@ -26566,8 +28499,8 @@ int64_t  __attribute__((export_name("TS_AcceptChannel_get_max_htlc_value_in_flig
 	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;
+	int64_t ret_conv = AcceptChannel_get_max_htlc_value_in_flight_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_AcceptChannel_set_max_htlc_value_in_flight_msat"))) TS_AcceptChannel_set_max_htlc_value_in_flight_msat(uint32_t this_ptr, int64_t val) {
@@ -26583,8 +28516,8 @@ int64_t  __attribute__((export_name("TS_AcceptChannel_get_channel_reserve_satosh
 	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;
+	int64_t ret_conv = AcceptChannel_get_channel_reserve_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_AcceptChannel_set_channel_reserve_satoshis"))) TS_AcceptChannel_set_channel_reserve_satoshis(uint32_t this_ptr, int64_t val) {
@@ -26600,8 +28533,8 @@ int64_t  __attribute__((export_name("TS_AcceptChannel_get_htlc_minimum_msat")))
 	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;
+	int64_t ret_conv = AcceptChannel_get_htlc_minimum_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_AcceptChannel_set_htlc_minimum_msat"))) TS_AcceptChannel_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) {
@@ -26617,8 +28550,8 @@ int32_t  __attribute__((export_name("TS_AcceptChannel_get_minimum_depth"))) TS_A
 	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;
+	int32_t ret_conv = AcceptChannel_get_minimum_depth(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_AcceptChannel_set_minimum_depth"))) TS_AcceptChannel_set_minimum_depth(uint32_t this_ptr, int32_t val) {
@@ -26634,8 +28567,8 @@ int16_t  __attribute__((export_name("TS_AcceptChannel_get_to_self_delay"))) TS_A
 	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;
+	int16_t ret_conv = AcceptChannel_get_to_self_delay(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_AcceptChannel_set_to_self_delay"))) TS_AcceptChannel_set_to_self_delay(uint32_t this_ptr, int16_t val) {
@@ -26651,8 +28584,8 @@ int16_t  __attribute__((export_name("TS_AcceptChannel_get_max_accepted_htlcs")))
 	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;
+	int16_t ret_conv = AcceptChannel_get_max_accepted_htlcs(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_AcceptChannel_set_max_accepted_htlcs"))) TS_AcceptChannel_set_max_accepted_htlcs(uint32_t this_ptr, int16_t val) {
@@ -26795,7 +28728,7 @@ uint32_t  __attribute__((export_name("TS_AcceptChannel_get_channel_type"))) TS_A
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelTypeFeatures ret_var = AcceptChannel_get_channel_type(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -26823,7 +28756,7 @@ void  __attribute__((export_name("TS_AcceptChannel_set_channel_type"))) TS_Accep
 
 static inline uintptr_t AcceptChannel_clone_ptr(LDKAcceptChannel *NONNULL_PTR arg) {
 	LDKAcceptChannel ret_var = AcceptChannel_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -26833,13 +28766,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_AcceptChannel_clone_ptr"))) TS_AcceptChannel_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_AcceptChannel_clone_ptr"))) TS_AcceptChannel_clone_ptr(uint32_t arg) {
 	LDKAcceptChannel arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = AcceptChannel_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = AcceptChannel_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_AcceptChannel_clone"))) TS_AcceptChannel_clone(uint32_t orig) {
@@ -26848,7 +28781,7 @@ uint32_t  __attribute__((export_name("TS_AcceptChannel_clone"))) TS_AcceptChanne
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKAcceptChannel ret_var = AcceptChannel_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -26914,8 +28847,8 @@ int16_t  __attribute__((export_name("TS_FundingCreated_get_funding_output_index"
 	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;
+	int16_t ret_conv = FundingCreated_get_funding_output_index(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_FundingCreated_set_funding_output_index"))) TS_FundingCreated_set_funding_output_index(uint32_t this_ptr, int16_t val) {
@@ -26958,7 +28891,7 @@ uint32_t  __attribute__((export_name("TS_FundingCreated_new"))) TS_FundingCreate
 	CHECK(signature_arg->arr_len == 64);
 	memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); FREE(signature_arg);
 	LDKFundingCreated ret_var = FundingCreated_new(temporary_channel_id_arg_ref, funding_txid_arg_ref, funding_output_index_arg, signature_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -26971,7 +28904,7 @@ uint32_t  __attribute__((export_name("TS_FundingCreated_new"))) TS_FundingCreate
 
 static inline uintptr_t FundingCreated_clone_ptr(LDKFundingCreated *NONNULL_PTR arg) {
 	LDKFundingCreated ret_var = FundingCreated_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -26981,13 +28914,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_FundingCreated_clone_ptr"))) TS_FundingCreated_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_FundingCreated_clone_ptr"))) TS_FundingCreated_clone_ptr(uint32_t arg) {
 	LDKFundingCreated arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = FundingCreated_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = FundingCreated_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_FundingCreated_clone"))) TS_FundingCreated_clone(uint32_t orig) {
@@ -26996,7 +28929,7 @@ uint32_t  __attribute__((export_name("TS_FundingCreated_clone"))) TS_FundingCrea
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKFundingCreated ret_var = FundingCreated_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27065,7 +28998,7 @@ uint32_t  __attribute__((export_name("TS_FundingSigned_new"))) TS_FundingSigned_
 	CHECK(signature_arg->arr_len == 64);
 	memcpy(signature_arg_ref.compact_form, signature_arg->elems, 64); FREE(signature_arg);
 	LDKFundingSigned ret_var = FundingSigned_new(channel_id_arg_ref, signature_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27078,7 +29011,7 @@ uint32_t  __attribute__((export_name("TS_FundingSigned_new"))) TS_FundingSigned_
 
 static inline uintptr_t FundingSigned_clone_ptr(LDKFundingSigned *NONNULL_PTR arg) {
 	LDKFundingSigned ret_var = FundingSigned_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27088,13 +29021,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_FundingSigned_clone_ptr"))) TS_FundingSigned_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_FundingSigned_clone_ptr"))) TS_FundingSigned_clone_ptr(uint32_t arg) {
 	LDKFundingSigned arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = FundingSigned_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = FundingSigned_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_FundingSigned_clone"))) TS_FundingSigned_clone(uint32_t orig) {
@@ -27103,7 +29036,7 @@ uint32_t  __attribute__((export_name("TS_FundingSigned_clone"))) TS_FundingSigne
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKFundingSigned ret_var = FundingSigned_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27114,65 +29047,92 @@ uint32_t  __attribute__((export_name("TS_FundingSigned_clone"))) TS_FundingSigne
 	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_FundingLocked_free"))) TS_FundingLocked_free(uint32_t this_obj) {
-	LDKFundingLocked this_obj_conv;
+void  __attribute__((export_name("TS_ChannelReady_free"))) TS_ChannelReady_free(uint32_t this_obj) {
+	LDKChannelReady this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
-	FundingLocked_free(this_obj_conv);
+	ChannelReady_free(this_obj_conv);
 }
 
-int8_tArray  __attribute__((export_name("TS_FundingLocked_get_channel_id"))) TS_FundingLocked_get_channel_id(uint32_t this_ptr) {
-	LDKFundingLocked this_ptr_conv;
+int8_tArray  __attribute__((export_name("TS_ChannelReady_get_channel_id"))) TS_ChannelReady_get_channel_id(uint32_t this_ptr) {
+	LDKChannelReady this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_int8_tArray(32, __LINE__);
-	memcpy(ret_arr->elems, *FundingLocked_get_channel_id(&this_ptr_conv), 32);
+	memcpy(ret_arr->elems, *ChannelReady_get_channel_id(&this_ptr_conv), 32);
 	return ret_arr;
 }
 
-void  __attribute__((export_name("TS_FundingLocked_set_channel_id"))) TS_FundingLocked_set_channel_id(uint32_t this_ptr, int8_tArray val) {
-	LDKFundingLocked this_ptr_conv;
+void  __attribute__((export_name("TS_ChannelReady_set_channel_id"))) TS_ChannelReady_set_channel_id(uint32_t this_ptr, int8_tArray val) {
+	LDKChannelReady this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKThirtyTwoBytes val_ref;
 	CHECK(val->arr_len == 32);
 	memcpy(val_ref.data, val->elems, 32); FREE(val);
-	FundingLocked_set_channel_id(&this_ptr_conv, val_ref);
+	ChannelReady_set_channel_id(&this_ptr_conv, val_ref);
 }
 
-int8_tArray  __attribute__((export_name("TS_FundingLocked_get_next_per_commitment_point"))) TS_FundingLocked_get_next_per_commitment_point(uint32_t this_ptr) {
-	LDKFundingLocked this_ptr_conv;
+int8_tArray  __attribute__((export_name("TS_ChannelReady_get_next_per_commitment_point"))) TS_ChannelReady_get_next_per_commitment_point(uint32_t this_ptr) {
+	LDKChannelReady this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	int8_tArray ret_arr = init_int8_tArray(33, __LINE__);
-	memcpy(ret_arr->elems, FundingLocked_get_next_per_commitment_point(&this_ptr_conv).compressed_form, 33);
+	memcpy(ret_arr->elems, ChannelReady_get_next_per_commitment_point(&this_ptr_conv).compressed_form, 33);
 	return ret_arr;
 }
 
-void  __attribute__((export_name("TS_FundingLocked_set_next_per_commitment_point"))) TS_FundingLocked_set_next_per_commitment_point(uint32_t this_ptr, int8_tArray val) {
-	LDKFundingLocked this_ptr_conv;
+void  __attribute__((export_name("TS_ChannelReady_set_next_per_commitment_point"))) TS_ChannelReady_set_next_per_commitment_point(uint32_t this_ptr, int8_tArray val) {
+	LDKChannelReady this_ptr_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(val->arr_len == 33);
 	memcpy(val_ref.compressed_form, val->elems, 33); FREE(val);
-	FundingLocked_set_next_per_commitment_point(&this_ptr_conv, val_ref);
+	ChannelReady_set_next_per_commitment_point(&this_ptr_conv, val_ref);
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelReady_get_short_channel_id_alias"))) TS_ChannelReady_get_short_channel_id_alias(uint32_t this_ptr) {
+	LDKChannelReady this_ptr_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 = ChannelReady_get_short_channel_id_alias(&this_ptr_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelReady_set_short_channel_id_alias"))) TS_ChannelReady_set_short_channel_id_alias(uint32_t this_ptr, uint32_t val) {
+	LDKChannelReady this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
+	CHECK_ACCESS(val_ptr);
+	LDKCOption_u64Z val_conv = *(LDKCOption_u64Z*)(val_ptr);
+	val_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)val) & ~1));
+	ChannelReady_set_short_channel_id_alias(&this_ptr_conv, val_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_FundingLocked_new"))) TS_FundingLocked_new(int8_tArray channel_id_arg, int8_tArray next_per_commitment_point_arg) {
+uint32_t  __attribute__((export_name("TS_ChannelReady_new"))) TS_ChannelReady_new(int8_tArray channel_id_arg, int8_tArray next_per_commitment_point_arg, uint32_t short_channel_id_alias_arg) {
 	LDKThirtyTwoBytes channel_id_arg_ref;
 	CHECK(channel_id_arg->arr_len == 32);
 	memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg);
 	LDKPublicKey next_per_commitment_point_arg_ref;
 	CHECK(next_per_commitment_point_arg->arr_len == 33);
 	memcpy(next_per_commitment_point_arg_ref.compressed_form, next_per_commitment_point_arg->elems, 33); FREE(next_per_commitment_point_arg);
-	LDKFundingLocked ret_var = FundingLocked_new(channel_id_arg_ref, next_per_commitment_point_arg_ref);
-	uintptr_t ret_ref = 0;
+	void* short_channel_id_alias_arg_ptr = (void*)(((uintptr_t)short_channel_id_alias_arg) & ~1);
+	CHECK_ACCESS(short_channel_id_alias_arg_ptr);
+	LDKCOption_u64Z short_channel_id_alias_arg_conv = *(LDKCOption_u64Z*)(short_channel_id_alias_arg_ptr);
+	short_channel_id_alias_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)short_channel_id_alias_arg) & ~1));
+	LDKChannelReady ret_var = ChannelReady_new(channel_id_arg_ref, next_per_commitment_point_arg_ref, short_channel_id_alias_arg_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27183,9 +29143,9 @@ uint32_t  __attribute__((export_name("TS_FundingLocked_new"))) TS_FundingLocked_
 	return ret_ref;
 }
 
-static inline uintptr_t FundingLocked_clone_ptr(LDKFundingLocked *NONNULL_PTR arg) {
-	LDKFundingLocked ret_var = FundingLocked_clone(arg);
-uintptr_t ret_ref = 0;
+static inline uintptr_t ChannelReady_clone_ptr(LDKChannelReady *NONNULL_PTR arg) {
+	LDKChannelReady ret_var = ChannelReady_clone(arg);
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27195,22 +29155,22 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_FundingLocked_clone_ptr"))) TS_FundingLocked_clone_ptr(uint32_t arg) {
-	LDKFundingLocked arg_conv;
+uint32_t  __attribute__((export_name("TS_ChannelReady_clone_ptr"))) TS_ChannelReady_clone_ptr(uint32_t arg) {
+	LDKChannelReady arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = FundingLocked_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelReady_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_FundingLocked_clone"))) TS_FundingLocked_clone(uint32_t orig) {
-	LDKFundingLocked orig_conv;
+uint32_t  __attribute__((export_name("TS_ChannelReady_clone"))) TS_ChannelReady_clone(uint32_t orig) {
+	LDKChannelReady 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);
-	uintptr_t ret_ref = 0;
+	LDKChannelReady ret_var = ChannelReady_clone(&orig_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27282,7 +29242,7 @@ uint32_t  __attribute__((export_name("TS_Shutdown_new"))) TS_Shutdown_new(int8_t
 	scriptpubkey_arg_ref.data = MALLOC(scriptpubkey_arg_ref.datalen, "LDKCVec_u8Z Bytes");
 	memcpy(scriptpubkey_arg_ref.data, scriptpubkey_arg->elems, scriptpubkey_arg_ref.datalen); FREE(scriptpubkey_arg);
 	LDKShutdown ret_var = Shutdown_new(channel_id_arg_ref, scriptpubkey_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27295,7 +29255,7 @@ uint32_t  __attribute__((export_name("TS_Shutdown_new"))) TS_Shutdown_new(int8_t
 
 static inline uintptr_t Shutdown_clone_ptr(LDKShutdown *NONNULL_PTR arg) {
 	LDKShutdown ret_var = Shutdown_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27305,13 +29265,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Shutdown_clone_ptr"))) TS_Shutdown_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Shutdown_clone_ptr"))) TS_Shutdown_clone_ptr(uint32_t arg) {
 	LDKShutdown arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = Shutdown_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Shutdown_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Shutdown_clone"))) TS_Shutdown_clone(uint32_t orig) {
@@ -27320,7 +29280,7 @@ uint32_t  __attribute__((export_name("TS_Shutdown_clone"))) TS_Shutdown_clone(ui
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKShutdown ret_var = Shutdown_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27344,8 +29304,8 @@ int64_t  __attribute__((export_name("TS_ClosingSignedFeeRange_get_min_fee_satosh
 	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;
+	int64_t ret_conv = ClosingSignedFeeRange_get_min_fee_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ClosingSignedFeeRange_set_min_fee_satoshis"))) TS_ClosingSignedFeeRange_set_min_fee_satoshis(uint32_t this_ptr, int64_t val) {
@@ -27361,8 +29321,8 @@ int64_t  __attribute__((export_name("TS_ClosingSignedFeeRange_get_max_fee_satosh
 	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;
+	int64_t ret_conv = ClosingSignedFeeRange_get_max_fee_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ClosingSignedFeeRange_set_max_fee_satoshis"))) TS_ClosingSignedFeeRange_set_max_fee_satoshis(uint32_t this_ptr, int64_t val) {
@@ -27375,7 +29335,7 @@ void  __attribute__((export_name("TS_ClosingSignedFeeRange_set_max_fee_satoshis"
 
 uint32_t  __attribute__((export_name("TS_ClosingSignedFeeRange_new"))) TS_ClosingSignedFeeRange_new(int64_t min_fee_satoshis_arg, int64_t max_fee_satoshis_arg) {
 	LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_new(min_fee_satoshis_arg, max_fee_satoshis_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27388,7 +29348,7 @@ uint32_t  __attribute__((export_name("TS_ClosingSignedFeeRange_new"))) TS_Closin
 
 static inline uintptr_t ClosingSignedFeeRange_clone_ptr(LDKClosingSignedFeeRange *NONNULL_PTR arg) {
 	LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27398,13 +29358,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ClosingSignedFeeRange_clone_ptr"))) TS_ClosingSignedFeeRange_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ClosingSignedFeeRange_clone_ptr"))) TS_ClosingSignedFeeRange_clone_ptr(uint32_t arg) {
 	LDKClosingSignedFeeRange arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ClosingSignedFeeRange_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ClosingSignedFeeRange_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosingSignedFeeRange_clone"))) TS_ClosingSignedFeeRange_clone(uint32_t orig) {
@@ -27413,7 +29373,7 @@ uint32_t  __attribute__((export_name("TS_ClosingSignedFeeRange_clone"))) TS_Clos
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKClosingSignedFeeRange ret_var = ClosingSignedFeeRange_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27458,8 +29418,8 @@ int64_t  __attribute__((export_name("TS_ClosingSigned_get_fee_satoshis"))) TS_Cl
 	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;
+	int64_t ret_conv = ClosingSigned_get_fee_satoshis(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ClosingSigned_set_fee_satoshis"))) TS_ClosingSigned_set_fee_satoshis(uint32_t this_ptr, int64_t val) {
@@ -27497,7 +29457,7 @@ uint32_t  __attribute__((export_name("TS_ClosingSigned_get_fee_range"))) TS_Clos
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKClosingSignedFeeRange ret_var = ClosingSigned_get_fee_range(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -27536,7 +29496,7 @@ uint32_t  __attribute__((export_name("TS_ClosingSigned_new"))) TS_ClosingSigned_
 	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);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27549,7 +29509,7 @@ uint32_t  __attribute__((export_name("TS_ClosingSigned_new"))) TS_ClosingSigned_
 
 static inline uintptr_t ClosingSigned_clone_ptr(LDKClosingSigned *NONNULL_PTR arg) {
 	LDKClosingSigned ret_var = ClosingSigned_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27559,13 +29519,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ClosingSigned_clone_ptr"))) TS_ClosingSigned_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ClosingSigned_clone_ptr"))) TS_ClosingSigned_clone_ptr(uint32_t arg) {
 	LDKClosingSigned arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ClosingSigned_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ClosingSigned_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosingSigned_clone"))) TS_ClosingSigned_clone(uint32_t orig) {
@@ -27574,7 +29534,7 @@ uint32_t  __attribute__((export_name("TS_ClosingSigned_clone"))) TS_ClosingSigne
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKClosingSigned ret_var = ClosingSigned_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27619,8 +29579,8 @@ int64_t  __attribute__((export_name("TS_UpdateAddHTLC_get_htlc_id"))) TS_UpdateA
 	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;
+	int64_t ret_conv = UpdateAddHTLC_get_htlc_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UpdateAddHTLC_set_htlc_id"))) TS_UpdateAddHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) {
@@ -27636,8 +29596,8 @@ int64_t  __attribute__((export_name("TS_UpdateAddHTLC_get_amount_msat"))) TS_Upd
 	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;
+	int64_t ret_conv = UpdateAddHTLC_get_amount_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UpdateAddHTLC_set_amount_msat"))) TS_UpdateAddHTLC_set_amount_msat(uint32_t this_ptr, int64_t val) {
@@ -27674,8 +29634,8 @@ int32_t  __attribute__((export_name("TS_UpdateAddHTLC_get_cltv_expiry"))) TS_Upd
 	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;
+	int32_t ret_conv = UpdateAddHTLC_get_cltv_expiry(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UpdateAddHTLC_set_cltv_expiry"))) TS_UpdateAddHTLC_set_cltv_expiry(uint32_t this_ptr, int32_t val) {
@@ -27688,7 +29648,7 @@ void  __attribute__((export_name("TS_UpdateAddHTLC_set_cltv_expiry"))) TS_Update
 
 static inline uintptr_t UpdateAddHTLC_clone_ptr(LDKUpdateAddHTLC *NONNULL_PTR arg) {
 	LDKUpdateAddHTLC ret_var = UpdateAddHTLC_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27698,13 +29658,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_UpdateAddHTLC_clone_ptr"))) TS_UpdateAddHTLC_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_UpdateAddHTLC_clone_ptr"))) TS_UpdateAddHTLC_clone_ptr(uint32_t arg) {
 	LDKUpdateAddHTLC arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = UpdateAddHTLC_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = UpdateAddHTLC_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_UpdateAddHTLC_clone"))) TS_UpdateAddHTLC_clone(uint32_t orig) {
@@ -27713,7 +29673,7 @@ uint32_t  __attribute__((export_name("TS_UpdateAddHTLC_clone"))) TS_UpdateAddHTL
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUpdateAddHTLC ret_var = UpdateAddHTLC_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27758,8 +29718,8 @@ int64_t  __attribute__((export_name("TS_UpdateFulfillHTLC_get_htlc_id"))) TS_Upd
 	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;
+	int64_t ret_conv = UpdateFulfillHTLC_get_htlc_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UpdateFulfillHTLC_set_htlc_id"))) TS_UpdateFulfillHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) {
@@ -27799,7 +29759,7 @@ uint32_t  __attribute__((export_name("TS_UpdateFulfillHTLC_new"))) TS_UpdateFulf
 	CHECK(payment_preimage_arg->arr_len == 32);
 	memcpy(payment_preimage_arg_ref.data, payment_preimage_arg->elems, 32); FREE(payment_preimage_arg);
 	LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_new(channel_id_arg_ref, htlc_id_arg, payment_preimage_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27812,7 +29772,7 @@ uint32_t  __attribute__((export_name("TS_UpdateFulfillHTLC_new"))) TS_UpdateFulf
 
 static inline uintptr_t UpdateFulfillHTLC_clone_ptr(LDKUpdateFulfillHTLC *NONNULL_PTR arg) {
 	LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27822,13 +29782,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_UpdateFulfillHTLC_clone_ptr"))) TS_UpdateFulfillHTLC_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_UpdateFulfillHTLC_clone_ptr"))) TS_UpdateFulfillHTLC_clone_ptr(uint32_t arg) {
 	LDKUpdateFulfillHTLC arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = UpdateFulfillHTLC_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = UpdateFulfillHTLC_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_UpdateFulfillHTLC_clone"))) TS_UpdateFulfillHTLC_clone(uint32_t orig) {
@@ -27837,7 +29797,7 @@ uint32_t  __attribute__((export_name("TS_UpdateFulfillHTLC_clone"))) TS_UpdateFu
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUpdateFulfillHTLC ret_var = UpdateFulfillHTLC_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27882,8 +29842,8 @@ int64_t  __attribute__((export_name("TS_UpdateFailHTLC_get_htlc_id"))) TS_Update
 	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;
+	int64_t ret_conv = UpdateFailHTLC_get_htlc_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UpdateFailHTLC_set_htlc_id"))) TS_UpdateFailHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) {
@@ -27896,7 +29856,7 @@ void  __attribute__((export_name("TS_UpdateFailHTLC_set_htlc_id"))) TS_UpdateFai
 
 static inline uintptr_t UpdateFailHTLC_clone_ptr(LDKUpdateFailHTLC *NONNULL_PTR arg) {
 	LDKUpdateFailHTLC ret_var = UpdateFailHTLC_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27906,13 +29866,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_UpdateFailHTLC_clone_ptr"))) TS_UpdateFailHTLC_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_UpdateFailHTLC_clone_ptr"))) TS_UpdateFailHTLC_clone_ptr(uint32_t arg) {
 	LDKUpdateFailHTLC arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = UpdateFailHTLC_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = UpdateFailHTLC_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_UpdateFailHTLC_clone"))) TS_UpdateFailHTLC_clone(uint32_t orig) {
@@ -27921,7 +29881,7 @@ uint32_t  __attribute__((export_name("TS_UpdateFailHTLC_clone"))) TS_UpdateFailH
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUpdateFailHTLC ret_var = UpdateFailHTLC_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -27966,8 +29926,8 @@ int64_t  __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_htlc_id")))
 	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;
+	int64_t ret_conv = UpdateFailMalformedHTLC_get_htlc_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_htlc_id"))) TS_UpdateFailMalformedHTLC_set_htlc_id(uint32_t this_ptr, int64_t val) {
@@ -27983,8 +29943,8 @@ int16_t  __attribute__((export_name("TS_UpdateFailMalformedHTLC_get_failure_code
 	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;
+	int16_t ret_conv = UpdateFailMalformedHTLC_get_failure_code(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_failure_code"))) TS_UpdateFailMalformedHTLC_set_failure_code(uint32_t this_ptr, int16_t val) {
@@ -27997,7 +29957,7 @@ void  __attribute__((export_name("TS_UpdateFailMalformedHTLC_set_failure_code"))
 
 static inline uintptr_t UpdateFailMalformedHTLC_clone_ptr(LDKUpdateFailMalformedHTLC *NONNULL_PTR arg) {
 	LDKUpdateFailMalformedHTLC ret_var = UpdateFailMalformedHTLC_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28007,13 +29967,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone_ptr"))) TS_UpdateFailMalformedHTLC_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone_ptr"))) TS_UpdateFailMalformedHTLC_clone_ptr(uint32_t arg) {
 	LDKUpdateFailMalformedHTLC arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = UpdateFailMalformedHTLC_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = UpdateFailMalformedHTLC_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone"))) TS_UpdateFailMalformedHTLC_clone(uint32_t orig) {
@@ -28022,7 +29982,7 @@ uint32_t  __attribute__((export_name("TS_UpdateFailMalformedHTLC_clone"))) TS_Up
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUpdateFailMalformedHTLC ret_var = UpdateFailMalformedHTLC_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28094,7 +30054,7 @@ void  __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements");
 	else
 		val_constr.data = NULL;
-	int8_tArray* val_vals = (void*) val->elems /* XXX val leaks */;
+	int8_tArray* val_vals = (void*) val->elems;
 	for (size_t m = 0; m < val_constr.datalen; m++) {
 		int8_tArray val_conv_12 = val_vals[m];
 		LDKSignature val_conv_12_ref;
@@ -28102,6 +30062,7 @@ void  __attribute__((export_name("TS_CommitmentSigned_set_htlc_signatures"))) TS
 		memcpy(val_conv_12_ref.compact_form, val_conv_12->elems, 64); FREE(val_conv_12);
 		val_constr.data[m] = val_conv_12_ref;
 	}
+	FREE(val);
 	CommitmentSigned_set_htlc_signatures(&this_ptr_conv, val_constr);
 }
 
@@ -28118,7 +30079,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentS
 		htlc_signatures_arg_constr.data = MALLOC(htlc_signatures_arg_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements");
 	else
 		htlc_signatures_arg_constr.data = NULL;
-	int8_tArray* htlc_signatures_arg_vals = (void*) htlc_signatures_arg->elems /* XXX htlc_signatures_arg leaks */;
+	int8_tArray* htlc_signatures_arg_vals = (void*) htlc_signatures_arg->elems;
 	for (size_t m = 0; m < htlc_signatures_arg_constr.datalen; m++) {
 		int8_tArray htlc_signatures_arg_conv_12 = htlc_signatures_arg_vals[m];
 		LDKSignature htlc_signatures_arg_conv_12_ref;
@@ -28126,8 +30087,9 @@ uint32_t  __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentS
 		memcpy(htlc_signatures_arg_conv_12_ref.compact_form, htlc_signatures_arg_conv_12->elems, 64); FREE(htlc_signatures_arg_conv_12);
 		htlc_signatures_arg_constr.data[m] = htlc_signatures_arg_conv_12_ref;
 	}
+	FREE(htlc_signatures_arg);
 	LDKCommitmentSigned ret_var = CommitmentSigned_new(channel_id_arg_ref, signature_arg_ref, htlc_signatures_arg_constr);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28140,7 +30102,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentSigned_new"))) TS_CommitmentS
 
 static inline uintptr_t CommitmentSigned_clone_ptr(LDKCommitmentSigned *NONNULL_PTR arg) {
 	LDKCommitmentSigned ret_var = CommitmentSigned_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28150,13 +30112,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_CommitmentSigned_clone_ptr"))) TS_CommitmentSigned_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CommitmentSigned_clone_ptr"))) TS_CommitmentSigned_clone_ptr(uint32_t arg) {
 	LDKCommitmentSigned arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = CommitmentSigned_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CommitmentSigned_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CommitmentSigned_clone"))) TS_CommitmentSigned_clone(uint32_t orig) {
@@ -28165,7 +30127,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentSigned_clone"))) TS_Commitmen
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCommitmentSigned ret_var = CommitmentSigned_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28258,7 +30220,7 @@ uint32_t  __attribute__((export_name("TS_RevokeAndACK_new"))) TS_RevokeAndACK_ne
 	CHECK(next_per_commitment_point_arg->arr_len == 33);
 	memcpy(next_per_commitment_point_arg_ref.compressed_form, next_per_commitment_point_arg->elems, 33); FREE(next_per_commitment_point_arg);
 	LDKRevokeAndACK ret_var = RevokeAndACK_new(channel_id_arg_ref, per_commitment_secret_arg_ref, next_per_commitment_point_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28271,7 +30233,7 @@ uint32_t  __attribute__((export_name("TS_RevokeAndACK_new"))) TS_RevokeAndACK_ne
 
 static inline uintptr_t RevokeAndACK_clone_ptr(LDKRevokeAndACK *NONNULL_PTR arg) {
 	LDKRevokeAndACK ret_var = RevokeAndACK_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28281,13 +30243,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_RevokeAndACK_clone_ptr"))) TS_RevokeAndACK_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_RevokeAndACK_clone_ptr"))) TS_RevokeAndACK_clone_ptr(uint32_t arg) {
 	LDKRevokeAndACK arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = RevokeAndACK_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = RevokeAndACK_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RevokeAndACK_clone"))) TS_RevokeAndACK_clone(uint32_t orig) {
@@ -28296,7 +30258,7 @@ uint32_t  __attribute__((export_name("TS_RevokeAndACK_clone"))) TS_RevokeAndACK_
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRevokeAndACK ret_var = RevokeAndACK_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28341,8 +30303,8 @@ int32_t  __attribute__((export_name("TS_UpdateFee_get_feerate_per_kw"))) TS_Upda
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int32_t ret_val = UpdateFee_get_feerate_per_kw(&this_ptr_conv);
-	return ret_val;
+	int32_t ret_conv = UpdateFee_get_feerate_per_kw(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UpdateFee_set_feerate_per_kw"))) TS_UpdateFee_set_feerate_per_kw(uint32_t this_ptr, int32_t val) {
@@ -28358,7 +30320,7 @@ uint32_t  __attribute__((export_name("TS_UpdateFee_new"))) TS_UpdateFee_new(int8
 	CHECK(channel_id_arg->arr_len == 32);
 	memcpy(channel_id_arg_ref.data, channel_id_arg->elems, 32); FREE(channel_id_arg);
 	LDKUpdateFee ret_var = UpdateFee_new(channel_id_arg_ref, feerate_per_kw_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28371,7 +30333,7 @@ uint32_t  __attribute__((export_name("TS_UpdateFee_new"))) TS_UpdateFee_new(int8
 
 static inline uintptr_t UpdateFee_clone_ptr(LDKUpdateFee *NONNULL_PTR arg) {
 	LDKUpdateFee ret_var = UpdateFee_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28381,13 +30343,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_UpdateFee_clone_ptr"))) TS_UpdateFee_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_UpdateFee_clone_ptr"))) TS_UpdateFee_clone_ptr(uint32_t arg) {
 	LDKUpdateFee arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = UpdateFee_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = UpdateFee_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_UpdateFee_clone"))) TS_UpdateFee_clone(uint32_t orig) {
@@ -28396,7 +30358,7 @@ uint32_t  __attribute__((export_name("TS_UpdateFee_clone"))) TS_UpdateFee_clone(
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUpdateFee ret_var = UpdateFee_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28465,7 +30427,7 @@ uint32_t  __attribute__((export_name("TS_DataLossProtect_new"))) TS_DataLossProt
 	CHECK(my_current_per_commitment_point_arg->arr_len == 33);
 	memcpy(my_current_per_commitment_point_arg_ref.compressed_form, my_current_per_commitment_point_arg->elems, 33); FREE(my_current_per_commitment_point_arg);
 	LDKDataLossProtect ret_var = DataLossProtect_new(your_last_per_commitment_secret_arg_ref, my_current_per_commitment_point_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28478,7 +30440,7 @@ uint32_t  __attribute__((export_name("TS_DataLossProtect_new"))) TS_DataLossProt
 
 static inline uintptr_t DataLossProtect_clone_ptr(LDKDataLossProtect *NONNULL_PTR arg) {
 	LDKDataLossProtect ret_var = DataLossProtect_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28488,13 +30450,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_DataLossProtect_clone_ptr"))) TS_DataLossProtect_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_DataLossProtect_clone_ptr"))) TS_DataLossProtect_clone_ptr(uint32_t arg) {
 	LDKDataLossProtect arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = DataLossProtect_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = DataLossProtect_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_DataLossProtect_clone"))) TS_DataLossProtect_clone(uint32_t orig) {
@@ -28503,7 +30465,7 @@ uint32_t  __attribute__((export_name("TS_DataLossProtect_clone"))) TS_DataLossPr
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKDataLossProtect ret_var = DataLossProtect_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28548,8 +30510,8 @@ int64_t  __attribute__((export_name("TS_ChannelReestablish_get_next_local_commit
 	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;
+	int64_t ret_conv = ChannelReestablish_get_next_local_commitment_number(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelReestablish_set_next_local_commitment_number"))) TS_ChannelReestablish_set_next_local_commitment_number(uint32_t this_ptr, int64_t val) {
@@ -28565,8 +30527,8 @@ int64_t  __attribute__((export_name("TS_ChannelReestablish_get_next_remote_commi
 	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;
+	int64_t ret_conv = ChannelReestablish_get_next_remote_commitment_number(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelReestablish_set_next_remote_commitment_number"))) TS_ChannelReestablish_set_next_remote_commitment_number(uint32_t this_ptr, int64_t val) {
@@ -28579,7 +30541,7 @@ void  __attribute__((export_name("TS_ChannelReestablish_set_next_remote_commitme
 
 static inline uintptr_t ChannelReestablish_clone_ptr(LDKChannelReestablish *NONNULL_PTR arg) {
 	LDKChannelReestablish ret_var = ChannelReestablish_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28589,13 +30551,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelReestablish_clone_ptr"))) TS_ChannelReestablish_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelReestablish_clone_ptr"))) TS_ChannelReestablish_clone_ptr(uint32_t arg) {
 	LDKChannelReestablish arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelReestablish_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelReestablish_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelReestablish_clone"))) TS_ChannelReestablish_clone(uint32_t orig) {
@@ -28604,7 +30566,7 @@ uint32_t  __attribute__((export_name("TS_ChannelReestablish_clone"))) TS_Channel
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelReestablish ret_var = ChannelReestablish_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28649,8 +30611,8 @@ int64_t  __attribute__((export_name("TS_AnnouncementSignatures_get_short_channel
 	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;
+	int64_t ret_conv = AnnouncementSignatures_get_short_channel_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_AnnouncementSignatures_set_short_channel_id"))) TS_AnnouncementSignatures_set_short_channel_id(uint32_t this_ptr, int64_t val) {
@@ -28714,7 +30676,7 @@ uint32_t  __attribute__((export_name("TS_AnnouncementSignatures_new"))) TS_Annou
 	CHECK(bitcoin_signature_arg->arr_len == 64);
 	memcpy(bitcoin_signature_arg_ref.compact_form, bitcoin_signature_arg->elems, 64); FREE(bitcoin_signature_arg);
 	LDKAnnouncementSignatures ret_var = AnnouncementSignatures_new(channel_id_arg_ref, short_channel_id_arg, node_signature_arg_ref, bitcoin_signature_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28727,7 +30689,7 @@ uint32_t  __attribute__((export_name("TS_AnnouncementSignatures_new"))) TS_Annou
 
 static inline uintptr_t AnnouncementSignatures_clone_ptr(LDKAnnouncementSignatures *NONNULL_PTR arg) {
 	LDKAnnouncementSignatures ret_var = AnnouncementSignatures_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28737,13 +30699,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_AnnouncementSignatures_clone_ptr"))) TS_AnnouncementSignatures_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_AnnouncementSignatures_clone_ptr"))) TS_AnnouncementSignatures_clone_ptr(uint32_t arg) {
 	LDKAnnouncementSignatures arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = AnnouncementSignatures_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = AnnouncementSignatures_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_AnnouncementSignatures_clone"))) TS_AnnouncementSignatures_clone(uint32_t orig) {
@@ -28752,7 +30714,7 @@ uint32_t  __attribute__((export_name("TS_AnnouncementSignatures_clone"))) TS_Ann
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKAnnouncementSignatures ret_var = AnnouncementSignatures_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28775,20 +30737,20 @@ void  __attribute__((export_name("TS_NetAddress_free"))) TS_NetAddress_free(uint
 static inline uintptr_t NetAddress_clone_ptr(LDKNetAddress *NONNULL_PTR arg) {
 	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
 	*ret_copy = NetAddress_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_NetAddress_clone_ptr"))) TS_NetAddress_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_NetAddress_clone_ptr"))) TS_NetAddress_clone_ptr(uint32_t arg) {
 	LDKNetAddress* arg_conv = (LDKNetAddress*)arg;
-	intptr_t ret_val = NetAddress_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = NetAddress_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NetAddress_clone"))) TS_NetAddress_clone(uint32_t orig) {
 	LDKNetAddress* orig_conv = (LDKNetAddress*)orig;
 	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
 	*ret_copy = NetAddress_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -28798,7 +30760,7 @@ uint32_t  __attribute__((export_name("TS_NetAddress_ipv4"))) TS_NetAddress_ipv4(
 	memcpy(addr_ref.data, addr->elems, 4); FREE(addr);
 	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
 	*ret_copy = NetAddress_ipv4(addr_ref, port);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -28808,7 +30770,7 @@ uint32_t  __attribute__((export_name("TS_NetAddress_ipv6"))) TS_NetAddress_ipv6(
 	memcpy(addr_ref.data, addr->elems, 16); FREE(addr);
 	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
 	*ret_copy = NetAddress_ipv6(addr_ref, port);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -28818,7 +30780,7 @@ uint32_t  __attribute__((export_name("TS_NetAddress_onion_v2"))) TS_NetAddress_o
 	memcpy(a_ref.data, a->elems, 12); FREE(a);
 	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
 	*ret_copy = NetAddress_onion_v2(a_ref);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -28828,7 +30790,7 @@ uint32_t  __attribute__((export_name("TS_NetAddress_onion_v3"))) TS_NetAddress_o
 	memcpy(ed25519_pubkey_ref.data, ed25519_pubkey->elems, 32); FREE(ed25519_pubkey);
 	LDKNetAddress *ret_copy = MALLOC(sizeof(LDKNetAddress), "LDKNetAddress");
 	*ret_copy = NetAddress_onion_v3(ed25519_pubkey_ref, checksum, version, port);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -28844,10 +30806,11 @@ int8_tArray  __attribute__((export_name("TS_NetAddress_write"))) TS_NetAddress_w
 uint32_t  __attribute__((export_name("TS_NetAddress_read"))) TS_NetAddress_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_NetAddressDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetAddressDecodeErrorZ), "LDKCResult_NetAddressDecodeErrorZ");
 	*ret_conv = NetAddress_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_UnsignedNodeAnnouncement_free"))) TS_UnsignedNodeAnnouncement_free(uint32_t this_obj) {
@@ -28864,7 +30827,7 @@ uint32_t  __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_features")
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeFeatures ret_var = UnsignedNodeAnnouncement_get_features(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -28893,8 +30856,8 @@ int32_t  __attribute__((export_name("TS_UnsignedNodeAnnouncement_get_timestamp")
 	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;
+	int32_t ret_conv = UnsignedNodeAnnouncement_get_timestamp(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_timestamp"))) TS_UnsignedNodeAnnouncement_set_timestamp(uint32_t this_ptr, int32_t val) {
@@ -28979,7 +30942,7 @@ void  __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_addresses")))
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements");
 	else
 		val_constr.data = NULL;
-	uint32_t* val_vals = val->elems /* XXX val leaks */;
+	uint32_t* val_vals = val->elems;
 	for (size_t m = 0; m < val_constr.datalen; m++) {
 		uint32_t val_conv_12 = val_vals[m];
 		void* val_conv_12_ptr = (void*)(((uintptr_t)val_conv_12) & ~1);
@@ -28988,12 +30951,13 @@ void  __attribute__((export_name("TS_UnsignedNodeAnnouncement_set_addresses")))
 		val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)val_conv_12) & ~1));
 		val_constr.data[m] = val_conv_12_conv;
 	}
+	FREE(val);
 	UnsignedNodeAnnouncement_set_addresses(&this_ptr_conv, val_constr);
 }
 
 static inline uintptr_t UnsignedNodeAnnouncement_clone_ptr(LDKUnsignedNodeAnnouncement *NONNULL_PTR arg) {
 	LDKUnsignedNodeAnnouncement ret_var = UnsignedNodeAnnouncement_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29003,13 +30967,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone_ptr"))) TS_UnsignedNodeAnnouncement_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone_ptr"))) TS_UnsignedNodeAnnouncement_clone_ptr(uint32_t arg) {
 	LDKUnsignedNodeAnnouncement arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = UnsignedNodeAnnouncement_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = UnsignedNodeAnnouncement_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone"))) TS_UnsignedNodeAnnouncement_clone(uint32_t orig) {
@@ -29018,7 +30982,7 @@ uint32_t  __attribute__((export_name("TS_UnsignedNodeAnnouncement_clone"))) TS_U
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUnsignedNodeAnnouncement ret_var = UnsignedNodeAnnouncement_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29064,7 +31028,7 @@ uint32_t  __attribute__((export_name("TS_NodeAnnouncement_get_contents"))) TS_No
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUnsignedNodeAnnouncement ret_var = NodeAnnouncement_get_contents(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29098,7 +31062,7 @@ uint32_t  __attribute__((export_name("TS_NodeAnnouncement_new"))) TS_NodeAnnounc
 	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);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29111,7 +31075,7 @@ uint32_t  __attribute__((export_name("TS_NodeAnnouncement_new"))) TS_NodeAnnounc
 
 static inline uintptr_t NodeAnnouncement_clone_ptr(LDKNodeAnnouncement *NONNULL_PTR arg) {
 	LDKNodeAnnouncement ret_var = NodeAnnouncement_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29121,13 +31085,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_NodeAnnouncement_clone_ptr"))) TS_NodeAnnouncement_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_NodeAnnouncement_clone_ptr"))) TS_NodeAnnouncement_clone_ptr(uint32_t arg) {
 	LDKNodeAnnouncement arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = NodeAnnouncement_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = NodeAnnouncement_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NodeAnnouncement_clone"))) TS_NodeAnnouncement_clone(uint32_t orig) {
@@ -29136,7 +31100,7 @@ uint32_t  __attribute__((export_name("TS_NodeAnnouncement_clone"))) TS_NodeAnnou
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNodeAnnouncement ret_var = NodeAnnouncement_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29161,7 +31125,7 @@ uint32_t  __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_feature
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelFeatures ret_var = UnsignedChannelAnnouncement_get_features(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29211,8 +31175,8 @@ int64_t  __attribute__((export_name("TS_UnsignedChannelAnnouncement_get_short_ch
 	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;
+	int64_t ret_conv = UnsignedChannelAnnouncement_get_short_channel_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_short_channel_id"))) TS_UnsignedChannelAnnouncement_set_short_channel_id(uint32_t this_ptr, int64_t val) {
@@ -29309,7 +31273,7 @@ void  __attribute__((export_name("TS_UnsignedChannelAnnouncement_set_bitcoin_key
 
 static inline uintptr_t UnsignedChannelAnnouncement_clone_ptr(LDKUnsignedChannelAnnouncement *NONNULL_PTR arg) {
 	LDKUnsignedChannelAnnouncement ret_var = UnsignedChannelAnnouncement_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29319,13 +31283,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone_ptr"))) TS_UnsignedChannelAnnouncement_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone_ptr"))) TS_UnsignedChannelAnnouncement_clone_ptr(uint32_t arg) {
 	LDKUnsignedChannelAnnouncement arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = UnsignedChannelAnnouncement_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = UnsignedChannelAnnouncement_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone"))) TS_UnsignedChannelAnnouncement_clone(uint32_t orig) {
@@ -29334,7 +31298,7 @@ uint32_t  __attribute__((export_name("TS_UnsignedChannelAnnouncement_clone"))) T
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUnsignedChannelAnnouncement ret_var = UnsignedChannelAnnouncement_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29443,7 +31407,7 @@ uint32_t  __attribute__((export_name("TS_ChannelAnnouncement_get_contents"))) TS
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUnsignedChannelAnnouncement ret_var = ChannelAnnouncement_get_contents(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29486,7 +31450,7 @@ uint32_t  __attribute__((export_name("TS_ChannelAnnouncement_new"))) TS_ChannelA
 	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);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29499,7 +31463,7 @@ uint32_t  __attribute__((export_name("TS_ChannelAnnouncement_new"))) TS_ChannelA
 
 static inline uintptr_t ChannelAnnouncement_clone_ptr(LDKChannelAnnouncement *NONNULL_PTR arg) {
 	LDKChannelAnnouncement ret_var = ChannelAnnouncement_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29509,13 +31473,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelAnnouncement_clone_ptr"))) TS_ChannelAnnouncement_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelAnnouncement_clone_ptr"))) TS_ChannelAnnouncement_clone_ptr(uint32_t arg) {
 	LDKChannelAnnouncement arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelAnnouncement_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelAnnouncement_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelAnnouncement_clone"))) TS_ChannelAnnouncement_clone(uint32_t orig) {
@@ -29524,7 +31488,7 @@ uint32_t  __attribute__((export_name("TS_ChannelAnnouncement_clone"))) TS_Channe
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelAnnouncement ret_var = ChannelAnnouncement_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29569,8 +31533,8 @@ int64_t  __attribute__((export_name("TS_UnsignedChannelUpdate_get_short_channel_
 	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;
+	int64_t ret_conv = UnsignedChannelUpdate_get_short_channel_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UnsignedChannelUpdate_set_short_channel_id"))) TS_UnsignedChannelUpdate_set_short_channel_id(uint32_t this_ptr, int64_t val) {
@@ -29586,8 +31550,8 @@ int32_t  __attribute__((export_name("TS_UnsignedChannelUpdate_get_timestamp")))
 	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;
+	int32_t ret_conv = UnsignedChannelUpdate_get_timestamp(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UnsignedChannelUpdate_set_timestamp"))) TS_UnsignedChannelUpdate_set_timestamp(uint32_t this_ptr, int32_t val) {
@@ -29603,8 +31567,8 @@ int8_t  __attribute__((export_name("TS_UnsignedChannelUpdate_get_flags"))) TS_Un
 	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;
+	int8_t ret_conv = UnsignedChannelUpdate_get_flags(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UnsignedChannelUpdate_set_flags"))) TS_UnsignedChannelUpdate_set_flags(uint32_t this_ptr, int8_t val) {
@@ -29620,8 +31584,8 @@ int16_t  __attribute__((export_name("TS_UnsignedChannelUpdate_get_cltv_expiry_de
 	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;
+	int16_t ret_conv = UnsignedChannelUpdate_get_cltv_expiry_delta(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UnsignedChannelUpdate_set_cltv_expiry_delta"))) TS_UnsignedChannelUpdate_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) {
@@ -29637,8 +31601,8 @@ int64_t  __attribute__((export_name("TS_UnsignedChannelUpdate_get_htlc_minimum_m
 	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;
+	int64_t ret_conv = UnsignedChannelUpdate_get_htlc_minimum_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UnsignedChannelUpdate_set_htlc_minimum_msat"))) TS_UnsignedChannelUpdate_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) {
@@ -29654,8 +31618,8 @@ int32_t  __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_base_msat"
 	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;
+	int32_t ret_conv = UnsignedChannelUpdate_get_fee_base_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_base_msat"))) TS_UnsignedChannelUpdate_set_fee_base_msat(uint32_t this_ptr, int32_t val) {
@@ -29671,8 +31635,8 @@ int32_t  __attribute__((export_name("TS_UnsignedChannelUpdate_get_fee_proportion
 	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;
+	int32_t ret_conv = UnsignedChannelUpdate_get_fee_proportional_millionths(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_proportional_millionths"))) TS_UnsignedChannelUpdate_set_fee_proportional_millionths(uint32_t this_ptr, int32_t val) {
@@ -29683,9 +31647,21 @@ void  __attribute__((export_name("TS_UnsignedChannelUpdate_set_fee_proportional_
 	UnsignedChannelUpdate_set_fee_proportional_millionths(&this_ptr_conv, val);
 }
 
+void  __attribute__((export_name("TS_UnsignedChannelUpdate_set_excess_data"))) TS_UnsignedChannelUpdate_set_excess_data(uint32_t this_ptr, int8_tArray val) {
+	LDKUnsignedChannelUpdate this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKCVec_u8Z val_ref;
+	val_ref.datalen = val->arr_len;
+	val_ref.data = MALLOC(val_ref.datalen, "LDKCVec_u8Z Bytes");
+	memcpy(val_ref.data, val->elems, val_ref.datalen); FREE(val);
+	UnsignedChannelUpdate_set_excess_data(&this_ptr_conv, val_ref);
+}
+
 static inline uintptr_t UnsignedChannelUpdate_clone_ptr(LDKUnsignedChannelUpdate *NONNULL_PTR arg) {
 	LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29695,13 +31671,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_UnsignedChannelUpdate_clone_ptr"))) TS_UnsignedChannelUpdate_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_UnsignedChannelUpdate_clone_ptr"))) TS_UnsignedChannelUpdate_clone_ptr(uint32_t arg) {
 	LDKUnsignedChannelUpdate arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = UnsignedChannelUpdate_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = UnsignedChannelUpdate_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_UnsignedChannelUpdate_clone"))) TS_UnsignedChannelUpdate_clone(uint32_t orig) {
@@ -29710,7 +31686,7 @@ uint32_t  __attribute__((export_name("TS_UnsignedChannelUpdate_clone"))) TS_Unsi
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKUnsignedChannelUpdate ret_var = UnsignedChannelUpdate_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29756,7 +31732,7 @@ uint32_t  __attribute__((export_name("TS_ChannelUpdate_get_contents"))) TS_Chann
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUnsignedChannelUpdate ret_var = ChannelUpdate_get_contents(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29790,7 +31766,7 @@ uint32_t  __attribute__((export_name("TS_ChannelUpdate_new"))) TS_ChannelUpdate_
 	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);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29803,7 +31779,7 @@ uint32_t  __attribute__((export_name("TS_ChannelUpdate_new"))) TS_ChannelUpdate_
 
 static inline uintptr_t ChannelUpdate_clone_ptr(LDKChannelUpdate *NONNULL_PTR arg) {
 	LDKChannelUpdate ret_var = ChannelUpdate_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29813,13 +31789,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelUpdate_clone_ptr"))) TS_ChannelUpdate_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelUpdate_clone_ptr"))) TS_ChannelUpdate_clone_ptr(uint32_t arg) {
 	LDKChannelUpdate arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelUpdate_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelUpdate_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelUpdate_clone"))) TS_ChannelUpdate_clone(uint32_t orig) {
@@ -29828,7 +31804,7 @@ uint32_t  __attribute__((export_name("TS_ChannelUpdate_clone"))) TS_ChannelUpdat
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelUpdate ret_var = ChannelUpdate_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29873,8 +31849,8 @@ int32_t  __attribute__((export_name("TS_QueryChannelRange_get_first_blocknum")))
 	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;
+	int32_t ret_conv = QueryChannelRange_get_first_blocknum(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_QueryChannelRange_set_first_blocknum"))) TS_QueryChannelRange_set_first_blocknum(uint32_t this_ptr, int32_t val) {
@@ -29890,8 +31866,8 @@ int32_t  __attribute__((export_name("TS_QueryChannelRange_get_number_of_blocks")
 	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;
+	int32_t ret_conv = QueryChannelRange_get_number_of_blocks(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_QueryChannelRange_set_number_of_blocks"))) TS_QueryChannelRange_set_number_of_blocks(uint32_t this_ptr, int32_t val) {
@@ -29907,7 +31883,7 @@ uint32_t  __attribute__((export_name("TS_QueryChannelRange_new"))) TS_QueryChann
 	CHECK(chain_hash_arg->arr_len == 32);
 	memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg);
 	LDKQueryChannelRange ret_var = QueryChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29920,7 +31896,7 @@ uint32_t  __attribute__((export_name("TS_QueryChannelRange_new"))) TS_QueryChann
 
 static inline uintptr_t QueryChannelRange_clone_ptr(LDKQueryChannelRange *NONNULL_PTR arg) {
 	LDKQueryChannelRange ret_var = QueryChannelRange_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29930,13 +31906,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_QueryChannelRange_clone_ptr"))) TS_QueryChannelRange_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_QueryChannelRange_clone_ptr"))) TS_QueryChannelRange_clone_ptr(uint32_t arg) {
 	LDKQueryChannelRange arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = QueryChannelRange_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = QueryChannelRange_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_QueryChannelRange_clone"))) TS_QueryChannelRange_clone(uint32_t orig) {
@@ -29945,7 +31921,7 @@ uint32_t  __attribute__((export_name("TS_QueryChannelRange_clone"))) TS_QueryCha
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKQueryChannelRange ret_var = QueryChannelRange_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -29990,8 +31966,8 @@ int32_t  __attribute__((export_name("TS_ReplyChannelRange_get_first_blocknum")))
 	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;
+	int32_t ret_conv = ReplyChannelRange_get_first_blocknum(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ReplyChannelRange_set_first_blocknum"))) TS_ReplyChannelRange_set_first_blocknum(uint32_t this_ptr, int32_t val) {
@@ -30007,8 +31983,8 @@ int32_t  __attribute__((export_name("TS_ReplyChannelRange_get_number_of_blocks")
 	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;
+	int32_t ret_conv = ReplyChannelRange_get_number_of_blocks(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ReplyChannelRange_set_number_of_blocks"))) TS_ReplyChannelRange_set_number_of_blocks(uint32_t this_ptr, int32_t val) {
@@ -30024,8 +32000,8 @@ jboolean  __attribute__((export_name("TS_ReplyChannelRange_get_sync_complete")))
 	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;
+	jboolean ret_conv = ReplyChannelRange_get_sync_complete(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ReplyChannelRange_set_sync_complete"))) TS_ReplyChannelRange_set_sync_complete(uint32_t this_ptr, jboolean val) {
@@ -30047,11 +32023,12 @@ void  __attribute__((export_name("TS_ReplyChannelRange_set_short_channel_ids")))
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements");
 	else
 		val_constr.data = NULL;
-	int64_t* val_vals = val->elems /* XXX val leaks */;
+	int64_t* val_vals = val->elems;
 	for (size_t i = 0; i < val_constr.datalen; i++) {
 		int64_t val_conv_8 = val_vals[i];
 		val_constr.data[i] = val_conv_8;
 	}
+	FREE(val);
 	ReplyChannelRange_set_short_channel_ids(&this_ptr_conv, val_constr);
 }
 
@@ -30065,13 +32042,14 @@ uint32_t  __attribute__((export_name("TS_ReplyChannelRange_new"))) TS_ReplyChann
 		short_channel_ids_arg_constr.data = MALLOC(short_channel_ids_arg_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements");
 	else
 		short_channel_ids_arg_constr.data = NULL;
-	int64_t* short_channel_ids_arg_vals = short_channel_ids_arg->elems /* XXX short_channel_ids_arg leaks */;
+	int64_t* short_channel_ids_arg_vals = short_channel_ids_arg->elems;
 	for (size_t i = 0; i < short_channel_ids_arg_constr.datalen; i++) {
 		int64_t short_channel_ids_arg_conv_8 = short_channel_ids_arg_vals[i];
 		short_channel_ids_arg_constr.data[i] = short_channel_ids_arg_conv_8;
 	}
+	FREE(short_channel_ids_arg);
 	LDKReplyChannelRange ret_var = ReplyChannelRange_new(chain_hash_arg_ref, first_blocknum_arg, number_of_blocks_arg, sync_complete_arg, short_channel_ids_arg_constr);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30084,7 +32062,7 @@ uint32_t  __attribute__((export_name("TS_ReplyChannelRange_new"))) TS_ReplyChann
 
 static inline uintptr_t ReplyChannelRange_clone_ptr(LDKReplyChannelRange *NONNULL_PTR arg) {
 	LDKReplyChannelRange ret_var = ReplyChannelRange_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30094,13 +32072,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ReplyChannelRange_clone_ptr"))) TS_ReplyChannelRange_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ReplyChannelRange_clone_ptr"))) TS_ReplyChannelRange_clone_ptr(uint32_t arg) {
 	LDKReplyChannelRange arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ReplyChannelRange_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ReplyChannelRange_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ReplyChannelRange_clone"))) TS_ReplyChannelRange_clone(uint32_t orig) {
@@ -30109,7 +32087,7 @@ uint32_t  __attribute__((export_name("TS_ReplyChannelRange_clone"))) TS_ReplyCha
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKReplyChannelRange ret_var = ReplyChannelRange_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30160,11 +32138,12 @@ void  __attribute__((export_name("TS_QueryShortChannelIds_set_short_channel_ids"
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements");
 	else
 		val_constr.data = NULL;
-	int64_t* val_vals = val->elems /* XXX val leaks */;
+	int64_t* val_vals = val->elems;
 	for (size_t i = 0; i < val_constr.datalen; i++) {
 		int64_t val_conv_8 = val_vals[i];
 		val_constr.data[i] = val_conv_8;
 	}
+	FREE(val);
 	QueryShortChannelIds_set_short_channel_ids(&this_ptr_conv, val_constr);
 }
 
@@ -30178,13 +32157,14 @@ uint32_t  __attribute__((export_name("TS_QueryShortChannelIds_new"))) TS_QuerySh
 		short_channel_ids_arg_constr.data = MALLOC(short_channel_ids_arg_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements");
 	else
 		short_channel_ids_arg_constr.data = NULL;
-	int64_t* short_channel_ids_arg_vals = short_channel_ids_arg->elems /* XXX short_channel_ids_arg leaks */;
+	int64_t* short_channel_ids_arg_vals = short_channel_ids_arg->elems;
 	for (size_t i = 0; i < short_channel_ids_arg_constr.datalen; i++) {
 		int64_t short_channel_ids_arg_conv_8 = short_channel_ids_arg_vals[i];
 		short_channel_ids_arg_constr.data[i] = short_channel_ids_arg_conv_8;
 	}
+	FREE(short_channel_ids_arg);
 	LDKQueryShortChannelIds ret_var = QueryShortChannelIds_new(chain_hash_arg_ref, short_channel_ids_arg_constr);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30197,7 +32177,7 @@ uint32_t  __attribute__((export_name("TS_QueryShortChannelIds_new"))) TS_QuerySh
 
 static inline uintptr_t QueryShortChannelIds_clone_ptr(LDKQueryShortChannelIds *NONNULL_PTR arg) {
 	LDKQueryShortChannelIds ret_var = QueryShortChannelIds_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30207,13 +32187,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_QueryShortChannelIds_clone_ptr"))) TS_QueryShortChannelIds_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_QueryShortChannelIds_clone_ptr"))) TS_QueryShortChannelIds_clone_ptr(uint32_t arg) {
 	LDKQueryShortChannelIds arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = QueryShortChannelIds_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = QueryShortChannelIds_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_QueryShortChannelIds_clone"))) TS_QueryShortChannelIds_clone(uint32_t orig) {
@@ -30222,7 +32202,7 @@ uint32_t  __attribute__((export_name("TS_QueryShortChannelIds_clone"))) TS_Query
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKQueryShortChannelIds ret_var = QueryShortChannelIds_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30267,8 +32247,8 @@ jboolean  __attribute__((export_name("TS_ReplyShortChannelIdsEnd_get_full_inform
 	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;
+	jboolean ret_conv = ReplyShortChannelIdsEnd_get_full_information(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ReplyShortChannelIdsEnd_set_full_information"))) TS_ReplyShortChannelIdsEnd_set_full_information(uint32_t this_ptr, jboolean val) {
@@ -30284,7 +32264,7 @@ uint32_t  __attribute__((export_name("TS_ReplyShortChannelIdsEnd_new"))) TS_Repl
 	CHECK(chain_hash_arg->arr_len == 32);
 	memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg);
 	LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_new(chain_hash_arg_ref, full_information_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30297,7 +32277,7 @@ uint32_t  __attribute__((export_name("TS_ReplyShortChannelIdsEnd_new"))) TS_Repl
 
 static inline uintptr_t ReplyShortChannelIdsEnd_clone_ptr(LDKReplyShortChannelIdsEnd *NONNULL_PTR arg) {
 	LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30307,13 +32287,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone_ptr"))) TS_ReplyShortChannelIdsEnd_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone_ptr"))) TS_ReplyShortChannelIdsEnd_clone_ptr(uint32_t arg) {
 	LDKReplyShortChannelIdsEnd arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ReplyShortChannelIdsEnd_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ReplyShortChannelIdsEnd_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone"))) TS_ReplyShortChannelIdsEnd_clone(uint32_t orig) {
@@ -30322,7 +32302,7 @@ uint32_t  __attribute__((export_name("TS_ReplyShortChannelIdsEnd_clone"))) TS_Re
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKReplyShortChannelIdsEnd ret_var = ReplyShortChannelIdsEnd_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30367,8 +32347,8 @@ int32_t  __attribute__((export_name("TS_GossipTimestampFilter_get_first_timestam
 	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;
+	int32_t ret_conv = GossipTimestampFilter_get_first_timestamp(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_GossipTimestampFilter_set_first_timestamp"))) TS_GossipTimestampFilter_set_first_timestamp(uint32_t this_ptr, int32_t val) {
@@ -30384,8 +32364,8 @@ int32_t  __attribute__((export_name("TS_GossipTimestampFilter_get_timestamp_rang
 	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;
+	int32_t ret_conv = GossipTimestampFilter_get_timestamp_range(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_GossipTimestampFilter_set_timestamp_range"))) TS_GossipTimestampFilter_set_timestamp_range(uint32_t this_ptr, int32_t val) {
@@ -30401,7 +32381,7 @@ uint32_t  __attribute__((export_name("TS_GossipTimestampFilter_new"))) TS_Gossip
 	CHECK(chain_hash_arg->arr_len == 32);
 	memcpy(chain_hash_arg_ref.data, chain_hash_arg->elems, 32); FREE(chain_hash_arg);
 	LDKGossipTimestampFilter ret_var = GossipTimestampFilter_new(chain_hash_arg_ref, first_timestamp_arg, timestamp_range_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30414,7 +32394,7 @@ uint32_t  __attribute__((export_name("TS_GossipTimestampFilter_new"))) TS_Gossip
 
 static inline uintptr_t GossipTimestampFilter_clone_ptr(LDKGossipTimestampFilter *NONNULL_PTR arg) {
 	LDKGossipTimestampFilter ret_var = GossipTimestampFilter_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30424,13 +32404,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_GossipTimestampFilter_clone_ptr"))) TS_GossipTimestampFilter_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_GossipTimestampFilter_clone_ptr"))) TS_GossipTimestampFilter_clone_ptr(uint32_t arg) {
 	LDKGossipTimestampFilter arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = GossipTimestampFilter_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = GossipTimestampFilter_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_GossipTimestampFilter_clone"))) TS_GossipTimestampFilter_clone(uint32_t orig) {
@@ -30439,7 +32419,7 @@ uint32_t  __attribute__((export_name("TS_GossipTimestampFilter_clone"))) TS_Goss
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKGossipTimestampFilter ret_var = GossipTimestampFilter_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30462,20 +32442,20 @@ void  __attribute__((export_name("TS_ErrorAction_free"))) TS_ErrorAction_free(ui
 static inline uintptr_t ErrorAction_clone_ptr(LDKErrorAction *NONNULL_PTR arg) {
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
 	*ret_copy = ErrorAction_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ErrorAction_clone_ptr"))) TS_ErrorAction_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ErrorAction_clone_ptr"))) TS_ErrorAction_clone_ptr(uint32_t arg) {
 	LDKErrorAction* arg_conv = (LDKErrorAction*)arg;
-	intptr_t ret_val = ErrorAction_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ErrorAction_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ErrorAction_clone"))) TS_ErrorAction_clone(uint32_t orig) {
 	LDKErrorAction* orig_conv = (LDKErrorAction*)orig;
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
 	*ret_copy = ErrorAction_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -30487,14 +32467,14 @@ uint32_t  __attribute__((export_name("TS_ErrorAction_disconnect_peer"))) TS_Erro
 	msg_conv = ErrorMessage_clone(&msg_conv);
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
 	*ret_copy = ErrorAction_disconnect_peer(msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_ErrorAction_ignore_error"))) TS_ErrorAction_ignore_error() {
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
 	*ret_copy = ErrorAction_ignore_error();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -30502,14 +32482,14 @@ uint32_t  __attribute__((export_name("TS_ErrorAction_ignore_and_log"))) TS_Error
 	LDKLevel a_conv = LDKLevel_from_js(a);
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
 	*ret_copy = ErrorAction_ignore_and_log(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_ErrorAction_ignore_duplicate_gossip"))) TS_ErrorAction_ignore_duplicate_gossip() {
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
 	*ret_copy = ErrorAction_ignore_duplicate_gossip();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -30521,7 +32501,7 @@ uint32_t  __attribute__((export_name("TS_ErrorAction_send_error_message"))) TS_E
 	msg_conv = ErrorMessage_clone(&msg_conv);
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
 	*ret_copy = ErrorAction_send_error_message(msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -30534,7 +32514,7 @@ uint32_t  __attribute__((export_name("TS_ErrorAction_send_warning_message"))) TS
 	LDKLevel log_level_conv = LDKLevel_from_js(log_level);
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
 	*ret_copy = ErrorAction_send_warning_message(msg_conv, log_level_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -30573,7 +32553,7 @@ uint32_t  __attribute__((export_name("TS_LightningError_get_action"))) TS_Lightn
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKErrorAction *ret_copy = MALLOC(sizeof(LDKErrorAction), "LDKErrorAction");
 	*ret_copy = LightningError_get_action(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -30596,7 +32576,7 @@ uint32_t  __attribute__((export_name("TS_LightningError_new"))) TS_LightningErro
 	LDKErrorAction action_arg_conv = *(LDKErrorAction*)(action_arg_ptr);
 	action_arg_conv = ErrorAction_clone((LDKErrorAction*)(((uintptr_t)action_arg) & ~1));
 	LDKLightningError ret_var = LightningError_new(err_arg_conv, action_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30609,7 +32589,7 @@ uint32_t  __attribute__((export_name("TS_LightningError_new"))) TS_LightningErro
 
 static inline uintptr_t LightningError_clone_ptr(LDKLightningError *NONNULL_PTR arg) {
 	LDKLightningError ret_var = LightningError_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30619,13 +32599,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_LightningError_clone_ptr"))) TS_LightningError_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_LightningError_clone_ptr"))) TS_LightningError_clone_ptr(uint32_t arg) {
 	LDKLightningError arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = LightningError_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = LightningError_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_LightningError_clone"))) TS_LightningError_clone(uint32_t orig) {
@@ -30634,7 +32614,7 @@ uint32_t  __attribute__((export_name("TS_LightningError_clone"))) TS_LightningEr
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKLightningError ret_var = LightningError_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30664,7 +32644,7 @@ uint32_tArray  __attribute__((export_name("TS_CommitmentUpdate_get_update_add_ht
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t p = 0; p < ret_var.datalen; p++) {
 		LDKUpdateAddHTLC ret_conv_15_var = ret_var.data[p];
-		uintptr_t ret_conv_15_ref = 0;
+		uint32_t ret_conv_15_ref = 0;
 		CHECK((((uintptr_t)ret_conv_15_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_15_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_15_var);
@@ -30690,7 +32670,7 @@ void  __attribute__((export_name("TS_CommitmentUpdate_set_update_add_htlcs"))) T
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateAddHTLC), "LDKCVec_UpdateAddHTLCZ Elements");
 	else
 		val_constr.data = NULL;
-	uint32_t* val_vals = val->elems /* XXX val leaks */;
+	uint32_t* val_vals = val->elems;
 	for (size_t p = 0; p < val_constr.datalen; p++) {
 		uint32_t val_conv_15 = val_vals[p];
 		LDKUpdateAddHTLC val_conv_15_conv;
@@ -30700,6 +32680,7 @@ void  __attribute__((export_name("TS_CommitmentUpdate_set_update_add_htlcs"))) T
 		val_conv_15_conv = UpdateAddHTLC_clone(&val_conv_15_conv);
 		val_constr.data[p] = val_conv_15_conv;
 	}
+	FREE(val);
 	CommitmentUpdate_set_update_add_htlcs(&this_ptr_conv, val_constr);
 }
 
@@ -30714,7 +32695,7 @@ uint32_tArray  __attribute__((export_name("TS_CommitmentUpdate_get_update_fulfil
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t t = 0; t < ret_var.datalen; t++) {
 		LDKUpdateFulfillHTLC ret_conv_19_var = ret_var.data[t];
-		uintptr_t ret_conv_19_ref = 0;
+		uint32_t ret_conv_19_ref = 0;
 		CHECK((((uintptr_t)ret_conv_19_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_19_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_19_var);
@@ -30740,7 +32721,7 @@ void  __attribute__((export_name("TS_CommitmentUpdate_set_update_fulfill_htlcs")
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFulfillHTLC), "LDKCVec_UpdateFulfillHTLCZ Elements");
 	else
 		val_constr.data = NULL;
-	uint32_t* val_vals = val->elems /* XXX val leaks */;
+	uint32_t* val_vals = val->elems;
 	for (size_t t = 0; t < val_constr.datalen; t++) {
 		uint32_t val_conv_19 = val_vals[t];
 		LDKUpdateFulfillHTLC val_conv_19_conv;
@@ -30750,6 +32731,7 @@ void  __attribute__((export_name("TS_CommitmentUpdate_set_update_fulfill_htlcs")
 		val_conv_19_conv = UpdateFulfillHTLC_clone(&val_conv_19_conv);
 		val_constr.data[t] = val_conv_19_conv;
 	}
+	FREE(val);
 	CommitmentUpdate_set_update_fulfill_htlcs(&this_ptr_conv, val_constr);
 }
 
@@ -30764,7 +32746,7 @@ uint32_tArray  __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_h
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t q = 0; q < ret_var.datalen; q++) {
 		LDKUpdateFailHTLC ret_conv_16_var = ret_var.data[q];
-		uintptr_t ret_conv_16_ref = 0;
+		uint32_t ret_conv_16_ref = 0;
 		CHECK((((uintptr_t)ret_conv_16_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_16_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_16_var);
@@ -30790,7 +32772,7 @@ void  __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_htlcs")))
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFailHTLC), "LDKCVec_UpdateFailHTLCZ Elements");
 	else
 		val_constr.data = NULL;
-	uint32_t* val_vals = val->elems /* XXX val leaks */;
+	uint32_t* val_vals = val->elems;
 	for (size_t q = 0; q < val_constr.datalen; q++) {
 		uint32_t val_conv_16 = val_vals[q];
 		LDKUpdateFailHTLC val_conv_16_conv;
@@ -30800,6 +32782,7 @@ void  __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_htlcs")))
 		val_conv_16_conv = UpdateFailHTLC_clone(&val_conv_16_conv);
 		val_constr.data[q] = val_conv_16_conv;
 	}
+	FREE(val);
 	CommitmentUpdate_set_update_fail_htlcs(&this_ptr_conv, val_constr);
 }
 
@@ -30814,7 +32797,7 @@ uint32_tArray  __attribute__((export_name("TS_CommitmentUpdate_get_update_fail_m
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t z = 0; z < ret_var.datalen; z++) {
 		LDKUpdateFailMalformedHTLC ret_conv_25_var = ret_var.data[z];
-		uintptr_t ret_conv_25_ref = 0;
+		uint32_t ret_conv_25_ref = 0;
 		CHECK((((uintptr_t)ret_conv_25_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_25_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_25_var);
@@ -30840,7 +32823,7 @@ void  __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_malformed_
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKUpdateFailMalformedHTLC), "LDKCVec_UpdateFailMalformedHTLCZ Elements");
 	else
 		val_constr.data = NULL;
-	uint32_t* val_vals = val->elems /* XXX val leaks */;
+	uint32_t* val_vals = val->elems;
 	for (size_t z = 0; z < val_constr.datalen; z++) {
 		uint32_t val_conv_25 = val_vals[z];
 		LDKUpdateFailMalformedHTLC val_conv_25_conv;
@@ -30850,6 +32833,7 @@ void  __attribute__((export_name("TS_CommitmentUpdate_set_update_fail_malformed_
 		val_conv_25_conv = UpdateFailMalformedHTLC_clone(&val_conv_25_conv);
 		val_constr.data[z] = val_conv_25_conv;
 	}
+	FREE(val);
 	CommitmentUpdate_set_update_fail_malformed_htlcs(&this_ptr_conv, val_constr);
 }
 
@@ -30859,7 +32843,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentUpdate_get_update_fee"))) TS_
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKUpdateFee ret_var = CommitmentUpdate_get_update_fee(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -30891,7 +32875,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentUpdate_get_commitment_signed"
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCommitmentSigned ret_var = CommitmentUpdate_get_commitment_signed(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -30922,7 +32906,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU
 		update_add_htlcs_arg_constr.data = MALLOC(update_add_htlcs_arg_constr.datalen * sizeof(LDKUpdateAddHTLC), "LDKCVec_UpdateAddHTLCZ Elements");
 	else
 		update_add_htlcs_arg_constr.data = NULL;
-	uint32_t* update_add_htlcs_arg_vals = update_add_htlcs_arg->elems /* XXX update_add_htlcs_arg leaks */;
+	uint32_t* update_add_htlcs_arg_vals = update_add_htlcs_arg->elems;
 	for (size_t p = 0; p < update_add_htlcs_arg_constr.datalen; p++) {
 		uint32_t update_add_htlcs_arg_conv_15 = update_add_htlcs_arg_vals[p];
 		LDKUpdateAddHTLC update_add_htlcs_arg_conv_15_conv;
@@ -30932,13 +32916,14 @@ uint32_t  __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU
 		update_add_htlcs_arg_conv_15_conv = UpdateAddHTLC_clone(&update_add_htlcs_arg_conv_15_conv);
 		update_add_htlcs_arg_constr.data[p] = update_add_htlcs_arg_conv_15_conv;
 	}
+	FREE(update_add_htlcs_arg);
 	LDKCVec_UpdateFulfillHTLCZ update_fulfill_htlcs_arg_constr;
 	update_fulfill_htlcs_arg_constr.datalen = update_fulfill_htlcs_arg->arr_len;
 	if (update_fulfill_htlcs_arg_constr.datalen > 0)
 		update_fulfill_htlcs_arg_constr.data = MALLOC(update_fulfill_htlcs_arg_constr.datalen * sizeof(LDKUpdateFulfillHTLC), "LDKCVec_UpdateFulfillHTLCZ Elements");
 	else
 		update_fulfill_htlcs_arg_constr.data = NULL;
-	uint32_t* update_fulfill_htlcs_arg_vals = update_fulfill_htlcs_arg->elems /* XXX update_fulfill_htlcs_arg leaks */;
+	uint32_t* update_fulfill_htlcs_arg_vals = update_fulfill_htlcs_arg->elems;
 	for (size_t t = 0; t < update_fulfill_htlcs_arg_constr.datalen; t++) {
 		uint32_t update_fulfill_htlcs_arg_conv_19 = update_fulfill_htlcs_arg_vals[t];
 		LDKUpdateFulfillHTLC update_fulfill_htlcs_arg_conv_19_conv;
@@ -30948,13 +32933,14 @@ uint32_t  __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU
 		update_fulfill_htlcs_arg_conv_19_conv = UpdateFulfillHTLC_clone(&update_fulfill_htlcs_arg_conv_19_conv);
 		update_fulfill_htlcs_arg_constr.data[t] = update_fulfill_htlcs_arg_conv_19_conv;
 	}
+	FREE(update_fulfill_htlcs_arg);
 	LDKCVec_UpdateFailHTLCZ update_fail_htlcs_arg_constr;
 	update_fail_htlcs_arg_constr.datalen = update_fail_htlcs_arg->arr_len;
 	if (update_fail_htlcs_arg_constr.datalen > 0)
 		update_fail_htlcs_arg_constr.data = MALLOC(update_fail_htlcs_arg_constr.datalen * sizeof(LDKUpdateFailHTLC), "LDKCVec_UpdateFailHTLCZ Elements");
 	else
 		update_fail_htlcs_arg_constr.data = NULL;
-	uint32_t* update_fail_htlcs_arg_vals = update_fail_htlcs_arg->elems /* XXX update_fail_htlcs_arg leaks */;
+	uint32_t* update_fail_htlcs_arg_vals = update_fail_htlcs_arg->elems;
 	for (size_t q = 0; q < update_fail_htlcs_arg_constr.datalen; q++) {
 		uint32_t update_fail_htlcs_arg_conv_16 = update_fail_htlcs_arg_vals[q];
 		LDKUpdateFailHTLC update_fail_htlcs_arg_conv_16_conv;
@@ -30964,13 +32950,14 @@ uint32_t  __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU
 		update_fail_htlcs_arg_conv_16_conv = UpdateFailHTLC_clone(&update_fail_htlcs_arg_conv_16_conv);
 		update_fail_htlcs_arg_constr.data[q] = update_fail_htlcs_arg_conv_16_conv;
 	}
+	FREE(update_fail_htlcs_arg);
 	LDKCVec_UpdateFailMalformedHTLCZ update_fail_malformed_htlcs_arg_constr;
 	update_fail_malformed_htlcs_arg_constr.datalen = update_fail_malformed_htlcs_arg->arr_len;
 	if (update_fail_malformed_htlcs_arg_constr.datalen > 0)
 		update_fail_malformed_htlcs_arg_constr.data = MALLOC(update_fail_malformed_htlcs_arg_constr.datalen * sizeof(LDKUpdateFailMalformedHTLC), "LDKCVec_UpdateFailMalformedHTLCZ Elements");
 	else
 		update_fail_malformed_htlcs_arg_constr.data = NULL;
-	uint32_t* update_fail_malformed_htlcs_arg_vals = update_fail_malformed_htlcs_arg->elems /* XXX update_fail_malformed_htlcs_arg leaks */;
+	uint32_t* update_fail_malformed_htlcs_arg_vals = update_fail_malformed_htlcs_arg->elems;
 	for (size_t z = 0; z < update_fail_malformed_htlcs_arg_constr.datalen; z++) {
 		uint32_t update_fail_malformed_htlcs_arg_conv_25 = update_fail_malformed_htlcs_arg_vals[z];
 		LDKUpdateFailMalformedHTLC update_fail_malformed_htlcs_arg_conv_25_conv;
@@ -30980,6 +32967,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU
 		update_fail_malformed_htlcs_arg_conv_25_conv = UpdateFailMalformedHTLC_clone(&update_fail_malformed_htlcs_arg_conv_25_conv);
 		update_fail_malformed_htlcs_arg_constr.data[z] = update_fail_malformed_htlcs_arg_conv_25_conv;
 	}
+	FREE(update_fail_malformed_htlcs_arg);
 	LDKUpdateFee update_fee_arg_conv;
 	update_fee_arg_conv.inner = (void*)(update_fee_arg & (~1));
 	update_fee_arg_conv.is_owned = (update_fee_arg & 1) || (update_fee_arg == 0);
@@ -30991,7 +32979,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(commitment_signed_arg_conv);
 	commitment_signed_arg_conv = CommitmentSigned_clone(&commitment_signed_arg_conv);
 	LDKCommitmentUpdate ret_var = CommitmentUpdate_new(update_add_htlcs_arg_constr, update_fulfill_htlcs_arg_constr, update_fail_htlcs_arg_constr, update_fail_malformed_htlcs_arg_constr, update_fee_arg_conv, commitment_signed_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -31004,7 +32992,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentUpdate_new"))) TS_CommitmentU
 
 static inline uintptr_t CommitmentUpdate_clone_ptr(LDKCommitmentUpdate *NONNULL_PTR arg) {
 	LDKCommitmentUpdate ret_var = CommitmentUpdate_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -31014,13 +33002,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_CommitmentUpdate_clone_ptr"))) TS_CommitmentUpdate_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CommitmentUpdate_clone_ptr"))) TS_CommitmentUpdate_clone_ptr(uint32_t arg) {
 	LDKCommitmentUpdate arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = CommitmentUpdate_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CommitmentUpdate_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CommitmentUpdate_clone"))) TS_CommitmentUpdate_clone(uint32_t orig) {
@@ -31029,7 +33017,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentUpdate_clone"))) TS_Commitmen
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCommitmentUpdate ret_var = CommitmentUpdate_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -31073,10 +33061,11 @@ int8_tArray  __attribute__((export_name("TS_AcceptChannel_write"))) TS_AcceptCha
 uint32_t  __attribute__((export_name("TS_AcceptChannel_read"))) TS_AcceptChannel_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_AcceptChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AcceptChannelDecodeErrorZ), "LDKCResult_AcceptChannelDecodeErrorZ");
 	*ret_conv = AcceptChannel_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_AnnouncementSignatures_write(uint32_t obj) {
@@ -31094,10 +33083,11 @@ int8_tArray  __attribute__((export_name("TS_AnnouncementSignatures_write"))) TS_
 uint32_t  __attribute__((export_name("TS_AnnouncementSignatures_read"))) TS_AnnouncementSignatures_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_AnnouncementSignaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_AnnouncementSignaturesDecodeErrorZ), "LDKCResult_AnnouncementSignaturesDecodeErrorZ");
 	*ret_conv = AnnouncementSignatures_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ChannelReestablish_write"))) TS_ChannelReestablish_write(uint32_t obj) {
@@ -31115,10 +33105,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelReestablish_write"))) TS_Chan
 uint32_t  __attribute__((export_name("TS_ChannelReestablish_read"))) TS_ChannelReestablish_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelReestablishDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReestablishDecodeErrorZ), "LDKCResult_ChannelReestablishDecodeErrorZ");
 	*ret_conv = ChannelReestablish_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSigned_write(uint32_t obj) {
@@ -31136,10 +33127,11 @@ int8_tArray  __attribute__((export_name("TS_ClosingSigned_write"))) TS_ClosingSi
 uint32_t  __attribute__((export_name("TS_ClosingSigned_read"))) TS_ClosingSigned_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ClosingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedDecodeErrorZ), "LDKCResult_ClosingSignedDecodeErrorZ");
 	*ret_conv = ClosingSigned_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_ClosingSignedFeeRange_write(uint32_t obj) {
@@ -31157,10 +33149,11 @@ int8_tArray  __attribute__((export_name("TS_ClosingSignedFeeRange_write"))) TS_C
 uint32_t  __attribute__((export_name("TS_ClosingSignedFeeRange_read"))) TS_ClosingSignedFeeRange_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ClosingSignedFeeRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ClosingSignedFeeRangeDecodeErrorZ), "LDKCResult_ClosingSignedFeeRangeDecodeErrorZ");
 	*ret_conv = ClosingSignedFeeRange_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_CommitmentSigned_write"))) TS_CommitmentSigned_write(uint32_t obj) {
@@ -31178,10 +33171,11 @@ int8_tArray  __attribute__((export_name("TS_CommitmentSigned_write"))) TS_Commit
 uint32_t  __attribute__((export_name("TS_CommitmentSigned_read"))) TS_CommitmentSigned_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_CommitmentSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentSignedDecodeErrorZ), "LDKCResult_CommitmentSignedDecodeErrorZ");
 	*ret_conv = CommitmentSigned_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingCreated_write(uint32_t obj) {
@@ -31199,10 +33193,11 @@ int8_tArray  __attribute__((export_name("TS_FundingCreated_write"))) TS_FundingC
 uint32_t  __attribute__((export_name("TS_FundingCreated_read"))) TS_FundingCreated_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_FundingCreatedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingCreatedDecodeErrorZ), "LDKCResult_FundingCreatedDecodeErrorZ");
 	*ret_conv = FundingCreated_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSigned_write(uint32_t obj) {
@@ -31220,31 +33215,33 @@ int8_tArray  __attribute__((export_name("TS_FundingSigned_write"))) TS_FundingSi
 uint32_t  __attribute__((export_name("TS_FundingSigned_read"))) TS_FundingSigned_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_FundingSignedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingSignedDecodeErrorZ), "LDKCResult_FundingSignedDecodeErrorZ");
 	*ret_conv = FundingSigned_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
-int8_tArray  __attribute__((export_name("TS_FundingLocked_write"))) TS_FundingLocked_write(uint32_t obj) {
-	LDKFundingLocked obj_conv;
+int8_tArray  __attribute__((export_name("TS_ChannelReady_write"))) TS_ChannelReady_write(uint32_t obj) {
+	LDKChannelReady 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);
+	LDKCVec_u8Z ret_var = ChannelReady_write(&obj_conv);
 	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
 	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
 	CVec_u8Z_free(ret_var);
 	return ret_arr;
 }
 
-uint32_t  __attribute__((export_name("TS_FundingLocked_read"))) TS_FundingLocked_read(int8_tArray ser) {
+uint32_t  __attribute__((export_name("TS_ChannelReady_read"))) TS_ChannelReady_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
-	LDKCResult_FundingLockedDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FundingLockedDecodeErrorZ), "LDKCResult_FundingLockedDecodeErrorZ");
-	*ret_conv = FundingLocked_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	ser_ref.data = ser->elems;
+	LDKCResult_ChannelReadyDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelReadyDecodeErrorZ), "LDKCResult_ChannelReadyDecodeErrorZ");
+	*ret_conv = ChannelReady_read(ser_ref);
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint32_t obj) {
@@ -31262,10 +33259,11 @@ int8_tArray  __attribute__((export_name("TS_Init_write"))) TS_Init_write(uint32_
 uint32_t  __attribute__((export_name("TS_Init_read"))) TS_Init_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_InitDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitDecodeErrorZ), "LDKCResult_InitDecodeErrorZ");
 	*ret_conv = Init_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel_write(uint32_t obj) {
@@ -31283,10 +33281,11 @@ int8_tArray  __attribute__((export_name("TS_OpenChannel_write"))) TS_OpenChannel
 uint32_t  __attribute__((export_name("TS_OpenChannel_read"))) TS_OpenChannel_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_OpenChannelDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_OpenChannelDecodeErrorZ), "LDKCResult_OpenChannelDecodeErrorZ");
 	*ret_conv = OpenChannel_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndACK_write(uint32_t obj) {
@@ -31304,10 +33303,11 @@ int8_tArray  __attribute__((export_name("TS_RevokeAndACK_write"))) TS_RevokeAndA
 uint32_t  __attribute__((export_name("TS_RevokeAndACK_read"))) TS_RevokeAndACK_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_RevokeAndACKDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RevokeAndACKDecodeErrorZ), "LDKCResult_RevokeAndACKDecodeErrorZ");
 	*ret_conv = RevokeAndACK_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write(uint32_t obj) {
@@ -31325,10 +33325,11 @@ int8_tArray  __attribute__((export_name("TS_Shutdown_write"))) TS_Shutdown_write
 uint32_t  __attribute__((export_name("TS_Shutdown_read"))) TS_Shutdown_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ShutdownDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownDecodeErrorZ), "LDKCResult_ShutdownDecodeErrorZ");
 	*ret_conv = Shutdown_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFailHTLC_write(uint32_t obj) {
@@ -31346,10 +33347,11 @@ int8_tArray  __attribute__((export_name("TS_UpdateFailHTLC_write"))) TS_UpdateFa
 uint32_t  __attribute__((export_name("TS_UpdateFailHTLC_read"))) TS_UpdateFailHTLC_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_UpdateFailHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailHTLCDecodeErrorZ), "LDKCResult_UpdateFailHTLCDecodeErrorZ");
 	*ret_conv = UpdateFailHTLC_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS_UpdateFailMalformedHTLC_write(uint32_t obj) {
@@ -31367,10 +33369,11 @@ int8_tArray  __attribute__((export_name("TS_UpdateFailMalformedHTLC_write"))) TS
 uint32_t  __attribute__((export_name("TS_UpdateFailMalformedHTLC_read"))) TS_UpdateFailMalformedHTLC_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ), "LDKCResult_UpdateFailMalformedHTLCDecodeErrorZ");
 	*ret_conv = UpdateFailMalformedHTLC_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_write(uint32_t obj) {
@@ -31388,10 +33391,11 @@ int8_tArray  __attribute__((export_name("TS_UpdateFee_write"))) TS_UpdateFee_wri
 uint32_t  __attribute__((export_name("TS_UpdateFee_read"))) TS_UpdateFee_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_UpdateFeeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFeeDecodeErrorZ), "LDKCResult_UpdateFeeDecodeErrorZ");
 	*ret_conv = UpdateFee_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_UpdateFulfillHTLC_write(uint32_t obj) {
@@ -31409,10 +33413,11 @@ int8_tArray  __attribute__((export_name("TS_UpdateFulfillHTLC_write"))) TS_Updat
 uint32_t  __attribute__((export_name("TS_UpdateFulfillHTLC_read"))) TS_UpdateFulfillHTLC_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_UpdateFulfillHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateFulfillHTLCDecodeErrorZ), "LDKCResult_UpdateFulfillHTLCDecodeErrorZ");
 	*ret_conv = UpdateFulfillHTLC_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAddHTLC_write(uint32_t obj) {
@@ -31430,10 +33435,11 @@ int8_tArray  __attribute__((export_name("TS_UpdateAddHTLC_write"))) TS_UpdateAdd
 uint32_t  __attribute__((export_name("TS_UpdateAddHTLC_read"))) TS_UpdateAddHTLC_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_UpdateAddHTLCDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UpdateAddHTLCDecodeErrorZ), "LDKCResult_UpdateAddHTLCDecodeErrorZ");
 	*ret_conv = UpdateAddHTLC_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint32_t obj) {
@@ -31451,10 +33457,11 @@ int8_tArray  __attribute__((export_name("TS_Ping_write"))) TS_Ping_write(uint32_
 uint32_t  __attribute__((export_name("TS_Ping_read"))) TS_Ping_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_PingDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PingDecodeErrorZ), "LDKCResult_PingDecodeErrorZ");
 	*ret_conv = Ping_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint32_t obj) {
@@ -31472,10 +33479,11 @@ int8_tArray  __attribute__((export_name("TS_Pong_write"))) TS_Pong_write(uint32_
 uint32_t  __attribute__((export_name("TS_Pong_read"))) TS_Pong_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_PongDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PongDecodeErrorZ), "LDKCResult_PongDecodeErrorZ");
 	*ret_conv = Pong_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_UnsignedChannelAnnouncement_write"))) TS_UnsignedChannelAnnouncement_write(uint32_t obj) {
@@ -31493,10 +33501,11 @@ int8_tArray  __attribute__((export_name("TS_UnsignedChannelAnnouncement_write"))
 uint32_t  __attribute__((export_name("TS_UnsignedChannelAnnouncement_read"))) TS_UnsignedChannelAnnouncement_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ), "LDKCResult_UnsignedChannelAnnouncementDecodeErrorZ");
 	*ret_conv = UnsignedChannelAnnouncement_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_ChannelAnnouncement_write(uint32_t obj) {
@@ -31514,10 +33523,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelAnnouncement_write"))) TS_Cha
 uint32_t  __attribute__((export_name("TS_ChannelAnnouncement_read"))) TS_ChannelAnnouncement_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelAnnouncementDecodeErrorZ), "LDKCResult_ChannelAnnouncementDecodeErrorZ");
 	*ret_conv = ChannelAnnouncement_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_UnsignedChannelUpdate_write(uint32_t obj) {
@@ -31535,10 +33545,11 @@ int8_tArray  __attribute__((export_name("TS_UnsignedChannelUpdate_write"))) TS_U
 uint32_t  __attribute__((export_name("TS_UnsignedChannelUpdate_read"))) TS_UnsignedChannelUpdate_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_UnsignedChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedChannelUpdateDecodeErrorZ), "LDKCResult_UnsignedChannelUpdateDecodeErrorZ");
 	*ret_conv = UnsignedChannelUpdate_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUpdate_write(uint32_t obj) {
@@ -31556,10 +33567,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelUpdate_write"))) TS_ChannelUp
 uint32_t  __attribute__((export_name("TS_ChannelUpdate_read"))) TS_ChannelUpdate_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelUpdateDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateDecodeErrorZ), "LDKCResult_ChannelUpdateDecodeErrorZ");
 	*ret_conv = ChannelUpdate_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessage_write(uint32_t obj) {
@@ -31577,10 +33589,11 @@ int8_tArray  __attribute__((export_name("TS_ErrorMessage_write"))) TS_ErrorMessa
 uint32_t  __attribute__((export_name("TS_ErrorMessage_read"))) TS_ErrorMessage_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ErrorMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ErrorMessageDecodeErrorZ), "LDKCResult_ErrorMessageDecodeErrorZ");
 	*ret_conv = ErrorMessage_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_WarningMessage_write"))) TS_WarningMessage_write(uint32_t obj) {
@@ -31598,10 +33611,11 @@ int8_tArray  __attribute__((export_name("TS_WarningMessage_write"))) TS_WarningM
 uint32_t  __attribute__((export_name("TS_WarningMessage_read"))) TS_WarningMessage_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_WarningMessageDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_WarningMessageDecodeErrorZ), "LDKCResult_WarningMessageDecodeErrorZ");
 	*ret_conv = WarningMessage_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) TS_UnsignedNodeAnnouncement_write(uint32_t obj) {
@@ -31619,10 +33633,11 @@ int8_tArray  __attribute__((export_name("TS_UnsignedNodeAnnouncement_write"))) T
 uint32_t  __attribute__((export_name("TS_UnsignedNodeAnnouncement_read"))) TS_UnsignedNodeAnnouncement_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ), "LDKCResult_UnsignedNodeAnnouncementDecodeErrorZ");
 	*ret_conv = UnsignedNodeAnnouncement_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAnnouncement_write(uint32_t obj) {
@@ -31640,19 +33655,21 @@ int8_tArray  __attribute__((export_name("TS_NodeAnnouncement_write"))) TS_NodeAn
 uint32_t  __attribute__((export_name("TS_NodeAnnouncement_read"))) TS_NodeAnnouncement_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_NodeAnnouncementDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementDecodeErrorZ), "LDKCResult_NodeAnnouncementDecodeErrorZ");
 	*ret_conv = NodeAnnouncement_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_QueryShortChannelIds_read"))) TS_QueryShortChannelIds_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_QueryShortChannelIdsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryShortChannelIdsDecodeErrorZ), "LDKCResult_QueryShortChannelIdsDecodeErrorZ");
 	*ret_conv = QueryShortChannelIds_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_QueryShortChannelIds_write"))) TS_QueryShortChannelIds_write(uint32_t obj) {
@@ -31682,10 +33699,11 @@ int8_tArray  __attribute__((export_name("TS_ReplyShortChannelIdsEnd_write"))) TS
 uint32_t  __attribute__((export_name("TS_ReplyShortChannelIdsEnd_read"))) TS_ReplyShortChannelIdsEnd_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ), "LDKCResult_ReplyShortChannelIdsEndDecodeErrorZ");
 	*ret_conv = ReplyShortChannelIdsEnd_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int32_t  __attribute__((export_name("TS_QueryChannelRange_end_blocknum"))) TS_QueryChannelRange_end_blocknum(uint32_t this_arg) {
@@ -31693,8 +33711,8 @@ int32_t  __attribute__((export_name("TS_QueryChannelRange_end_blocknum"))) TS_Qu
 	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;
+	int32_t ret_conv = QueryChannelRange_end_blocknum(&this_arg_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_QueryChannelRange_write"))) TS_QueryChannelRange_write(uint32_t obj) {
@@ -31712,19 +33730,21 @@ int8_tArray  __attribute__((export_name("TS_QueryChannelRange_write"))) TS_Query
 uint32_t  __attribute__((export_name("TS_QueryChannelRange_read"))) TS_QueryChannelRange_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_QueryChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_QueryChannelRangeDecodeErrorZ), "LDKCResult_QueryChannelRangeDecodeErrorZ");
 	*ret_conv = QueryChannelRange_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ReplyChannelRange_read"))) TS_ReplyChannelRange_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ReplyChannelRangeDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ReplyChannelRangeDecodeErrorZ), "LDKCResult_ReplyChannelRangeDecodeErrorZ");
 	*ret_conv = ReplyChannelRange_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ReplyChannelRange_write"))) TS_ReplyChannelRange_write(uint32_t obj) {
@@ -31754,10 +33774,11 @@ int8_tArray  __attribute__((export_name("TS_GossipTimestampFilter_write"))) TS_G
 uint32_t  __attribute__((export_name("TS_GossipTimestampFilter_read"))) TS_GossipTimestampFilter_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_GossipTimestampFilterDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_GossipTimestampFilterDecodeErrorZ), "LDKCResult_GossipTimestampFilterDecodeErrorZ");
 	*ret_conv = GossipTimestampFilter_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_CustomMessageHandler_free"))) TS_CustomMessageHandler_free(uint32_t this_ptr) {
@@ -31779,7 +33800,7 @@ void  __attribute__((export_name("TS_IgnoringMessageHandler_free"))) TS_Ignoring
 
 uint32_t  __attribute__((export_name("TS_IgnoringMessageHandler_new"))) TS_IgnoringMessageHandler_new() {
 	LDKIgnoringMessageHandler ret_var = IgnoringMessageHandler_new();
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -31797,7 +33818,7 @@ uint32_t  __attribute__((export_name("TS_IgnoringMessageHandler_as_MessageSendEv
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider");
 	*ret_ret = IgnoringMessageHandler_as_MessageSendEventsProvider(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_IgnoringMessageHandler_as_RoutingMessageHandler"))) TS_IgnoringMessageHandler_as_RoutingMessageHandler(uint32_t this_arg) {
@@ -31807,7 +33828,7 @@ uint32_t  __attribute__((export_name("TS_IgnoringMessageHandler_as_RoutingMessag
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKRoutingMessageHandler* ret_ret = MALLOC(sizeof(LDKRoutingMessageHandler), "LDKRoutingMessageHandler");
 	*ret_ret = IgnoringMessageHandler_as_RoutingMessageHandler(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageReader"))) TS_IgnoringMessageHandler_as_CustomMessageReader(uint32_t this_arg) {
@@ -31817,7 +33838,7 @@ uint32_t  __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessage
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCustomMessageReader* ret_ret = MALLOC(sizeof(LDKCustomMessageReader), "LDKCustomMessageReader");
 	*ret_ret = IgnoringMessageHandler_as_CustomMessageReader(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessageHandler"))) TS_IgnoringMessageHandler_as_CustomMessageHandler(uint32_t this_arg) {
@@ -31827,7 +33848,7 @@ uint32_t  __attribute__((export_name("TS_IgnoringMessageHandler_as_CustomMessage
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKCustomMessageHandler* ret_ret = MALLOC(sizeof(LDKCustomMessageHandler), "LDKCustomMessageHandler");
 	*ret_ret = IgnoringMessageHandler_as_CustomMessageHandler(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 void  __attribute__((export_name("TS_ErroringMessageHandler_free"))) TS_ErroringMessageHandler_free(uint32_t this_obj) {
@@ -31840,7 +33861,7 @@ void  __attribute__((export_name("TS_ErroringMessageHandler_free"))) TS_Erroring
 
 uint32_t  __attribute__((export_name("TS_ErroringMessageHandler_new"))) TS_ErroringMessageHandler_new() {
 	LDKErroringMessageHandler ret_var = ErroringMessageHandler_new();
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -31858,7 +33879,7 @@ uint32_t  __attribute__((export_name("TS_ErroringMessageHandler_as_MessageSendEv
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKMessageSendEventsProvider* ret_ret = MALLOC(sizeof(LDKMessageSendEventsProvider), "LDKMessageSendEventsProvider");
 	*ret_ret = ErroringMessageHandler_as_MessageSendEventsProvider(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_ErroringMessageHandler_as_ChannelMessageHandler"))) TS_ErroringMessageHandler_as_ChannelMessageHandler(uint32_t this_arg) {
@@ -31868,7 +33889,7 @@ uint32_t  __attribute__((export_name("TS_ErroringMessageHandler_as_ChannelMessag
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelMessageHandler* ret_ret = MALLOC(sizeof(LDKChannelMessageHandler), "LDKChannelMessageHandler");
 	*ret_ret = ErroringMessageHandler_as_ChannelMessageHandler(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 void  __attribute__((export_name("TS_MessageHandler_free"))) TS_MessageHandler_free(uint32_t this_obj) {
@@ -31885,7 +33906,7 @@ uint32_t  __attribute__((export_name("TS_MessageHandler_get_chan_handler"))) TS_
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
-	uintptr_t ret_ret = ((uintptr_t)MessageHandler_get_chan_handler(&this_ptr_conv)) | 1;
+	uint32_t ret_ret = ((uintptr_t)MessageHandler_get_chan_handler(&this_ptr_conv)) | 1;
 	return ret_ret;
 }
 
@@ -31897,6 +33918,10 @@ void  __attribute__((export_name("TS_MessageHandler_set_chan_handler"))) TS_Mess
 	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKChannelMessageHandler val_conv = *(LDKChannelMessageHandler*)(val_ptr);
+	if (val_conv.free == LDKChannelMessageHandler_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKChannelMessageHandler_JCalls_cloned(&val_conv);
+	}
 	MessageHandler_set_chan_handler(&this_ptr_conv, val_conv);
 }
 
@@ -31906,7 +33931,7 @@ uint32_t  __attribute__((export_name("TS_MessageHandler_get_route_handler"))) TS
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	// WARNING: This object doesn't live past this scope, needs clone!
-	uintptr_t ret_ret = ((uintptr_t)MessageHandler_get_route_handler(&this_ptr_conv)) | 1;
+	uint32_t ret_ret = ((uintptr_t)MessageHandler_get_route_handler(&this_ptr_conv)) | 1;
 	return ret_ret;
 }
 
@@ -31918,6 +33943,10 @@ void  __attribute__((export_name("TS_MessageHandler_set_route_handler"))) TS_Mes
 	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
 	CHECK_ACCESS(val_ptr);
 	LDKRoutingMessageHandler val_conv = *(LDKRoutingMessageHandler*)(val_ptr);
+	if (val_conv.free == LDKRoutingMessageHandler_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKRoutingMessageHandler_JCalls_cloned(&val_conv);
+	}
 	MessageHandler_set_route_handler(&this_ptr_conv, val_conv);
 }
 
@@ -31925,11 +33954,19 @@ uint32_t  __attribute__((export_name("TS_MessageHandler_new"))) TS_MessageHandle
 	void* chan_handler_arg_ptr = (void*)(((uintptr_t)chan_handler_arg) & ~1);
 	CHECK_ACCESS(chan_handler_arg_ptr);
 	LDKChannelMessageHandler chan_handler_arg_conv = *(LDKChannelMessageHandler*)(chan_handler_arg_ptr);
+	if (chan_handler_arg_conv.free == LDKChannelMessageHandler_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKChannelMessageHandler_JCalls_cloned(&chan_handler_arg_conv);
+	}
 	void* route_handler_arg_ptr = (void*)(((uintptr_t)route_handler_arg) & ~1);
 	CHECK_ACCESS(route_handler_arg_ptr);
 	LDKRoutingMessageHandler route_handler_arg_conv = *(LDKRoutingMessageHandler*)(route_handler_arg_ptr);
+	if (route_handler_arg_conv.free == LDKRoutingMessageHandler_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKRoutingMessageHandler_JCalls_cloned(&route_handler_arg_conv);
+	}
 	LDKMessageHandler ret_var = MessageHandler_new(chan_handler_arg_conv, route_handler_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -31943,14 +33980,14 @@ uint32_t  __attribute__((export_name("TS_MessageHandler_new"))) TS_MessageHandle
 static inline uintptr_t SocketDescriptor_clone_ptr(LDKSocketDescriptor *NONNULL_PTR arg) {
 	LDKSocketDescriptor* ret_ret = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor");
 	*ret_ret = SocketDescriptor_clone(arg);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
-intptr_t  __attribute__((export_name("TS_SocketDescriptor_clone_ptr"))) TS_SocketDescriptor_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_SocketDescriptor_clone_ptr"))) TS_SocketDescriptor_clone_ptr(uint32_t arg) {
 	void* arg_ptr = (void*)(((uintptr_t)arg) & ~1);
 	if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); }
 	LDKSocketDescriptor* arg_conv = (LDKSocketDescriptor*)arg_ptr;
-	intptr_t ret_val = SocketDescriptor_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = SocketDescriptor_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_SocketDescriptor_clone"))) TS_SocketDescriptor_clone(uint32_t orig) {
@@ -31959,7 +33996,7 @@ uint32_t  __attribute__((export_name("TS_SocketDescriptor_clone"))) TS_SocketDes
 	LDKSocketDescriptor* orig_conv = (LDKSocketDescriptor*)orig_ptr;
 	LDKSocketDescriptor* ret_ret = MALLOC(sizeof(LDKSocketDescriptor), "LDKSocketDescriptor");
 	*ret_ret = SocketDescriptor_clone(orig_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 void  __attribute__((export_name("TS_SocketDescriptor_free"))) TS_SocketDescriptor_free(uint32_t this_ptr) {
@@ -31984,8 +34021,8 @@ jboolean  __attribute__((export_name("TS_PeerHandleError_get_no_connection_possi
 	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;
+	jboolean ret_conv = PeerHandleError_get_no_connection_possible(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_PeerHandleError_set_no_connection_possible"))) TS_PeerHandleError_set_no_connection_possible(uint32_t this_ptr, jboolean val) {
@@ -31998,7 +34035,7 @@ void  __attribute__((export_name("TS_PeerHandleError_set_no_connection_possible"
 
 uint32_t  __attribute__((export_name("TS_PeerHandleError_new"))) TS_PeerHandleError_new(jboolean no_connection_possible_arg) {
 	LDKPeerHandleError ret_var = PeerHandleError_new(no_connection_possible_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32011,7 +34048,7 @@ uint32_t  __attribute__((export_name("TS_PeerHandleError_new"))) TS_PeerHandleEr
 
 static inline uintptr_t PeerHandleError_clone_ptr(LDKPeerHandleError *NONNULL_PTR arg) {
 	LDKPeerHandleError ret_var = PeerHandleError_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32021,13 +34058,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_PeerHandleError_clone_ptr"))) TS_PeerHandleError_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_PeerHandleError_clone_ptr"))) TS_PeerHandleError_clone_ptr(uint32_t arg) {
 	LDKPeerHandleError arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = PeerHandleError_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = PeerHandleError_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PeerHandleError_clone"))) TS_PeerHandleError_clone(uint32_t orig) {
@@ -32036,7 +34073,7 @@ uint32_t  __attribute__((export_name("TS_PeerHandleError_clone"))) TS_PeerHandle
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPeerHandleError ret_var = PeerHandleError_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32071,11 +34108,19 @@ uint32_t  __attribute__((export_name("TS_PeerManager_new"))) TS_PeerManager_new(
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	void* custom_message_handler_ptr = (void*)(((uintptr_t)custom_message_handler) & ~1);
 	CHECK_ACCESS(custom_message_handler_ptr);
 	LDKCustomMessageHandler custom_message_handler_conv = *(LDKCustomMessageHandler*)(custom_message_handler_ptr);
+	if (custom_message_handler_conv.free == LDKCustomMessageHandler_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKCustomMessageHandler_JCalls_cloned(&custom_message_handler_conv);
+	}
 	LDKPeerManager ret_var = PeerManager_new(message_handler_conv, our_node_secret_ref, ephemeral_random_data_ref, logger_conv, custom_message_handler_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32105,7 +34150,7 @@ ptrArray  __attribute__((export_name("TS_PeerManager_get_peer_node_ids"))) TS_Pe
 	return ret_arr;
 }
 
-uint32_t  __attribute__((export_name("TS_PeerManager_new_outbound_connection"))) TS_PeerManager_new_outbound_connection(uint32_t this_arg, int8_tArray their_node_id, uint32_t descriptor) {
+uint32_t  __attribute__((export_name("TS_PeerManager_new_outbound_connection"))) TS_PeerManager_new_outbound_connection(uint32_t this_arg, int8_tArray their_node_id, uint32_t descriptor, uint32_t remote_network_address) {
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -32116,12 +34161,19 @@ uint32_t  __attribute__((export_name("TS_PeerManager_new_outbound_connection")))
 	void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1);
 	CHECK_ACCESS(descriptor_ptr);
 	LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(descriptor_ptr);
+	if (descriptor_conv.free == LDKSocketDescriptor_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKSocketDescriptor_JCalls_cloned(&descriptor_conv);
+	}
+	void* remote_network_address_ptr = (void*)(((uintptr_t)remote_network_address) & ~1);
+	CHECK_ACCESS(remote_network_address_ptr);
+	LDKCOption_NetAddressZ remote_network_address_conv = *(LDKCOption_NetAddressZ*)(remote_network_address_ptr);
 	LDKCResult_CVec_u8ZPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_u8ZPeerHandleErrorZ), "LDKCResult_CVec_u8ZPeerHandleErrorZ");
-	*ret_conv = PeerManager_new_outbound_connection(&this_arg_conv, their_node_id_ref, descriptor_conv);
-	return (uintptr_t)ret_conv;
+	*ret_conv = PeerManager_new_outbound_connection(&this_arg_conv, their_node_id_ref, descriptor_conv, remote_network_address_conv);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_PeerManager_new_inbound_connection"))) TS_PeerManager_new_inbound_connection(uint32_t this_arg, uint32_t descriptor) {
+uint32_t  __attribute__((export_name("TS_PeerManager_new_inbound_connection"))) TS_PeerManager_new_inbound_connection(uint32_t this_arg, uint32_t descriptor, uint32_t remote_network_address) {
 	LDKPeerManager this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -32129,9 +34181,16 @@ uint32_t  __attribute__((export_name("TS_PeerManager_new_inbound_connection")))
 	void* descriptor_ptr = (void*)(((uintptr_t)descriptor) & ~1);
 	CHECK_ACCESS(descriptor_ptr);
 	LDKSocketDescriptor descriptor_conv = *(LDKSocketDescriptor*)(descriptor_ptr);
+	if (descriptor_conv.free == LDKSocketDescriptor_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKSocketDescriptor_JCalls_cloned(&descriptor_conv);
+	}
+	void* remote_network_address_ptr = (void*)(((uintptr_t)remote_network_address) & ~1);
+	CHECK_ACCESS(remote_network_address_ptr);
+	LDKCOption_NetAddressZ remote_network_address_conv = *(LDKCOption_NetAddressZ*)(remote_network_address_ptr);
 	LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ");
-	*ret_conv = PeerManager_new_inbound_connection(&this_arg_conv, descriptor_conv);
-	return (uintptr_t)ret_conv;
+	*ret_conv = PeerManager_new_inbound_connection(&this_arg_conv, descriptor_conv, remote_network_address_conv);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PeerManager_write_buffer_space_avail"))) TS_PeerManager_write_buffer_space_avail(uint32_t this_arg, uint32_t descriptor) {
@@ -32144,7 +34203,7 @@ uint32_t  __attribute__((export_name("TS_PeerManager_write_buffer_space_avail"))
 	LDKSocketDescriptor* descriptor_conv = (LDKSocketDescriptor*)descriptor_ptr;
 	LDKCResult_NonePeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NonePeerHandleErrorZ), "LDKCResult_NonePeerHandleErrorZ");
 	*ret_conv = PeerManager_write_buffer_space_avail(&this_arg_conv, descriptor_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManager_read_event(uint32_t this_arg, uint32_t peer_descriptor, int8_tArray data) {
@@ -32157,10 +34216,11 @@ uint32_t  __attribute__((export_name("TS_PeerManager_read_event"))) TS_PeerManag
 	LDKSocketDescriptor* peer_descriptor_conv = (LDKSocketDescriptor*)peer_descriptor_ptr;
 	LDKu8slice data_ref;
 	data_ref.datalen = data->arr_len;
-	data_ref.data = data->elems /* XXX data leaks */;
+	data_ref.data = data->elems;
 	LDKCResult_boolPeerHandleErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_boolPeerHandleErrorZ), "LDKCResult_boolPeerHandleErrorZ");
 	*ret_conv = PeerManager_read_event(&this_arg_conv, peer_descriptor_conv, data_ref);
-	return (uintptr_t)ret_conv;
+	FREE(data);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_PeerManager_process_events"))) TS_PeerManager_process_events(uint32_t this_arg) {
@@ -32210,13 +34270,13 @@ void  __attribute__((export_name("TS_PeerManager_timer_tick_occurred"))) TS_Peer
 }
 
 int64_t  __attribute__((export_name("TS_htlc_success_tx_weight"))) TS_htlc_success_tx_weight(jboolean opt_anchors) {
-	int64_t ret_val = htlc_success_tx_weight(opt_anchors);
-	return ret_val;
+	int64_t ret_conv = htlc_success_tx_weight(opt_anchors);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_htlc_timeout_tx_weight"))) TS_htlc_timeout_tx_weight(jboolean opt_anchors) {
-	int64_t ret_val = htlc_timeout_tx_weight(opt_anchors);
-	return ret_val;
+	int64_t ret_conv = htlc_timeout_tx_weight(opt_anchors);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_build_commitment_secret"))) TS_build_commitment_secret(int8_tArray commitment_seed, int64_t idx) {
@@ -32260,7 +34320,7 @@ void  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_free"))) TS_C
 
 static inline uintptr_t CounterpartyCommitmentSecrets_clone_ptr(LDKCounterpartyCommitmentSecrets *NONNULL_PTR arg) {
 	LDKCounterpartyCommitmentSecrets ret_var = CounterpartyCommitmentSecrets_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32270,13 +34330,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone_ptr"))) TS_CounterpartyCommitmentSecrets_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone_ptr"))) TS_CounterpartyCommitmentSecrets_clone_ptr(uint32_t arg) {
 	LDKCounterpartyCommitmentSecrets arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = CounterpartyCommitmentSecrets_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CounterpartyCommitmentSecrets_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone"))) TS_CounterpartyCommitmentSecrets_clone(uint32_t orig) {
@@ -32285,7 +34345,7 @@ uint32_t  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone")))
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCounterpartyCommitmentSecrets ret_var = CounterpartyCommitmentSecrets_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32298,7 +34358,7 @@ uint32_t  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_clone")))
 
 uint32_t  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_new"))) TS_CounterpartyCommitmentSecrets_new() {
 	LDKCounterpartyCommitmentSecrets ret_var = CounterpartyCommitmentSecrets_new();
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32314,8 +34374,8 @@ int64_t  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_get_min_se
 	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 = CounterpartyCommitmentSecrets_get_min_seen_secret(&this_arg_conv);
-	return ret_val;
+	int64_t ret_conv = CounterpartyCommitmentSecrets_get_min_seen_secret(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_provide_secret"))) TS_CounterpartyCommitmentSecrets_provide_secret(uint32_t this_arg, int64_t idx, int8_tArray secret) {
@@ -32328,7 +34388,7 @@ uint32_t  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_provide_s
 	memcpy(secret_ref.data, secret->elems, 32); FREE(secret);
 	LDKCResult_NoneNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneNoneZ), "LDKCResult_NoneNoneZ");
 	*ret_conv = CounterpartyCommitmentSecrets_provide_secret(&this_arg_conv, idx, secret_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_get_secret"))) TS_CounterpartyCommitmentSecrets_get_secret(uint32_t this_arg, int64_t idx) {
@@ -32356,10 +34416,11 @@ int8_tArray  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_write"
 uint32_t  __attribute__((export_name("TS_CounterpartyCommitmentSecrets_read"))) TS_CounterpartyCommitmentSecrets_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ), "LDKCResult_CounterpartyCommitmentSecretsDecodeErrorZ");
 	*ret_conv = CounterpartyCommitmentSecrets_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_derive_private_key"))) TS_derive_private_key(int8_tArray per_commitment_point, int8_tArray base_secret) {
@@ -32372,7 +34433,7 @@ uint32_t  __attribute__((export_name("TS_derive_private_key"))) TS_derive_privat
 	unsigned char (*base_secret_ref)[32] = &base_secret_arr;
 	LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ");
 	*ret_conv = derive_private_key(per_commitment_point_ref, base_secret_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_derive_public_key"))) TS_derive_public_key(int8_tArray per_commitment_point, int8_tArray base_point) {
@@ -32384,7 +34445,7 @@ uint32_t  __attribute__((export_name("TS_derive_public_key"))) TS_derive_public_
 	memcpy(base_point_ref.compressed_form, base_point->elems, 33); FREE(base_point);
 	LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ");
 	*ret_conv = derive_public_key(per_commitment_point_ref, base_point_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_derive_private_revocation_key"))) TS_derive_private_revocation_key(int8_tArray per_commitment_secret, int8_tArray countersignatory_revocation_base_secret) {
@@ -32398,7 +34459,7 @@ uint32_t  __attribute__((export_name("TS_derive_private_revocation_key"))) TS_de
 	unsigned char (*countersignatory_revocation_base_secret_ref)[32] = &countersignatory_revocation_base_secret_arr;
 	LDKCResult_SecretKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SecretKeyErrorZ), "LDKCResult_SecretKeyErrorZ");
 	*ret_conv = derive_private_revocation_key(per_commitment_secret_ref, countersignatory_revocation_base_secret_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_derive_public_revocation_key"))) TS_derive_public_revocation_key(int8_tArray per_commitment_point, int8_tArray countersignatory_revocation_base_point) {
@@ -32410,7 +34471,7 @@ uint32_t  __attribute__((export_name("TS_derive_public_revocation_key"))) TS_der
 	memcpy(countersignatory_revocation_base_point_ref.compressed_form, countersignatory_revocation_base_point->elems, 33); FREE(countersignatory_revocation_base_point);
 	LDKCResult_PublicKeyErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PublicKeyErrorZ), "LDKCResult_PublicKeyErrorZ");
 	*ret_conv = derive_public_revocation_key(per_commitment_point_ref, countersignatory_revocation_base_point_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_TxCreationKeys_free"))) TS_TxCreationKeys_free(uint32_t this_obj) {
@@ -32543,7 +34604,7 @@ uint32_t  __attribute__((export_name("TS_TxCreationKeys_new"))) TS_TxCreationKey
 	CHECK(broadcaster_delayed_payment_key_arg->arr_len == 33);
 	memcpy(broadcaster_delayed_payment_key_arg_ref.compressed_form, broadcaster_delayed_payment_key_arg->elems, 33); FREE(broadcaster_delayed_payment_key_arg);
 	LDKTxCreationKeys ret_var = TxCreationKeys_new(per_commitment_point_arg_ref, revocation_key_arg_ref, broadcaster_htlc_key_arg_ref, countersignatory_htlc_key_arg_ref, broadcaster_delayed_payment_key_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32556,7 +34617,7 @@ uint32_t  __attribute__((export_name("TS_TxCreationKeys_new"))) TS_TxCreationKey
 
 static inline uintptr_t TxCreationKeys_clone_ptr(LDKTxCreationKeys *NONNULL_PTR arg) {
 	LDKTxCreationKeys ret_var = TxCreationKeys_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32566,13 +34627,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_TxCreationKeys_clone_ptr"))) TS_TxCreationKeys_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_TxCreationKeys_clone_ptr"))) TS_TxCreationKeys_clone_ptr(uint32_t arg) {
 	LDKTxCreationKeys arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = TxCreationKeys_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = TxCreationKeys_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_TxCreationKeys_clone"))) TS_TxCreationKeys_clone(uint32_t orig) {
@@ -32581,7 +34642,7 @@ uint32_t  __attribute__((export_name("TS_TxCreationKeys_clone"))) TS_TxCreationK
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKTxCreationKeys ret_var = TxCreationKeys_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32607,10 +34668,11 @@ int8_tArray  __attribute__((export_name("TS_TxCreationKeys_write"))) TS_TxCreati
 uint32_t  __attribute__((export_name("TS_TxCreationKeys_read"))) TS_TxCreationKeys_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_TxCreationKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysDecodeErrorZ), "LDKCResult_TxCreationKeysDecodeErrorZ");
 	*ret_conv = TxCreationKeys_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelPublicKeys_free"))) TS_ChannelPublicKeys_free(uint32_t this_obj) {
@@ -32743,7 +34805,7 @@ uint32_t  __attribute__((export_name("TS_ChannelPublicKeys_new"))) TS_ChannelPub
 	CHECK(htlc_basepoint_arg->arr_len == 33);
 	memcpy(htlc_basepoint_arg_ref.compressed_form, htlc_basepoint_arg->elems, 33); FREE(htlc_basepoint_arg);
 	LDKChannelPublicKeys ret_var = ChannelPublicKeys_new(funding_pubkey_arg_ref, revocation_basepoint_arg_ref, payment_point_arg_ref, delayed_payment_basepoint_arg_ref, htlc_basepoint_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32756,7 +34818,7 @@ uint32_t  __attribute__((export_name("TS_ChannelPublicKeys_new"))) TS_ChannelPub
 
 static inline uintptr_t ChannelPublicKeys_clone_ptr(LDKChannelPublicKeys *NONNULL_PTR arg) {
 	LDKChannelPublicKeys ret_var = ChannelPublicKeys_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32766,13 +34828,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelPublicKeys_clone_ptr"))) TS_ChannelPublicKeys_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelPublicKeys_clone_ptr"))) TS_ChannelPublicKeys_clone_ptr(uint32_t arg) {
 	LDKChannelPublicKeys arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelPublicKeys_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelPublicKeys_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelPublicKeys_clone"))) TS_ChannelPublicKeys_clone(uint32_t orig) {
@@ -32781,7 +34843,7 @@ uint32_t  __attribute__((export_name("TS_ChannelPublicKeys_clone"))) TS_ChannelP
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelPublicKeys ret_var = ChannelPublicKeys_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32807,10 +34869,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelPublicKeys_write"))) TS_Chann
 uint32_t  __attribute__((export_name("TS_ChannelPublicKeys_read"))) TS_ChannelPublicKeys_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelPublicKeysDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelPublicKeysDecodeErrorZ), "LDKCResult_ChannelPublicKeysDecodeErrorZ");
 	*ret_conv = ChannelPublicKeys_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_TxCreationKeys_derive_new"))) TS_TxCreationKeys_derive_new(int8_tArray per_commitment_point, int8_tArray broadcaster_delayed_payment_base, int8_tArray broadcaster_htlc_base, int8_tArray countersignatory_revocation_base, int8_tArray countersignatory_htlc_base) {
@@ -32831,7 +34894,7 @@ uint32_t  __attribute__((export_name("TS_TxCreationKeys_derive_new"))) TS_TxCrea
 	memcpy(countersignatory_htlc_base_ref.compressed_form, countersignatory_htlc_base->elems, 33); FREE(countersignatory_htlc_base);
 	LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ");
 	*ret_conv = TxCreationKeys_derive_new(per_commitment_point_ref, broadcaster_delayed_payment_base_ref, broadcaster_htlc_base_ref, countersignatory_revocation_base_ref, countersignatory_htlc_base_ref);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_TxCreationKeys_from_channel_static_keys"))) TS_TxCreationKeys_from_channel_static_keys(int8_tArray per_commitment_point, uint32_t broadcaster_keys, uint32_t countersignatory_keys) {
@@ -32848,7 +34911,7 @@ uint32_t  __attribute__((export_name("TS_TxCreationKeys_from_channel_static_keys
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(countersignatory_keys_conv);
 	LDKCResult_TxCreationKeysErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_TxCreationKeysErrorZ), "LDKCResult_TxCreationKeysErrorZ");
 	*ret_conv = TxCreationKeys_from_channel_static_keys(per_commitment_point_ref, &broadcaster_keys_conv, &countersignatory_keys_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_get_revokeable_redeemscript"))) TS_get_revokeable_redeemscript(int8_tArray revocation_key, int16_t contest_delay, int8_tArray broadcaster_delayed_payment_key) {
@@ -32878,8 +34941,8 @@ jboolean  __attribute__((export_name("TS_HTLCOutputInCommitment_get_offered")))
 	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;
+	jboolean ret_conv = HTLCOutputInCommitment_get_offered(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_HTLCOutputInCommitment_set_offered"))) TS_HTLCOutputInCommitment_set_offered(uint32_t this_ptr, jboolean val) {
@@ -32895,8 +34958,8 @@ int64_t  __attribute__((export_name("TS_HTLCOutputInCommitment_get_amount_msat")
 	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;
+	int64_t ret_conv = HTLCOutputInCommitment_get_amount_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_HTLCOutputInCommitment_set_amount_msat"))) TS_HTLCOutputInCommitment_set_amount_msat(uint32_t this_ptr, int64_t val) {
@@ -32912,8 +34975,8 @@ int32_t  __attribute__((export_name("TS_HTLCOutputInCommitment_get_cltv_expiry")
 	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;
+	int32_t ret_conv = HTLCOutputInCommitment_get_cltv_expiry(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_HTLCOutputInCommitment_set_cltv_expiry"))) TS_HTLCOutputInCommitment_set_cltv_expiry(uint32_t this_ptr, int32_t val) {
@@ -32952,7 +35015,7 @@ uint32_t  __attribute__((export_name("TS_HTLCOutputInCommitment_get_transaction_
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z");
 	*ret_copy = HTLCOutputInCommitment_get_transaction_output_index(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -32977,7 +35040,7 @@ uint32_t  __attribute__((export_name("TS_HTLCOutputInCommitment_new"))) TS_HTLCO
 	LDKCOption_u32Z transaction_output_index_arg_conv = *(LDKCOption_u32Z*)(transaction_output_index_arg_ptr);
 	transaction_output_index_arg_conv = COption_u32Z_clone((LDKCOption_u32Z*)(((uintptr_t)transaction_output_index_arg) & ~1));
 	LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_new(offered_arg, amount_msat_arg, cltv_expiry_arg, payment_hash_arg_ref, transaction_output_index_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -32990,7 +35053,7 @@ uint32_t  __attribute__((export_name("TS_HTLCOutputInCommitment_new"))) TS_HTLCO
 
 static inline uintptr_t HTLCOutputInCommitment_clone_ptr(LDKHTLCOutputInCommitment *NONNULL_PTR arg) {
 	LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33000,13 +35063,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_HTLCOutputInCommitment_clone_ptr"))) TS_HTLCOutputInCommitment_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_HTLCOutputInCommitment_clone_ptr"))) TS_HTLCOutputInCommitment_clone_ptr(uint32_t arg) {
 	LDKHTLCOutputInCommitment arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = HTLCOutputInCommitment_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = HTLCOutputInCommitment_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_HTLCOutputInCommitment_clone"))) TS_HTLCOutputInCommitment_clone(uint32_t orig) {
@@ -33015,7 +35078,7 @@ uint32_t  __attribute__((export_name("TS_HTLCOutputInCommitment_clone"))) TS_HTL
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKHTLCOutputInCommitment ret_var = HTLCOutputInCommitment_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33041,10 +35104,11 @@ int8_tArray  __attribute__((export_name("TS_HTLCOutputInCommitment_write"))) TS_
 uint32_t  __attribute__((export_name("TS_HTLCOutputInCommitment_read"))) TS_HTLCOutputInCommitment_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_HTLCOutputInCommitmentDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HTLCOutputInCommitmentDecodeErrorZ), "LDKCResult_HTLCOutputInCommitmentDecodeErrorZ");
 	*ret_conv = HTLCOutputInCommitment_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_get_htlc_redeemscript"))) TS_get_htlc_redeemscript(uint32_t htlc, jboolean opt_anchors, uint32_t keys) {
@@ -33124,7 +35188,7 @@ uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_get_holder
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelPublicKeys ret_var = ChannelTransactionParameters_get_holder_pubkeys(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33153,8 +35217,8 @@ int16_t  __attribute__((export_name("TS_ChannelTransactionParameters_get_holder_
 	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;
+	int16_t ret_conv = ChannelTransactionParameters_get_holder_selected_contest_delay(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelTransactionParameters_set_holder_selected_contest_delay"))) TS_ChannelTransactionParameters_set_holder_selected_contest_delay(uint32_t this_ptr, int16_t val) {
@@ -33170,8 +35234,8 @@ jboolean  __attribute__((export_name("TS_ChannelTransactionParameters_get_is_out
 	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;
+	jboolean ret_conv = ChannelTransactionParameters_get_is_outbound_from_holder(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelTransactionParameters_set_is_outbound_from_holder"))) TS_ChannelTransactionParameters_set_is_outbound_from_holder(uint32_t this_ptr, jboolean val) {
@@ -33188,7 +35252,7 @@ uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_get_counte
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCounterpartyChannelTransactionParameters ret_var = ChannelTransactionParameters_get_counterparty_parameters(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -33220,7 +35284,7 @@ uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_get_fundin
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKOutPoint ret_var = ChannelTransactionParameters_get_funding_outpoint(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -33282,7 +35346,7 @@ uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_new"))) TS
 	funding_outpoint_arg_conv = OutPoint_clone(&funding_outpoint_arg_conv);
 	LDKCOption_NoneZ opt_anchors_arg_conv = LDKCOption_NoneZ_from_js(opt_anchors_arg);
 	LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_new(holder_pubkeys_arg_conv, holder_selected_contest_delay_arg, is_outbound_from_holder_arg, counterparty_parameters_arg_conv, funding_outpoint_arg_conv, opt_anchors_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33295,7 +35359,7 @@ uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_new"))) TS
 
 static inline uintptr_t ChannelTransactionParameters_clone_ptr(LDKChannelTransactionParameters *NONNULL_PTR arg) {
 	LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33305,13 +35369,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelTransactionParameters_clone_ptr"))) TS_ChannelTransactionParameters_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_clone_ptr"))) TS_ChannelTransactionParameters_clone_ptr(uint32_t arg) {
 	LDKChannelTransactionParameters arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelTransactionParameters_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelTransactionParameters_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_clone"))) TS_ChannelTransactionParameters_clone(uint32_t orig) {
@@ -33320,7 +35384,7 @@ uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_clone")))
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelTransactionParameters ret_var = ChannelTransactionParameters_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33345,7 +35409,7 @@ uint32_t  __attribute__((export_name("TS_CounterpartyChannelTransactionParameter
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelPublicKeys ret_var = CounterpartyChannelTransactionParameters_get_pubkeys(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33374,8 +35438,8 @@ int16_t  __attribute__((export_name("TS_CounterpartyChannelTransactionParameters
 	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;
+	int16_t ret_conv = CounterpartyChannelTransactionParameters_get_selected_contest_delay(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_set_selected_contest_delay"))) TS_CounterpartyChannelTransactionParameters_set_selected_contest_delay(uint32_t this_ptr, int16_t val) {
@@ -33393,7 +35457,7 @@ uint32_t  __attribute__((export_name("TS_CounterpartyChannelTransactionParameter
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(pubkeys_arg_conv);
 	pubkeys_arg_conv = ChannelPublicKeys_clone(&pubkeys_arg_conv);
 	LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_new(pubkeys_arg_conv, selected_contest_delay_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33406,7 +35470,7 @@ uint32_t  __attribute__((export_name("TS_CounterpartyChannelTransactionParameter
 
 static inline uintptr_t CounterpartyChannelTransactionParameters_clone_ptr(LDKCounterpartyChannelTransactionParameters *NONNULL_PTR arg) {
 	LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33416,13 +35480,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone_ptr"))) TS_CounterpartyChannelTransactionParameters_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone_ptr"))) TS_CounterpartyChannelTransactionParameters_clone_ptr(uint32_t arg) {
 	LDKCounterpartyChannelTransactionParameters arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = CounterpartyChannelTransactionParameters_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CounterpartyChannelTransactionParameters_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_clone"))) TS_CounterpartyChannelTransactionParameters_clone(uint32_t orig) {
@@ -33431,7 +35495,7 @@ uint32_t  __attribute__((export_name("TS_CounterpartyChannelTransactionParameter
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCounterpartyChannelTransactionParameters ret_var = CounterpartyChannelTransactionParameters_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33447,8 +35511,8 @@ jboolean  __attribute__((export_name("TS_ChannelTransactionParameters_is_populat
 	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;
+	jboolean ret_conv = ChannelTransactionParameters_is_populated(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_as_holder_broadcastable"))) TS_ChannelTransactionParameters_as_holder_broadcastable(uint32_t this_arg) {
@@ -33457,7 +35521,7 @@ uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_as_holder_
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKDirectedChannelTransactionParameters ret_var = ChannelTransactionParameters_as_holder_broadcastable(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33474,7 +35538,7 @@ uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_as_counter
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKDirectedChannelTransactionParameters ret_var = ChannelTransactionParameters_as_counterparty_broadcastable(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33500,10 +35564,11 @@ int8_tArray  __attribute__((export_name("TS_CounterpartyChannelTransactionParame
 uint32_t  __attribute__((export_name("TS_CounterpartyChannelTransactionParameters_read"))) TS_CounterpartyChannelTransactionParameters_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ), "LDKCResult_CounterpartyChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = CounterpartyChannelTransactionParameters_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ChannelTransactionParameters_write"))) TS_ChannelTransactionParameters_write(uint32_t obj) {
@@ -33521,10 +35586,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelTransactionParameters_write")
 uint32_t  __attribute__((export_name("TS_ChannelTransactionParameters_read"))) TS_ChannelTransactionParameters_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelTransactionParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTransactionParametersDecodeErrorZ), "LDKCResult_ChannelTransactionParametersDecodeErrorZ");
 	*ret_conv = ChannelTransactionParameters_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_DirectedChannelTransactionParameters_free"))) TS_DirectedChannelTransactionParameters_free(uint32_t this_obj) {
@@ -33541,7 +35607,7 @@ uint32_t  __attribute__((export_name("TS_DirectedChannelTransactionParameters_br
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelPublicKeys ret_var = DirectedChannelTransactionParameters_broadcaster_pubkeys(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33558,7 +35624,7 @@ uint32_t  __attribute__((export_name("TS_DirectedChannelTransactionParameters_co
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelPublicKeys ret_var = DirectedChannelTransactionParameters_countersignatory_pubkeys(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33574,8 +35640,8 @@ int16_t  __attribute__((export_name("TS_DirectedChannelTransactionParameters_con
 	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;
+	int16_t ret_conv = DirectedChannelTransactionParameters_contest_delay(&this_arg_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_DirectedChannelTransactionParameters_is_outbound"))) TS_DirectedChannelTransactionParameters_is_outbound(uint32_t this_arg) {
@@ -33583,8 +35649,8 @@ jboolean  __attribute__((export_name("TS_DirectedChannelTransactionParameters_is
 	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;
+	jboolean ret_conv = DirectedChannelTransactionParameters_is_outbound(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_DirectedChannelTransactionParameters_funding_outpoint"))) TS_DirectedChannelTransactionParameters_funding_outpoint(uint32_t this_arg) {
@@ -33593,7 +35659,7 @@ uint32_t  __attribute__((export_name("TS_DirectedChannelTransactionParameters_fu
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKOutPoint ret_var = DirectedChannelTransactionParameters_funding_outpoint(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33609,8 +35675,8 @@ jboolean  __attribute__((export_name("TS_DirectedChannelTransactionParameters_op
 	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;
+	jboolean ret_conv = DirectedChannelTransactionParameters_opt_anchors(&this_arg_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_HolderCommitmentTransaction_free"))) TS_HolderCommitmentTransaction_free(uint32_t this_obj) {
@@ -33653,7 +35719,7 @@ void  __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterpart
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements");
 	else
 		val_constr.data = NULL;
-	int8_tArray* val_vals = (void*) val->elems /* XXX val leaks */;
+	int8_tArray* val_vals = (void*) val->elems;
 	for (size_t m = 0; m < val_constr.datalen; m++) {
 		int8_tArray val_conv_12 = val_vals[m];
 		LDKSignature val_conv_12_ref;
@@ -33661,12 +35727,13 @@ void  __attribute__((export_name("TS_HolderCommitmentTransaction_set_counterpart
 		memcpy(val_conv_12_ref.compact_form, val_conv_12->elems, 64); FREE(val_conv_12);
 		val_constr.data[m] = val_conv_12_ref;
 	}
+	FREE(val);
 	HolderCommitmentTransaction_set_counterparty_htlc_sigs(&this_ptr_conv, val_constr);
 }
 
 static inline uintptr_t HolderCommitmentTransaction_clone_ptr(LDKHolderCommitmentTransaction *NONNULL_PTR arg) {
 	LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33676,13 +35743,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_HolderCommitmentTransaction_clone_ptr"))) TS_HolderCommitmentTransaction_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_HolderCommitmentTransaction_clone_ptr"))) TS_HolderCommitmentTransaction_clone_ptr(uint32_t arg) {
 	LDKHolderCommitmentTransaction arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = HolderCommitmentTransaction_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = HolderCommitmentTransaction_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_HolderCommitmentTransaction_clone"))) TS_HolderCommitmentTransaction_clone(uint32_t orig) {
@@ -33691,7 +35758,7 @@ uint32_t  __attribute__((export_name("TS_HolderCommitmentTransaction_clone"))) T
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33717,10 +35784,11 @@ int8_tArray  __attribute__((export_name("TS_HolderCommitmentTransaction_write"))
 uint32_t  __attribute__((export_name("TS_HolderCommitmentTransaction_read"))) TS_HolderCommitmentTransaction_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_HolderCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_HolderCommitmentTransactionDecodeErrorZ), "LDKCResult_HolderCommitmentTransactionDecodeErrorZ");
 	*ret_conv = HolderCommitmentTransaction_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_HolderCommitmentTransaction_new(uint32_t commitment_tx, int8_tArray counterparty_sig, ptrArray counterparty_htlc_sigs, int8_tArray holder_funding_key, int8_tArray counterparty_funding_key) {
@@ -33738,7 +35806,7 @@ uint32_t  __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_
 		counterparty_htlc_sigs_constr.data = MALLOC(counterparty_htlc_sigs_constr.datalen * sizeof(LDKSignature), "LDKCVec_SignatureZ Elements");
 	else
 		counterparty_htlc_sigs_constr.data = NULL;
-	int8_tArray* counterparty_htlc_sigs_vals = (void*) counterparty_htlc_sigs->elems /* XXX counterparty_htlc_sigs leaks */;
+	int8_tArray* counterparty_htlc_sigs_vals = (void*) counterparty_htlc_sigs->elems;
 	for (size_t m = 0; m < counterparty_htlc_sigs_constr.datalen; m++) {
 		int8_tArray counterparty_htlc_sigs_conv_12 = counterparty_htlc_sigs_vals[m];
 		LDKSignature counterparty_htlc_sigs_conv_12_ref;
@@ -33746,6 +35814,7 @@ uint32_t  __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_
 		memcpy(counterparty_htlc_sigs_conv_12_ref.compact_form, counterparty_htlc_sigs_conv_12->elems, 64); FREE(counterparty_htlc_sigs_conv_12);
 		counterparty_htlc_sigs_constr.data[m] = counterparty_htlc_sigs_conv_12_ref;
 	}
+	FREE(counterparty_htlc_sigs);
 	LDKPublicKey holder_funding_key_ref;
 	CHECK(holder_funding_key->arr_len == 33);
 	memcpy(holder_funding_key_ref.compressed_form, holder_funding_key->elems, 33); FREE(holder_funding_key);
@@ -33753,7 +35822,7 @@ uint32_t  __attribute__((export_name("TS_HolderCommitmentTransaction_new"))) TS_
 	CHECK(counterparty_funding_key->arr_len == 33);
 	memcpy(counterparty_funding_key_ref.compressed_form, counterparty_funding_key->elems, 33); FREE(counterparty_funding_key);
 	LDKHolderCommitmentTransaction ret_var = HolderCommitmentTransaction_new(commitment_tx_conv, counterparty_sig_ref, counterparty_htlc_sigs_constr, holder_funding_key_ref, counterparty_funding_key_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33828,7 +35897,7 @@ uint32_t  __attribute__((export_name("TS_BuiltCommitmentTransaction_new"))) TS_B
 	CHECK(txid_arg->arr_len == 32);
 	memcpy(txid_arg_ref.data, txid_arg->elems, 32); FREE(txid_arg);
 	LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_new(transaction_arg_ref, txid_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33841,7 +35910,7 @@ uint32_t  __attribute__((export_name("TS_BuiltCommitmentTransaction_new"))) TS_B
 
 static inline uintptr_t BuiltCommitmentTransaction_clone_ptr(LDKBuiltCommitmentTransaction *NONNULL_PTR arg) {
 	LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33851,13 +35920,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_BuiltCommitmentTransaction_clone_ptr"))) TS_BuiltCommitmentTransaction_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_BuiltCommitmentTransaction_clone_ptr"))) TS_BuiltCommitmentTransaction_clone_ptr(uint32_t arg) {
 	LDKBuiltCommitmentTransaction arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = BuiltCommitmentTransaction_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = BuiltCommitmentTransaction_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_BuiltCommitmentTransaction_clone"))) TS_BuiltCommitmentTransaction_clone(uint32_t orig) {
@@ -33866,7 +35935,7 @@ uint32_t  __attribute__((export_name("TS_BuiltCommitmentTransaction_clone"))) TS
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKBuiltCommitmentTransaction ret_var = BuiltCommitmentTransaction_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33892,10 +35961,11 @@ int8_tArray  __attribute__((export_name("TS_BuiltCommitmentTransaction_write")))
 uint32_t  __attribute__((export_name("TS_BuiltCommitmentTransaction_read"))) TS_BuiltCommitmentTransaction_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_BuiltCommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_BuiltCommitmentTransactionDecodeErrorZ), "LDKCResult_BuiltCommitmentTransactionDecodeErrorZ");
 	*ret_conv = BuiltCommitmentTransaction_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_BuiltCommitmentTransaction_get_sighash_all"))) TS_BuiltCommitmentTransaction_get_sighash_all(uint32_t this_arg, int8_tArray funding_redeemscript, int64_t channel_value_satoshis) {
@@ -33905,9 +35975,10 @@ int8_tArray  __attribute__((export_name("TS_BuiltCommitmentTransaction_get_sigha
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKu8slice funding_redeemscript_ref;
 	funding_redeemscript_ref.datalen = funding_redeemscript->arr_len;
-	funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */;
+	funding_redeemscript_ref.data = funding_redeemscript->elems;
 	int8_tArray ret_arr = init_int8_tArray(32, __LINE__);
 	memcpy(ret_arr->elems, BuiltCommitmentTransaction_get_sighash_all(&this_arg_conv, funding_redeemscript_ref, channel_value_satoshis).data, 32);
+	FREE(funding_redeemscript);
 	return ret_arr;
 }
 
@@ -33922,9 +35993,10 @@ int8_tArray  __attribute__((export_name("TS_BuiltCommitmentTransaction_sign")))
 	unsigned char (*funding_key_ref)[32] = &funding_key_arr;
 	LDKu8slice funding_redeemscript_ref;
 	funding_redeemscript_ref.datalen = funding_redeemscript->arr_len;
-	funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */;
+	funding_redeemscript_ref.data = funding_redeemscript->elems;
 	int8_tArray ret_arr = init_int8_tArray(64, __LINE__);
 	memcpy(ret_arr->elems, BuiltCommitmentTransaction_sign(&this_arg_conv, funding_key_ref, funding_redeemscript_ref, channel_value_satoshis).compact_form, 64);
+	FREE(funding_redeemscript);
 	return ret_arr;
 }
 
@@ -33938,7 +36010,7 @@ void  __attribute__((export_name("TS_ClosingTransaction_free"))) TS_ClosingTrans
 
 static inline uintptr_t ClosingTransaction_clone_ptr(LDKClosingTransaction *NONNULL_PTR arg) {
 	LDKClosingTransaction ret_var = ClosingTransaction_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33948,13 +36020,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ClosingTransaction_clone_ptr"))) TS_ClosingTransaction_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ClosingTransaction_clone_ptr"))) TS_ClosingTransaction_clone_ptr(uint32_t arg) {
 	LDKClosingTransaction arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ClosingTransaction_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ClosingTransaction_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosingTransaction_clone"))) TS_ClosingTransaction_clone(uint32_t orig) {
@@ -33963,7 +36035,7 @@ uint32_t  __attribute__((export_name("TS_ClosingTransaction_clone"))) TS_Closing
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKClosingTransaction ret_var = ClosingTransaction_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -33979,8 +36051,8 @@ int64_t  __attribute__((export_name("TS_ClosingTransaction_hash"))) TS_ClosingTr
 	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;
+	int64_t ret_conv = ClosingTransaction_hash(&o_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ClosingTransaction_new"))) TS_ClosingTransaction_new(int64_t to_holder_value_sat, int64_t to_counterparty_value_sat, int8_tArray to_holder_script, int8_tArray to_counterparty_script, uint32_t funding_outpoint) {
@@ -33998,7 +36070,7 @@ uint32_t  __attribute__((export_name("TS_ClosingTransaction_new"))) TS_ClosingTr
 	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);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34015,7 +36087,7 @@ uint32_t  __attribute__((export_name("TS_ClosingTransaction_trust"))) TS_Closing
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKTrustedClosingTransaction ret_var = ClosingTransaction_trust(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34038,7 +36110,7 @@ uint32_t  __attribute__((export_name("TS_ClosingTransaction_verify"))) TS_Closin
 	funding_outpoint_conv = OutPoint_clone(&funding_outpoint_conv);
 	LDKCResult_TrustedClosingTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedClosingTransactionNoneZ), "LDKCResult_TrustedClosingTransactionNoneZ");
 	*ret_conv = ClosingTransaction_verify(&this_arg_conv, funding_outpoint_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_ClosingTransaction_to_holder_value_sat"))) TS_ClosingTransaction_to_holder_value_sat(uint32_t this_arg) {
@@ -34046,8 +36118,8 @@ int64_t  __attribute__((export_name("TS_ClosingTransaction_to_holder_value_sat")
 	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;
+	int64_t ret_conv = ClosingTransaction_to_holder_value_sat(&this_arg_conv);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_ClosingTransaction_to_counterparty_value_sat"))) TS_ClosingTransaction_to_counterparty_value_sat(uint32_t this_arg) {
@@ -34055,8 +36127,8 @@ int64_t  __attribute__((export_name("TS_ClosingTransaction_to_counterparty_value
 	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;
+	int64_t ret_conv = ClosingTransaction_to_counterparty_value_sat(&this_arg_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ClosingTransaction_to_holder_script"))) TS_ClosingTransaction_to_holder_script(uint32_t this_arg) {
@@ -34108,9 +36180,10 @@ int8_tArray  __attribute__((export_name("TS_TrustedClosingTransaction_get_sighas
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKu8slice funding_redeemscript_ref;
 	funding_redeemscript_ref.datalen = funding_redeemscript->arr_len;
-	funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */;
+	funding_redeemscript_ref.data = funding_redeemscript->elems;
 	int8_tArray ret_arr = init_int8_tArray(32, __LINE__);
 	memcpy(ret_arr->elems, TrustedClosingTransaction_get_sighash_all(&this_arg_conv, funding_redeemscript_ref, channel_value_satoshis).data, 32);
+	FREE(funding_redeemscript);
 	return ret_arr;
 }
 
@@ -34125,9 +36198,10 @@ int8_tArray  __attribute__((export_name("TS_TrustedClosingTransaction_sign"))) T
 	unsigned char (*funding_key_ref)[32] = &funding_key_arr;
 	LDKu8slice funding_redeemscript_ref;
 	funding_redeemscript_ref.datalen = funding_redeemscript->arr_len;
-	funding_redeemscript_ref.data = funding_redeemscript->elems /* XXX funding_redeemscript leaks */;
+	funding_redeemscript_ref.data = funding_redeemscript->elems;
 	int8_tArray ret_arr = init_int8_tArray(64, __LINE__);
 	memcpy(ret_arr->elems, TrustedClosingTransaction_sign(&this_arg_conv, funding_key_ref, funding_redeemscript_ref, channel_value_satoshis).compact_form, 64);
+	FREE(funding_redeemscript);
 	return ret_arr;
 }
 
@@ -34141,7 +36215,7 @@ void  __attribute__((export_name("TS_CommitmentTransaction_free"))) TS_Commitmen
 
 static inline uintptr_t CommitmentTransaction_clone_ptr(LDKCommitmentTransaction *NONNULL_PTR arg) {
 	LDKCommitmentTransaction ret_var = CommitmentTransaction_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34151,13 +36225,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_CommitmentTransaction_clone_ptr"))) TS_CommitmentTransaction_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_CommitmentTransaction_clone_ptr"))) TS_CommitmentTransaction_clone_ptr(uint32_t arg) {
 	LDKCommitmentTransaction arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = CommitmentTransaction_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = CommitmentTransaction_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CommitmentTransaction_clone"))) TS_CommitmentTransaction_clone(uint32_t orig) {
@@ -34166,7 +36240,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentTransaction_clone"))) TS_Comm
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKCommitmentTransaction ret_var = CommitmentTransaction_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34192,10 +36266,11 @@ int8_tArray  __attribute__((export_name("TS_CommitmentTransaction_write"))) TS_C
 uint32_t  __attribute__((export_name("TS_CommitmentTransaction_read"))) TS_CommitmentTransaction_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_CommitmentTransactionDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_CommitmentTransactionDecodeErrorZ), "LDKCResult_CommitmentTransactionDecodeErrorZ");
 	*ret_conv = CommitmentTransaction_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_CommitmentTransaction_commitment_number"))) TS_CommitmentTransaction_commitment_number(uint32_t this_arg) {
@@ -34203,8 +36278,8 @@ int64_t  __attribute__((export_name("TS_CommitmentTransaction_commitment_number"
 	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;
+	int64_t ret_conv = CommitmentTransaction_commitment_number(&this_arg_conv);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_CommitmentTransaction_to_broadcaster_value_sat"))) TS_CommitmentTransaction_to_broadcaster_value_sat(uint32_t this_arg) {
@@ -34212,8 +36287,8 @@ int64_t  __attribute__((export_name("TS_CommitmentTransaction_to_broadcaster_val
 	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;
+	int64_t ret_conv = CommitmentTransaction_to_broadcaster_value_sat(&this_arg_conv);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_CommitmentTransaction_to_countersignatory_value_sat"))) TS_CommitmentTransaction_to_countersignatory_value_sat(uint32_t this_arg) {
@@ -34221,8 +36296,8 @@ int64_t  __attribute__((export_name("TS_CommitmentTransaction_to_countersignator
 	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;
+	int64_t ret_conv = CommitmentTransaction_to_countersignatory_value_sat(&this_arg_conv);
+	return ret_conv;
 }
 
 int32_t  __attribute__((export_name("TS_CommitmentTransaction_feerate_per_kw"))) TS_CommitmentTransaction_feerate_per_kw(uint32_t this_arg) {
@@ -34230,8 +36305,8 @@ int32_t  __attribute__((export_name("TS_CommitmentTransaction_feerate_per_kw")))
 	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;
+	int32_t ret_conv = CommitmentTransaction_feerate_per_kw(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_CommitmentTransaction_trust"))) TS_CommitmentTransaction_trust(uint32_t this_arg) {
@@ -34240,7 +36315,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentTransaction_trust"))) TS_Comm
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKTrustedCommitmentTransaction ret_var = CommitmentTransaction_trust(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34270,7 +36345,7 @@ uint32_t  __attribute__((export_name("TS_CommitmentTransaction_verify"))) TS_Com
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(countersignatory_keys_conv);
 	LDKCResult_TrustedCommitmentTransactionNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_TrustedCommitmentTransactionNoneZ), "LDKCResult_TrustedCommitmentTransactionNoneZ");
 	*ret_conv = CommitmentTransaction_verify(&this_arg_conv, &channel_parameters_conv, &broadcaster_keys_conv, &countersignatory_keys_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_TrustedCommitmentTransaction_free"))) TS_TrustedCommitmentTransaction_free(uint32_t this_obj) {
@@ -34297,7 +36372,7 @@ uint32_t  __attribute__((export_name("TS_TrustedCommitmentTransaction_built_tran
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKBuiltCommitmentTransaction ret_var = TrustedCommitmentTransaction_built_transaction(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34314,7 +36389,7 @@ uint32_t  __attribute__((export_name("TS_TrustedCommitmentTransaction_keys"))) T
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKTxCreationKeys ret_var = TrustedCommitmentTransaction_keys(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34330,8 +36405,8 @@ jboolean  __attribute__((export_name("TS_TrustedCommitmentTransaction_opt_anchor
 	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;
+	jboolean ret_conv = TrustedCommitmentTransaction_opt_anchors(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_TrustedCommitmentTransaction_get_htlc_sigs"))) TS_TrustedCommitmentTransaction_get_htlc_sigs(uint32_t this_arg, int8_tArray htlc_base_key, uint32_t channel_parameters) {
@@ -34349,7 +36424,7 @@ uint32_t  __attribute__((export_name("TS_TrustedCommitmentTransaction_get_htlc_s
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_parameters_conv);
 	LDKCResult_CVec_SignatureZNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_CVec_SignatureZNoneZ), "LDKCResult_CVec_SignatureZNoneZ");
 	*ret_conv = TrustedCommitmentTransaction_get_htlc_sigs(&this_arg_conv, htlc_base_key_ref, &channel_parameters_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_get_commitment_transaction_number_obscure_factor"))) TS_get_commitment_transaction_number_obscure_factor(int8_tArray broadcaster_payment_basepoint, int8_tArray countersignatory_payment_basepoint, jboolean outbound_from_broadcaster) {
@@ -34359,8 +36434,8 @@ int64_t  __attribute__((export_name("TS_get_commitment_transaction_number_obscur
 	LDKPublicKey countersignatory_payment_basepoint_ref;
 	CHECK(countersignatory_payment_basepoint->arr_len == 33);
 	memcpy(countersignatory_payment_basepoint_ref.compressed_form, countersignatory_payment_basepoint->elems, 33); FREE(countersignatory_payment_basepoint);
-	int64_t ret_val = get_commitment_transaction_number_obscure_factor(broadcaster_payment_basepoint_ref, countersignatory_payment_basepoint_ref, outbound_from_broadcaster);
-	return ret_val;
+	int64_t ret_conv = get_commitment_transaction_number_obscure_factor(broadcaster_payment_basepoint_ref, countersignatory_payment_basepoint_ref, outbound_from_broadcaster);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_InitFeatures_eq"))) TS_InitFeatures_eq(uint32_t a, uint32_t b) {
@@ -34372,8 +36447,8 @@ jboolean  __attribute__((export_name("TS_InitFeatures_eq"))) TS_InitFeatures_eq(
 	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;
+	jboolean ret_conv = InitFeatures_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_NodeFeatures_eq"))) TS_NodeFeatures_eq(uint32_t a, uint32_t b) {
@@ -34385,8 +36460,8 @@ jboolean  __attribute__((export_name("TS_NodeFeatures_eq"))) TS_NodeFeatures_eq(
 	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;
+	jboolean ret_conv = NodeFeatures_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_ChannelFeatures_eq"))) TS_ChannelFeatures_eq(uint32_t a, uint32_t b) {
@@ -34398,8 +36473,8 @@ jboolean  __attribute__((export_name("TS_ChannelFeatures_eq"))) TS_ChannelFeatur
 	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;
+	jboolean ret_conv = ChannelFeatures_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_InvoiceFeatures_eq"))) TS_InvoiceFeatures_eq(uint32_t a, uint32_t b) {
@@ -34411,8 +36486,8 @@ jboolean  __attribute__((export_name("TS_InvoiceFeatures_eq"))) TS_InvoiceFeatur
 	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 ret_conv = InvoiceFeatures_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_ChannelTypeFeatures_eq"))) TS_ChannelTypeFeatures_eq(uint32_t a, uint32_t b) {
@@ -34424,13 +36499,13 @@ jboolean  __attribute__((export_name("TS_ChannelTypeFeatures_eq"))) TS_ChannelTy
 	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;
+	jboolean ret_conv = ChannelTypeFeatures_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 static inline uintptr_t InitFeatures_clone_ptr(LDKInitFeatures *NONNULL_PTR arg) {
 	LDKInitFeatures ret_var = InitFeatures_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34440,13 +36515,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_InitFeatures_clone_ptr"))) TS_InitFeatures_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_InitFeatures_clone_ptr"))) TS_InitFeatures_clone_ptr(uint32_t arg) {
 	LDKInitFeatures arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = InitFeatures_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = InitFeatures_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_InitFeatures_clone"))) TS_InitFeatures_clone(uint32_t orig) {
@@ -34455,7 +36530,7 @@ uint32_t  __attribute__((export_name("TS_InitFeatures_clone"))) TS_InitFeatures_
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInitFeatures ret_var = InitFeatures_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34468,7 +36543,7 @@ uint32_t  __attribute__((export_name("TS_InitFeatures_clone"))) TS_InitFeatures_
 
 static inline uintptr_t NodeFeatures_clone_ptr(LDKNodeFeatures *NONNULL_PTR arg) {
 	LDKNodeFeatures ret_var = NodeFeatures_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34478,13 +36553,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_NodeFeatures_clone_ptr"))) TS_NodeFeatures_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_NodeFeatures_clone_ptr"))) TS_NodeFeatures_clone_ptr(uint32_t arg) {
 	LDKNodeFeatures arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = NodeFeatures_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = NodeFeatures_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NodeFeatures_clone"))) TS_NodeFeatures_clone(uint32_t orig) {
@@ -34493,7 +36568,7 @@ uint32_t  __attribute__((export_name("TS_NodeFeatures_clone"))) TS_NodeFeatures_
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNodeFeatures ret_var = NodeFeatures_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34506,7 +36581,7 @@ uint32_t  __attribute__((export_name("TS_NodeFeatures_clone"))) TS_NodeFeatures_
 
 static inline uintptr_t ChannelFeatures_clone_ptr(LDKChannelFeatures *NONNULL_PTR arg) {
 	LDKChannelFeatures ret_var = ChannelFeatures_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34516,13 +36591,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelFeatures_clone_ptr"))) TS_ChannelFeatures_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelFeatures_clone_ptr"))) TS_ChannelFeatures_clone_ptr(uint32_t arg) {
 	LDKChannelFeatures arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelFeatures_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelFeatures_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelFeatures_clone"))) TS_ChannelFeatures_clone(uint32_t orig) {
@@ -34531,7 +36606,7 @@ uint32_t  __attribute__((export_name("TS_ChannelFeatures_clone"))) TS_ChannelFea
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelFeatures ret_var = ChannelFeatures_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34544,7 +36619,7 @@ uint32_t  __attribute__((export_name("TS_ChannelFeatures_clone"))) TS_ChannelFea
 
 static inline uintptr_t InvoiceFeatures_clone_ptr(LDKInvoiceFeatures *NONNULL_PTR arg) {
 	LDKInvoiceFeatures ret_var = InvoiceFeatures_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34554,13 +36629,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_InvoiceFeatures_clone_ptr"))) TS_InvoiceFeatures_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_InvoiceFeatures_clone_ptr"))) TS_InvoiceFeatures_clone_ptr(uint32_t arg) {
 	LDKInvoiceFeatures arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = InvoiceFeatures_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = InvoiceFeatures_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_InvoiceFeatures_clone"))) TS_InvoiceFeatures_clone(uint32_t orig) {
@@ -34569,7 +36644,7 @@ uint32_t  __attribute__((export_name("TS_InvoiceFeatures_clone"))) TS_InvoiceFea
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInvoiceFeatures ret_var = InvoiceFeatures_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34582,7 +36657,7 @@ uint32_t  __attribute__((export_name("TS_InvoiceFeatures_clone"))) TS_InvoiceFea
 
 static inline uintptr_t ChannelTypeFeatures_clone_ptr(LDKChannelTypeFeatures *NONNULL_PTR arg) {
 	LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34592,13 +36667,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelTypeFeatures_clone_ptr"))) TS_ChannelTypeFeatures_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelTypeFeatures_clone_ptr"))) TS_ChannelTypeFeatures_clone_ptr(uint32_t arg) {
 	LDKChannelTypeFeatures arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelTypeFeatures_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelTypeFeatures_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelTypeFeatures_clone"))) TS_ChannelTypeFeatures_clone(uint32_t orig) {
@@ -34607,7 +36682,7 @@ uint32_t  __attribute__((export_name("TS_ChannelTypeFeatures_clone"))) TS_Channe
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34660,7 +36735,7 @@ void  __attribute__((export_name("TS_ChannelTypeFeatures_free"))) TS_ChannelType
 
 uint32_t  __attribute__((export_name("TS_InitFeatures_empty"))) TS_InitFeatures_empty() {
 	LDKInitFeatures ret_var = InitFeatures_empty();
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34673,7 +36748,112 @@ uint32_t  __attribute__((export_name("TS_InitFeatures_empty"))) TS_InitFeatures_
 
 uint32_t  __attribute__((export_name("TS_InitFeatures_known"))) TS_InitFeatures_known() {
 	LDKInitFeatures ret_var = InitFeatures_known();
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_unknown_bits"))) TS_InitFeatures_requires_unknown_bits(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_unknown_bits(&this_arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_NodeFeatures_empty"))) TS_NodeFeatures_empty() {
+	LDKNodeFeatures ret_var = NodeFeatures_empty();
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_NodeFeatures_known"))) TS_NodeFeatures_known() {
+	LDKNodeFeatures ret_var = NodeFeatures_known();
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_unknown_bits"))) TS_NodeFeatures_requires_unknown_bits(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_unknown_bits(&this_arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelFeatures_empty"))) TS_ChannelFeatures_empty() {
+	LDKChannelFeatures ret_var = ChannelFeatures_empty();
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelFeatures_known"))) TS_ChannelFeatures_known() {
+	LDKChannelFeatures ret_var = ChannelFeatures_known();
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+jboolean  __attribute__((export_name("TS_ChannelFeatures_requires_unknown_bits"))) TS_ChannelFeatures_requires_unknown_bits(uint32_t this_arg) {
+	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_conv = ChannelFeatures_requires_unknown_bits(&this_arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_InvoiceFeatures_empty"))) TS_InvoiceFeatures_empty() {
+	LDKInvoiceFeatures ret_var = InvoiceFeatures_empty();
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_InvoiceFeatures_known"))) TS_InvoiceFeatures_known() {
+	LDKInvoiceFeatures ret_var = InvoiceFeatures_known();
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34684,258 +36864,1237 @@ uint32_t  __attribute__((export_name("TS_InitFeatures_known"))) TS_InitFeatures_
 	return ret_ref;
 }
 
-jboolean  __attribute__((export_name("TS_InitFeatures_requires_unknown_bits"))) TS_InitFeatures_requires_unknown_bits(uint32_t this_arg) {
+jboolean  __attribute__((export_name("TS_InvoiceFeatures_requires_unknown_bits"))) TS_InvoiceFeatures_requires_unknown_bits(uint32_t this_arg) {
+	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_conv = InvoiceFeatures_requires_unknown_bits(&this_arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelTypeFeatures_empty"))) TS_ChannelTypeFeatures_empty() {
+	LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_empty();
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelTypeFeatures_known"))) TS_ChannelTypeFeatures_known() {
+	LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_known();
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+jboolean  __attribute__((export_name("TS_ChannelTypeFeatures_requires_unknown_bits"))) 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;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	jboolean ret_conv = ChannelTypeFeatures_requires_unknown_bits(&this_arg_conv);
+	return ret_conv;
+}
+
+int8_tArray  __attribute__((export_name("TS_InitFeatures_write"))) TS_InitFeatures_write(uint32_t obj) {
+	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_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+uint32_t  __attribute__((export_name("TS_InitFeatures_read"))) TS_InitFeatures_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = ser->arr_len;
+	ser_ref.data = ser->elems;
+	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
+	*ret_conv = InitFeatures_read(ser_ref);
+	FREE(ser);
+	return (uint32_t)ret_conv;
+}
+
+int8_tArray  __attribute__((export_name("TS_ChannelFeatures_write"))) 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_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelFeatures_read"))) TS_ChannelFeatures_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = ser->arr_len;
+	ser_ref.data = ser->elems;
+	LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ");
+	*ret_conv = ChannelFeatures_read(ser_ref);
+	FREE(ser);
+	return (uint32_t)ret_conv;
+}
+
+int8_tArray  __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatures_write(uint32_t obj) {
+	LDKNodeFeatures 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 = NodeFeatures_write(&obj_conv);
+	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+uint32_t  __attribute__((export_name("TS_NodeFeatures_read"))) TS_NodeFeatures_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = ser->arr_len;
+	ser_ref.data = ser->elems;
+	LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ");
+	*ret_conv = NodeFeatures_read(ser_ref);
+	FREE(ser);
+	return (uint32_t)ret_conv;
+}
+
+int8_tArray  __attribute__((export_name("TS_InvoiceFeatures_write"))) 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_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+uint32_t  __attribute__((export_name("TS_InvoiceFeatures_read"))) TS_InvoiceFeatures_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = ser->arr_len;
+	ser_ref.data = ser->elems;
+	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
+	*ret_conv = InvoiceFeatures_read(ser_ref);
+	FREE(ser);
+	return (uint32_t)ret_conv;
+}
+
+int8_tArray  __attribute__((export_name("TS_ChannelTypeFeatures_write"))) 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_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelTypeFeatures_read"))) TS_ChannelTypeFeatures_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = ser->arr_len;
+	ser_ref.data = ser->elems;
+	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ");
+	*ret_conv = ChannelTypeFeatures_read(ser_ref);
+	FREE(ser);
+	return (uint32_t)ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_data_loss_protect_optional"))) TS_InitFeatures_set_data_loss_protect_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_data_loss_protect_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_data_loss_protect_required"))) TS_InitFeatures_set_data_loss_protect_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_data_loss_protect_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_data_loss_protect"))) TS_InitFeatures_supports_data_loss_protect(uint32_t this_arg) {
+	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_conv = InitFeatures_supports_data_loss_protect(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_data_loss_protect_optional"))) TS_NodeFeatures_set_data_loss_protect_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_data_loss_protect_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_data_loss_protect_required"))) TS_NodeFeatures_set_data_loss_protect_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_data_loss_protect_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_data_loss_protect"))) TS_NodeFeatures_supports_data_loss_protect(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_data_loss_protect(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_data_loss_protect"))) TS_InitFeatures_requires_data_loss_protect(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_data_loss_protect(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_data_loss_protect"))) TS_NodeFeatures_requires_data_loss_protect(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_data_loss_protect(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_initial_routing_sync_optional"))) TS_InitFeatures_set_initial_routing_sync_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_initial_routing_sync_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_initial_routing_sync_required"))) TS_InitFeatures_set_initial_routing_sync_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_initial_routing_sync_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_initial_routing_sync"))) TS_InitFeatures_initial_routing_sync(uint32_t this_arg) {
+	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_conv = InitFeatures_initial_routing_sync(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_upfront_shutdown_script_optional"))) TS_InitFeatures_set_upfront_shutdown_script_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_upfront_shutdown_script_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_upfront_shutdown_script_required"))) TS_InitFeatures_set_upfront_shutdown_script_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_upfront_shutdown_script_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_upfront_shutdown_script"))) TS_InitFeatures_supports_upfront_shutdown_script(uint32_t this_arg) {
+	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_conv = InitFeatures_supports_upfront_shutdown_script(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_upfront_shutdown_script_optional"))) TS_NodeFeatures_set_upfront_shutdown_script_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_upfront_shutdown_script_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_upfront_shutdown_script_required"))) TS_NodeFeatures_set_upfront_shutdown_script_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_upfront_shutdown_script_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_upfront_shutdown_script"))) TS_NodeFeatures_supports_upfront_shutdown_script(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_upfront_shutdown_script(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_upfront_shutdown_script"))) TS_InitFeatures_requires_upfront_shutdown_script(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_upfront_shutdown_script(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_upfront_shutdown_script"))) TS_NodeFeatures_requires_upfront_shutdown_script(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_upfront_shutdown_script(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_gossip_queries_optional"))) TS_InitFeatures_set_gossip_queries_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_gossip_queries_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_gossip_queries_required"))) TS_InitFeatures_set_gossip_queries_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_gossip_queries_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_gossip_queries"))) TS_InitFeatures_supports_gossip_queries(uint32_t this_arg) {
+	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_conv = InitFeatures_supports_gossip_queries(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_gossip_queries_optional"))) TS_NodeFeatures_set_gossip_queries_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_gossip_queries_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_gossip_queries_required"))) TS_NodeFeatures_set_gossip_queries_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_gossip_queries_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_gossip_queries"))) TS_NodeFeatures_supports_gossip_queries(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_gossip_queries(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_gossip_queries"))) TS_InitFeatures_requires_gossip_queries(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_gossip_queries(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_gossip_queries"))) TS_NodeFeatures_requires_gossip_queries(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_gossip_queries(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_variable_length_onion_optional"))) TS_InitFeatures_set_variable_length_onion_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_variable_length_onion_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_variable_length_onion_required"))) TS_InitFeatures_set_variable_length_onion_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_variable_length_onion_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_variable_length_onion"))) TS_InitFeatures_supports_variable_length_onion(uint32_t this_arg) {
+	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_conv = InitFeatures_supports_variable_length_onion(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_variable_length_onion_optional"))) TS_NodeFeatures_set_variable_length_onion_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_variable_length_onion_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_variable_length_onion_required"))) TS_NodeFeatures_set_variable_length_onion_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_variable_length_onion_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_variable_length_onion"))) TS_NodeFeatures_supports_variable_length_onion(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_variable_length_onion(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InvoiceFeatures_set_variable_length_onion_optional"))) TS_InvoiceFeatures_set_variable_length_onion_optional(uint32_t this_arg) {
+	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);
+	InvoiceFeatures_set_variable_length_onion_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InvoiceFeatures_set_variable_length_onion_required"))) TS_InvoiceFeatures_set_variable_length_onion_required(uint32_t this_arg) {
+	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);
+	InvoiceFeatures_set_variable_length_onion_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InvoiceFeatures_supports_variable_length_onion"))) TS_InvoiceFeatures_supports_variable_length_onion(uint32_t this_arg) {
+	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_conv = InvoiceFeatures_supports_variable_length_onion(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_variable_length_onion"))) TS_InitFeatures_requires_variable_length_onion(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_variable_length_onion(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_variable_length_onion"))) TS_NodeFeatures_requires_variable_length_onion(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_variable_length_onion(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InvoiceFeatures_requires_variable_length_onion"))) TS_InvoiceFeatures_requires_variable_length_onion(uint32_t this_arg) {
+	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_conv = InvoiceFeatures_requires_variable_length_onion(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_static_remote_key_optional"))) TS_InitFeatures_set_static_remote_key_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_static_remote_key_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_static_remote_key_required"))) TS_InitFeatures_set_static_remote_key_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_static_remote_key_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_static_remote_key"))) TS_InitFeatures_supports_static_remote_key(uint32_t this_arg) {
+	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_conv = InitFeatures_supports_static_remote_key(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_static_remote_key_optional"))) TS_NodeFeatures_set_static_remote_key_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_static_remote_key_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_static_remote_key_required"))) TS_NodeFeatures_set_static_remote_key_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_static_remote_key_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_static_remote_key"))) TS_NodeFeatures_supports_static_remote_key(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_static_remote_key(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelTypeFeatures_set_static_remote_key_optional"))) TS_ChannelTypeFeatures_set_static_remote_key_optional(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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);
+	ChannelTypeFeatures_set_static_remote_key_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_ChannelTypeFeatures_set_static_remote_key_required"))) TS_ChannelTypeFeatures_set_static_remote_key_required(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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);
+	ChannelTypeFeatures_set_static_remote_key_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_ChannelTypeFeatures_supports_static_remote_key"))) TS_ChannelTypeFeatures_supports_static_remote_key(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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_conv = ChannelTypeFeatures_supports_static_remote_key(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_static_remote_key"))) TS_InitFeatures_requires_static_remote_key(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_static_remote_key(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_static_remote_key"))) TS_NodeFeatures_requires_static_remote_key(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_static_remote_key(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_ChannelTypeFeatures_requires_static_remote_key"))) TS_ChannelTypeFeatures_requires_static_remote_key(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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_conv = ChannelTypeFeatures_requires_static_remote_key(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_payment_secret_optional"))) TS_InitFeatures_set_payment_secret_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_payment_secret_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_payment_secret_required"))) TS_InitFeatures_set_payment_secret_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_payment_secret_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_payment_secret"))) TS_InitFeatures_supports_payment_secret(uint32_t this_arg) {
+	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_conv = InitFeatures_supports_payment_secret(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_payment_secret_optional"))) TS_NodeFeatures_set_payment_secret_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_payment_secret_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_payment_secret_required"))) TS_NodeFeatures_set_payment_secret_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_payment_secret_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_payment_secret"))) TS_NodeFeatures_supports_payment_secret(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_payment_secret(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InvoiceFeatures_set_payment_secret_optional"))) TS_InvoiceFeatures_set_payment_secret_optional(uint32_t this_arg) {
+	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);
+	InvoiceFeatures_set_payment_secret_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InvoiceFeatures_set_payment_secret_required"))) TS_InvoiceFeatures_set_payment_secret_required(uint32_t this_arg) {
+	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);
+	InvoiceFeatures_set_payment_secret_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InvoiceFeatures_supports_payment_secret"))) TS_InvoiceFeatures_supports_payment_secret(uint32_t this_arg) {
+	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_conv = InvoiceFeatures_supports_payment_secret(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_payment_secret"))) TS_InitFeatures_requires_payment_secret(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_payment_secret(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_payment_secret"))) TS_NodeFeatures_requires_payment_secret(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_payment_secret(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InvoiceFeatures_requires_payment_secret"))) TS_InvoiceFeatures_requires_payment_secret(uint32_t this_arg) {
+	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_conv = InvoiceFeatures_requires_payment_secret(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_basic_mpp_optional"))) TS_InitFeatures_set_basic_mpp_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_basic_mpp_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_basic_mpp_required"))) TS_InitFeatures_set_basic_mpp_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_basic_mpp_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_basic_mpp"))) TS_InitFeatures_supports_basic_mpp(uint32_t this_arg) {
+	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_conv = InitFeatures_supports_basic_mpp(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_basic_mpp_optional"))) TS_NodeFeatures_set_basic_mpp_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_basic_mpp_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_basic_mpp_required"))) TS_NodeFeatures_set_basic_mpp_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_basic_mpp_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_basic_mpp"))) TS_NodeFeatures_supports_basic_mpp(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_basic_mpp(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InvoiceFeatures_set_basic_mpp_optional"))) TS_InvoiceFeatures_set_basic_mpp_optional(uint32_t this_arg) {
+	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);
+	InvoiceFeatures_set_basic_mpp_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InvoiceFeatures_set_basic_mpp_required"))) TS_InvoiceFeatures_set_basic_mpp_required(uint32_t this_arg) {
+	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);
+	InvoiceFeatures_set_basic_mpp_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InvoiceFeatures_supports_basic_mpp"))) TS_InvoiceFeatures_supports_basic_mpp(uint32_t this_arg) {
+	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_conv = InvoiceFeatures_supports_basic_mpp(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_basic_mpp"))) TS_InitFeatures_requires_basic_mpp(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_basic_mpp(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_basic_mpp"))) TS_NodeFeatures_requires_basic_mpp(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_basic_mpp(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InvoiceFeatures_requires_basic_mpp"))) TS_InvoiceFeatures_requires_basic_mpp(uint32_t this_arg) {
+	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_conv = InvoiceFeatures_requires_basic_mpp(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_wumbo_optional"))) TS_InitFeatures_set_wumbo_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_wumbo_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_wumbo_required"))) TS_InitFeatures_set_wumbo_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_wumbo_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_wumbo"))) TS_InitFeatures_supports_wumbo(uint32_t this_arg) {
+	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_conv = InitFeatures_supports_wumbo(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_wumbo_optional"))) TS_NodeFeatures_set_wumbo_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_wumbo_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_wumbo_required"))) TS_NodeFeatures_set_wumbo_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_wumbo_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_wumbo"))) TS_NodeFeatures_supports_wumbo(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_wumbo(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_wumbo"))) TS_InitFeatures_requires_wumbo(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_wumbo(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_wumbo"))) TS_NodeFeatures_requires_wumbo(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_wumbo(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_shutdown_any_segwit_optional"))) TS_InitFeatures_set_shutdown_any_segwit_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_shutdown_any_segwit_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_shutdown_any_segwit_required"))) TS_InitFeatures_set_shutdown_any_segwit_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_shutdown_any_segwit_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_shutdown_anysegwit"))) TS_InitFeatures_supports_shutdown_anysegwit(uint32_t this_arg) {
+	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_conv = InitFeatures_supports_shutdown_anysegwit(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_shutdown_any_segwit_optional"))) TS_NodeFeatures_set_shutdown_any_segwit_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_shutdown_any_segwit_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_shutdown_any_segwit_required"))) TS_NodeFeatures_set_shutdown_any_segwit_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_shutdown_any_segwit_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_shutdown_anysegwit"))) TS_NodeFeatures_supports_shutdown_anysegwit(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_shutdown_anysegwit(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_shutdown_anysegwit"))) TS_InitFeatures_requires_shutdown_anysegwit(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_shutdown_anysegwit(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_shutdown_anysegwit"))) TS_NodeFeatures_requires_shutdown_anysegwit(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_shutdown_anysegwit(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_channel_type_optional"))) TS_InitFeatures_set_channel_type_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_channel_type_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_channel_type_required"))) TS_InitFeatures_set_channel_type_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_channel_type_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_channel_type"))) TS_InitFeatures_supports_channel_type(uint32_t this_arg) {
+	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_conv = InitFeatures_supports_channel_type(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_channel_type_optional"))) TS_NodeFeatures_set_channel_type_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_channel_type_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_channel_type_required"))) TS_NodeFeatures_set_channel_type_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_channel_type_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_channel_type"))) TS_NodeFeatures_supports_channel_type(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_channel_type(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_channel_type"))) TS_InitFeatures_requires_channel_type(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_channel_type(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_channel_type"))) TS_NodeFeatures_requires_channel_type(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_channel_type(&this_arg_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_scid_privacy_optional"))) TS_InitFeatures_set_scid_privacy_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_scid_privacy_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_InitFeatures_set_scid_privacy_required"))) TS_InitFeatures_set_scid_privacy_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_scid_privacy_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_scid_privacy"))) TS_InitFeatures_supports_scid_privacy(uint32_t this_arg) {
 	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;
+	jboolean ret_conv = InitFeatures_supports_scid_privacy(&this_arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_NodeFeatures_empty"))) TS_NodeFeatures_empty() {
-	LDKNodeFeatures ret_var = NodeFeatures_empty();
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+void  __attribute__((export_name("TS_NodeFeatures_set_scid_privacy_optional"))) TS_NodeFeatures_set_scid_privacy_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_scid_privacy_optional(&this_arg_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_NodeFeatures_known"))) TS_NodeFeatures_known() {
-	LDKNodeFeatures ret_var = NodeFeatures_known();
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+void  __attribute__((export_name("TS_NodeFeatures_set_scid_privacy_required"))) TS_NodeFeatures_set_scid_privacy_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_scid_privacy_required(&this_arg_conv);
 }
 
-jboolean  __attribute__((export_name("TS_NodeFeatures_requires_unknown_bits"))) TS_NodeFeatures_requires_unknown_bits(uint32_t this_arg) {
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_scid_privacy"))) TS_NodeFeatures_supports_scid_privacy(uint32_t this_arg) {
 	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;
+	jboolean ret_conv = NodeFeatures_supports_scid_privacy(&this_arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelFeatures_empty"))) TS_ChannelFeatures_empty() {
-	LDKChannelFeatures ret_var = ChannelFeatures_empty();
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+void  __attribute__((export_name("TS_ChannelTypeFeatures_set_scid_privacy_optional"))) TS_ChannelTypeFeatures_set_scid_privacy_optional(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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);
+	ChannelTypeFeatures_set_scid_privacy_optional(&this_arg_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelFeatures_known"))) TS_ChannelFeatures_known() {
-	LDKChannelFeatures ret_var = ChannelFeatures_known();
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+void  __attribute__((export_name("TS_ChannelTypeFeatures_set_scid_privacy_required"))) TS_ChannelTypeFeatures_set_scid_privacy_required(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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);
+	ChannelTypeFeatures_set_scid_privacy_required(&this_arg_conv);
 }
 
-jboolean  __attribute__((export_name("TS_ChannelFeatures_requires_unknown_bits"))) TS_ChannelFeatures_requires_unknown_bits(uint32_t this_arg) {
-	LDKChannelFeatures this_arg_conv;
+jboolean  __attribute__((export_name("TS_ChannelTypeFeatures_supports_scid_privacy"))) TS_ChannelTypeFeatures_supports_scid_privacy(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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;
+	jboolean ret_conv = ChannelTypeFeatures_supports_scid_privacy(&this_arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_InvoiceFeatures_empty"))) TS_InvoiceFeatures_empty() {
-	LDKInvoiceFeatures ret_var = InvoiceFeatures_empty();
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_scid_privacy"))) TS_InitFeatures_requires_scid_privacy(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_scid_privacy(&this_arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_InvoiceFeatures_known"))) TS_InvoiceFeatures_known() {
-	LDKInvoiceFeatures ret_var = InvoiceFeatures_known();
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_scid_privacy"))) TS_NodeFeatures_requires_scid_privacy(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_scid_privacy(&this_arg_conv);
+	return ret_conv;
 }
 
-jboolean  __attribute__((export_name("TS_InvoiceFeatures_requires_unknown_bits"))) TS_InvoiceFeatures_requires_unknown_bits(uint32_t this_arg) {
-	LDKInvoiceFeatures this_arg_conv;
+jboolean  __attribute__((export_name("TS_ChannelTypeFeatures_requires_scid_privacy"))) TS_ChannelTypeFeatures_requires_scid_privacy(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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 ret_conv = ChannelTypeFeatures_requires_scid_privacy(&this_arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelTypeFeatures_empty"))) TS_ChannelTypeFeatures_empty() {
-	LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_empty();
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+void  __attribute__((export_name("TS_InitFeatures_set_zero_conf_optional"))) TS_InitFeatures_set_zero_conf_optional(uint32_t this_arg) {
+	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);
+	InitFeatures_set_zero_conf_optional(&this_arg_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelTypeFeatures_known"))) TS_ChannelTypeFeatures_known() {
-	LDKChannelTypeFeatures ret_var = ChannelTypeFeatures_known();
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+void  __attribute__((export_name("TS_InitFeatures_set_zero_conf_required"))) TS_InitFeatures_set_zero_conf_required(uint32_t this_arg) {
+	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);
+	InitFeatures_set_zero_conf_required(&this_arg_conv);
 }
 
-jboolean  __attribute__((export_name("TS_ChannelTypeFeatures_requires_unknown_bits"))) TS_ChannelTypeFeatures_requires_unknown_bits(uint32_t this_arg) {
-	LDKChannelTypeFeatures this_arg_conv;
+jboolean  __attribute__((export_name("TS_InitFeatures_supports_zero_conf"))) TS_InitFeatures_supports_zero_conf(uint32_t this_arg) {
+	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 = ChannelTypeFeatures_requires_unknown_bits(&this_arg_conv);
-	return ret_val;
+	jboolean ret_conv = InitFeatures_supports_zero_conf(&this_arg_conv);
+	return ret_conv;
 }
 
-int8_tArray  __attribute__((export_name("TS_InitFeatures_write"))) TS_InitFeatures_write(uint32_t obj) {
-	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_int8_tArray(ret_var.datalen, __LINE__);
-	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
+void  __attribute__((export_name("TS_NodeFeatures_set_zero_conf_optional"))) TS_NodeFeatures_set_zero_conf_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_zero_conf_optional(&this_arg_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_InitFeatures_read"))) TS_InitFeatures_read(int8_tArray ser) {
-	LDKu8slice ser_ref;
-	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
-	LDKCResult_InitFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InitFeaturesDecodeErrorZ), "LDKCResult_InitFeaturesDecodeErrorZ");
-	*ret_conv = InitFeatures_read(ser_ref);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_NodeFeatures_set_zero_conf_required"))) TS_NodeFeatures_set_zero_conf_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_zero_conf_required(&this_arg_conv);
 }
 
-int8_tArray  __attribute__((export_name("TS_ChannelFeatures_write"))) 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_int8_tArray(ret_var.datalen, __LINE__);
-	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_zero_conf"))) TS_NodeFeatures_supports_zero_conf(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_zero_conf(&this_arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelFeatures_read"))) TS_ChannelFeatures_read(int8_tArray ser) {
-	LDKu8slice ser_ref;
-	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
-	LDKCResult_ChannelFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelFeaturesDecodeErrorZ), "LDKCResult_ChannelFeaturesDecodeErrorZ");
-	*ret_conv = ChannelFeatures_read(ser_ref);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_ChannelTypeFeatures_set_zero_conf_optional"))) TS_ChannelTypeFeatures_set_zero_conf_optional(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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);
+	ChannelTypeFeatures_set_zero_conf_optional(&this_arg_conv);
 }
 
-int8_tArray  __attribute__((export_name("TS_NodeFeatures_write"))) TS_NodeFeatures_write(uint32_t obj) {
-	LDKNodeFeatures 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 = NodeFeatures_write(&obj_conv);
-	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
-	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
+void  __attribute__((export_name("TS_ChannelTypeFeatures_set_zero_conf_required"))) TS_ChannelTypeFeatures_set_zero_conf_required(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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);
+	ChannelTypeFeatures_set_zero_conf_required(&this_arg_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_NodeFeatures_read"))) TS_NodeFeatures_read(int8_tArray ser) {
-	LDKu8slice ser_ref;
-	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
-	LDKCResult_NodeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeFeaturesDecodeErrorZ), "LDKCResult_NodeFeaturesDecodeErrorZ");
-	*ret_conv = NodeFeatures_read(ser_ref);
-	return (uintptr_t)ret_conv;
+jboolean  __attribute__((export_name("TS_ChannelTypeFeatures_supports_zero_conf"))) TS_ChannelTypeFeatures_supports_zero_conf(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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_conv = ChannelTypeFeatures_supports_zero_conf(&this_arg_conv);
+	return ret_conv;
 }
 
-int8_tArray  __attribute__((export_name("TS_InvoiceFeatures_write"))) 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_int8_tArray(ret_var.datalen, __LINE__);
-	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
+jboolean  __attribute__((export_name("TS_InitFeatures_requires_zero_conf"))) TS_InitFeatures_requires_zero_conf(uint32_t this_arg) {
+	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_conv = InitFeatures_requires_zero_conf(&this_arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_InvoiceFeatures_read"))) TS_InvoiceFeatures_read(int8_tArray ser) {
-	LDKu8slice ser_ref;
-	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
-	LDKCResult_InvoiceFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceFeaturesDecodeErrorZ), "LDKCResult_InvoiceFeaturesDecodeErrorZ");
-	*ret_conv = InvoiceFeatures_read(ser_ref);
-	return (uintptr_t)ret_conv;
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_zero_conf"))) TS_NodeFeatures_requires_zero_conf(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_zero_conf(&this_arg_conv);
+	return ret_conv;
 }
 
-int8_tArray  __attribute__((export_name("TS_ChannelTypeFeatures_write"))) 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_int8_tArray(ret_var.datalen, __LINE__);
-	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
+jboolean  __attribute__((export_name("TS_ChannelTypeFeatures_requires_zero_conf"))) TS_ChannelTypeFeatures_requires_zero_conf(uint32_t this_arg) {
+	LDKChannelTypeFeatures 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_conv = ChannelTypeFeatures_requires_zero_conf(&this_arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_ChannelTypeFeatures_read"))) TS_ChannelTypeFeatures_read(int8_tArray ser) {
-	LDKu8slice ser_ref;
-	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
-	LDKCResult_ChannelTypeFeaturesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelTypeFeaturesDecodeErrorZ), "LDKCResult_ChannelTypeFeaturesDecodeErrorZ");
-	*ret_conv = ChannelTypeFeatures_read(ser_ref);
-	return (uintptr_t)ret_conv;
+void  __attribute__((export_name("TS_NodeFeatures_set_keysend_optional"))) TS_NodeFeatures_set_keysend_optional(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_keysend_optional(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_NodeFeatures_set_keysend_required"))) TS_NodeFeatures_set_keysend_required(uint32_t this_arg) {
+	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);
+	NodeFeatures_set_keysend_required(&this_arg_conv);
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_supports_keysend"))) TS_NodeFeatures_supports_keysend(uint32_t this_arg) {
+	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_conv = NodeFeatures_supports_keysend(&this_arg_conv);
+	return ret_conv;
+}
+
+jboolean  __attribute__((export_name("TS_NodeFeatures_requires_keysend"))) TS_NodeFeatures_requires_keysend(uint32_t this_arg) {
+	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_conv = NodeFeatures_requires_keysend(&this_arg_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ShutdownScript_free"))) TS_ShutdownScript_free(uint32_t this_obj) {
@@ -34948,7 +38107,7 @@ void  __attribute__((export_name("TS_ShutdownScript_free"))) TS_ShutdownScript_f
 
 static inline uintptr_t ShutdownScript_clone_ptr(LDKShutdownScript *NONNULL_PTR arg) {
 	LDKShutdownScript ret_var = ShutdownScript_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -34958,13 +38117,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ShutdownScript_clone_ptr"))) TS_ShutdownScript_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ShutdownScript_clone_ptr"))) TS_ShutdownScript_clone_ptr(uint32_t arg) {
 	LDKShutdownScript arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ShutdownScript_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ShutdownScript_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ShutdownScript_clone"))) TS_ShutdownScript_clone(uint32_t orig) {
@@ -34973,7 +38132,7 @@ uint32_t  __attribute__((export_name("TS_ShutdownScript_clone"))) TS_ShutdownScr
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKShutdownScript ret_var = ShutdownScript_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35021,7 +38180,7 @@ uint32_t  __attribute__((export_name("TS_InvalidShutdownScript_new"))) TS_Invali
 	script_arg_ref.data = MALLOC(script_arg_ref.datalen, "LDKCVec_u8Z Bytes");
 	memcpy(script_arg_ref.data, script_arg->elems, script_arg_ref.datalen); FREE(script_arg);
 	LDKInvalidShutdownScript ret_var = InvalidShutdownScript_new(script_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35034,7 +38193,7 @@ uint32_t  __attribute__((export_name("TS_InvalidShutdownScript_new"))) TS_Invali
 
 static inline uintptr_t InvalidShutdownScript_clone_ptr(LDKInvalidShutdownScript *NONNULL_PTR arg) {
 	LDKInvalidShutdownScript ret_var = InvalidShutdownScript_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35044,13 +38203,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_InvalidShutdownScript_clone_ptr"))) TS_InvalidShutdownScript_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_InvalidShutdownScript_clone_ptr"))) TS_InvalidShutdownScript_clone_ptr(uint32_t arg) {
 	LDKInvalidShutdownScript arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = InvalidShutdownScript_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = InvalidShutdownScript_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_InvalidShutdownScript_clone"))) TS_InvalidShutdownScript_clone(uint32_t orig) {
@@ -35059,7 +38218,7 @@ uint32_t  __attribute__((export_name("TS_InvalidShutdownScript_clone"))) TS_Inva
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInvalidShutdownScript ret_var = InvalidShutdownScript_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35085,10 +38244,11 @@ int8_tArray  __attribute__((export_name("TS_ShutdownScript_write"))) TS_Shutdown
 uint32_t  __attribute__((export_name("TS_ShutdownScript_read"))) TS_ShutdownScript_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ShutdownScriptDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptDecodeErrorZ), "LDKCResult_ShutdownScriptDecodeErrorZ");
 	*ret_conv = ShutdownScript_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ShutdownScript_new_p2wpkh"))) TS_ShutdownScript_new_p2wpkh(int8_tArray pubkey_hash) {
@@ -35097,7 +38257,7 @@ uint32_t  __attribute__((export_name("TS_ShutdownScript_new_p2wpkh"))) TS_Shutdo
 	memcpy(pubkey_hash_arr, pubkey_hash->elems, 20); FREE(pubkey_hash);
 	unsigned char (*pubkey_hash_ref)[20] = &pubkey_hash_arr;
 	LDKShutdownScript ret_var = ShutdownScript_new_p2wpkh(pubkey_hash_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35114,7 +38274,7 @@ uint32_t  __attribute__((export_name("TS_ShutdownScript_new_p2wsh"))) TS_Shutdow
 	memcpy(script_hash_arr, script_hash->elems, 32); FREE(script_hash);
 	unsigned char (*script_hash_ref)[32] = &script_hash_arr;
 	LDKShutdownScript ret_var = ShutdownScript_new_p2wsh(script_hash_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35126,12 +38286,14 @@ uint32_t  __attribute__((export_name("TS_ShutdownScript_new_p2wsh"))) TS_Shutdow
 }
 
 uint32_t  __attribute__((export_name("TS_ShutdownScript_new_witness_program"))) TS_ShutdownScript_new_witness_program(int8_t version, int8_tArray program) {
+	
 	LDKu8slice program_ref;
 	program_ref.datalen = program->arr_len;
-	program_ref.data = program->elems /* XXX program leaks */;
+	program_ref.data = program->elems;
 	LDKCResult_ShutdownScriptInvalidShutdownScriptZ* ret_conv = MALLOC(sizeof(LDKCResult_ShutdownScriptInvalidShutdownScriptZ), "LDKCResult_ShutdownScriptInvalidShutdownScriptZ");
-	*ret_conv = ShutdownScript_new_witness_program(version, program_ref);
-	return (uintptr_t)ret_conv;
+	*ret_conv = ShutdownScript_new_witness_program((LDKWitnessVersion){ ._0 = version }, program_ref);
+	FREE(program);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_ShutdownScript_into_inner"))) TS_ShutdownScript_into_inner(uint32_t this_arg) {
@@ -35166,8 +38328,8 @@ jboolean  __attribute__((export_name("TS_ShutdownScript_is_compatible"))) TS_Shu
 	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;
+	jboolean ret_conv = ShutdownScript_is_compatible(&this_arg_conv, &features_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_CustomMessageReader_free"))) TS_CustomMessageReader_free(uint32_t this_ptr) {
@@ -35182,14 +38344,14 @@ void  __attribute__((export_name("TS_CustomMessageReader_free"))) TS_CustomMessa
 static inline uintptr_t Type_clone_ptr(LDKType *NONNULL_PTR arg) {
 	LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType");
 	*ret_ret = Type_clone(arg);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
-intptr_t  __attribute__((export_name("TS_Type_clone_ptr"))) TS_Type_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Type_clone_ptr"))) TS_Type_clone_ptr(uint32_t arg) {
 	void* arg_ptr = (void*)(((uintptr_t)arg) & ~1);
 	if (!(arg & 1)) { CHECK_ACCESS(arg_ptr); }
 	LDKType* arg_conv = (LDKType*)arg_ptr;
-	intptr_t ret_val = Type_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Type_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Type_clone"))) TS_Type_clone(uint32_t orig) {
@@ -35198,7 +38360,7 @@ uint32_t  __attribute__((export_name("TS_Type_clone"))) TS_Type_clone(uint32_t o
 	LDKType* orig_conv = (LDKType*)orig_ptr;
 	LDKType* ret_ret = MALLOC(sizeof(LDKType), "LDKType");
 	*ret_ret = Type_clone(orig_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 void  __attribute__((export_name("TS_Type_free"))) TS_Type_free(uint32_t this_ptr) {
@@ -35220,7 +38382,7 @@ void  __attribute__((export_name("TS_NodeId_free"))) TS_NodeId_free(uint32_t thi
 
 static inline uintptr_t NodeId_clone_ptr(LDKNodeId *NONNULL_PTR arg) {
 	LDKNodeId ret_var = NodeId_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35230,13 +38392,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_NodeId_clone_ptr"))) TS_NodeId_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_NodeId_clone_ptr"))) TS_NodeId_clone_ptr(uint32_t arg) {
 	LDKNodeId arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = NodeId_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = NodeId_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NodeId_clone"))) TS_NodeId_clone(uint32_t orig) {
@@ -35245,7 +38407,7 @@ uint32_t  __attribute__((export_name("TS_NodeId_clone"))) TS_NodeId_clone(uint32
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNodeId ret_var = NodeId_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35261,7 +38423,7 @@ uint32_t  __attribute__((export_name("TS_NodeId_from_pubkey"))) TS_NodeId_from_p
 	CHECK(pubkey->arr_len == 33);
 	memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); FREE(pubkey);
 	LDKNodeId ret_var = NodeId_from_pubkey(pubkey_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35288,8 +38450,8 @@ int64_t  __attribute__((export_name("TS_NodeId_hash"))) TS_NodeId_hash(uint32_t
 	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;
+	int64_t ret_conv = NodeId_hash(&o_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_NodeId_write"))) TS_NodeId_write(uint32_t obj) {
@@ -35307,10 +38469,11 @@ int8_tArray  __attribute__((export_name("TS_NodeId_write"))) TS_NodeId_write(uin
 uint32_t  __attribute__((export_name("TS_NodeId_read"))) TS_NodeId_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_NodeIdDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeIdDecodeErrorZ), "LDKCResult_NodeIdDecodeErrorZ");
 	*ret_conv = NodeId_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_NetworkGraph_free"))) TS_NetworkGraph_free(uint32_t this_obj) {
@@ -35321,44 +38484,6 @@ void  __attribute__((export_name("TS_NetworkGraph_free"))) TS_NetworkGraph_free(
 	NetworkGraph_free(this_obj_conv);
 }
 
-static inline uintptr_t NetworkGraph_clone_ptr(LDKNetworkGraph *NONNULL_PTR arg) {
-	LDKNetworkGraph ret_var = NetworkGraph_clone(arg);
-uintptr_t ret_ref = 0;
-CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-ret_ref = (uintptr_t)ret_var.inner;
-if (ret_var.is_owned) {
-	ret_ref |= 1;
-}
-	return ret_ref;
-}
-intptr_t  __attribute__((export_name("TS_NetworkGraph_clone_ptr"))) TS_NetworkGraph_clone_ptr(uint32_t arg) {
-	LDKNetworkGraph arg_conv;
-	arg_conv.inner = (void*)(arg & (~1));
-	arg_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = NetworkGraph_clone_ptr(&arg_conv);
-	return ret_val;
-}
-
-uint32_t  __attribute__((export_name("TS_NetworkGraph_clone"))) 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);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
-}
-
 void  __attribute__((export_name("TS_ReadOnlyNetworkGraph_free"))) TS_ReadOnlyNetworkGraph_free(uint32_t this_obj) {
 	LDKReadOnlyNetworkGraph this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
@@ -35379,20 +38504,20 @@ void  __attribute__((export_name("TS_NetworkUpdate_free"))) TS_NetworkUpdate_fre
 static inline uintptr_t NetworkUpdate_clone_ptr(LDKNetworkUpdate *NONNULL_PTR arg) {
 	LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate");
 	*ret_copy = NetworkUpdate_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_NetworkUpdate_clone_ptr"))) TS_NetworkUpdate_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_NetworkUpdate_clone_ptr"))) TS_NetworkUpdate_clone_ptr(uint32_t arg) {
 	LDKNetworkUpdate* arg_conv = (LDKNetworkUpdate*)arg;
-	intptr_t ret_val = NetworkUpdate_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = NetworkUpdate_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NetworkUpdate_clone"))) TS_NetworkUpdate_clone(uint32_t orig) {
 	LDKNetworkUpdate* orig_conv = (LDKNetworkUpdate*)orig;
 	LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate");
 	*ret_copy = NetworkUpdate_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -35404,14 +38529,14 @@ uint32_t  __attribute__((export_name("TS_NetworkUpdate_channel_update_message"))
 	msg_conv = ChannelUpdate_clone(&msg_conv);
 	LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate");
 	*ret_copy = NetworkUpdate_channel_update_message(msg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_NetworkUpdate_channel_closed"))) TS_NetworkUpdate_channel_closed(int64_t short_channel_id, jboolean is_permanent) {
+uint32_t  __attribute__((export_name("TS_NetworkUpdate_channel_failure"))) TS_NetworkUpdate_channel_failure(int64_t short_channel_id, jboolean is_permanent) {
 	LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate");
-	*ret_copy = NetworkUpdate_channel_closed(short_channel_id, is_permanent);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	*ret_copy = NetworkUpdate_channel_failure(short_channel_id, is_permanent);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -35421,7 +38546,7 @@ uint32_t  __attribute__((export_name("TS_NetworkUpdate_node_failure"))) TS_Netwo
 	memcpy(node_id_ref.compressed_form, node_id->elems, 33); FREE(node_id);
 	LDKNetworkUpdate *ret_copy = MALLOC(sizeof(LDKNetworkUpdate), "LDKNetworkUpdate");
 	*ret_copy = NetworkUpdate_node_failure(node_id_ref, is_permanent);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -35437,31 +38562,22 @@ int8_tArray  __attribute__((export_name("TS_NetworkUpdate_write"))) TS_NetworkUp
 uint32_t  __attribute__((export_name("TS_NetworkUpdate_read"))) TS_NetworkUpdate_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_COption_NetworkUpdateZDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_COption_NetworkUpdateZDecodeErrorZ), "LDKCResult_COption_NetworkUpdateZDecodeErrorZ");
 	*ret_conv = NetworkUpdate_read(ser_ref);
-	return (uintptr_t)ret_conv;
-}
-
-uint32_t  __attribute__((export_name("TS_NetGraphMsgHandler_as_EventHandler"))) 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 (uintptr_t)ret_ret;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_NetGraphMsgHandler_free"))) TS_NetGraphMsgHandler_free(uint32_t this_obj) {
-	LDKNetGraphMsgHandler this_obj_conv;
+void  __attribute__((export_name("TS_P2PGossipSync_free"))) TS_P2PGossipSync_free(uint32_t this_obj) {
+	LDKP2PGossipSync this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
-	NetGraphMsgHandler_free(this_obj_conv);
+	P2PGossipSync_free(this_obj_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_NetGraphMsgHandler_new"))) TS_NetGraphMsgHandler_new(uint32_t network_graph, uint32_t chain_access, uint32_t logger) {
+uint32_t  __attribute__((export_name("TS_P2PGossipSync_new"))) TS_P2PGossipSync_new(uint32_t network_graph, uint32_t chain_access, uint32_t logger) {
 	LDKNetworkGraph network_graph_conv;
 	network_graph_conv.inner = (void*)(network_graph & (~1));
 	network_graph_conv.is_owned = false;
@@ -35472,12 +38588,20 @@ uint32_t  __attribute__((export_name("TS_NetGraphMsgHandler_new"))) TS_NetGraphM
 	// WARNING: we may need a move here but no clone is available for LDKCOption_AccessZ
 	if (chain_access_conv.tag == LDKCOption_AccessZ_Some) {
 		// Manually implement clone for Java trait instances
+		if (chain_access_conv.some.free == LDKAccess_JCalls_free) {
+			// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+			LDKAccess_JCalls_cloned(&chain_access_conv.some);
+		}
 	}
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
-	LDKNetGraphMsgHandler ret_var = NetGraphMsgHandler_new(&network_graph_conv, chain_access_conv, logger_conv);
-	uintptr_t ret_ref = 0;
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
+	LDKP2PGossipSync ret_var = P2PGossipSync_new(&network_graph_conv, chain_access_conv, logger_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35488,8 +38612,8 @@ uint32_t  __attribute__((export_name("TS_NetGraphMsgHandler_new"))) TS_NetGraphM
 	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_NetGraphMsgHandler_add_chain_access"))) TS_NetGraphMsgHandler_add_chain_access(uint32_t this_arg, uint32_t chain_access) {
-	LDKNetGraphMsgHandler this_arg_conv;
+void  __attribute__((export_name("TS_P2PGossipSync_add_chain_access"))) TS_P2PGossipSync_add_chain_access(uint32_t this_arg, uint32_t chain_access) {
+	LDKP2PGossipSync 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);
@@ -35499,28 +38623,42 @@ void  __attribute__((export_name("TS_NetGraphMsgHandler_add_chain_access"))) TS_
 	// WARNING: we may need a move here but no clone is available for LDKCOption_AccessZ
 	if (chain_access_conv.tag == LDKCOption_AccessZ_Some) {
 		// Manually implement clone for Java trait instances
+		if (chain_access_conv.some.free == LDKAccess_JCalls_free) {
+			// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+			LDKAccess_JCalls_cloned(&chain_access_conv.some);
+		}
 	}
-	NetGraphMsgHandler_add_chain_access(&this_arg_conv, chain_access_conv);
+	P2PGossipSync_add_chain_access(&this_arg_conv, chain_access_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_NetworkGraph_as_EventHandler"))) TS_NetworkGraph_as_EventHandler(uint32_t this_arg) {
+	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);
+	LDKEventHandler* ret_ret = MALLOC(sizeof(LDKEventHandler), "LDKEventHandler");
+	*ret_ret = NetworkGraph_as_EventHandler(&this_arg_conv);
+	return (uint32_t)ret_ret;
 }
 
-uint32_t  __attribute__((export_name("TS_NetGraphMsgHandler_as_RoutingMessageHandler"))) TS_NetGraphMsgHandler_as_RoutingMessageHandler(uint32_t this_arg) {
-	LDKNetGraphMsgHandler this_arg_conv;
+uint32_t  __attribute__((export_name("TS_P2PGossipSync_as_RoutingMessageHandler"))) TS_P2PGossipSync_as_RoutingMessageHandler(uint32_t this_arg) {
+	LDKP2PGossipSync 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 (uintptr_t)ret_ret;
+	*ret_ret = P2PGossipSync_as_RoutingMessageHandler(&this_arg_conv);
+	return (uint32_t)ret_ret;
 }
 
-uint32_t  __attribute__((export_name("TS_NetGraphMsgHandler_as_MessageSendEventsProvider"))) TS_NetGraphMsgHandler_as_MessageSendEventsProvider(uint32_t this_arg) {
-	LDKNetGraphMsgHandler this_arg_conv;
+uint32_t  __attribute__((export_name("TS_P2PGossipSync_as_MessageSendEventsProvider"))) TS_P2PGossipSync_as_MessageSendEventsProvider(uint32_t this_arg) {
+	LDKP2PGossipSync 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 (uintptr_t)ret_ret;
+	*ret_ret = P2PGossipSync_as_MessageSendEventsProvider(&this_arg_conv);
+	return (uint32_t)ret_ret;
 }
 
 void  __attribute__((export_name("TS_ChannelUpdateInfo_free"))) TS_ChannelUpdateInfo_free(uint32_t this_obj) {
@@ -35536,8 +38674,8 @@ int32_t  __attribute__((export_name("TS_ChannelUpdateInfo_get_last_update"))) TS
 	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 = ChannelUpdateInfo_get_last_update(&this_ptr_conv);
-	return ret_val;
+	int32_t ret_conv = ChannelUpdateInfo_get_last_update(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelUpdateInfo_set_last_update"))) TS_ChannelUpdateInfo_set_last_update(uint32_t this_ptr, int32_t val) {
@@ -35553,8 +38691,8 @@ jboolean  __attribute__((export_name("TS_ChannelUpdateInfo_get_enabled"))) TS_Ch
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	jboolean ret_val = ChannelUpdateInfo_get_enabled(&this_ptr_conv);
-	return ret_val;
+	jboolean ret_conv = ChannelUpdateInfo_get_enabled(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelUpdateInfo_set_enabled"))) TS_ChannelUpdateInfo_set_enabled(uint32_t this_ptr, jboolean val) {
@@ -35570,8 +38708,8 @@ int16_t  __attribute__((export_name("TS_ChannelUpdateInfo_get_cltv_expiry_delta"
 	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 = ChannelUpdateInfo_get_cltv_expiry_delta(&this_ptr_conv);
-	return ret_val;
+	int16_t ret_conv = ChannelUpdateInfo_get_cltv_expiry_delta(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelUpdateInfo_set_cltv_expiry_delta"))) TS_ChannelUpdateInfo_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) {
@@ -35587,8 +38725,8 @@ int64_t  __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_minimum_msat"
 	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 = ChannelUpdateInfo_get_htlc_minimum_msat(&this_ptr_conv);
-	return ret_val;
+	int64_t ret_conv = ChannelUpdateInfo_get_htlc_minimum_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelUpdateInfo_set_htlc_minimum_msat"))) TS_ChannelUpdateInfo_set_htlc_minimum_msat(uint32_t this_ptr, int64_t val) {
@@ -35606,7 +38744,7 @@ uint32_t  __attribute__((export_name("TS_ChannelUpdateInfo_get_htlc_maximum_msat
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = ChannelUpdateInfo_get_htlc_maximum_msat(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -35628,7 +38766,7 @@ uint32_t  __attribute__((export_name("TS_ChannelUpdateInfo_get_fees"))) TS_Chann
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRoutingFees ret_var = ChannelUpdateInfo_get_fees(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35658,7 +38796,7 @@ uint32_t  __attribute__((export_name("TS_ChannelUpdateInfo_get_last_update_messa
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelUpdate ret_var = ChannelUpdateInfo_get_last_update_message(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -35700,7 +38838,7 @@ uint32_t  __attribute__((export_name("TS_ChannelUpdateInfo_new"))) TS_ChannelUpd
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(last_update_message_arg_conv);
 	last_update_message_arg_conv = ChannelUpdate_clone(&last_update_message_arg_conv);
 	LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_new(last_update_arg, enabled_arg, cltv_expiry_delta_arg, htlc_minimum_msat_arg, htlc_maximum_msat_arg_conv, fees_arg_conv, last_update_message_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35713,7 +38851,7 @@ uint32_t  __attribute__((export_name("TS_ChannelUpdateInfo_new"))) TS_ChannelUpd
 
 static inline uintptr_t ChannelUpdateInfo_clone_ptr(LDKChannelUpdateInfo *NONNULL_PTR arg) {
 	LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35723,13 +38861,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelUpdateInfo_clone_ptr"))) TS_ChannelUpdateInfo_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelUpdateInfo_clone_ptr"))) TS_ChannelUpdateInfo_clone_ptr(uint32_t arg) {
 	LDKChannelUpdateInfo arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelUpdateInfo_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelUpdateInfo_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelUpdateInfo_clone"))) TS_ChannelUpdateInfo_clone(uint32_t orig) {
@@ -35738,7 +38876,7 @@ uint32_t  __attribute__((export_name("TS_ChannelUpdateInfo_clone"))) TS_ChannelU
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelUpdateInfo ret_var = ChannelUpdateInfo_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35764,10 +38902,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelUpdateInfo_write"))) TS_Chann
 uint32_t  __attribute__((export_name("TS_ChannelUpdateInfo_read"))) TS_ChannelUpdateInfo_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelUpdateInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelUpdateInfoDecodeErrorZ), "LDKCResult_ChannelUpdateInfoDecodeErrorZ");
 	*ret_conv = ChannelUpdateInfo_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_ChannelInfo_free"))) TS_ChannelInfo_free(uint32_t this_obj) {
@@ -35784,7 +38923,7 @@ uint32_t  __attribute__((export_name("TS_ChannelInfo_get_features"))) TS_Channel
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelFeatures ret_var = ChannelInfo_get_features(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35814,7 +38953,7 @@ uint32_t  __attribute__((export_name("TS_ChannelInfo_get_node_one"))) TS_Channel
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeId ret_var = ChannelInfo_get_node_one(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35844,7 +38983,7 @@ uint32_t  __attribute__((export_name("TS_ChannelInfo_get_one_to_two"))) TS_Chann
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelUpdateInfo ret_var = ChannelInfo_get_one_to_two(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -35876,7 +39015,7 @@ uint32_t  __attribute__((export_name("TS_ChannelInfo_get_node_two"))) TS_Channel
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeId ret_var = ChannelInfo_get_node_two(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35906,7 +39045,7 @@ uint32_t  __attribute__((export_name("TS_ChannelInfo_get_two_to_one"))) TS_Chann
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelUpdateInfo ret_var = ChannelInfo_get_two_to_one(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -35939,7 +39078,7 @@ uint32_t  __attribute__((export_name("TS_ChannelInfo_get_capacity_sats"))) TS_Ch
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = ChannelInfo_get_capacity_sats(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -35961,7 +39100,7 @@ uint32_t  __attribute__((export_name("TS_ChannelInfo_get_announcement_message"))
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelAnnouncement ret_var = ChannelInfo_get_announcement_message(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -35989,7 +39128,7 @@ void  __attribute__((export_name("TS_ChannelInfo_set_announcement_message"))) TS
 
 static inline uintptr_t ChannelInfo_clone_ptr(LDKChannelInfo *NONNULL_PTR arg) {
 	LDKChannelInfo ret_var = ChannelInfo_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -35999,13 +39138,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ChannelInfo_clone_ptr"))) TS_ChannelInfo_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ChannelInfo_clone_ptr"))) TS_ChannelInfo_clone_ptr(uint32_t arg) {
 	LDKChannelInfo arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ChannelInfo_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ChannelInfo_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelInfo_clone"))) TS_ChannelInfo_clone(uint32_t orig) {
@@ -36014,7 +39153,7 @@ uint32_t  __attribute__((export_name("TS_ChannelInfo_clone"))) TS_ChannelInfo_cl
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKChannelInfo ret_var = ChannelInfo_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36025,6 +39164,25 @@ uint32_t  __attribute__((export_name("TS_ChannelInfo_clone"))) TS_ChannelInfo_cl
 	return ret_ref;
 }
 
+uint32_t  __attribute__((export_name("TS_ChannelInfo_get_directional_info"))) TS_ChannelInfo_get_directional_info(uint32_t this_arg, int8_t channel_flags) {
+	LDKChannelInfo 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);
+	LDKChannelUpdateInfo ret_var = ChannelInfo_get_directional_info(&this_arg_conv, channel_flags);
+	uint32_t ret_ref = 0;
+	if ((uintptr_t)ret_var.inner > 4096) {
+		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+		ret_ref = (uintptr_t)ret_var.inner;
+		if (ret_var.is_owned) {
+			ret_ref |= 1;
+		}
+	}
+	return ret_ref;
+}
+
 int8_tArray  __attribute__((export_name("TS_ChannelInfo_write"))) TS_ChannelInfo_write(uint32_t obj) {
 	LDKChannelInfo obj_conv;
 	obj_conv.inner = (void*)(obj & (~1));
@@ -36040,10 +39198,11 @@ int8_tArray  __attribute__((export_name("TS_ChannelInfo_write"))) TS_ChannelInfo
 uint32_t  __attribute__((export_name("TS_ChannelInfo_read"))) TS_ChannelInfo_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_ChannelInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ChannelInfoDecodeErrorZ), "LDKCResult_ChannelInfoDecodeErrorZ");
 	*ret_conv = ChannelInfo_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_DirectedChannelInfo_free"))) TS_DirectedChannelInfo_free(uint32_t this_obj) {
@@ -36056,7 +39215,7 @@ void  __attribute__((export_name("TS_DirectedChannelInfo_free"))) TS_DirectedCha
 
 static inline uintptr_t DirectedChannelInfo_clone_ptr(LDKDirectedChannelInfo *NONNULL_PTR arg) {
 	LDKDirectedChannelInfo ret_var = DirectedChannelInfo_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36066,13 +39225,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_DirectedChannelInfo_clone_ptr"))) TS_DirectedChannelInfo_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_DirectedChannelInfo_clone_ptr"))) TS_DirectedChannelInfo_clone_ptr(uint32_t arg) {
 	LDKDirectedChannelInfo arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = DirectedChannelInfo_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = DirectedChannelInfo_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_DirectedChannelInfo_clone"))) TS_DirectedChannelInfo_clone(uint32_t orig) {
@@ -36081,7 +39240,7 @@ uint32_t  __attribute__((export_name("TS_DirectedChannelInfo_clone"))) TS_Direct
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKDirectedChannelInfo ret_var = DirectedChannelInfo_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36098,7 +39257,7 @@ uint32_t  __attribute__((export_name("TS_DirectedChannelInfo_channel"))) TS_Dire
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelInfo ret_var = DirectedChannelInfo_channel(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36115,7 +39274,7 @@ uint32_t  __attribute__((export_name("TS_DirectedChannelInfo_direction"))) TS_Di
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKChannelUpdateInfo ret_var = DirectedChannelInfo_direction(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -36128,6 +39287,15 @@ uint32_t  __attribute__((export_name("TS_DirectedChannelInfo_direction"))) TS_Di
 	return ret_ref;
 }
 
+int64_t  __attribute__((export_name("TS_DirectedChannelInfo_htlc_maximum_msat"))) TS_DirectedChannelInfo_htlc_maximum_msat(uint32_t this_arg) {
+	LDKDirectedChannelInfo 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_conv = DirectedChannelInfo_htlc_maximum_msat(&this_arg_conv);
+	return ret_conv;
+}
+
 uint32_t  __attribute__((export_name("TS_DirectedChannelInfo_effective_capacity"))) TS_DirectedChannelInfo_effective_capacity(uint32_t this_arg) {
 	LDKDirectedChannelInfo this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
@@ -36135,7 +39303,7 @@ uint32_t  __attribute__((export_name("TS_DirectedChannelInfo_effective_capacity"
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity");
 	*ret_copy = DirectedChannelInfo_effective_capacity(&this_arg_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -36151,62 +39319,66 @@ void  __attribute__((export_name("TS_EffectiveCapacity_free"))) TS_EffectiveCapa
 static inline uintptr_t EffectiveCapacity_clone_ptr(LDKEffectiveCapacity *NONNULL_PTR arg) {
 	LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity");
 	*ret_copy = EffectiveCapacity_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_EffectiveCapacity_clone_ptr"))) TS_EffectiveCapacity_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_EffectiveCapacity_clone_ptr"))) TS_EffectiveCapacity_clone_ptr(uint32_t arg) {
 	LDKEffectiveCapacity* arg_conv = (LDKEffectiveCapacity*)arg;
-	intptr_t ret_val = EffectiveCapacity_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = EffectiveCapacity_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_EffectiveCapacity_clone"))) TS_EffectiveCapacity_clone(uint32_t orig) {
 	LDKEffectiveCapacity* orig_conv = (LDKEffectiveCapacity*)orig;
 	LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity");
 	*ret_copy = EffectiveCapacity_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_EffectiveCapacity_exact_liquidity"))) TS_EffectiveCapacity_exact_liquidity(int64_t liquidity_msat) {
 	LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity");
 	*ret_copy = EffectiveCapacity_exact_liquidity(liquidity_msat);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_EffectiveCapacity_maximum_htlc"))) TS_EffectiveCapacity_maximum_htlc(int64_t amount_msat) {
 	LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity");
 	*ret_copy = EffectiveCapacity_maximum_htlc(amount_msat);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_EffectiveCapacity_total"))) TS_EffectiveCapacity_total(int64_t capacity_msat) {
+uint32_t  __attribute__((export_name("TS_EffectiveCapacity_total"))) TS_EffectiveCapacity_total(int64_t capacity_msat, uint32_t htlc_maximum_msat) {
+	void* htlc_maximum_msat_ptr = (void*)(((uintptr_t)htlc_maximum_msat) & ~1);
+	CHECK_ACCESS(htlc_maximum_msat_ptr);
+	LDKCOption_u64Z htlc_maximum_msat_conv = *(LDKCOption_u64Z*)(htlc_maximum_msat_ptr);
+	htlc_maximum_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_maximum_msat) & ~1));
 	LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity");
-	*ret_copy = EffectiveCapacity_total(capacity_msat);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	*ret_copy = EffectiveCapacity_total(capacity_msat, htlc_maximum_msat_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_EffectiveCapacity_infinite"))) TS_EffectiveCapacity_infinite() {
 	LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity");
 	*ret_copy = EffectiveCapacity_infinite();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_EffectiveCapacity_unknown"))) TS_EffectiveCapacity_unknown() {
 	LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity");
 	*ret_copy = EffectiveCapacity_unknown();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 int64_t  __attribute__((export_name("TS_EffectiveCapacity_as_msat"))) TS_EffectiveCapacity_as_msat(uint32_t this_arg) {
 	LDKEffectiveCapacity* this_arg_conv = (LDKEffectiveCapacity*)this_arg;
-	int64_t ret_val = EffectiveCapacity_as_msat(this_arg_conv);
-	return ret_val;
+	int64_t ret_conv = EffectiveCapacity_as_msat(this_arg_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_RoutingFees_free"))) TS_RoutingFees_free(uint32_t this_obj) {
@@ -36222,8 +39394,8 @@ int32_t  __attribute__((export_name("TS_RoutingFees_get_base_msat"))) TS_Routing
 	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;
+	int32_t ret_conv = RoutingFees_get_base_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_RoutingFees_set_base_msat"))) TS_RoutingFees_set_base_msat(uint32_t this_ptr, int32_t val) {
@@ -36239,8 +39411,8 @@ int32_t  __attribute__((export_name("TS_RoutingFees_get_proportional_millionths"
 	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;
+	int32_t ret_conv = RoutingFees_get_proportional_millionths(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_RoutingFees_set_proportional_millionths"))) TS_RoutingFees_set_proportional_millionths(uint32_t this_ptr, int32_t val) {
@@ -36253,7 +39425,7 @@ void  __attribute__((export_name("TS_RoutingFees_set_proportional_millionths")))
 
 uint32_t  __attribute__((export_name("TS_RoutingFees_new"))) TS_RoutingFees_new(int32_t base_msat_arg, int32_t proportional_millionths_arg) {
 	LDKRoutingFees ret_var = RoutingFees_new(base_msat_arg, proportional_millionths_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36273,13 +39445,13 @@ jboolean  __attribute__((export_name("TS_RoutingFees_eq"))) TS_RoutingFees_eq(ui
 	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;
+	jboolean ret_conv = RoutingFees_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 static inline uintptr_t RoutingFees_clone_ptr(LDKRoutingFees *NONNULL_PTR arg) {
 	LDKRoutingFees ret_var = RoutingFees_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36289,13 +39461,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_RoutingFees_clone_ptr"))) TS_RoutingFees_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_RoutingFees_clone_ptr"))) TS_RoutingFees_clone_ptr(uint32_t arg) {
 	LDKRoutingFees arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = RoutingFees_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = RoutingFees_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RoutingFees_clone"))) TS_RoutingFees_clone(uint32_t orig) {
@@ -36304,7 +39476,7 @@ uint32_t  __attribute__((export_name("TS_RoutingFees_clone"))) TS_RoutingFees_cl
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRoutingFees ret_var = RoutingFees_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36320,8 +39492,8 @@ int64_t  __attribute__((export_name("TS_RoutingFees_hash"))) TS_RoutingFees_hash
 	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;
+	int64_t ret_conv = RoutingFees_hash(&o_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_RoutingFees_write"))) TS_RoutingFees_write(uint32_t obj) {
@@ -36339,10 +39511,11 @@ int8_tArray  __attribute__((export_name("TS_RoutingFees_write"))) TS_RoutingFees
 uint32_t  __attribute__((export_name("TS_RoutingFees_read"))) TS_RoutingFees_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_RoutingFeesDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RoutingFeesDecodeErrorZ), "LDKCResult_RoutingFeesDecodeErrorZ");
 	*ret_conv = RoutingFees_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_NodeAnnouncementInfo_free"))) TS_NodeAnnouncementInfo_free(uint32_t this_obj) {
@@ -36359,7 +39532,7 @@ uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_get_features"))) T
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeFeatures ret_var = NodeAnnouncementInfo_get_features(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36388,8 +39561,8 @@ int32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_get_last_update")))
 	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;
+	int32_t ret_conv = NodeAnnouncementInfo_get_last_update(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_NodeAnnouncementInfo_set_last_update"))) TS_NodeAnnouncementInfo_set_last_update(uint32_t this_ptr, int32_t val) {
@@ -36421,25 +39594,34 @@ void  __attribute__((export_name("TS_NodeAnnouncementInfo_set_rgb"))) TS_NodeAnn
 	NodeAnnouncementInfo_set_rgb(&this_ptr_conv, val_ref);
 }
 
-int8_tArray  __attribute__((export_name("TS_NodeAnnouncementInfo_get_alias"))) TS_NodeAnnouncementInfo_get_alias(uint32_t this_ptr) {
+uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_get_alias"))) TS_NodeAnnouncementInfo_get_alias(uint32_t this_ptr) {
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int8_tArray ret_arr = init_int8_tArray(32, __LINE__);
-	memcpy(ret_arr->elems, *NodeAnnouncementInfo_get_alias(&this_ptr_conv), 32);
-	return ret_arr;
+	LDKNodeAlias ret_var = NodeAnnouncementInfo_get_alias(&this_ptr_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_NodeAnnouncementInfo_set_alias"))) TS_NodeAnnouncementInfo_set_alias(uint32_t this_ptr, int8_tArray val) {
+void  __attribute__((export_name("TS_NodeAnnouncementInfo_set_alias"))) TS_NodeAnnouncementInfo_set_alias(uint32_t this_ptr, uint32_t val) {
 	LDKNodeAnnouncementInfo this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	LDKThirtyTwoBytes val_ref;
-	CHECK(val->arr_len == 32);
-	memcpy(val_ref.data, val->elems, 32); FREE(val);
-	NodeAnnouncementInfo_set_alias(&this_ptr_conv, val_ref);
+	LDKNodeAlias val_conv;
+	val_conv.inner = (void*)(val & (~1));
+	val_conv.is_owned = (val & 1) || (val == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(val_conv);
+	val_conv = NodeAlias_clone(&val_conv);
+	NodeAnnouncementInfo_set_alias(&this_ptr_conv, val_conv);
 }
 
 void  __attribute__((export_name("TS_NodeAnnouncementInfo_set_addresses"))) TS_NodeAnnouncementInfo_set_addresses(uint32_t this_ptr, uint32_tArray val) {
@@ -36453,7 +39635,7 @@ void  __attribute__((export_name("TS_NodeAnnouncementInfo_set_addresses"))) TS_N
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements");
 	else
 		val_constr.data = NULL;
-	uint32_t* val_vals = val->elems /* XXX val leaks */;
+	uint32_t* val_vals = val->elems;
 	for (size_t m = 0; m < val_constr.datalen; m++) {
 		uint32_t val_conv_12 = val_vals[m];
 		void* val_conv_12_ptr = (void*)(((uintptr_t)val_conv_12) & ~1);
@@ -36462,6 +39644,7 @@ void  __attribute__((export_name("TS_NodeAnnouncementInfo_set_addresses"))) TS_N
 		val_conv_12_conv = NetAddress_clone((LDKNetAddress*)(((uintptr_t)val_conv_12) & ~1));
 		val_constr.data[m] = val_conv_12_conv;
 	}
+	FREE(val);
 	NodeAnnouncementInfo_set_addresses(&this_ptr_conv, val_constr);
 }
 
@@ -36471,7 +39654,7 @@ uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_get_announcement_m
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeAnnouncement ret_var = NodeAnnouncementInfo_get_announcement_message(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -36497,7 +39680,7 @@ void  __attribute__((export_name("TS_NodeAnnouncementInfo_set_announcement_messa
 	NodeAnnouncementInfo_set_announcement_message(&this_ptr_conv, val_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnnouncementInfo_new(uint32_t features_arg, int32_t last_update_arg, int8_tArray rgb_arg, int8_tArray alias_arg, uint32_tArray addresses_arg, uint32_t announcement_message_arg) {
+uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnnouncementInfo_new(uint32_t features_arg, int32_t last_update_arg, int8_tArray rgb_arg, uint32_t alias_arg, uint32_tArray addresses_arg, uint32_t announcement_message_arg) {
 	LDKNodeFeatures features_arg_conv;
 	features_arg_conv.inner = (void*)(features_arg & (~1));
 	features_arg_conv.is_owned = (features_arg & 1) || (features_arg == 0);
@@ -36506,16 +39689,18 @@ uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnn
 	LDKThreeBytes rgb_arg_ref;
 	CHECK(rgb_arg->arr_len == 3);
 	memcpy(rgb_arg_ref.data, rgb_arg->elems, 3); FREE(rgb_arg);
-	LDKThirtyTwoBytes alias_arg_ref;
-	CHECK(alias_arg->arr_len == 32);
-	memcpy(alias_arg_ref.data, alias_arg->elems, 32); FREE(alias_arg);
+	LDKNodeAlias alias_arg_conv;
+	alias_arg_conv.inner = (void*)(alias_arg & (~1));
+	alias_arg_conv.is_owned = (alias_arg & 1) || (alias_arg == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(alias_arg_conv);
+	alias_arg_conv = NodeAlias_clone(&alias_arg_conv);
 	LDKCVec_NetAddressZ addresses_arg_constr;
 	addresses_arg_constr.datalen = addresses_arg->arr_len;
 	if (addresses_arg_constr.datalen > 0)
 		addresses_arg_constr.data = MALLOC(addresses_arg_constr.datalen * sizeof(LDKNetAddress), "LDKCVec_NetAddressZ Elements");
 	else
 		addresses_arg_constr.data = NULL;
-	uint32_t* addresses_arg_vals = addresses_arg->elems /* XXX addresses_arg leaks */;
+	uint32_t* addresses_arg_vals = addresses_arg->elems;
 	for (size_t m = 0; m < addresses_arg_constr.datalen; m++) {
 		uint32_t addresses_arg_conv_12 = addresses_arg_vals[m];
 		void* addresses_arg_conv_12_ptr = (void*)(((uintptr_t)addresses_arg_conv_12) & ~1);
@@ -36523,13 +39708,14 @@ uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnn
 		LDKNetAddress addresses_arg_conv_12_conv = *(LDKNetAddress*)(addresses_arg_conv_12_ptr);
 		addresses_arg_constr.data[m] = addresses_arg_conv_12_conv;
 	}
+	FREE(addresses_arg);
 	LDKNodeAnnouncement announcement_message_arg_conv;
 	announcement_message_arg_conv.inner = (void*)(announcement_message_arg & (~1));
 	announcement_message_arg_conv.is_owned = (announcement_message_arg & 1) || (announcement_message_arg == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(announcement_message_arg_conv);
 	announcement_message_arg_conv = NodeAnnouncement_clone(&announcement_message_arg_conv);
-	LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_new(features_arg_conv, last_update_arg, rgb_arg_ref, alias_arg_ref, addresses_arg_constr, announcement_message_arg_conv);
-	uintptr_t ret_ref = 0;
+	LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_new(features_arg_conv, last_update_arg, rgb_arg_ref, alias_arg_conv, addresses_arg_constr, announcement_message_arg_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36542,7 +39728,7 @@ uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_new"))) TS_NodeAnn
 
 static inline uintptr_t NodeAnnouncementInfo_clone_ptr(LDKNodeAnnouncementInfo *NONNULL_PTR arg) {
 	LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36552,13 +39738,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_NodeAnnouncementInfo_clone_ptr"))) TS_NodeAnnouncementInfo_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_clone_ptr"))) TS_NodeAnnouncementInfo_clone_ptr(uint32_t arg) {
 	LDKNodeAnnouncementInfo arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = NodeAnnouncementInfo_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = NodeAnnouncementInfo_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_clone"))) TS_NodeAnnouncementInfo_clone(uint32_t orig) {
@@ -36567,7 +39753,7 @@ uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_clone"))) TS_NodeA
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNodeAnnouncementInfo ret_var = NodeAnnouncementInfo_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36593,10 +39779,116 @@ int8_tArray  __attribute__((export_name("TS_NodeAnnouncementInfo_write"))) TS_No
 uint32_t  __attribute__((export_name("TS_NodeAnnouncementInfo_read"))) TS_NodeAnnouncementInfo_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_NodeAnnouncementInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAnnouncementInfoDecodeErrorZ), "LDKCResult_NodeAnnouncementInfoDecodeErrorZ");
 	*ret_conv = NodeAnnouncementInfo_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
+}
+
+void  __attribute__((export_name("TS_NodeAlias_free"))) TS_NodeAlias_free(uint32_t this_obj) {
+	LDKNodeAlias this_obj_conv;
+	this_obj_conv.inner = (void*)(this_obj & (~1));
+	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
+	NodeAlias_free(this_obj_conv);
+}
+
+int8_tArray  __attribute__((export_name("TS_NodeAlias_get_a"))) TS_NodeAlias_get_a(uint32_t this_ptr) {
+	LDKNodeAlias this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	int8_tArray ret_arr = init_int8_tArray(32, __LINE__);
+	memcpy(ret_arr->elems, *NodeAlias_get_a(&this_ptr_conv), 32);
+	return ret_arr;
+}
+
+void  __attribute__((export_name("TS_NodeAlias_set_a"))) TS_NodeAlias_set_a(uint32_t this_ptr, int8_tArray val) {
+	LDKNodeAlias this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKThirtyTwoBytes val_ref;
+	CHECK(val->arr_len == 32);
+	memcpy(val_ref.data, val->elems, 32); FREE(val);
+	NodeAlias_set_a(&this_ptr_conv, val_ref);
+}
+
+uint32_t  __attribute__((export_name("TS_NodeAlias_new"))) TS_NodeAlias_new(int8_tArray a_arg) {
+	LDKThirtyTwoBytes a_arg_ref;
+	CHECK(a_arg->arr_len == 32);
+	memcpy(a_arg_ref.data, a_arg->elems, 32); FREE(a_arg);
+	LDKNodeAlias ret_var = NodeAlias_new(a_arg_ref);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline uintptr_t NodeAlias_clone_ptr(LDKNodeAlias *NONNULL_PTR arg) {
+	LDKNodeAlias ret_var = NodeAlias_clone(arg);
+uint32_t ret_ref = 0;
+CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uintptr_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+uint32_t  __attribute__((export_name("TS_NodeAlias_clone_ptr"))) TS_NodeAlias_clone_ptr(uint32_t arg) {
+	LDKNodeAlias arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	uint32_t ret_conv = NodeAlias_clone_ptr(&arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_NodeAlias_clone"))) TS_NodeAlias_clone(uint32_t orig) {
+	LDKNodeAlias orig_conv;
+	orig_conv.inner = (void*)(orig & (~1));
+	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
+	LDKNodeAlias ret_var = NodeAlias_clone(&orig_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+int8_tArray  __attribute__((export_name("TS_NodeAlias_write"))) TS_NodeAlias_write(uint32_t obj) {
+	LDKNodeAlias obj_conv;
+	obj_conv.inner = (void*)(obj & (~1));
+	obj_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(obj_conv);
+	LDKCVec_u8Z ret_var = NodeAlias_write(&obj_conv);
+	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+uint32_t  __attribute__((export_name("TS_NodeAlias_read"))) TS_NodeAlias_read(int8_tArray ser) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = ser->arr_len;
+	ser_ref.data = ser->elems;
+	LDKCResult_NodeAliasDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeAliasDecodeErrorZ), "LDKCResult_NodeAliasDecodeErrorZ");
+	*ret_conv = NodeAlias_read(ser_ref);
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_NodeInfo_free"))) TS_NodeInfo_free(uint32_t this_obj) {
@@ -36618,11 +39910,12 @@ void  __attribute__((export_name("TS_NodeInfo_set_channels"))) TS_NodeInfo_set_c
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements");
 	else
 		val_constr.data = NULL;
-	int64_t* val_vals = val->elems /* XXX val leaks */;
+	int64_t* val_vals = val->elems;
 	for (size_t i = 0; i < val_constr.datalen; i++) {
 		int64_t val_conv_8 = val_vals[i];
 		val_constr.data[i] = val_conv_8;
 	}
+	FREE(val);
 	NodeInfo_set_channels(&this_ptr_conv, val_constr);
 }
 
@@ -36632,7 +39925,7 @@ uint32_t  __attribute__((export_name("TS_NodeInfo_get_lowest_inbound_channel_fee
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRoutingFees ret_var = NodeInfo_get_lowest_inbound_channel_fees(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -36664,7 +39957,7 @@ uint32_t  __attribute__((export_name("TS_NodeInfo_get_announcement_info"))) TS_N
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeAnnouncementInfo ret_var = NodeInfo_get_announcement_info(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -36697,11 +39990,12 @@ uint32_t  __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_
 		channels_arg_constr.data = MALLOC(channels_arg_constr.datalen * sizeof(int64_t), "LDKCVec_u64Z Elements");
 	else
 		channels_arg_constr.data = NULL;
-	int64_t* channels_arg_vals = channels_arg->elems /* XXX channels_arg leaks */;
+	int64_t* channels_arg_vals = channels_arg->elems;
 	for (size_t i = 0; i < channels_arg_constr.datalen; i++) {
 		int64_t channels_arg_conv_8 = channels_arg_vals[i];
 		channels_arg_constr.data[i] = channels_arg_conv_8;
 	}
+	FREE(channels_arg);
 	LDKRoutingFees lowest_inbound_channel_fees_arg_conv;
 	lowest_inbound_channel_fees_arg_conv.inner = (void*)(lowest_inbound_channel_fees_arg & (~1));
 	lowest_inbound_channel_fees_arg_conv.is_owned = (lowest_inbound_channel_fees_arg & 1) || (lowest_inbound_channel_fees_arg == 0);
@@ -36713,7 +40007,7 @@ uint32_t  __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(announcement_info_arg_conv);
 	announcement_info_arg_conv = NodeAnnouncementInfo_clone(&announcement_info_arg_conv);
 	LDKNodeInfo ret_var = NodeInfo_new(channels_arg_constr, lowest_inbound_channel_fees_arg_conv, announcement_info_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36726,7 +40020,7 @@ uint32_t  __attribute__((export_name("TS_NodeInfo_new"))) TS_NodeInfo_new(int64_
 
 static inline uintptr_t NodeInfo_clone_ptr(LDKNodeInfo *NONNULL_PTR arg) {
 	LDKNodeInfo ret_var = NodeInfo_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36736,13 +40030,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_NodeInfo_clone_ptr"))) TS_NodeInfo_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_NodeInfo_clone_ptr"))) TS_NodeInfo_clone_ptr(uint32_t arg) {
 	LDKNodeInfo arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = NodeInfo_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = NodeInfo_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NodeInfo_clone"))) TS_NodeInfo_clone(uint32_t orig) {
@@ -36751,7 +40045,7 @@ uint32_t  __attribute__((export_name("TS_NodeInfo_clone"))) TS_NodeInfo_clone(ui
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKNodeInfo ret_var = NodeInfo_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36777,10 +40071,11 @@ int8_tArray  __attribute__((export_name("TS_NodeInfo_write"))) TS_NodeInfo_write
 uint32_t  __attribute__((export_name("TS_NodeInfo_read"))) TS_NodeInfo_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_NodeInfoDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NodeInfoDecodeErrorZ), "LDKCResult_NodeInfoDecodeErrorZ");
 	*ret_conv = NodeInfo_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGraph_write(uint32_t obj) {
@@ -36795,21 +40090,36 @@ int8_tArray  __attribute__((export_name("TS_NetworkGraph_write"))) TS_NetworkGra
 	return ret_arr;
 }
 
-uint32_t  __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_read(int8_tArray ser) {
+uint32_t  __attribute__((export_name("TS_NetworkGraph_read"))) TS_NetworkGraph_read(int8_tArray ser, uint32_t arg) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
+	void* arg_ptr = (void*)(((uintptr_t)arg) & ~1);
+	CHECK_ACCESS(arg_ptr);
+	LDKLogger arg_conv = *(LDKLogger*)(arg_ptr);
+	if (arg_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&arg_conv);
+	}
 	LDKCResult_NetworkGraphDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NetworkGraphDecodeErrorZ), "LDKCResult_NetworkGraphDecodeErrorZ");
-	*ret_conv = NetworkGraph_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	*ret_conv = NetworkGraph_read(ser_ref, arg_conv);
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_NetworkGraph_new"))) TS_NetworkGraph_new(int8_tArray genesis_hash) {
+uint32_t  __attribute__((export_name("TS_NetworkGraph_new"))) TS_NetworkGraph_new(int8_tArray genesis_hash, uint32_t logger) {
 	LDKThirtyTwoBytes genesis_hash_ref;
 	CHECK(genesis_hash->arr_len == 32);
 	memcpy(genesis_hash_ref.data, genesis_hash->elems, 32); FREE(genesis_hash);
-	LDKNetworkGraph ret_var = NetworkGraph_new(genesis_hash_ref);
-	uintptr_t ret_ref = 0;
+	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
+	CHECK_ACCESS(logger_ptr);
+	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
+	LDKNetworkGraph ret_var = NetworkGraph_new(genesis_hash_ref, logger_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36826,7 +40136,7 @@ uint32_t  __attribute__((export_name("TS_NetworkGraph_read_only"))) TS_NetworkGr
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKReadOnlyNetworkGraph ret_var = NetworkGraph_read_only(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -36837,6 +40147,25 @@ uint32_t  __attribute__((export_name("TS_NetworkGraph_read_only"))) TS_NetworkGr
 	return ret_ref;
 }
 
+uint32_t  __attribute__((export_name("TS_NetworkGraph_get_last_rapid_gossip_sync_timestamp"))) TS_NetworkGraph_get_last_rapid_gossip_sync_timestamp(uint32_t this_arg) {
+	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);
+	LDKCOption_u32Z *ret_copy = MALLOC(sizeof(LDKCOption_u32Z), "LDKCOption_u32Z");
+	*ret_copy = NetworkGraph_get_last_rapid_gossip_sync_timestamp(&this_arg_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_NetworkGraph_set_last_rapid_gossip_sync_timestamp"))) TS_NetworkGraph_set_last_rapid_gossip_sync_timestamp(uint32_t this_arg, int32_t last_rapid_gossip_sync_timestamp) {
+	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_set_last_rapid_gossip_sync_timestamp(&this_arg_conv, last_rapid_gossip_sync_timestamp);
+}
+
 uint32_t  __attribute__((export_name("TS_NetworkGraph_update_node_from_announcement"))) TS_NetworkGraph_update_node_from_announcement(uint32_t this_arg, uint32_t msg) {
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
@@ -36848,7 +40177,7 @@ uint32_t  __attribute__((export_name("TS_NetworkGraph_update_node_from_announcem
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = NetworkGraph_update_node_from_announcement(&this_arg_conv, &msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NetworkGraph_update_node_from_unsigned_announcement"))) TS_NetworkGraph_update_node_from_unsigned_announcement(uint32_t this_arg, uint32_t msg) {
@@ -36862,7 +40191,7 @@ uint32_t  __attribute__((export_name("TS_NetworkGraph_update_node_from_unsigned_
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = NetworkGraph_update_node_from_unsigned_announcement(&this_arg_conv, &msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NetworkGraph_update_channel_from_announcement"))) TS_NetworkGraph_update_channel_from_announcement(uint32_t this_arg, uint32_t msg, uint32_t chain_access) {
@@ -36880,10 +40209,14 @@ uint32_t  __attribute__((export_name("TS_NetworkGraph_update_channel_from_announ
 	// WARNING: we may need a move here but no clone is available for LDKCOption_AccessZ
 	if (chain_access_conv.tag == LDKCOption_AccessZ_Some) {
 		// Manually implement clone for Java trait instances
+		if (chain_access_conv.some.free == LDKAccess_JCalls_free) {
+			// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+			LDKAccess_JCalls_cloned(&chain_access_conv.some);
+		}
 	}
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = NetworkGraph_update_channel_from_announcement(&this_arg_conv, &msg_conv, chain_access_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NetworkGraph_update_channel_from_unsigned_announcement"))) TS_NetworkGraph_update_channel_from_unsigned_announcement(uint32_t this_arg, uint32_t msg, uint32_t chain_access) {
@@ -36901,21 +40234,46 @@ uint32_t  __attribute__((export_name("TS_NetworkGraph_update_channel_from_unsign
 	// WARNING: we may need a move here but no clone is available for LDKCOption_AccessZ
 	if (chain_access_conv.tag == LDKCOption_AccessZ_Some) {
 		// Manually implement clone for Java trait instances
+		if (chain_access_conv.some.free == LDKAccess_JCalls_free) {
+			// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+			LDKAccess_JCalls_cloned(&chain_access_conv.some);
+		}
 	}
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = NetworkGraph_update_channel_from_unsigned_announcement(&this_arg_conv, &msg_conv, chain_access_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_NetworkGraph_add_channel_from_partial_announcement"))) TS_NetworkGraph_add_channel_from_partial_announcement(uint32_t this_arg, int64_t short_channel_id, int64_t timestamp, uint32_t features, int8_tArray node_id_1, int8_tArray node_id_2) {
+	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);
+	LDKChannelFeatures features_conv;
+	features_conv.inner = (void*)(features & (~1));
+	features_conv.is_owned = (features & 1) || (features == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(features_conv);
+	features_conv = ChannelFeatures_clone(&features_conv);
+	LDKPublicKey node_id_1_ref;
+	CHECK(node_id_1->arr_len == 33);
+	memcpy(node_id_1_ref.compressed_form, node_id_1->elems, 33); FREE(node_id_1);
+	LDKPublicKey node_id_2_ref;
+	CHECK(node_id_2->arr_len == 33);
+	memcpy(node_id_2_ref.compressed_form, node_id_2->elems, 33); FREE(node_id_2);
+	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
+	*ret_conv = NetworkGraph_add_channel_from_partial_announcement(&this_arg_conv, short_channel_id, timestamp, features_conv, node_id_1_ref, node_id_2_ref);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_NetworkGraph_close_channel_from_update"))) TS_NetworkGraph_close_channel_from_update(uint32_t this_arg, int64_t short_channel_id, jboolean is_permanent) {
+void  __attribute__((export_name("TS_NetworkGraph_channel_failed"))) TS_NetworkGraph_channel_failed(uint32_t this_arg, int64_t short_channel_id, jboolean is_permanent) {
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
-	NetworkGraph_close_channel_from_update(&this_arg_conv, short_channel_id, is_permanent);
+	NetworkGraph_channel_failed(&this_arg_conv, short_channel_id, is_permanent);
 }
 
-void  __attribute__((export_name("TS_NetworkGraph_fail_node"))) TS_NetworkGraph_fail_node(uint32_t this_arg, int8_tArray _node_id, jboolean is_permanent) {
+void  __attribute__((export_name("TS_NetworkGraph_node_failed"))) TS_NetworkGraph_node_failed(uint32_t this_arg, int8_tArray _node_id, jboolean is_permanent) {
 	LDKNetworkGraph this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
@@ -36923,7 +40281,7 @@ void  __attribute__((export_name("TS_NetworkGraph_fail_node"))) TS_NetworkGraph_
 	LDKPublicKey _node_id_ref;
 	CHECK(_node_id->arr_len == 33);
 	memcpy(_node_id_ref.compressed_form, _node_id->elems, 33); FREE(_node_id);
-	NetworkGraph_fail_node(&this_arg_conv, _node_id_ref, is_permanent);
+	NetworkGraph_node_failed(&this_arg_conv, _node_id_ref, is_permanent);
 }
 
 void  __attribute__((export_name("TS_NetworkGraph_remove_stale_channels_with_time"))) TS_NetworkGraph_remove_stale_channels_with_time(uint32_t this_arg, int64_t current_time_unix) {
@@ -36945,7 +40303,7 @@ uint32_t  __attribute__((export_name("TS_NetworkGraph_update_channel"))) TS_Netw
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = NetworkGraph_update_channel(&this_arg_conv, &msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_NetworkGraph_update_channel_unsigned"))) TS_NetworkGraph_update_channel_unsigned(uint32_t this_arg, uint32_t msg) {
@@ -36959,7 +40317,7 @@ uint32_t  __attribute__((export_name("TS_NetworkGraph_update_channel_unsigned"))
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(msg_conv);
 	LDKCResult_NoneLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_NoneLightningErrorZ), "LDKCResult_NoneLightningErrorZ");
 	*ret_conv = NetworkGraph_update_channel_unsigned(&this_arg_conv, &msg_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ReadOnlyNetworkGraph_get_addresses"))) TS_ReadOnlyNetworkGraph_get_addresses(uint32_t this_arg, int8_tArray pubkey) {
@@ -36972,7 +40330,7 @@ uint32_t  __attribute__((export_name("TS_ReadOnlyNetworkGraph_get_addresses")))
 	memcpy(pubkey_ref.compressed_form, pubkey->elems, 33); FREE(pubkey);
 	LDKCOption_CVec_NetAddressZZ *ret_copy = MALLOC(sizeof(LDKCOption_CVec_NetAddressZZ), "LDKCOption_CVec_NetAddressZZ");
 	*ret_copy = ReadOnlyNetworkGraph_get_addresses(&this_arg_conv, pubkey_ref);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -37011,7 +40369,7 @@ uint32_t  __attribute__((export_name("TS_RouteHop_get_node_features"))) TS_Route
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKNodeFeatures ret_var = RouteHop_get_node_features(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37040,8 +40398,8 @@ int64_t  __attribute__((export_name("TS_RouteHop_get_short_channel_id"))) TS_Rou
 	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;
+	int64_t ret_conv = RouteHop_get_short_channel_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_RouteHop_set_short_channel_id"))) TS_RouteHop_set_short_channel_id(uint32_t this_ptr, int64_t val) {
@@ -37058,7 +40416,7 @@ uint32_t  __attribute__((export_name("TS_RouteHop_get_channel_features"))) TS_Ro
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKChannelFeatures ret_var = RouteHop_get_channel_features(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37087,8 +40445,8 @@ int64_t  __attribute__((export_name("TS_RouteHop_get_fee_msat"))) TS_RouteHop_ge
 	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;
+	int64_t ret_conv = RouteHop_get_fee_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_RouteHop_set_fee_msat"))) TS_RouteHop_set_fee_msat(uint32_t this_ptr, int64_t val) {
@@ -37104,8 +40462,8 @@ int32_t  __attribute__((export_name("TS_RouteHop_get_cltv_expiry_delta"))) TS_Ro
 	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;
+	int32_t ret_conv = RouteHop_get_cltv_expiry_delta(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_RouteHop_set_cltv_expiry_delta"))) TS_RouteHop_set_cltv_expiry_delta(uint32_t this_ptr, int32_t val) {
@@ -37131,7 +40489,7 @@ uint32_t  __attribute__((export_name("TS_RouteHop_new"))) TS_RouteHop_new(int8_t
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(channel_features_arg_conv);
 	channel_features_arg_conv = ChannelFeatures_clone(&channel_features_arg_conv);
 	LDKRouteHop ret_var = RouteHop_new(pubkey_arg_ref, node_features_arg_conv, short_channel_id_arg, channel_features_arg_conv, fee_msat_arg, cltv_expiry_delta_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37144,7 +40502,7 @@ uint32_t  __attribute__((export_name("TS_RouteHop_new"))) TS_RouteHop_new(int8_t
 
 static inline uintptr_t RouteHop_clone_ptr(LDKRouteHop *NONNULL_PTR arg) {
 	LDKRouteHop ret_var = RouteHop_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37154,13 +40512,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_RouteHop_clone_ptr"))) TS_RouteHop_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_RouteHop_clone_ptr"))) TS_RouteHop_clone_ptr(uint32_t arg) {
 	LDKRouteHop arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = RouteHop_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = RouteHop_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RouteHop_clone"))) TS_RouteHop_clone(uint32_t orig) {
@@ -37169,7 +40527,7 @@ uint32_t  __attribute__((export_name("TS_RouteHop_clone"))) TS_RouteHop_clone(ui
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRouteHop ret_var = RouteHop_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37185,8 +40543,8 @@ int64_t  __attribute__((export_name("TS_RouteHop_hash"))) TS_RouteHop_hash(uint3
 	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;
+	int64_t ret_conv = RouteHop_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_RouteHop_eq"))) TS_RouteHop_eq(uint32_t a, uint32_t b) {
@@ -37198,8 +40556,8 @@ jboolean  __attribute__((export_name("TS_RouteHop_eq"))) TS_RouteHop_eq(uint32_t
 	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;
+	jboolean ret_conv = RouteHop_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_RouteHop_write"))) TS_RouteHop_write(uint32_t obj) {
@@ -37217,10 +40575,11 @@ int8_tArray  __attribute__((export_name("TS_RouteHop_write"))) TS_RouteHop_write
 uint32_t  __attribute__((export_name("TS_RouteHop_read"))) TS_RouteHop_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_RouteHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHopDecodeErrorZ), "LDKCResult_RouteHopDecodeErrorZ");
 	*ret_conv = RouteHop_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_Route_free"))) TS_Route_free(uint32_t this_obj) {
@@ -37247,7 +40606,7 @@ ptrArray  __attribute__((export_name("TS_Route_get_paths"))) TS_Route_get_paths(
 		uint32_t *ret_conv_12_arr_ptr = (uint32_t*)(((uint8_t*)ret_conv_12_arr) + 4);
 		for (size_t k = 0; k < ret_conv_12_var.datalen; k++) {
 			LDKRouteHop ret_conv_12_conv_10_var = ret_conv_12_var.data[k];
-			uintptr_t ret_conv_12_conv_10_ref = 0;
+			uint32_t ret_conv_12_conv_10_ref = 0;
 			CHECK((((uintptr_t)ret_conv_12_conv_10_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 			CHECK((((uintptr_t)&ret_conv_12_conv_10_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_12_conv_10_var);
@@ -37277,7 +40636,7 @@ void  __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKCVec_RouteHopZ), "LDKCVec_CVec_RouteHopZZ Elements");
 	else
 		val_constr.data = NULL;
-	uint32_tArray* val_vals = (void*) val->elems /* XXX val leaks */;
+	uint32_tArray* val_vals = (void*) val->elems;
 	for (size_t m = 0; m < val_constr.datalen; m++) {
 		uint32_tArray val_conv_12 = val_vals[m];
 		LDKCVec_RouteHopZ val_conv_12_constr;
@@ -37286,7 +40645,7 @@ void  __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint
 			val_conv_12_constr.data = MALLOC(val_conv_12_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
 		else
 			val_conv_12_constr.data = NULL;
-		uint32_t* val_conv_12_vals = val_conv_12->elems /* XXX val_conv_12 leaks */;
+		uint32_t* val_conv_12_vals = val_conv_12->elems;
 		for (size_t k = 0; k < val_conv_12_constr.datalen; k++) {
 			uint32_t val_conv_12_conv_10 = val_conv_12_vals[k];
 			LDKRouteHop val_conv_12_conv_10_conv;
@@ -37296,8 +40655,10 @@ void  __attribute__((export_name("TS_Route_set_paths"))) TS_Route_set_paths(uint
 			val_conv_12_conv_10_conv = RouteHop_clone(&val_conv_12_conv_10_conv);
 			val_conv_12_constr.data[k] = val_conv_12_conv_10_conv;
 		}
+		FREE(val_conv_12);
 		val_constr.data[m] = val_conv_12_constr;
 	}
+	FREE(val);
 	Route_set_paths(&this_ptr_conv, val_constr);
 }
 
@@ -37307,7 +40668,7 @@ uint32_t  __attribute__((export_name("TS_Route_get_payment_params"))) TS_Route_g
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPaymentParameters ret_var = Route_get_payment_params(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -37340,7 +40701,7 @@ uint32_t  __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat
 		paths_arg_constr.data = MALLOC(paths_arg_constr.datalen * sizeof(LDKCVec_RouteHopZ), "LDKCVec_CVec_RouteHopZZ Elements");
 	else
 		paths_arg_constr.data = NULL;
-	uint32_tArray* paths_arg_vals = (void*) paths_arg->elems /* XXX paths_arg leaks */;
+	uint32_tArray* paths_arg_vals = (void*) paths_arg->elems;
 	for (size_t m = 0; m < paths_arg_constr.datalen; m++) {
 		uint32_tArray paths_arg_conv_12 = paths_arg_vals[m];
 		LDKCVec_RouteHopZ paths_arg_conv_12_constr;
@@ -37349,7 +40710,7 @@ uint32_t  __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat
 			paths_arg_conv_12_constr.data = MALLOC(paths_arg_conv_12_constr.datalen * sizeof(LDKRouteHop), "LDKCVec_RouteHopZ Elements");
 		else
 			paths_arg_conv_12_constr.data = NULL;
-		uint32_t* paths_arg_conv_12_vals = paths_arg_conv_12->elems /* XXX paths_arg_conv_12 leaks */;
+		uint32_t* paths_arg_conv_12_vals = paths_arg_conv_12->elems;
 		for (size_t k = 0; k < paths_arg_conv_12_constr.datalen; k++) {
 			uint32_t paths_arg_conv_12_conv_10 = paths_arg_conv_12_vals[k];
 			LDKRouteHop paths_arg_conv_12_conv_10_conv;
@@ -37359,15 +40720,17 @@ uint32_t  __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat
 			paths_arg_conv_12_conv_10_conv = RouteHop_clone(&paths_arg_conv_12_conv_10_conv);
 			paths_arg_conv_12_constr.data[k] = paths_arg_conv_12_conv_10_conv;
 		}
+		FREE(paths_arg_conv_12);
 		paths_arg_constr.data[m] = paths_arg_conv_12_constr;
 	}
+	FREE(paths_arg);
 	LDKPaymentParameters payment_params_arg_conv;
 	payment_params_arg_conv.inner = (void*)(payment_params_arg & (~1));
 	payment_params_arg_conv.is_owned = (payment_params_arg & 1) || (payment_params_arg == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(payment_params_arg_conv);
 	payment_params_arg_conv = PaymentParameters_clone(&payment_params_arg_conv);
 	LDKRoute ret_var = Route_new(paths_arg_constr, payment_params_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37380,7 +40743,7 @@ uint32_t  __attribute__((export_name("TS_Route_new"))) TS_Route_new(ptrArray pat
 
 static inline uintptr_t Route_clone_ptr(LDKRoute *NONNULL_PTR arg) {
 	LDKRoute ret_var = Route_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37390,13 +40753,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Route_clone_ptr"))) TS_Route_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Route_clone_ptr"))) TS_Route_clone_ptr(uint32_t arg) {
 	LDKRoute arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = Route_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Route_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Route_clone"))) TS_Route_clone(uint32_t orig) {
@@ -37405,7 +40768,7 @@ uint32_t  __attribute__((export_name("TS_Route_clone"))) TS_Route_clone(uint32_t
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRoute ret_var = Route_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37421,8 +40784,8 @@ int64_t  __attribute__((export_name("TS_Route_hash"))) TS_Route_hash(uint32_t o)
 	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;
+	int64_t ret_conv = Route_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_Route_eq"))) TS_Route_eq(uint32_t a, uint32_t b) {
@@ -37434,8 +40797,8 @@ jboolean  __attribute__((export_name("TS_Route_eq"))) TS_Route_eq(uint32_t a, ui
 	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;
+	jboolean ret_conv = Route_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_Route_get_total_fees"))) TS_Route_get_total_fees(uint32_t this_arg) {
@@ -37443,8 +40806,8 @@ int64_t  __attribute__((export_name("TS_Route_get_total_fees"))) TS_Route_get_to
 	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;
+	int64_t ret_conv = Route_get_total_fees(&this_arg_conv);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_Route_get_total_amount"))) TS_Route_get_total_amount(uint32_t this_arg) {
@@ -37452,8 +40815,8 @@ int64_t  __attribute__((export_name("TS_Route_get_total_amount"))) TS_Route_get_
 	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;
+	int64_t ret_conv = Route_get_total_amount(&this_arg_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_Route_write"))) TS_Route_write(uint32_t obj) {
@@ -37471,10 +40834,11 @@ int8_tArray  __attribute__((export_name("TS_Route_write"))) TS_Route_write(uint3
 uint32_t  __attribute__((export_name("TS_Route_read"))) TS_Route_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_RouteDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteDecodeErrorZ), "LDKCResult_RouteDecodeErrorZ");
 	*ret_conv = Route_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_RouteParameters_free"))) TS_RouteParameters_free(uint32_t this_obj) {
@@ -37491,7 +40855,7 @@ uint32_t  __attribute__((export_name("TS_RouteParameters_get_payment_params")))
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPaymentParameters ret_var = RouteParameters_get_payment_params(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37520,8 +40884,8 @@ int64_t  __attribute__((export_name("TS_RouteParameters_get_final_value_msat")))
 	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;
+	int64_t ret_conv = RouteParameters_get_final_value_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_RouteParameters_set_final_value_msat"))) TS_RouteParameters_set_final_value_msat(uint32_t this_ptr, int64_t val) {
@@ -37537,8 +40901,8 @@ int32_t  __attribute__((export_name("TS_RouteParameters_get_final_cltv_expiry_de
 	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;
+	int32_t ret_conv = RouteParameters_get_final_cltv_expiry_delta(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_RouteParameters_set_final_cltv_expiry_delta"))) TS_RouteParameters_set_final_cltv_expiry_delta(uint32_t this_ptr, int32_t val) {
@@ -37556,7 +40920,7 @@ uint32_t  __attribute__((export_name("TS_RouteParameters_new"))) TS_RouteParamet
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(payment_params_arg_conv);
 	payment_params_arg_conv = PaymentParameters_clone(&payment_params_arg_conv);
 	LDKRouteParameters ret_var = RouteParameters_new(payment_params_arg_conv, final_value_msat_arg, final_cltv_expiry_delta_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37569,7 +40933,7 @@ uint32_t  __attribute__((export_name("TS_RouteParameters_new"))) TS_RouteParamet
 
 static inline uintptr_t RouteParameters_clone_ptr(LDKRouteParameters *NONNULL_PTR arg) {
 	LDKRouteParameters ret_var = RouteParameters_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37579,13 +40943,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_RouteParameters_clone_ptr"))) TS_RouteParameters_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_RouteParameters_clone_ptr"))) TS_RouteParameters_clone_ptr(uint32_t arg) {
 	LDKRouteParameters arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = RouteParameters_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = RouteParameters_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RouteParameters_clone"))) TS_RouteParameters_clone(uint32_t orig) {
@@ -37594,7 +40958,7 @@ uint32_t  __attribute__((export_name("TS_RouteParameters_clone"))) TS_RouteParam
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRouteParameters ret_var = RouteParameters_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37620,10 +40984,11 @@ int8_tArray  __attribute__((export_name("TS_RouteParameters_write"))) TS_RoutePa
 uint32_t  __attribute__((export_name("TS_RouteParameters_read"))) TS_RouteParameters_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_RouteParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteParametersDecodeErrorZ), "LDKCResult_RouteParametersDecodeErrorZ");
 	*ret_conv = RouteParameters_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_PaymentParameters_free"))) TS_PaymentParameters_free(uint32_t this_obj) {
@@ -37661,7 +41026,7 @@ uint32_t  __attribute__((export_name("TS_PaymentParameters_get_features"))) TS_P
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKInvoiceFeatures ret_var = PaymentParameters_get_features(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -37698,7 +41063,7 @@ uint32_tArray  __attribute__((export_name("TS_PaymentParameters_get_route_hints"
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t l = 0; l < ret_var.datalen; l++) {
 		LDKRouteHint ret_conv_11_var = ret_var.data[l];
-		uintptr_t ret_conv_11_ref = 0;
+		uint32_t ret_conv_11_ref = 0;
 		CHECK((((uintptr_t)ret_conv_11_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_11_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_11_var);
@@ -37724,7 +41089,7 @@ void  __attribute__((export_name("TS_PaymentParameters_set_route_hints"))) TS_Pa
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements");
 	else
 		val_constr.data = NULL;
-	uint32_t* val_vals = val->elems /* XXX val leaks */;
+	uint32_t* val_vals = val->elems;
 	for (size_t l = 0; l < val_constr.datalen; l++) {
 		uint32_t val_conv_11 = val_vals[l];
 		LDKRouteHint val_conv_11_conv;
@@ -37734,6 +41099,7 @@ void  __attribute__((export_name("TS_PaymentParameters_set_route_hints"))) TS_Pa
 		val_conv_11_conv = RouteHint_clone(&val_conv_11_conv);
 		val_constr.data[l] = val_conv_11_conv;
 	}
+	FREE(val);
 	PaymentParameters_set_route_hints(&this_ptr_conv, val_constr);
 }
 
@@ -37744,7 +41110,7 @@ uint32_t  __attribute__((export_name("TS_PaymentParameters_get_expiry_time"))) T
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = PaymentParameters_get_expiry_time(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -37765,8 +41131,8 @@ int32_t  __attribute__((export_name("TS_PaymentParameters_get_max_total_cltv_exp
 	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 = PaymentParameters_get_max_total_cltv_expiry_delta(&this_ptr_conv);
-	return ret_val;
+	int32_t ret_conv = PaymentParameters_get_max_total_cltv_expiry_delta(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_PaymentParameters_set_max_total_cltv_expiry_delta"))) TS_PaymentParameters_set_max_total_cltv_expiry_delta(uint32_t this_ptr, int32_t val) {
@@ -37777,7 +41143,24 @@ void  __attribute__((export_name("TS_PaymentParameters_set_max_total_cltv_expiry
 	PaymentParameters_set_max_total_cltv_expiry_delta(&this_ptr_conv, val);
 }
 
-uint32_t  __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentParameters_new(int8_tArray payee_pubkey_arg, uint32_t features_arg, uint32_tArray route_hints_arg, uint32_t expiry_time_arg, int32_t max_total_cltv_expiry_delta_arg) {
+int8_t  __attribute__((export_name("TS_PaymentParameters_get_max_mpp_path_count"))) TS_PaymentParameters_get_max_mpp_path_count(uint32_t this_ptr) {
+	LDKPaymentParameters this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	int8_t ret_conv = PaymentParameters_get_max_mpp_path_count(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_PaymentParameters_set_max_mpp_path_count"))) TS_PaymentParameters_set_max_mpp_path_count(uint32_t this_ptr, int8_t val) {
+	LDKPaymentParameters this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	PaymentParameters_set_max_mpp_path_count(&this_ptr_conv, val);
+}
+
+uint32_t  __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentParameters_new(int8_tArray payee_pubkey_arg, uint32_t features_arg, uint32_tArray route_hints_arg, uint32_t expiry_time_arg, int32_t max_total_cltv_expiry_delta_arg, int8_t max_mpp_path_count_arg) {
 	LDKPublicKey payee_pubkey_arg_ref;
 	CHECK(payee_pubkey_arg->arr_len == 33);
 	memcpy(payee_pubkey_arg_ref.compressed_form, payee_pubkey_arg->elems, 33); FREE(payee_pubkey_arg);
@@ -37792,7 +41175,7 @@ uint32_t  __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentPar
 		route_hints_arg_constr.data = MALLOC(route_hints_arg_constr.datalen * sizeof(LDKRouteHint), "LDKCVec_RouteHintZ Elements");
 	else
 		route_hints_arg_constr.data = NULL;
-	uint32_t* route_hints_arg_vals = route_hints_arg->elems /* XXX route_hints_arg leaks */;
+	uint32_t* route_hints_arg_vals = route_hints_arg->elems;
 	for (size_t l = 0; l < route_hints_arg_constr.datalen; l++) {
 		uint32_t route_hints_arg_conv_11 = route_hints_arg_vals[l];
 		LDKRouteHint route_hints_arg_conv_11_conv;
@@ -37802,12 +41185,13 @@ uint32_t  __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentPar
 		route_hints_arg_conv_11_conv = RouteHint_clone(&route_hints_arg_conv_11_conv);
 		route_hints_arg_constr.data[l] = route_hints_arg_conv_11_conv;
 	}
+	FREE(route_hints_arg);
 	void* expiry_time_arg_ptr = (void*)(((uintptr_t)expiry_time_arg) & ~1);
 	CHECK_ACCESS(expiry_time_arg_ptr);
 	LDKCOption_u64Z expiry_time_arg_conv = *(LDKCOption_u64Z*)(expiry_time_arg_ptr);
 	expiry_time_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)expiry_time_arg) & ~1));
-	LDKPaymentParameters ret_var = PaymentParameters_new(payee_pubkey_arg_ref, features_arg_conv, route_hints_arg_constr, expiry_time_arg_conv, max_total_cltv_expiry_delta_arg);
-	uintptr_t ret_ref = 0;
+	LDKPaymentParameters ret_var = PaymentParameters_new(payee_pubkey_arg_ref, features_arg_conv, route_hints_arg_constr, expiry_time_arg_conv, max_total_cltv_expiry_delta_arg, max_mpp_path_count_arg);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37820,7 +41204,7 @@ uint32_t  __attribute__((export_name("TS_PaymentParameters_new"))) TS_PaymentPar
 
 static inline uintptr_t PaymentParameters_clone_ptr(LDKPaymentParameters *NONNULL_PTR arg) {
 	LDKPaymentParameters ret_var = PaymentParameters_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37830,13 +41214,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_PaymentParameters_clone_ptr"))) TS_PaymentParameters_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_PaymentParameters_clone_ptr"))) TS_PaymentParameters_clone_ptr(uint32_t arg) {
 	LDKPaymentParameters arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = PaymentParameters_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = PaymentParameters_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PaymentParameters_clone"))) TS_PaymentParameters_clone(uint32_t orig) {
@@ -37845,7 +41229,7 @@ uint32_t  __attribute__((export_name("TS_PaymentParameters_clone"))) TS_PaymentP
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPaymentParameters ret_var = PaymentParameters_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37861,8 +41245,8 @@ int64_t  __attribute__((export_name("TS_PaymentParameters_hash"))) TS_PaymentPar
 	o_conv.inner = (void*)(o & (~1));
 	o_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(o_conv);
-	int64_t ret_val = PaymentParameters_hash(&o_conv);
-	return ret_val;
+	int64_t ret_conv = PaymentParameters_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_PaymentParameters_eq"))) TS_PaymentParameters_eq(uint32_t a, uint32_t b) {
@@ -37874,8 +41258,8 @@ jboolean  __attribute__((export_name("TS_PaymentParameters_eq"))) TS_PaymentPara
 	b_conv.inner = (void*)(b & (~1));
 	b_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(b_conv);
-	jboolean ret_val = PaymentParameters_eq(&a_conv, &b_conv);
-	return ret_val;
+	jboolean ret_conv = PaymentParameters_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_PaymentParameters_write"))) TS_PaymentParameters_write(uint32_t obj) {
@@ -37893,10 +41277,11 @@ int8_tArray  __attribute__((export_name("TS_PaymentParameters_write"))) TS_Payme
 uint32_t  __attribute__((export_name("TS_PaymentParameters_read"))) TS_PaymentParameters_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_PaymentParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentParametersDecodeErrorZ), "LDKCResult_PaymentParametersDecodeErrorZ");
 	*ret_conv = PaymentParameters_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PaymentParameters_from_node_id"))) TS_PaymentParameters_from_node_id(int8_tArray payee_pubkey) {
@@ -37904,7 +41289,7 @@ uint32_t  __attribute__((export_name("TS_PaymentParameters_from_node_id"))) TS_P
 	CHECK(payee_pubkey->arr_len == 33);
 	memcpy(payee_pubkey_ref.compressed_form, payee_pubkey->elems, 33); FREE(payee_pubkey);
 	LDKPaymentParameters ret_var = PaymentParameters_from_node_id(payee_pubkey_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37920,7 +41305,7 @@ uint32_t  __attribute__((export_name("TS_PaymentParameters_for_keysend"))) TS_Pa
 	CHECK(payee_pubkey->arr_len == 33);
 	memcpy(payee_pubkey_ref.compressed_form, payee_pubkey->elems, 33); FREE(payee_pubkey);
 	LDKPaymentParameters ret_var = PaymentParameters_for_keysend(payee_pubkey_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -37950,7 +41335,7 @@ uint32_tArray  __attribute__((export_name("TS_RouteHint_get_a"))) TS_RouteHint_g
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t o = 0; o < ret_var.datalen; o++) {
 		LDKRouteHintHop ret_conv_14_var = ret_var.data[o];
-		uintptr_t ret_conv_14_ref = 0;
+		uint32_t ret_conv_14_ref = 0;
 		CHECK((((uintptr_t)ret_conv_14_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_14_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var);
@@ -37976,7 +41361,7 @@ void  __attribute__((export_name("TS_RouteHint_set_a"))) TS_RouteHint_set_a(uint
 		val_constr.data = MALLOC(val_constr.datalen * sizeof(LDKRouteHintHop), "LDKCVec_RouteHintHopZ Elements");
 	else
 		val_constr.data = NULL;
-	uint32_t* val_vals = val->elems /* XXX val leaks */;
+	uint32_t* val_vals = val->elems;
 	for (size_t o = 0; o < val_constr.datalen; o++) {
 		uint32_t val_conv_14 = val_vals[o];
 		LDKRouteHintHop val_conv_14_conv;
@@ -37986,6 +41371,7 @@ void  __attribute__((export_name("TS_RouteHint_set_a"))) TS_RouteHint_set_a(uint
 		val_conv_14_conv = RouteHintHop_clone(&val_conv_14_conv);
 		val_constr.data[o] = val_conv_14_conv;
 	}
+	FREE(val);
 	RouteHint_set_a(&this_ptr_conv, val_constr);
 }
 
@@ -37996,7 +41382,7 @@ uint32_t  __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint
 		a_arg_constr.data = MALLOC(a_arg_constr.datalen * sizeof(LDKRouteHintHop), "LDKCVec_RouteHintHopZ Elements");
 	else
 		a_arg_constr.data = NULL;
-	uint32_t* a_arg_vals = a_arg->elems /* XXX a_arg leaks */;
+	uint32_t* a_arg_vals = a_arg->elems;
 	for (size_t o = 0; o < a_arg_constr.datalen; o++) {
 		uint32_t a_arg_conv_14 = a_arg_vals[o];
 		LDKRouteHintHop a_arg_conv_14_conv;
@@ -38006,8 +41392,9 @@ uint32_t  __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint
 		a_arg_conv_14_conv = RouteHintHop_clone(&a_arg_conv_14_conv);
 		a_arg_constr.data[o] = a_arg_conv_14_conv;
 	}
+	FREE(a_arg);
 	LDKRouteHint ret_var = RouteHint_new(a_arg_constr);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38020,7 +41407,7 @@ uint32_t  __attribute__((export_name("TS_RouteHint_new"))) TS_RouteHint_new(uint
 
 static inline uintptr_t RouteHint_clone_ptr(LDKRouteHint *NONNULL_PTR arg) {
 	LDKRouteHint ret_var = RouteHint_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38030,13 +41417,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_RouteHint_clone_ptr"))) TS_RouteHint_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_RouteHint_clone_ptr"))) TS_RouteHint_clone_ptr(uint32_t arg) {
 	LDKRouteHint arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = RouteHint_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = RouteHint_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RouteHint_clone"))) TS_RouteHint_clone(uint32_t orig) {
@@ -38045,7 +41432,7 @@ uint32_t  __attribute__((export_name("TS_RouteHint_clone"))) TS_RouteHint_clone(
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRouteHint ret_var = RouteHint_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38061,8 +41448,8 @@ int64_t  __attribute__((export_name("TS_RouteHint_hash"))) TS_RouteHint_hash(uin
 	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;
+	int64_t ret_conv = RouteHint_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_RouteHint_eq"))) TS_RouteHint_eq(uint32_t a, uint32_t b) {
@@ -38074,8 +41461,8 @@ jboolean  __attribute__((export_name("TS_RouteHint_eq"))) TS_RouteHint_eq(uint32
 	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;
+	jboolean ret_conv = RouteHint_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_RouteHint_write"))) TS_RouteHint_write(uint32_t obj) {
@@ -38093,10 +41480,11 @@ int8_tArray  __attribute__((export_name("TS_RouteHint_write"))) TS_RouteHint_wri
 uint32_t  __attribute__((export_name("TS_RouteHint_read"))) TS_RouteHint_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_RouteHintDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintDecodeErrorZ), "LDKCResult_RouteHintDecodeErrorZ");
 	*ret_conv = RouteHint_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_RouteHintHop_free"))) TS_RouteHintHop_free(uint32_t this_obj) {
@@ -38133,8 +41521,8 @@ int64_t  __attribute__((export_name("TS_RouteHintHop_get_short_channel_id"))) TS
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int64_t ret_val = RouteHintHop_get_short_channel_id(&this_ptr_conv);
-	return ret_val;
+	int64_t ret_conv = RouteHintHop_get_short_channel_id(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_RouteHintHop_set_short_channel_id"))) TS_RouteHintHop_set_short_channel_id(uint32_t this_ptr, int64_t val) {
@@ -38151,7 +41539,7 @@ uint32_t  __attribute__((export_name("TS_RouteHintHop_get_fees"))) TS_RouteHintH
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRoutingFees ret_var = RouteHintHop_get_fees(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38180,8 +41568,8 @@ int16_t  __attribute__((export_name("TS_RouteHintHop_get_cltv_expiry_delta"))) T
 	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;
+	int16_t ret_conv = RouteHintHop_get_cltv_expiry_delta(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_RouteHintHop_set_cltv_expiry_delta"))) TS_RouteHintHop_set_cltv_expiry_delta(uint32_t this_ptr, int16_t val) {
@@ -38199,7 +41587,7 @@ uint32_t  __attribute__((export_name("TS_RouteHintHop_get_htlc_minimum_msat")))
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = RouteHintHop_get_htlc_minimum_msat(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -38222,7 +41610,7 @@ uint32_t  __attribute__((export_name("TS_RouteHintHop_get_htlc_maximum_msat")))
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKCOption_u64Z *ret_copy = MALLOC(sizeof(LDKCOption_u64Z), "LDKCOption_u64Z");
 	*ret_copy = RouteHintHop_get_htlc_maximum_msat(&this_ptr_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -38256,7 +41644,7 @@ uint32_t  __attribute__((export_name("TS_RouteHintHop_new"))) TS_RouteHintHop_ne
 	LDKCOption_u64Z htlc_maximum_msat_arg_conv = *(LDKCOption_u64Z*)(htlc_maximum_msat_arg_ptr);
 	htlc_maximum_msat_arg_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)htlc_maximum_msat_arg) & ~1));
 	LDKRouteHintHop ret_var = RouteHintHop_new(src_node_id_arg_ref, short_channel_id_arg, fees_arg_conv, cltv_expiry_delta_arg, htlc_minimum_msat_arg_conv, htlc_maximum_msat_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38269,7 +41657,7 @@ uint32_t  __attribute__((export_name("TS_RouteHintHop_new"))) TS_RouteHintHop_ne
 
 static inline uintptr_t RouteHintHop_clone_ptr(LDKRouteHintHop *NONNULL_PTR arg) {
 	LDKRouteHintHop ret_var = RouteHintHop_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38279,13 +41667,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_RouteHintHop_clone_ptr"))) TS_RouteHintHop_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_RouteHintHop_clone_ptr"))) TS_RouteHintHop_clone_ptr(uint32_t arg) {
 	LDKRouteHintHop arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = RouteHintHop_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = RouteHintHop_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RouteHintHop_clone"))) TS_RouteHintHop_clone(uint32_t orig) {
@@ -38294,7 +41682,7 @@ uint32_t  __attribute__((export_name("TS_RouteHintHop_clone"))) TS_RouteHintHop_
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRouteHintHop ret_var = RouteHintHop_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38310,8 +41698,8 @@ int64_t  __attribute__((export_name("TS_RouteHintHop_hash"))) TS_RouteHintHop_ha
 	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;
+	int64_t ret_conv = RouteHintHop_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_RouteHintHop_eq"))) TS_RouteHintHop_eq(uint32_t a, uint32_t b) {
@@ -38323,8 +41711,8 @@ jboolean  __attribute__((export_name("TS_RouteHintHop_eq"))) TS_RouteHintHop_eq(
 	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;
+	jboolean ret_conv = RouteHintHop_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_RouteHintHop_write"))) TS_RouteHintHop_write(uint32_t obj) {
@@ -38342,13 +41730,14 @@ int8_tArray  __attribute__((export_name("TS_RouteHintHop_write"))) TS_RouteHintH
 uint32_t  __attribute__((export_name("TS_RouteHintHop_read"))) TS_RouteHintHop_read(int8_tArray ser) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
+	ser_ref.data = ser->elems;
 	LDKCResult_RouteHintHopDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteHintHopDecodeErrorZ), "LDKCResult_RouteHintHopDecodeErrorZ");
 	*ret_conv = RouteHintHop_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArray our_node_pubkey, uint32_t route_params, uint32_t network, uint32_tArray first_hops, uint32_t logger, uint32_t scorer) {
+uint32_t  __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArray our_node_pubkey, uint32_t route_params, uint32_t network_graph, uint32_tArray first_hops, uint32_t logger, uint32_t scorer, int8_tArray random_seed_bytes) {
 	LDKPublicKey our_node_pubkey_ref;
 	CHECK(our_node_pubkey->arr_len == 33);
 	memcpy(our_node_pubkey_ref.compressed_form, our_node_pubkey->elems, 33); FREE(our_node_pubkey);
@@ -38356,10 +41745,10 @@ uint32_t  __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArra
 	route_params_conv.inner = (void*)(route_params & (~1));
 	route_params_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_conv);
-	LDKNetworkGraph network_conv;
-	network_conv.inner = (void*)(network & (~1));
-	network_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(network_conv);
+	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);
 	LDKCVec_ChannelDetailsZ first_hops_constr;
 	LDKCVec_ChannelDetailsZ *first_hops_ptr = NULL;
 	if (first_hops != 0) {
@@ -38368,7 +41757,7 @@ uint32_t  __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArra
 			first_hops_constr.data = MALLOC(first_hops_constr.datalen * sizeof(LDKChannelDetails), "LDKCVec_ChannelDetailsZ Elements");
 		else
 			first_hops_constr.data = NULL;
-		uint32_t* first_hops_vals = first_hops->elems /* XXX first_hops leaks */;
+		uint32_t* first_hops_vals = first_hops->elems;
 		for (size_t q = 0; q < first_hops_constr.datalen; q++) {
 			uint32_t first_hops_conv_16 = first_hops_vals[q];
 			LDKChannelDetails first_hops_conv_16_conv;
@@ -38377,18 +41766,70 @@ uint32_t  __attribute__((export_name("TS_find_route"))) TS_find_route(int8_tArra
 			CHECK_INNER_FIELD_ACCESS_OR_NULL(first_hops_conv_16_conv);
 			first_hops_constr.data[q] = first_hops_conv_16_conv;
 		}
+		FREE(first_hops);
 		first_hops_ptr = &first_hops_constr;
 	}
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	void* scorer_ptr = (void*)(((uintptr_t)scorer) & ~1);
 	if (!(scorer & 1)) { CHECK_ACCESS(scorer_ptr); }
 	LDKScore* scorer_conv = (LDKScore*)scorer_ptr;
+	unsigned char random_seed_bytes_arr[32];
+	CHECK(random_seed_bytes->arr_len == 32);
+	memcpy(random_seed_bytes_arr, random_seed_bytes->elems, 32); FREE(random_seed_bytes);
+	unsigned char (*random_seed_bytes_ref)[32] = &random_seed_bytes_arr;
 	LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ");
-	*ret_conv = find_route(our_node_pubkey_ref, &route_params_conv, &network_conv, first_hops_ptr, logger_conv, scorer_conv);
+	*ret_conv = find_route(our_node_pubkey_ref, &route_params_conv, &network_graph_conv, first_hops_ptr, logger_conv, scorer_conv, random_seed_bytes_ref);
 	if (first_hops_ptr != NULL) { FREE(first_hops_constr.data); }
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_build_route_from_hops"))) TS_build_route_from_hops(int8_tArray our_node_pubkey, ptrArray hops, uint32_t route_params, uint32_t network_graph, uint32_t logger, int8_tArray random_seed_bytes) {
+	LDKPublicKey our_node_pubkey_ref;
+	CHECK(our_node_pubkey->arr_len == 33);
+	memcpy(our_node_pubkey_ref.compressed_form, our_node_pubkey->elems, 33); FREE(our_node_pubkey);
+	LDKCVec_PublicKeyZ hops_constr;
+	hops_constr.datalen = hops->arr_len;
+	if (hops_constr.datalen > 0)
+		hops_constr.data = MALLOC(hops_constr.datalen * sizeof(LDKPublicKey), "LDKCVec_PublicKeyZ Elements");
+	else
+		hops_constr.data = NULL;
+	int8_tArray* hops_vals = (void*) hops->elems;
+	for (size_t m = 0; m < hops_constr.datalen; m++) {
+		int8_tArray hops_conv_12 = hops_vals[m];
+		LDKPublicKey hops_conv_12_ref;
+		CHECK(hops_conv_12->arr_len == 33);
+		memcpy(hops_conv_12_ref.compressed_form, hops_conv_12->elems, 33); FREE(hops_conv_12);
+		hops_constr.data[m] = hops_conv_12_ref;
+	}
+	FREE(hops);
+	LDKRouteParameters route_params_conv;
+	route_params_conv.inner = (void*)(route_params & (~1));
+	route_params_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(route_params_conv);
+	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*)(((uintptr_t)logger) & ~1);
+	CHECK_ACCESS(logger_ptr);
+	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
+	unsigned char random_seed_bytes_arr[32];
+	CHECK(random_seed_bytes->arr_len == 32);
+	memcpy(random_seed_bytes_arr, random_seed_bytes->elems, 32); FREE(random_seed_bytes);
+	unsigned char (*random_seed_bytes_ref)[32] = &random_seed_bytes_arr;
+	LDKCResult_RouteLightningErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_RouteLightningErrorZ), "LDKCResult_RouteLightningErrorZ");
+	*ret_conv = build_route_from_hops(our_node_pubkey_ref, hops_constr, &route_params_conv, &network_graph_conv, logger_conv, random_seed_bytes_ref);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_Score_free"))) TS_Score_free(uint32_t this_ptr) {
@@ -38417,12 +41858,148 @@ void  __attribute__((export_name("TS_MultiThreadedLockableScore_free"))) TS_Mult
 	MultiThreadedLockableScore_free(this_obj_conv);
 }
 
+int8_tArray  __attribute__((export_name("TS_MultiThreadedLockableScore_write"))) TS_MultiThreadedLockableScore_write(uint32_t obj) {
+	LDKMultiThreadedLockableScore 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 = MultiThreadedLockableScore_write(&obj_conv);
+	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
 uint32_t  __attribute__((export_name("TS_MultiThreadedLockableScore_new"))) TS_MultiThreadedLockableScore_new(uint32_t score) {
 	void* score_ptr = (void*)(((uintptr_t)score) & ~1);
 	CHECK_ACCESS(score_ptr);
 	LDKScore score_conv = *(LDKScore*)(score_ptr);
+	if (score_conv.free == LDKScore_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKScore_JCalls_cloned(&score_conv);
+	}
 	LDKMultiThreadedLockableScore ret_var = MultiThreadedLockableScore_new(score_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelUsage_free"))) TS_ChannelUsage_free(uint32_t this_obj) {
+	LDKChannelUsage this_obj_conv;
+	this_obj_conv.inner = (void*)(this_obj & (~1));
+	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
+	ChannelUsage_free(this_obj_conv);
+}
+
+int64_t  __attribute__((export_name("TS_ChannelUsage_get_amount_msat"))) TS_ChannelUsage_get_amount_msat(uint32_t this_ptr) {
+	LDKChannelUsage this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	int64_t ret_conv = ChannelUsage_get_amount_msat(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelUsage_set_amount_msat"))) TS_ChannelUsage_set_amount_msat(uint32_t this_ptr, int64_t val) {
+	LDKChannelUsage this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	ChannelUsage_set_amount_msat(&this_ptr_conv, val);
+}
+
+int64_t  __attribute__((export_name("TS_ChannelUsage_get_inflight_htlc_msat"))) TS_ChannelUsage_get_inflight_htlc_msat(uint32_t this_ptr) {
+	LDKChannelUsage this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	int64_t ret_conv = ChannelUsage_get_inflight_htlc_msat(&this_ptr_conv);
+	return ret_conv;
+}
+
+void  __attribute__((export_name("TS_ChannelUsage_set_inflight_htlc_msat"))) TS_ChannelUsage_set_inflight_htlc_msat(uint32_t this_ptr, int64_t val) {
+	LDKChannelUsage this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	ChannelUsage_set_inflight_htlc_msat(&this_ptr_conv, val);
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelUsage_get_effective_capacity"))) TS_ChannelUsage_get_effective_capacity(uint32_t this_ptr) {
+	LDKChannelUsage this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	LDKEffectiveCapacity *ret_copy = MALLOC(sizeof(LDKEffectiveCapacity), "LDKEffectiveCapacity");
+	*ret_copy = ChannelUsage_get_effective_capacity(&this_ptr_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ChannelUsage_set_effective_capacity"))) TS_ChannelUsage_set_effective_capacity(uint32_t this_ptr, uint32_t val) {
+	LDKChannelUsage this_ptr_conv;
+	this_ptr_conv.inner = (void*)(this_ptr & (~1));
+	this_ptr_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
+	void* val_ptr = (void*)(((uintptr_t)val) & ~1);
+	CHECK_ACCESS(val_ptr);
+	LDKEffectiveCapacity val_conv = *(LDKEffectiveCapacity*)(val_ptr);
+	val_conv = EffectiveCapacity_clone((LDKEffectiveCapacity*)(((uintptr_t)val) & ~1));
+	ChannelUsage_set_effective_capacity(&this_ptr_conv, val_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelUsage_new"))) TS_ChannelUsage_new(int64_t amount_msat_arg, int64_t inflight_htlc_msat_arg, uint32_t effective_capacity_arg) {
+	void* effective_capacity_arg_ptr = (void*)(((uintptr_t)effective_capacity_arg) & ~1);
+	CHECK_ACCESS(effective_capacity_arg_ptr);
+	LDKEffectiveCapacity effective_capacity_arg_conv = *(LDKEffectiveCapacity*)(effective_capacity_arg_ptr);
+	effective_capacity_arg_conv = EffectiveCapacity_clone((LDKEffectiveCapacity*)(((uintptr_t)effective_capacity_arg) & ~1));
+	LDKChannelUsage ret_var = ChannelUsage_new(amount_msat_arg, inflight_htlc_msat_arg, effective_capacity_arg_conv);
+	uint32_t ret_ref = 0;
+	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+	ret_ref = (uintptr_t)ret_var.inner;
+	if (ret_var.is_owned) {
+		ret_ref |= 1;
+	}
+	return ret_ref;
+}
+
+static inline uintptr_t ChannelUsage_clone_ptr(LDKChannelUsage *NONNULL_PTR arg) {
+	LDKChannelUsage ret_var = ChannelUsage_clone(arg);
+uint32_t ret_ref = 0;
+CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
+CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
+CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
+ret_ref = (uintptr_t)ret_var.inner;
+if (ret_var.is_owned) {
+	ret_ref |= 1;
+}
+	return ret_ref;
+}
+uint32_t  __attribute__((export_name("TS_ChannelUsage_clone_ptr"))) TS_ChannelUsage_clone_ptr(uint32_t arg) {
+	LDKChannelUsage arg_conv;
+	arg_conv.inner = (void*)(arg & (~1));
+	arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
+	uint32_t ret_conv = ChannelUsage_clone_ptr(&arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_ChannelUsage_clone"))) TS_ChannelUsage_clone(uint32_t orig) {
+	LDKChannelUsage orig_conv;
+	orig_conv.inner = (void*)(orig & (~1));
+	orig_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
+	LDKChannelUsage ret_var = ChannelUsage_clone(&orig_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38443,7 +42020,7 @@ void  __attribute__((export_name("TS_FixedPenaltyScorer_free"))) TS_FixedPenalty
 
 static inline uintptr_t FixedPenaltyScorer_clone_ptr(LDKFixedPenaltyScorer *NONNULL_PTR arg) {
 	LDKFixedPenaltyScorer ret_var = FixedPenaltyScorer_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38453,13 +42030,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_FixedPenaltyScorer_clone_ptr"))) TS_FixedPenaltyScorer_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_FixedPenaltyScorer_clone_ptr"))) TS_FixedPenaltyScorer_clone_ptr(uint32_t arg) {
 	LDKFixedPenaltyScorer arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = FixedPenaltyScorer_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = FixedPenaltyScorer_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_FixedPenaltyScorer_clone"))) TS_FixedPenaltyScorer_clone(uint32_t orig) {
@@ -38468,7 +42045,7 @@ uint32_t  __attribute__((export_name("TS_FixedPenaltyScorer_clone"))) TS_FixedPe
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKFixedPenaltyScorer ret_var = FixedPenaltyScorer_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38479,30 +42056,9 @@ uint32_t  __attribute__((export_name("TS_FixedPenaltyScorer_clone"))) TS_FixedPe
 	return ret_ref;
 }
 
-int8_tArray  __attribute__((export_name("TS_FixedPenaltyScorer_write"))) TS_FixedPenaltyScorer_write(uint32_t obj) {
-	LDKFixedPenaltyScorer 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 = FixedPenaltyScorer_write(&obj_conv);
-	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
-	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
-}
-
-uint32_t  __attribute__((export_name("TS_FixedPenaltyScorer_read"))) TS_FixedPenaltyScorer_read(int8_tArray ser) {
-	LDKu8slice ser_ref;
-	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
-	LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ");
-	*ret_conv = FixedPenaltyScorer_read(ser_ref);
-	return (uintptr_t)ret_conv;
-}
-
 uint32_t  __attribute__((export_name("TS_FixedPenaltyScorer_with_penalty"))) TS_FixedPenaltyScorer_with_penalty(int64_t penalty_msat) {
 	LDKFixedPenaltyScorer ret_var = FixedPenaltyScorer_with_penalty(penalty_msat);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38520,126 +42076,135 @@ uint32_t  __attribute__((export_name("TS_FixedPenaltyScorer_as_Score"))) TS_Fixe
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKScore* ret_ret = MALLOC(sizeof(LDKScore), "LDKScore");
 	*ret_ret = FixedPenaltyScorer_as_Score(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
+}
+
+int8_tArray  __attribute__((export_name("TS_FixedPenaltyScorer_write"))) TS_FixedPenaltyScorer_write(uint32_t obj) {
+	LDKFixedPenaltyScorer 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 = FixedPenaltyScorer_write(&obj_conv);
+	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
+	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
+	CVec_u8Z_free(ret_var);
+	return ret_arr;
+}
+
+uint32_t  __attribute__((export_name("TS_FixedPenaltyScorer_read"))) TS_FixedPenaltyScorer_read(int8_tArray ser, int64_t arg) {
+	LDKu8slice ser_ref;
+	ser_ref.datalen = ser->arr_len;
+	ser_ref.data = ser->elems;
+	LDKCResult_FixedPenaltyScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_FixedPenaltyScorerDecodeErrorZ), "LDKCResult_FixedPenaltyScorerDecodeErrorZ");
+	*ret_conv = FixedPenaltyScorer_read(ser_ref, arg);
+	FREE(ser);
+	return (uint32_t)ret_conv;
 }
 
-void  __attribute__((export_name("TS_Scorer_free"))) TS_Scorer_free(uint32_t this_obj) {
-	LDKScorer this_obj_conv;
+void  __attribute__((export_name("TS_ProbabilisticScorer_free"))) TS_ProbabilisticScorer_free(uint32_t this_obj) {
+	LDKProbabilisticScorer this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
-	Scorer_free(this_obj_conv);
+	ProbabilisticScorer_free(this_obj_conv);
 }
 
-void  __attribute__((export_name("TS_ScoringParameters_free"))) TS_ScoringParameters_free(uint32_t this_obj) {
-	LDKScoringParameters this_obj_conv;
+void  __attribute__((export_name("TS_ProbabilisticScoringParameters_free"))) TS_ProbabilisticScoringParameters_free(uint32_t this_obj) {
+	LDKProbabilisticScoringParameters this_obj_conv;
 	this_obj_conv.inner = (void*)(this_obj & (~1));
 	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
-	ScoringParameters_free(this_obj_conv);
+	ProbabilisticScoringParameters_free(this_obj_conv);
 }
 
-int64_t  __attribute__((export_name("TS_ScoringParameters_get_base_penalty_msat"))) TS_ScoringParameters_get_base_penalty_msat(uint32_t this_ptr) {
-	LDKScoringParameters this_ptr_conv;
+int64_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_get_base_penalty_msat"))) TS_ProbabilisticScoringParameters_get_base_penalty_msat(uint32_t this_ptr) {
+	LDKProbabilisticScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int64_t ret_val = ScoringParameters_get_base_penalty_msat(&this_ptr_conv);
-	return ret_val;
+	int64_t ret_conv = ProbabilisticScoringParameters_get_base_penalty_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_ScoringParameters_set_base_penalty_msat"))) TS_ScoringParameters_set_base_penalty_msat(uint32_t this_ptr, int64_t val) {
-	LDKScoringParameters this_ptr_conv;
+void  __attribute__((export_name("TS_ProbabilisticScoringParameters_set_base_penalty_msat"))) TS_ProbabilisticScoringParameters_set_base_penalty_msat(uint32_t this_ptr, int64_t val) {
+	LDKProbabilisticScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	ScoringParameters_set_base_penalty_msat(&this_ptr_conv, val);
+	ProbabilisticScoringParameters_set_base_penalty_msat(&this_ptr_conv, val);
 }
 
-int64_t  __attribute__((export_name("TS_ScoringParameters_get_failure_penalty_msat"))) TS_ScoringParameters_get_failure_penalty_msat(uint32_t this_ptr) {
-	LDKScoringParameters this_ptr_conv;
+int64_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(uint32_t this_ptr) {
+	LDKProbabilisticScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	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;
+	int64_t ret_conv = ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_ScoringParameters_set_failure_penalty_msat"))) TS_ScoringParameters_set_failure_penalty_msat(uint32_t this_ptr, int64_t val) {
-	LDKScoringParameters this_ptr_conv;
+void  __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(uint32_t this_ptr, int64_t val) {
+	LDKProbabilisticScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	ScoringParameters_set_failure_penalty_msat(&this_ptr_conv, val);
+	ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(&this_ptr_conv, val);
 }
 
-int16_t  __attribute__((export_name("TS_ScoringParameters_get_overuse_penalty_start_1024th"))) TS_ScoringParameters_get_overuse_penalty_start_1024th(uint32_t this_ptr) {
-	LDKScoringParameters this_ptr_conv;
+int64_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life(uint32_t this_ptr) {
+	LDKProbabilisticScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int16_t ret_val = ScoringParameters_get_overuse_penalty_start_1024th(&this_ptr_conv);
-	return ret_val;
+	int64_t ret_conv = ProbabilisticScoringParameters_get_liquidity_offset_half_life(&this_ptr_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_ScoringParameters_set_overuse_penalty_start_1024th"))) TS_ScoringParameters_set_overuse_penalty_start_1024th(uint32_t this_ptr, int16_t val) {
-	LDKScoringParameters this_ptr_conv;
+void  __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life(uint32_t this_ptr, int64_t val) {
+	LDKProbabilisticScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	ScoringParameters_set_overuse_penalty_start_1024th(&this_ptr_conv, val);
+	ProbabilisticScoringParameters_set_liquidity_offset_half_life(&this_ptr_conv, val);
 }
 
-int64_t  __attribute__((export_name("TS_ScoringParameters_get_overuse_penalty_msat_per_1024th"))) TS_ScoringParameters_get_overuse_penalty_msat_per_1024th(uint32_t this_ptr) {
-	LDKScoringParameters this_ptr_conv;
+int64_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_get_amount_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_amount_penalty_multiplier_msat(uint32_t this_ptr) {
+	LDKProbabilisticScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int64_t ret_val = ScoringParameters_get_overuse_penalty_msat_per_1024th(&this_ptr_conv);
-	return ret_val;
+	int64_t ret_conv = ProbabilisticScoringParameters_get_amount_penalty_multiplier_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_ScoringParameters_set_overuse_penalty_msat_per_1024th"))) TS_ScoringParameters_set_overuse_penalty_msat_per_1024th(uint32_t this_ptr, int64_t val) {
-	LDKScoringParameters this_ptr_conv;
+void  __attribute__((export_name("TS_ProbabilisticScoringParameters_set_amount_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_amount_penalty_multiplier_msat(uint32_t this_ptr, int64_t val) {
+	LDKProbabilisticScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	ScoringParameters_set_overuse_penalty_msat_per_1024th(&this_ptr_conv, val);
+	ProbabilisticScoringParameters_set_amount_penalty_multiplier_msat(&this_ptr_conv, val);
 }
 
-int64_t  __attribute__((export_name("TS_ScoringParameters_get_failure_penalty_half_life"))) TS_ScoringParameters_get_failure_penalty_half_life(uint32_t this_ptr) {
-	LDKScoringParameters this_ptr_conv;
+int64_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_get_anti_probing_penalty_msat(uint32_t this_ptr) {
+	LDKProbabilisticScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int64_t ret_val = ScoringParameters_get_failure_penalty_half_life(&this_ptr_conv);
-	return ret_val;
+	int64_t ret_conv = ProbabilisticScoringParameters_get_anti_probing_penalty_msat(&this_ptr_conv);
+	return ret_conv;
 }
 
-void  __attribute__((export_name("TS_ScoringParameters_set_failure_penalty_half_life"))) TS_ScoringParameters_set_failure_penalty_half_life(uint32_t this_ptr, int64_t val) {
-	LDKScoringParameters this_ptr_conv;
+void  __attribute__((export_name("TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat"))) TS_ProbabilisticScoringParameters_set_anti_probing_penalty_msat(uint32_t this_ptr, int64_t val) {
+	LDKProbabilisticScoringParameters this_ptr_conv;
 	this_ptr_conv.inner = (void*)(this_ptr & (~1));
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	ScoringParameters_set_failure_penalty_half_life(&this_ptr_conv, val);
-}
-
-uint32_t  __attribute__((export_name("TS_ScoringParameters_new"))) TS_ScoringParameters_new(int64_t base_penalty_msat_arg, int64_t failure_penalty_msat_arg, int16_t overuse_penalty_start_1024th_arg, int64_t overuse_penalty_msat_per_1024th_arg, int64_t failure_penalty_half_life_arg) {
-	LDKScoringParameters ret_var = ScoringParameters_new(base_penalty_msat_arg, failure_penalty_msat_arg, overuse_penalty_start_1024th_arg, overuse_penalty_msat_per_1024th_arg, failure_penalty_half_life_arg);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
-	return ret_ref;
+	ProbabilisticScoringParameters_set_anti_probing_penalty_msat(&this_ptr_conv, val);
 }
 
-static inline uintptr_t ScoringParameters_clone_ptr(LDKScoringParameters *NONNULL_PTR arg) {
-	LDKScoringParameters ret_var = ScoringParameters_clone(arg);
-uintptr_t ret_ref = 0;
+static inline uintptr_t ProbabilisticScoringParameters_clone_ptr(LDKProbabilisticScoringParameters *NONNULL_PTR arg) {
+	LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_clone(arg);
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38649,22 +42214,22 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ScoringParameters_clone_ptr"))) TS_ScoringParameters_clone_ptr(uint32_t arg) {
-	LDKScoringParameters arg_conv;
+uint32_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_clone_ptr"))) TS_ProbabilisticScoringParameters_clone_ptr(uint32_t arg) {
+	LDKProbabilisticScoringParameters arg_conv;
 	arg_conv.inner = (void*)(arg & (~1));
 	arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ScoringParameters_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ProbabilisticScoringParameters_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
-uint32_t  __attribute__((export_name("TS_ScoringParameters_clone"))) TS_ScoringParameters_clone(uint32_t orig) {
-	LDKScoringParameters orig_conv;
+uint32_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_clone"))) TS_ProbabilisticScoringParameters_clone(uint32_t orig) {
+	LDKProbabilisticScoringParameters orig_conv;
 	orig_conv.inner = (void*)(orig & (~1));
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
-	LDKScoringParameters ret_var = ScoringParameters_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_clone(&orig_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38675,35 +42240,25 @@ uint32_t  __attribute__((export_name("TS_ScoringParameters_clone"))) TS_ScoringP
 	return ret_ref;
 }
 
-int8_tArray  __attribute__((export_name("TS_ScoringParameters_write"))) TS_ScoringParameters_write(uint32_t obj) {
-	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_int8_tArray(ret_var.datalen, __LINE__);
-	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
-}
-
-uint32_t  __attribute__((export_name("TS_ScoringParameters_read"))) TS_ScoringParameters_read(int8_tArray ser) {
-	LDKu8slice ser_ref;
-	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
-	LDKCResult_ScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScoringParametersDecodeErrorZ), "LDKCResult_ScoringParametersDecodeErrorZ");
-	*ret_conv = ScoringParameters_read(ser_ref);
-	return (uintptr_t)ret_conv;
-}
-
-uint32_t  __attribute__((export_name("TS_Scorer_new"))) TS_Scorer_new(uint32_t params) {
-	LDKScoringParameters params_conv;
+uint32_t  __attribute__((export_name("TS_ProbabilisticScorer_new"))) TS_ProbabilisticScorer_new(uint32_t params, uint32_t network_graph, uint32_t logger) {
+	LDKProbabilisticScoringParameters 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 = ScoringParameters_clone(&params_conv);
-	LDKScorer ret_var = Scorer_new(params_conv);
-	uintptr_t ret_ref = 0;
+	params_conv = ProbabilisticScoringParameters_clone(&params_conv);
+	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*)(((uintptr_t)logger) & ~1);
+	CHECK_ACCESS(logger_ptr);
+	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
+	LDKProbabilisticScorer ret_var = ProbabilisticScorer_new(params_conv, &network_graph_conv, logger_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38714,22 +42269,89 @@ uint32_t  __attribute__((export_name("TS_Scorer_new"))) TS_Scorer_new(uint32_t p
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_Scorer_default"))) TS_Scorer_default() {
-	LDKScorer ret_var = Scorer_default();
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
+void  __attribute__((export_name("TS_ProbabilisticScorer_debug_log_liquidity_stats"))) TS_ProbabilisticScorer_debug_log_liquidity_stats(uint32_t this_arg) {
+	LDKProbabilisticScorer this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	ProbabilisticScorer_debug_log_liquidity_stats(&this_arg_conv);
+}
+
+uint32_t  __attribute__((export_name("TS_ProbabilisticScorer_estimated_channel_liquidity_range"))) TS_ProbabilisticScorer_estimated_channel_liquidity_range(uint32_t this_arg, int64_t scid, uint32_t target) {
+	LDKProbabilisticScorer this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	LDKNodeId target_conv;
+	target_conv.inner = (void*)(target & (~1));
+	target_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(target_conv);
+	LDKCOption_C2Tuple_u64u64ZZ *ret_copy = MALLOC(sizeof(LDKCOption_C2Tuple_u64u64ZZ), "LDKCOption_C2Tuple_u64u64ZZ");
+	*ret_copy = ProbabilisticScorer_estimated_channel_liquidity_range(&this_arg_conv, scid, &target_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_ScoringParameters_default"))) TS_ScoringParameters_default() {
-	LDKScoringParameters ret_var = ScoringParameters_default();
-	uintptr_t ret_ref = 0;
+void  __attribute__((export_name("TS_ProbabilisticScorer_add_banned"))) TS_ProbabilisticScorer_add_banned(uint32_t this_arg, uint32_t node_id) {
+	LDKProbabilisticScorer this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	LDKNodeId node_id_conv;
+	node_id_conv.inner = (void*)(node_id & (~1));
+	node_id_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv);
+	ProbabilisticScorer_add_banned(&this_arg_conv, &node_id_conv);
+}
+
+void  __attribute__((export_name("TS_ProbabilisticScorer_remove_banned"))) TS_ProbabilisticScorer_remove_banned(uint32_t this_arg, uint32_t node_id) {
+	LDKProbabilisticScorer this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	LDKNodeId node_id_conv;
+	node_id_conv.inner = (void*)(node_id & (~1));
+	node_id_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(node_id_conv);
+	ProbabilisticScorer_remove_banned(&this_arg_conv, &node_id_conv);
+}
+
+void  __attribute__((export_name("TS_ProbabilisticScorer_clear_banned"))) TS_ProbabilisticScorer_clear_banned(uint32_t this_arg) {
+	LDKProbabilisticScorer this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	ProbabilisticScorer_clear_banned(&this_arg_conv);
+}
+
+void  __attribute__((export_name("TS_ProbabilisticScoringParameters_add_banned_from_list"))) TS_ProbabilisticScoringParameters_add_banned_from_list(uint32_t this_arg, uint32_tArray node_ids) {
+	LDKProbabilisticScoringParameters this_arg_conv;
+	this_arg_conv.inner = (void*)(this_arg & (~1));
+	this_arg_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
+	LDKCVec_NodeIdZ node_ids_constr;
+	node_ids_constr.datalen = node_ids->arr_len;
+	if (node_ids_constr.datalen > 0)
+		node_ids_constr.data = MALLOC(node_ids_constr.datalen * sizeof(LDKNodeId), "LDKCVec_NodeIdZ Elements");
+	else
+		node_ids_constr.data = NULL;
+	uint32_t* node_ids_vals = node_ids->elems;
+	for (size_t i = 0; i < node_ids_constr.datalen; i++) {
+		uint32_t node_ids_conv_8 = node_ids_vals[i];
+		LDKNodeId node_ids_conv_8_conv;
+		node_ids_conv_8_conv.inner = (void*)(node_ids_conv_8 & (~1));
+		node_ids_conv_8_conv.is_owned = (node_ids_conv_8 & 1) || (node_ids_conv_8 == 0);
+		CHECK_INNER_FIELD_ACCESS_OR_NULL(node_ids_conv_8_conv);
+		node_ids_conv_8_conv = NodeId_clone(&node_ids_conv_8_conv);
+		node_ids_constr.data[i] = node_ids_conv_8_conv;
+	}
+	FREE(node_ids);
+	ProbabilisticScoringParameters_add_banned_from_list(&this_arg_conv, node_ids_constr);
+}
+
+uint32_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_default"))) TS_ProbabilisticScoringParameters_default() {
+	LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_default();
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38740,161 +42362,262 @@ uint32_t  __attribute__((export_name("TS_ScoringParameters_default"))) TS_Scorin
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_Scorer_as_Score"))) TS_Scorer_as_Score(uint32_t this_arg) {
-	LDKScorer this_arg_conv;
+uint32_t  __attribute__((export_name("TS_ProbabilisticScorer_as_Score"))) TS_ProbabilisticScorer_as_Score(uint32_t this_arg) {
+	LDKProbabilisticScorer this_arg_conv;
 	this_arg_conv.inner = (void*)(this_arg & (~1));
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKScore* ret_ret = MALLOC(sizeof(LDKScore), "LDKScore");
-	*ret_ret = Scorer_as_Score(&this_arg_conv);
-	return (uintptr_t)ret_ret;
+	*ret_ret = ProbabilisticScorer_as_Score(&this_arg_conv);
+	return (uint32_t)ret_ret;
 }
 
-int8_tArray  __attribute__((export_name("TS_Scorer_write"))) TS_Scorer_write(uint32_t obj) {
-	LDKScorer obj_conv;
+int8_tArray  __attribute__((export_name("TS_ProbabilisticScorer_write"))) TS_ProbabilisticScorer_write(uint32_t obj) {
+	LDKProbabilisticScorer 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);
+	LDKCVec_u8Z ret_var = ProbabilisticScorer_write(&obj_conv);
 	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
 	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
 	CVec_u8Z_free(ret_var);
 	return ret_arr;
 }
 
-uint32_t  __attribute__((export_name("TS_Scorer_read"))) TS_Scorer_read(int8_tArray ser) {
+uint32_t  __attribute__((export_name("TS_ProbabilisticScorer_read"))) TS_ProbabilisticScorer_read(int8_tArray ser, uint32_t arg_a, uint32_t arg_b, uint32_t arg_c) {
 	LDKu8slice ser_ref;
 	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
-	LDKCResult_ScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ScorerDecodeErrorZ), "LDKCResult_ScorerDecodeErrorZ");
-	*ret_conv = Scorer_read(ser_ref);
-	return (uintptr_t)ret_conv;
+	ser_ref.data = ser->elems;
+	LDKProbabilisticScoringParameters arg_a_conv;
+	arg_a_conv.inner = (void*)(arg_a & (~1));
+	arg_a_conv.is_owned = (arg_a & 1) || (arg_a == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_a_conv);
+	arg_a_conv = ProbabilisticScoringParameters_clone(&arg_a_conv);
+	LDKNetworkGraph arg_b_conv;
+	arg_b_conv.inner = (void*)(arg_b & (~1));
+	arg_b_conv.is_owned = false;
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_b_conv);
+	void* arg_c_ptr = (void*)(((uintptr_t)arg_c) & ~1);
+	CHECK_ACCESS(arg_c_ptr);
+	LDKLogger arg_c_conv = *(LDKLogger*)(arg_c_ptr);
+	if (arg_c_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&arg_c_conv);
+	}
+	LDKCResult_ProbabilisticScorerDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScorerDecodeErrorZ), "LDKCResult_ProbabilisticScorerDecodeErrorZ");
+	*ret_conv = ProbabilisticScorer_read(ser_ref, arg_a_conv, &arg_b_conv, arg_c_conv);
+	FREE(ser);
+	return (uint32_t)ret_conv;
+}
+
+void  __attribute__((export_name("TS_ParseError_free"))) TS_ParseError_free(uint32_t this_ptr) {
+	if ((this_ptr & 1) != 0) return;
+	void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1);
+	CHECK_ACCESS(this_ptr_ptr);
+	LDKParseError this_ptr_conv = *(LDKParseError*)(this_ptr_ptr);
+	FREE((void*)this_ptr);
+	ParseError_free(this_ptr_conv);
 }
 
-void  __attribute__((export_name("TS_ProbabilisticScoringParameters_free"))) TS_ProbabilisticScoringParameters_free(uint32_t this_obj) {
-	LDKProbabilisticScoringParameters this_obj_conv;
-	this_obj_conv.inner = (void*)(this_obj & (~1));
-	this_obj_conv.is_owned = (this_obj & 1) || (this_obj == 0);
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_obj_conv);
-	ProbabilisticScoringParameters_free(this_obj_conv);
+static inline uintptr_t ParseError_clone_ptr(LDKParseError *NONNULL_PTR arg) {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+uint32_t  __attribute__((export_name("TS_ParseError_clone_ptr"))) TS_ParseError_clone_ptr(uint32_t arg) {
+	LDKParseError* arg_conv = (LDKParseError*)arg;
+	uint32_t ret_conv = ParseError_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
-int64_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(uint32_t this_ptr) {
-	LDKProbabilisticScoringParameters this_ptr_conv;
-	this_ptr_conv.inner = (void*)(this_ptr & (~1));
-	this_ptr_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int64_t ret_val = ProbabilisticScoringParameters_get_liquidity_penalty_multiplier_msat(&this_ptr_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_ParseError_clone"))) TS_ParseError_clone(uint32_t orig) {
+	LDKParseError* orig_conv = (LDKParseError*)orig;
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat"))) TS_ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(uint32_t this_ptr, int64_t val) {
-	LDKProbabilisticScoringParameters this_ptr_conv;
-	this_ptr_conv.inner = (void*)(this_ptr & (~1));
-	this_ptr_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	ProbabilisticScoringParameters_set_liquidity_penalty_multiplier_msat(&this_ptr_conv, val);
+uint32_t  __attribute__((export_name("TS_ParseError_bech32_error"))) TS_ParseError_bech32_error(uint32_t a) {
+	void* a_ptr = (void*)(((uintptr_t)a) & ~1);
+	CHECK_ACCESS(a_ptr);
+	LDKBech32Error a_conv = *(LDKBech32Error*)(a_ptr);
+	a_conv = Bech32Error_clone((LDKBech32Error*)(((uintptr_t)a) & ~1));
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_bech32_error(a_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-int64_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_get_liquidity_offset_half_life(uint32_t this_ptr) {
-	LDKProbabilisticScoringParameters this_ptr_conv;
-	this_ptr_conv.inner = (void*)(this_ptr & (~1));
-	this_ptr_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	int64_t ret_val = ProbabilisticScoringParameters_get_liquidity_offset_half_life(&this_ptr_conv);
-	return ret_val;
+uint32_t  __attribute__((export_name("TS_ParseError_parse_amount_error"))) TS_ParseError_parse_amount_error(int32_t a) {
+	
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_parse_amount_error((LDKError){ ._dummy = 0 });
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-void  __attribute__((export_name("TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life"))) TS_ProbabilisticScoringParameters_set_liquidity_offset_half_life(uint32_t this_ptr, int64_t val) {
-	LDKProbabilisticScoringParameters this_ptr_conv;
-	this_ptr_conv.inner = (void*)(this_ptr & (~1));
-	this_ptr_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
-	ProbabilisticScoringParameters_set_liquidity_offset_half_life(&this_ptr_conv, val);
+uint32_t  __attribute__((export_name("TS_ParseError_malformed_signature"))) TS_ParseError_malformed_signature(uint32_t a) {
+	LDKSecp256k1Error a_conv = LDKSecp256k1Error_from_js(a);
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_malformed_signature(a_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_new"))) TS_ProbabilisticScoringParameters_new(int64_t liquidity_penalty_multiplier_msat_arg, int64_t liquidity_offset_half_life_arg) {
-	LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_new(liquidity_penalty_multiplier_msat_arg, liquidity_offset_half_life_arg);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
+uint32_t  __attribute__((export_name("TS_ParseError_bad_prefix"))) TS_ParseError_bad_prefix() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_bad_prefix();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-static inline uintptr_t ProbabilisticScoringParameters_clone_ptr(LDKProbabilisticScoringParameters *NONNULL_PTR arg) {
-	LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_clone(arg);
-uintptr_t ret_ref = 0;
-CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-ret_ref = (uintptr_t)ret_var.inner;
-if (ret_var.is_owned) {
-	ret_ref |= 1;
+uint32_t  __attribute__((export_name("TS_ParseError_unknown_currency"))) TS_ParseError_unknown_currency() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_unknown_currency();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
+
+uint32_t  __attribute__((export_name("TS_ParseError_unknown_si_prefix"))) TS_ParseError_unknown_si_prefix() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_unknown_si_prefix();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_clone_ptr"))) TS_ProbabilisticScoringParameters_clone_ptr(uint32_t arg) {
-	LDKProbabilisticScoringParameters arg_conv;
-	arg_conv.inner = (void*)(arg & (~1));
-	arg_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(arg_conv);
-	intptr_t ret_val = ProbabilisticScoringParameters_clone_ptr(&arg_conv);
-	return ret_val;
+
+uint32_t  __attribute__((export_name("TS_ParseError_malformed_hrp"))) TS_ParseError_malformed_hrp() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_malformed_hrp();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_clone"))) TS_ProbabilisticScoringParameters_clone(uint32_t orig) {
-	LDKProbabilisticScoringParameters orig_conv;
-	orig_conv.inner = (void*)(orig & (~1));
-	orig_conv.is_owned = false;
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
-	LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
+uint32_t  __attribute__((export_name("TS_ParseError_too_short_data_part"))) TS_ParseError_too_short_data_part() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_too_short_data_part();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-int8_tArray  __attribute__((export_name("TS_ProbabilisticScoringParameters_write"))) TS_ProbabilisticScoringParameters_write(uint32_t obj) {
-	LDKProbabilisticScoringParameters 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 = ProbabilisticScoringParameters_write(&obj_conv);
-	int8_tArray ret_arr = init_int8_tArray(ret_var.datalen, __LINE__);
-	memcpy(ret_arr->elems, ret_var.data, ret_var.datalen);
-	CVec_u8Z_free(ret_var);
-	return ret_arr;
+uint32_t  __attribute__((export_name("TS_ParseError_unexpected_end_of_tagged_fields"))) TS_ParseError_unexpected_end_of_tagged_fields() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_unexpected_end_of_tagged_fields();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_read"))) TS_ProbabilisticScoringParameters_read(int8_tArray ser) {
-	LDKu8slice ser_ref;
-	ser_ref.datalen = ser->arr_len;
-	ser_ref.data = ser->elems /* XXX ser leaks */;
-	LDKCResult_ProbabilisticScoringParametersDecodeErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_ProbabilisticScoringParametersDecodeErrorZ), "LDKCResult_ProbabilisticScoringParametersDecodeErrorZ");
-	*ret_conv = ProbabilisticScoringParameters_read(ser_ref);
-	return (uintptr_t)ret_conv;
+uint32_t  __attribute__((export_name("TS_ParseError_description_decode_error"))) TS_ParseError_description_decode_error(int32_t a) {
+	
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_description_decode_error((LDKError){ ._dummy = 0 });
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_ProbabilisticScoringParameters_default"))) TS_ProbabilisticScoringParameters_default() {
-	LDKProbabilisticScoringParameters ret_var = ProbabilisticScoringParameters_default();
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
+uint32_t  __attribute__((export_name("TS_ParseError_padding_error"))) TS_ParseError_padding_error() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_padding_error();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ParseError_integer_overflow_error"))) TS_ParseError_integer_overflow_error() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_integer_overflow_error();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ParseError_invalid_seg_wit_program_length"))) TS_ParseError_invalid_seg_wit_program_length() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_invalid_seg_wit_program_length();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ParseError_invalid_pub_key_hash_length"))) TS_ParseError_invalid_pub_key_hash_length() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_invalid_pub_key_hash_length();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ParseError_invalid_script_hash_length"))) TS_ParseError_invalid_script_hash_length() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_invalid_script_hash_length();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ParseError_invalid_recovery_id"))) TS_ParseError_invalid_recovery_id() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_invalid_recovery_id();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ParseError_invalid_slice_length"))) TS_ParseError_invalid_slice_length(jstring a) {
+	LDKStr a_conv = str_ref_to_owned_c(a);
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_invalid_slice_length(a_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ParseError_skip"))) TS_ParseError_skip() {
+	LDKParseError *ret_copy = MALLOC(sizeof(LDKParseError), "LDKParseError");
+	*ret_copy = ParseError_skip();
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+void  __attribute__((export_name("TS_ParseOrSemanticError_free"))) TS_ParseOrSemanticError_free(uint32_t this_ptr) {
+	if ((this_ptr & 1) != 0) return;
+	void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1);
+	CHECK_ACCESS(this_ptr_ptr);
+	LDKParseOrSemanticError this_ptr_conv = *(LDKParseOrSemanticError*)(this_ptr_ptr);
+	FREE((void*)this_ptr);
+	ParseOrSemanticError_free(this_ptr_conv);
+}
+
+static inline uintptr_t ParseOrSemanticError_clone_ptr(LDKParseOrSemanticError *NONNULL_PTR arg) {
+	LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError");
+	*ret_copy = ParseOrSemanticError_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+uint32_t  __attribute__((export_name("TS_ParseOrSemanticError_clone_ptr"))) TS_ParseOrSemanticError_clone_ptr(uint32_t arg) {
+	LDKParseOrSemanticError* arg_conv = (LDKParseOrSemanticError*)arg;
+	uint32_t ret_conv = ParseOrSemanticError_clone_ptr(arg_conv);
+	return ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_ParseOrSemanticError_clone"))) TS_ParseOrSemanticError_clone(uint32_t orig) {
+	LDKParseOrSemanticError* orig_conv = (LDKParseOrSemanticError*)orig;
+	LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError");
+	*ret_copy = ParseOrSemanticError_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ParseOrSemanticError_parse_error"))) TS_ParseOrSemanticError_parse_error(uint32_t a) {
+	void* a_ptr = (void*)(((uintptr_t)a) & ~1);
+	CHECK_ACCESS(a_ptr);
+	LDKParseError a_conv = *(LDKParseError*)(a_ptr);
+	a_conv = ParseError_clone((LDKParseError*)(((uintptr_t)a) & ~1));
+	LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError");
+	*ret_copy = ParseOrSemanticError_parse_error(a_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
+	return ret_ref;
+}
+
+uint32_t  __attribute__((export_name("TS_ParseOrSemanticError_semantic_error"))) TS_ParseOrSemanticError_semantic_error(uint32_t a) {
+	LDKSemanticError a_conv = LDKSemanticError_from_js(a);
+	LDKParseOrSemanticError *ret_copy = MALLOC(sizeof(LDKParseOrSemanticError), "LDKParseOrSemanticError");
+	*ret_copy = ParseOrSemanticError_semantic_error(a_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -38915,13 +42638,13 @@ jboolean  __attribute__((export_name("TS_Invoice_eq"))) TS_Invoice_eq(uint32_t a
 	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;
+	jboolean ret_conv = Invoice_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 static inline uintptr_t Invoice_clone_ptr(LDKInvoice *NONNULL_PTR arg) {
 	LDKInvoice ret_var = Invoice_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38931,13 +42654,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Invoice_clone_ptr"))) TS_Invoice_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Invoice_clone_ptr"))) 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);
-	intptr_t ret_val = Invoice_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Invoice_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Invoice_clone"))) TS_Invoice_clone(uint32_t orig) {
@@ -38946,7 +42669,7 @@ uint32_t  __attribute__((export_name("TS_Invoice_clone"))) TS_Invoice_clone(uint
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInvoice ret_var = Invoice_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38974,13 +42697,13 @@ jboolean  __attribute__((export_name("TS_SignedRawInvoice_eq"))) TS_SignedRawInv
 	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;
+	jboolean ret_conv = SignedRawInvoice_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 static inline uintptr_t SignedRawInvoice_clone_ptr(LDKSignedRawInvoice *NONNULL_PTR arg) {
 	LDKSignedRawInvoice ret_var = SignedRawInvoice_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -38990,13 +42713,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_SignedRawInvoice_clone_ptr"))) TS_SignedRawInvoice_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_SignedRawInvoice_clone_ptr"))) 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);
-	intptr_t ret_val = SignedRawInvoice_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = SignedRawInvoice_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_SignedRawInvoice_clone"))) TS_SignedRawInvoice_clone(uint32_t orig) {
@@ -39005,7 +42728,7 @@ uint32_t  __attribute__((export_name("TS_SignedRawInvoice_clone"))) TS_SignedRaw
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKSignedRawInvoice ret_var = SignedRawInvoice_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39030,7 +42753,7 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_get_data"))) TS_RawInvoice_g
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKRawDataPart ret_var = RawInvoice_get_data(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39063,13 +42786,13 @@ jboolean  __attribute__((export_name("TS_RawInvoice_eq"))) TS_RawInvoice_eq(uint
 	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;
+	jboolean ret_conv = RawInvoice_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 static inline uintptr_t RawInvoice_clone_ptr(LDKRawInvoice *NONNULL_PTR arg) {
 	LDKRawInvoice ret_var = RawInvoice_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39079,13 +42802,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_RawInvoice_clone_ptr"))) TS_RawInvoice_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_RawInvoice_clone_ptr"))) 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);
-	intptr_t ret_val = RawInvoice_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = RawInvoice_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RawInvoice_clone"))) TS_RawInvoice_clone(uint32_t orig) {
@@ -39094,7 +42817,7 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_clone"))) TS_RawInvoice_clon
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRawInvoice ret_var = RawInvoice_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39119,7 +42842,7 @@ uint32_t  __attribute__((export_name("TS_RawDataPart_get_timestamp"))) TS_RawDat
 	this_ptr_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_ptr_conv);
 	LDKPositiveTimestamp ret_var = RawDataPart_get_timestamp(&this_ptr_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39152,13 +42875,13 @@ jboolean  __attribute__((export_name("TS_RawDataPart_eq"))) TS_RawDataPart_eq(ui
 	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;
+	jboolean ret_conv = RawDataPart_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 static inline uintptr_t RawDataPart_clone_ptr(LDKRawDataPart *NONNULL_PTR arg) {
 	LDKRawDataPart ret_var = RawDataPart_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39168,13 +42891,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_RawDataPart_clone_ptr"))) TS_RawDataPart_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_RawDataPart_clone_ptr"))) 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);
-	intptr_t ret_val = RawDataPart_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = RawDataPart_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_RawDataPart_clone"))) TS_RawDataPart_clone(uint32_t orig) {
@@ -39183,7 +42906,7 @@ uint32_t  __attribute__((export_name("TS_RawDataPart_clone"))) TS_RawDataPart_cl
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKRawDataPart ret_var = RawDataPart_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39211,13 +42934,13 @@ jboolean  __attribute__((export_name("TS_PositiveTimestamp_eq"))) TS_PositiveTim
 	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;
+	jboolean ret_conv = PositiveTimestamp_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 static inline uintptr_t PositiveTimestamp_clone_ptr(LDKPositiveTimestamp *NONNULL_PTR arg) {
 	LDKPositiveTimestamp ret_var = PositiveTimestamp_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39227,13 +42950,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_PositiveTimestamp_clone_ptr"))) TS_PositiveTimestamp_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_PositiveTimestamp_clone_ptr"))) 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);
-	intptr_t ret_val = PositiveTimestamp_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = PositiveTimestamp_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PositiveTimestamp_clone"))) TS_PositiveTimestamp_clone(uint32_t orig) {
@@ -39242,7 +42965,7 @@ uint32_t  __attribute__((export_name("TS_PositiveTimestamp_clone"))) TS_Positive
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPositiveTimestamp ret_var = PositiveTimestamp_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39282,14 +43005,14 @@ uint32_t  __attribute__((export_name("TS_SiPrefix_pico"))) TS_SiPrefix_pico() {
 jboolean  __attribute__((export_name("TS_SiPrefix_eq"))) TS_SiPrefix_eq(uint32_t a, uint32_t b) {
 	LDKSiPrefix* a_conv = (LDKSiPrefix*)(a & ~1);
 	LDKSiPrefix* b_conv = (LDKSiPrefix*)(b & ~1);
-	jboolean ret_val = SiPrefix_eq(a_conv, b_conv);
-	return ret_val;
+	jboolean ret_conv = SiPrefix_eq(a_conv, b_conv);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_SiPrefix_multiplier"))) TS_SiPrefix_multiplier(uint32_t this_arg) {
 	LDKSiPrefix* this_arg_conv = (LDKSiPrefix*)(this_arg & ~1);
-	int64_t ret_val = SiPrefix_multiplier(this_arg_conv);
-	return ret_val;
+	int64_t ret_conv = SiPrefix_multiplier(this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Currency_clone"))) TS_Currency_clone(uint32_t orig) {
@@ -39325,15 +43048,15 @@ uint32_t  __attribute__((export_name("TS_Currency_signet"))) TS_Currency_signet(
 
 int64_t  __attribute__((export_name("TS_Currency_hash"))) TS_Currency_hash(uint32_t o) {
 	LDKCurrency* o_conv = (LDKCurrency*)(o & ~1);
-	int64_t ret_val = Currency_hash(o_conv);
-	return ret_val;
+	int64_t ret_conv = Currency_hash(o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_Currency_eq"))) TS_Currency_eq(uint32_t a, uint32_t b) {
 	LDKCurrency* a_conv = (LDKCurrency*)(a & ~1);
 	LDKCurrency* b_conv = (LDKCurrency*)(b & ~1);
-	jboolean ret_val = Currency_eq(a_conv, b_conv);
-	return ret_val;
+	jboolean ret_conv = Currency_eq(a_conv, b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_Sha256_free"))) TS_Sha256_free(uint32_t this_obj) {
@@ -39346,7 +43069,7 @@ void  __attribute__((export_name("TS_Sha256_free"))) TS_Sha256_free(uint32_t thi
 
 static inline uintptr_t Sha256_clone_ptr(LDKSha256 *NONNULL_PTR arg) {
 	LDKSha256 ret_var = Sha256_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39356,13 +43079,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Sha256_clone_ptr"))) TS_Sha256_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Sha256_clone_ptr"))) 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);
-	intptr_t ret_val = Sha256_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Sha256_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Sha256_clone"))) TS_Sha256_clone(uint32_t orig) {
@@ -39371,7 +43094,7 @@ uint32_t  __attribute__((export_name("TS_Sha256_clone"))) TS_Sha256_clone(uint32
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKSha256 ret_var = Sha256_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39387,8 +43110,8 @@ int64_t  __attribute__((export_name("TS_Sha256_hash"))) TS_Sha256_hash(uint32_t
 	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;
+	int64_t ret_conv = Sha256_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_Sha256_eq"))) TS_Sha256_eq(uint32_t a, uint32_t b) {
@@ -39400,8 +43123,8 @@ jboolean  __attribute__((export_name("TS_Sha256_eq"))) TS_Sha256_eq(uint32_t a,
 	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;
+	jboolean ret_conv = Sha256_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_Description_free"))) TS_Description_free(uint32_t this_obj) {
@@ -39414,7 +43137,7 @@ void  __attribute__((export_name("TS_Description_free"))) TS_Description_free(ui
 
 static inline uintptr_t Description_clone_ptr(LDKDescription *NONNULL_PTR arg) {
 	LDKDescription ret_var = Description_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39424,13 +43147,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Description_clone_ptr"))) TS_Description_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Description_clone_ptr"))) 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);
-	intptr_t ret_val = Description_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Description_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Description_clone"))) TS_Description_clone(uint32_t orig) {
@@ -39439,7 +43162,7 @@ uint32_t  __attribute__((export_name("TS_Description_clone"))) TS_Description_cl
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKDescription ret_var = Description_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39455,8 +43178,8 @@ int64_t  __attribute__((export_name("TS_Description_hash"))) TS_Description_hash
 	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;
+	int64_t ret_conv = Description_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_Description_eq"))) TS_Description_eq(uint32_t a, uint32_t b) {
@@ -39468,8 +43191,8 @@ jboolean  __attribute__((export_name("TS_Description_eq"))) TS_Description_eq(ui
 	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;
+	jboolean ret_conv = Description_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_PayeePubKey_free"))) TS_PayeePubKey_free(uint32_t this_obj) {
@@ -39506,7 +43229,7 @@ uint32_t  __attribute__((export_name("TS_PayeePubKey_new"))) TS_PayeePubKey_new(
 	CHECK(a_arg->arr_len == 33);
 	memcpy(a_arg_ref.compressed_form, a_arg->elems, 33); FREE(a_arg);
 	LDKPayeePubKey ret_var = PayeePubKey_new(a_arg_ref);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39519,7 +43242,7 @@ uint32_t  __attribute__((export_name("TS_PayeePubKey_new"))) TS_PayeePubKey_new(
 
 static inline uintptr_t PayeePubKey_clone_ptr(LDKPayeePubKey *NONNULL_PTR arg) {
 	LDKPayeePubKey ret_var = PayeePubKey_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39529,13 +43252,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_PayeePubKey_clone_ptr"))) TS_PayeePubKey_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_PayeePubKey_clone_ptr"))) 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);
-	intptr_t ret_val = PayeePubKey_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = PayeePubKey_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PayeePubKey_clone"))) TS_PayeePubKey_clone(uint32_t orig) {
@@ -39544,7 +43267,7 @@ uint32_t  __attribute__((export_name("TS_PayeePubKey_clone"))) TS_PayeePubKey_cl
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPayeePubKey ret_var = PayeePubKey_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39560,8 +43283,8 @@ int64_t  __attribute__((export_name("TS_PayeePubKey_hash"))) TS_PayeePubKey_hash
 	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;
+	int64_t ret_conv = PayeePubKey_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_PayeePubKey_eq"))) TS_PayeePubKey_eq(uint32_t a, uint32_t b) {
@@ -39573,8 +43296,8 @@ jboolean  __attribute__((export_name("TS_PayeePubKey_eq"))) TS_PayeePubKey_eq(ui
 	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;
+	jboolean ret_conv = PayeePubKey_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_ExpiryTime_free"))) TS_ExpiryTime_free(uint32_t this_obj) {
@@ -39587,7 +43310,7 @@ void  __attribute__((export_name("TS_ExpiryTime_free"))) TS_ExpiryTime_free(uint
 
 static inline uintptr_t ExpiryTime_clone_ptr(LDKExpiryTime *NONNULL_PTR arg) {
 	LDKExpiryTime ret_var = ExpiryTime_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39597,13 +43320,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_ExpiryTime_clone_ptr"))) TS_ExpiryTime_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_ExpiryTime_clone_ptr"))) 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);
-	intptr_t ret_val = ExpiryTime_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = ExpiryTime_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_ExpiryTime_clone"))) TS_ExpiryTime_clone(uint32_t orig) {
@@ -39612,7 +43335,7 @@ uint32_t  __attribute__((export_name("TS_ExpiryTime_clone"))) TS_ExpiryTime_clon
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKExpiryTime ret_var = ExpiryTime_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39628,8 +43351,8 @@ int64_t  __attribute__((export_name("TS_ExpiryTime_hash"))) TS_ExpiryTime_hash(u
 	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;
+	int64_t ret_conv = ExpiryTime_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_ExpiryTime_eq"))) TS_ExpiryTime_eq(uint32_t a, uint32_t b) {
@@ -39641,8 +43364,8 @@ jboolean  __attribute__((export_name("TS_ExpiryTime_eq"))) TS_ExpiryTime_eq(uint
 	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;
+	jboolean ret_conv = ExpiryTime_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_MinFinalCltvExpiry_free"))) TS_MinFinalCltvExpiry_free(uint32_t this_obj) {
@@ -39658,8 +43381,8 @@ int64_t  __attribute__((export_name("TS_MinFinalCltvExpiry_get_a"))) TS_MinFinal
 	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;
+	int64_t ret_conv = MinFinalCltvExpiry_get_a(&this_ptr_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_MinFinalCltvExpiry_set_a"))) TS_MinFinalCltvExpiry_set_a(uint32_t this_ptr, int64_t val) {
@@ -39672,7 +43395,7 @@ void  __attribute__((export_name("TS_MinFinalCltvExpiry_set_a"))) TS_MinFinalClt
 
 uint32_t  __attribute__((export_name("TS_MinFinalCltvExpiry_new"))) TS_MinFinalCltvExpiry_new(int64_t a_arg) {
 	LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_new(a_arg);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39685,7 +43408,7 @@ uint32_t  __attribute__((export_name("TS_MinFinalCltvExpiry_new"))) TS_MinFinalC
 
 static inline uintptr_t MinFinalCltvExpiry_clone_ptr(LDKMinFinalCltvExpiry *NONNULL_PTR arg) {
 	LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39695,13 +43418,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_MinFinalCltvExpiry_clone_ptr"))) TS_MinFinalCltvExpiry_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_MinFinalCltvExpiry_clone_ptr"))) 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);
-	intptr_t ret_val = MinFinalCltvExpiry_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = MinFinalCltvExpiry_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_MinFinalCltvExpiry_clone"))) TS_MinFinalCltvExpiry_clone(uint32_t orig) {
@@ -39710,7 +43433,7 @@ uint32_t  __attribute__((export_name("TS_MinFinalCltvExpiry_clone"))) TS_MinFina
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKMinFinalCltvExpiry ret_var = MinFinalCltvExpiry_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39726,8 +43449,8 @@ int64_t  __attribute__((export_name("TS_MinFinalCltvExpiry_hash"))) TS_MinFinalC
 	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;
+	int64_t ret_conv = MinFinalCltvExpiry_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_MinFinalCltvExpiry_eq"))) TS_MinFinalCltvExpiry_eq(uint32_t a, uint32_t b) {
@@ -39739,8 +43462,8 @@ jboolean  __attribute__((export_name("TS_MinFinalCltvExpiry_eq"))) TS_MinFinalCl
 	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;
+	jboolean ret_conv = MinFinalCltvExpiry_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_Fallback_free"))) TS_Fallback_free(uint32_t this_ptr) {
@@ -39755,20 +43478,20 @@ void  __attribute__((export_name("TS_Fallback_free"))) TS_Fallback_free(uint32_t
 static inline uintptr_t Fallback_clone_ptr(LDKFallback *NONNULL_PTR arg) {
 	LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback");
 	*ret_copy = Fallback_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_Fallback_clone_ptr"))) TS_Fallback_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_Fallback_clone_ptr"))) TS_Fallback_clone_ptr(uint32_t arg) {
 	LDKFallback* arg_conv = (LDKFallback*)arg;
-	intptr_t ret_val = Fallback_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = Fallback_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Fallback_clone"))) TS_Fallback_clone(uint32_t orig) {
 	LDKFallback* orig_conv = (LDKFallback*)orig;
 	LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback");
 	*ret_copy = Fallback_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -39780,7 +43503,7 @@ uint32_t  __attribute__((export_name("TS_Fallback_seg_wit_program"))) TS_Fallbac
 	memcpy(program_ref.data, program->elems, program_ref.datalen); FREE(program);
 	LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback");
 	*ret_copy = Fallback_seg_wit_program((LDKu5){ ._0 = version }, program_ref);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -39790,7 +43513,7 @@ uint32_t  __attribute__((export_name("TS_Fallback_pub_key_hash"))) TS_Fallback_p
 	memcpy(a_ref.data, a->elems, 20); FREE(a);
 	LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback");
 	*ret_copy = Fallback_pub_key_hash(a_ref);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -39800,21 +43523,21 @@ uint32_t  __attribute__((export_name("TS_Fallback_script_hash"))) TS_Fallback_sc
 	memcpy(a_ref.data, a->elems, 20); FREE(a);
 	LDKFallback *ret_copy = MALLOC(sizeof(LDKFallback), "LDKFallback");
 	*ret_copy = Fallback_script_hash(a_ref);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 int64_t  __attribute__((export_name("TS_Fallback_hash"))) TS_Fallback_hash(uint32_t o) {
 	LDKFallback* o_conv = (LDKFallback*)o;
-	int64_t ret_val = Fallback_hash(o_conv);
-	return ret_val;
+	int64_t ret_conv = Fallback_hash(o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_Fallback_eq"))) TS_Fallback_eq(uint32_t a, uint32_t b) {
 	LDKFallback* a_conv = (LDKFallback*)a;
 	LDKFallback* b_conv = (LDKFallback*)b;
-	jboolean ret_val = Fallback_eq(a_conv, b_conv);
-	return ret_val;
+	jboolean ret_conv = Fallback_eq(a_conv, b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_InvoiceSignature_free"))) TS_InvoiceSignature_free(uint32_t this_obj) {
@@ -39827,7 +43550,7 @@ void  __attribute__((export_name("TS_InvoiceSignature_free"))) TS_InvoiceSignatu
 
 static inline uintptr_t InvoiceSignature_clone_ptr(LDKInvoiceSignature *NONNULL_PTR arg) {
 	LDKInvoiceSignature ret_var = InvoiceSignature_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39837,13 +43560,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_InvoiceSignature_clone_ptr"))) TS_InvoiceSignature_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_InvoiceSignature_clone_ptr"))) 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);
-	intptr_t ret_val = InvoiceSignature_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = InvoiceSignature_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_InvoiceSignature_clone"))) TS_InvoiceSignature_clone(uint32_t orig) {
@@ -39852,7 +43575,7 @@ uint32_t  __attribute__((export_name("TS_InvoiceSignature_clone"))) TS_InvoiceSi
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKInvoiceSignature ret_var = InvoiceSignature_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39872,8 +43595,8 @@ jboolean  __attribute__((export_name("TS_InvoiceSignature_eq"))) TS_InvoiceSigna
 	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;
+	jboolean ret_conv = InvoiceSignature_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_PrivateRoute_free"))) TS_PrivateRoute_free(uint32_t this_obj) {
@@ -39886,7 +43609,7 @@ void  __attribute__((export_name("TS_PrivateRoute_free"))) TS_PrivateRoute_free(
 
 static inline uintptr_t PrivateRoute_clone_ptr(LDKPrivateRoute *NONNULL_PTR arg) {
 	LDKPrivateRoute ret_var = PrivateRoute_clone(arg);
-uintptr_t ret_ref = 0;
+uint32_t ret_ref = 0;
 CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39896,13 +43619,13 @@ if (ret_var.is_owned) {
 }
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_PrivateRoute_clone_ptr"))) TS_PrivateRoute_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_PrivateRoute_clone_ptr"))) 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);
-	intptr_t ret_val = PrivateRoute_clone_ptr(&arg_conv);
-	return ret_val;
+	uint32_t ret_conv = PrivateRoute_clone_ptr(&arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PrivateRoute_clone"))) TS_PrivateRoute_clone(uint32_t orig) {
@@ -39911,7 +43634,7 @@ uint32_t  __attribute__((export_name("TS_PrivateRoute_clone"))) TS_PrivateRoute_
 	orig_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(orig_conv);
 	LDKPrivateRoute ret_var = PrivateRoute_clone(&orig_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39927,8 +43650,8 @@ int64_t  __attribute__((export_name("TS_PrivateRoute_hash"))) TS_PrivateRoute_ha
 	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;
+	int64_t ret_conv = PrivateRoute_hash(&o_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_PrivateRoute_eq"))) TS_PrivateRoute_eq(uint32_t a, uint32_t b) {
@@ -39940,8 +43663,8 @@ jboolean  __attribute__((export_name("TS_PrivateRoute_eq"))) TS_PrivateRoute_eq(
 	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;
+	jboolean ret_conv = PrivateRoute_eq(&a_conv, &b_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_SignedRawInvoice_into_parts"))) TS_SignedRawInvoice_into_parts(uint32_t this_arg) {
@@ -39952,7 +43675,7 @@ uint32_t  __attribute__((export_name("TS_SignedRawInvoice_into_parts"))) TS_Sign
 	this_arg_conv = SignedRawInvoice_clone(&this_arg_conv);
 	LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ* ret_conv = MALLOC(sizeof(LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ), "LDKC3Tuple_RawInvoice_u832InvoiceSignatureZ");
 	*ret_conv = SignedRawInvoice_into_parts(this_arg_conv);
-	return ((uintptr_t)ret_conv);
+	return ((uint32_t)ret_conv);
 }
 
 uint32_t  __attribute__((export_name("TS_SignedRawInvoice_raw_invoice"))) TS_SignedRawInvoice_raw_invoice(uint32_t this_arg) {
@@ -39961,7 +43684,7 @@ uint32_t  __attribute__((export_name("TS_SignedRawInvoice_raw_invoice"))) TS_Sig
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKRawInvoice ret_var = SignedRawInvoice_raw_invoice(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -39988,7 +43711,7 @@ uint32_t  __attribute__((export_name("TS_SignedRawInvoice_signature"))) TS_Signe
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKInvoiceSignature ret_var = SignedRawInvoice_signature(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -40006,7 +43729,7 @@ uint32_t  __attribute__((export_name("TS_SignedRawInvoice_recover_payee_pub_key"
 	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 (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_SignedRawInvoice_check_signature"))) TS_SignedRawInvoice_check_signature(uint32_t this_arg) {
@@ -40014,8 +43737,8 @@ jboolean  __attribute__((export_name("TS_SignedRawInvoice_check_signature"))) TS
 	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;
+	jboolean ret_conv = SignedRawInvoice_check_signature(&this_arg_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_RawInvoice_hash"))) TS_RawInvoice_hash(uint32_t this_arg) {
@@ -40034,7 +43757,7 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_payment_hash"))) TS_RawInvoi
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKSha256 ret_var = RawInvoice_payment_hash(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -40053,7 +43776,7 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_description"))) TS_RawInvoic
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKDescription ret_var = RawInvoice_description(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -40072,7 +43795,7 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_payee_pub_key"))) TS_RawInvo
 	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);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -40091,7 +43814,7 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_description_hash"))) TS_RawI
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKSha256 ret_var = RawInvoice_description_hash(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -40110,7 +43833,7 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_expiry_time"))) TS_RawInvoic
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKExpiryTime ret_var = RawInvoice_expiry_time(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -40129,7 +43852,7 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_min_final_cltv_expiry"))) TS
 	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);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -40158,7 +43881,7 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_features"))) TS_RawInvoice_f
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKInvoiceFeatures ret_var = RawInvoice_features(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -40182,7 +43905,7 @@ uint32_tArray  __attribute__((export_name("TS_RawInvoice_private_routes"))) TS_R
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t o = 0; o < ret_var.datalen; o++) {
 		LDKPrivateRoute ret_conv_14_var = ret_var.data[o];
-		uintptr_t ret_conv_14_ref = 0;
+		uint32_t ret_conv_14_ref = 0;
 		CHECK((((uintptr_t)ret_conv_14_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_14_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var);
@@ -40204,7 +43927,7 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_amount_pico_btc"))) TS_RawIn
 	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);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -40220,13 +43943,13 @@ uint32_t  __attribute__((export_name("TS_RawInvoice_currency"))) TS_RawInvoice_c
 uint32_t  __attribute__((export_name("TS_PositiveTimestamp_from_unix_timestamp"))) TS_PositiveTimestamp_from_unix_timestamp(int64_t unix_seconds) {
 	LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ");
 	*ret_conv = PositiveTimestamp_from_unix_timestamp(unix_seconds);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PositiveTimestamp_from_duration_since_epoch"))) TS_PositiveTimestamp_from_duration_since_epoch(int64_t duration) {
 	LDKCResult_PositiveTimestampCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PositiveTimestampCreationErrorZ), "LDKCResult_PositiveTimestampCreationErrorZ");
 	*ret_conv = PositiveTimestamp_from_duration_since_epoch(duration);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_PositiveTimestamp_as_unix_timestamp"))) TS_PositiveTimestamp_as_unix_timestamp(uint32_t this_arg) {
@@ -40234,8 +43957,8 @@ int64_t  __attribute__((export_name("TS_PositiveTimestamp_as_unix_timestamp")))
 	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;
+	int64_t ret_conv = PositiveTimestamp_as_unix_timestamp(&this_arg_conv);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_PositiveTimestamp_as_duration_since_epoch"))) TS_PositiveTimestamp_as_duration_since_epoch(uint32_t this_arg) {
@@ -40243,8 +43966,8 @@ int64_t  __attribute__((export_name("TS_PositiveTimestamp_as_duration_since_epoc
 	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_duration_since_epoch(&this_arg_conv);
-	return ret_val;
+	int64_t ret_conv = PositiveTimestamp_as_duration_since_epoch(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Invoice_into_signed_raw"))) TS_Invoice_into_signed_raw(uint32_t this_arg) {
@@ -40254,7 +43977,7 @@ uint32_t  __attribute__((export_name("TS_Invoice_into_signed_raw"))) TS_Invoice_
 	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);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -40272,7 +43995,7 @@ uint32_t  __attribute__((export_name("TS_Invoice_check_signature"))) TS_Invoice_
 	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 (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Invoice_from_signed"))) TS_Invoice_from_signed(uint32_t signed_invoice) {
@@ -40283,7 +44006,7 @@ uint32_t  __attribute__((export_name("TS_Invoice_from_signed"))) TS_Invoice_from
 	signed_invoice_conv = SignedRawInvoice_clone(&signed_invoice_conv);
 	LDKCResult_InvoiceSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSemanticErrorZ), "LDKCResult_InvoiceSemanticErrorZ");
 	*ret_conv = Invoice_from_signed(signed_invoice_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_Invoice_duration_since_epoch"))) TS_Invoice_duration_since_epoch(uint32_t this_arg) {
@@ -40291,8 +44014,8 @@ int64_t  __attribute__((export_name("TS_Invoice_duration_since_epoch"))) TS_Invo
 	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_duration_since_epoch(&this_arg_conv);
-	return ret_val;
+	int64_t ret_conv = Invoice_duration_since_epoch(&this_arg_conv);
+	return ret_conv;
 }
 
 int8_tArray  __attribute__((export_name("TS_Invoice_payment_hash"))) TS_Invoice_payment_hash(uint32_t this_arg) {
@@ -40331,7 +44054,7 @@ uint32_t  __attribute__((export_name("TS_Invoice_features"))) TS_Invoice_feature
 	this_arg_conv.is_owned = false;
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(this_arg_conv);
 	LDKInvoiceFeatures ret_var = Invoice_features(&this_arg_conv);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	if ((uintptr_t)ret_var.inner > 4096) {
 		CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
@@ -40359,8 +44082,8 @@ int64_t  __attribute__((export_name("TS_Invoice_expiry_time"))) TS_Invoice_expir
 	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;
+	int64_t ret_conv = Invoice_expiry_time(&this_arg_conv);
+	return ret_conv;
 }
 
 jboolean  __attribute__((export_name("TS_Invoice_would_expire"))) TS_Invoice_would_expire(uint32_t this_arg, int64_t at_time) {
@@ -40368,8 +44091,8 @@ jboolean  __attribute__((export_name("TS_Invoice_would_expire"))) TS_Invoice_wou
 	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_would_expire(&this_arg_conv, at_time);
-	return ret_val;
+	jboolean ret_conv = Invoice_would_expire(&this_arg_conv, at_time);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_Invoice_min_final_cltv_expiry"))) TS_Invoice_min_final_cltv_expiry(uint32_t this_arg) {
@@ -40377,8 +44100,8 @@ int64_t  __attribute__((export_name("TS_Invoice_min_final_cltv_expiry"))) TS_Inv
 	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;
+	int64_t ret_conv = Invoice_min_final_cltv_expiry(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_tArray  __attribute__((export_name("TS_Invoice_private_routes"))) TS_Invoice_private_routes(uint32_t this_arg) {
@@ -40392,7 +44115,7 @@ uint32_tArray  __attribute__((export_name("TS_Invoice_private_routes"))) TS_Invo
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t o = 0; o < ret_var.datalen; o++) {
 		LDKPrivateRoute ret_conv_14_var = ret_var.data[o];
-		uintptr_t ret_conv_14_ref = 0;
+		uint32_t ret_conv_14_ref = 0;
 		CHECK((((uintptr_t)ret_conv_14_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_14_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_14_var);
@@ -40418,7 +44141,7 @@ uint32_tArray  __attribute__((export_name("TS_Invoice_route_hints"))) TS_Invoice
 	uint32_t *ret_arr_ptr = (uint32_t*)(((uint8_t*)ret_arr) + 4);
 	for (size_t l = 0; l < ret_var.datalen; l++) {
 		LDKRouteHint ret_conv_11_var = ret_var.data[l];
-		uintptr_t ret_conv_11_ref = 0;
+		uint32_t ret_conv_11_ref = 0;
 		CHECK((((uintptr_t)ret_conv_11_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 		CHECK((((uintptr_t)&ret_conv_11_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 		CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_conv_11_var);
@@ -40449,7 +44172,7 @@ uint32_t  __attribute__((export_name("TS_Invoice_amount_milli_satoshis"))) TS_In
 	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);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -40457,7 +44180,7 @@ uint32_t  __attribute__((export_name("TS_Description_new"))) TS_Description_new(
 	LDKStr description_conv = str_ref_to_owned_c(description);
 	LDKCResult_DescriptionCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_DescriptionCreationErrorZ), "LDKCResult_DescriptionCreationErrorZ");
 	*ret_conv = Description_new(description_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 jstring  __attribute__((export_name("TS_Description_into_inner"))) TS_Description_into_inner(uint32_t this_arg) {
@@ -40474,7 +44197,7 @@ jstring  __attribute__((export_name("TS_Description_into_inner"))) TS_Descriptio
 
 uint32_t  __attribute__((export_name("TS_ExpiryTime_from_seconds"))) TS_ExpiryTime_from_seconds(int64_t seconds) {
 	LDKExpiryTime ret_var = ExpiryTime_from_seconds(seconds);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -40487,7 +44210,7 @@ uint32_t  __attribute__((export_name("TS_ExpiryTime_from_seconds"))) TS_ExpiryTi
 
 uint32_t  __attribute__((export_name("TS_ExpiryTime_from_duration"))) TS_ExpiryTime_from_duration(int64_t duration) {
 	LDKExpiryTime ret_var = ExpiryTime_from_duration(duration);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -40503,8 +44226,8 @@ int64_t  __attribute__((export_name("TS_ExpiryTime_as_seconds"))) TS_ExpiryTime_
 	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;
+	int64_t ret_conv = ExpiryTime_as_seconds(&this_arg_conv);
+	return ret_conv;
 }
 
 int64_t  __attribute__((export_name("TS_ExpiryTime_as_duration"))) TS_ExpiryTime_as_duration(uint32_t this_arg) {
@@ -40512,8 +44235,8 @@ int64_t  __attribute__((export_name("TS_ExpiryTime_as_duration"))) TS_ExpiryTime
 	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;
+	int64_t ret_conv = ExpiryTime_as_duration(&this_arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PrivateRoute_new"))) TS_PrivateRoute_new(uint32_t hops) {
@@ -40524,7 +44247,7 @@ uint32_t  __attribute__((export_name("TS_PrivateRoute_new"))) TS_PrivateRoute_ne
 	hops_conv = RouteHint_clone(&hops_conv);
 	LDKCResult_PrivateRouteCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PrivateRouteCreationErrorZ), "LDKCResult_PrivateRouteCreationErrorZ");
 	*ret_conv = PrivateRoute_new(hops_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PrivateRoute_into_inner"))) TS_PrivateRoute_into_inner(uint32_t this_arg) {
@@ -40534,7 +44257,7 @@ uint32_t  __attribute__((export_name("TS_PrivateRoute_into_inner"))) TS_PrivateR
 	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);
-	uintptr_t ret_ref = 0;
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -40579,8 +44302,8 @@ uint32_t  __attribute__((export_name("TS_CreationError_missing_route_hints"))) T
 jboolean  __attribute__((export_name("TS_CreationError_eq"))) TS_CreationError_eq(uint32_t a, uint32_t b) {
 	LDKCreationError* a_conv = (LDKCreationError*)(a & ~1);
 	LDKCreationError* b_conv = (LDKCreationError*)(b & ~1);
-	jboolean ret_val = CreationError_eq(a_conv, b_conv);
-	return ret_val;
+	jboolean ret_conv = CreationError_eq(a_conv, b_conv);
+	return ret_conv;
 }
 
 jstring  __attribute__((export_name("TS_CreationError_to_str"))) TS_CreationError_to_str(uint32_t o) {
@@ -40650,8 +44373,8 @@ uint32_t  __attribute__((export_name("TS_SemanticError_imprecise_amount"))) TS_S
 jboolean  __attribute__((export_name("TS_SemanticError_eq"))) TS_SemanticError_eq(uint32_t a, uint32_t b) {
 	LDKSemanticError* a_conv = (LDKSemanticError*)(a & ~1);
 	LDKSemanticError* b_conv = (LDKSemanticError*)(b & ~1);
-	jboolean ret_val = SemanticError_eq(a_conv, b_conv);
-	return ret_val;
+	jboolean ret_conv = SemanticError_eq(a_conv, b_conv);
+	return ret_conv;
 }
 
 jstring  __attribute__((export_name("TS_SemanticError_to_str"))) TS_SemanticError_to_str(uint32_t o) {
@@ -40674,27 +44397,27 @@ void  __attribute__((export_name("TS_SignOrCreationError_free"))) TS_SignOrCreat
 static inline uintptr_t SignOrCreationError_clone_ptr(LDKSignOrCreationError *NONNULL_PTR arg) {
 	LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError");
 	*ret_copy = SignOrCreationError_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_SignOrCreationError_clone_ptr"))) TS_SignOrCreationError_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_SignOrCreationError_clone_ptr"))) TS_SignOrCreationError_clone_ptr(uint32_t arg) {
 	LDKSignOrCreationError* arg_conv = (LDKSignOrCreationError*)arg;
-	intptr_t ret_val = SignOrCreationError_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = SignOrCreationError_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_SignOrCreationError_clone"))) TS_SignOrCreationError_clone(uint32_t orig) {
 	LDKSignOrCreationError* orig_conv = (LDKSignOrCreationError*)orig;
 	LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError");
 	*ret_copy = SignOrCreationError_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 uint32_t  __attribute__((export_name("TS_SignOrCreationError_sign_error"))) TS_SignOrCreationError_sign_error() {
 	LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError");
 	*ret_copy = SignOrCreationError_sign_error();
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -40702,15 +44425,15 @@ uint32_t  __attribute__((export_name("TS_SignOrCreationError_creation_error")))
 	LDKCreationError a_conv = LDKCreationError_from_js(a);
 	LDKSignOrCreationError *ret_copy = MALLOC(sizeof(LDKSignOrCreationError), "LDKSignOrCreationError");
 	*ret_copy = SignOrCreationError_creation_error(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
 jboolean  __attribute__((export_name("TS_SignOrCreationError_eq"))) TS_SignOrCreationError_eq(uint32_t a, uint32_t b) {
 	LDKSignOrCreationError* a_conv = (LDKSignOrCreationError*)a;
 	LDKSignOrCreationError* b_conv = (LDKSignOrCreationError*)b;
-	jboolean ret_val = SignOrCreationError_eq(a_conv, b_conv);
-	return ret_val;
+	jboolean ret_conv = SignOrCreationError_eq(a_conv, b_conv);
+	return ret_conv;
 }
 
 jstring  __attribute__((export_name("TS_SignOrCreationError_to_str"))) TS_SignOrCreationError_to_str(uint32_t o) {
@@ -40747,102 +44470,53 @@ void  __attribute__((export_name("TS_Router_free"))) TS_Router_free(uint32_t thi
 	Router_free(this_ptr_conv);
 }
 
-void  __attribute__((export_name("TS_RetryAttempts_free"))) TS_RetryAttempts_free(uint32_t this_obj) {
-	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);
-}
-
-intptr_t  __attribute__((export_name("TS_RetryAttempts_get_a"))) TS_RetryAttempts_get_a(uint32_t this_ptr) {
-	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);
-	intptr_t ret_val = RetryAttempts_get_a(&this_ptr_conv);
-	return ret_val;
-}
-
-void  __attribute__((export_name("TS_RetryAttempts_set_a"))) TS_RetryAttempts_set_a(uint32_t this_ptr, intptr_t val) {
-	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);
+void  __attribute__((export_name("TS_Retry_free"))) TS_Retry_free(uint32_t this_ptr) {
+	if ((this_ptr & 1) != 0) return;
+	void* this_ptr_ptr = (void*)(((uintptr_t)this_ptr) & ~1);
+	CHECK_ACCESS(this_ptr_ptr);
+	LDKRetry this_ptr_conv = *(LDKRetry*)(this_ptr_ptr);
+	FREE((void*)this_ptr);
+	Retry_free(this_ptr_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_RetryAttempts_new"))) TS_RetryAttempts_new(intptr_t a_arg) {
-	LDKRetryAttempts ret_var = RetryAttempts_new(a_arg);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
+static inline uintptr_t Retry_clone_ptr(LDKRetry *NONNULL_PTR arg) {
+	LDKRetry *ret_copy = MALLOC(sizeof(LDKRetry), "LDKRetry");
+	*ret_copy = Retry_clone(arg);
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-
-static inline uintptr_t RetryAttempts_clone_ptr(LDKRetryAttempts *NONNULL_PTR arg) {
-	LDKRetryAttempts ret_var = RetryAttempts_clone(arg);
-uintptr_t ret_ref = 0;
-CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-ret_ref = (uintptr_t)ret_var.inner;
-if (ret_var.is_owned) {
-	ret_ref |= 1;
+uint32_t  __attribute__((export_name("TS_Retry_clone_ptr"))) TS_Retry_clone_ptr(uint32_t arg) {
+	LDKRetry* arg_conv = (LDKRetry*)arg;
+	uint32_t ret_conv = Retry_clone_ptr(arg_conv);
+	return ret_conv;
 }
+
+uint32_t  __attribute__((export_name("TS_Retry_clone"))) TS_Retry_clone(uint32_t orig) {
+	LDKRetry* orig_conv = (LDKRetry*)orig;
+	LDKRetry *ret_copy = MALLOC(sizeof(LDKRetry), "LDKRetry");
+	*ret_copy = Retry_clone(orig_conv);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_RetryAttempts_clone_ptr"))) 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);
-	intptr_t ret_val = RetryAttempts_clone_ptr(&arg_conv);
-	return ret_val;
-}
 
-uint32_t  __attribute__((export_name("TS_RetryAttempts_clone"))) 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);
-	uintptr_t ret_ref = 0;
-	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
-	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
-	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
-	ret_ref = (uintptr_t)ret_var.inner;
-	if (ret_var.is_owned) {
-		ret_ref |= 1;
-	}
+uint32_t  __attribute__((export_name("TS_Retry_attempts"))) TS_Retry_attempts(uint32_t a) {
+	LDKRetry *ret_copy = MALLOC(sizeof(LDKRetry), "LDKRetry");
+	*ret_copy = Retry_attempts(a);
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-jboolean  __attribute__((export_name("TS_RetryAttempts_eq"))) TS_RetryAttempts_eq(uint32_t a, uint32_t b) {
-	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;
+jboolean  __attribute__((export_name("TS_Retry_eq"))) TS_Retry_eq(uint32_t a, uint32_t b) {
+	LDKRetry* a_conv = (LDKRetry*)a;
+	LDKRetry* b_conv = (LDKRetry*)b;
+	jboolean ret_conv = Retry_eq(a_conv, b_conv);
+	return ret_conv;
 }
 
-int64_t  __attribute__((export_name("TS_RetryAttempts_hash"))) 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;
+int64_t  __attribute__((export_name("TS_Retry_hash"))) TS_Retry_hash(uint32_t o) {
+	LDKRetry* o_conv = (LDKRetry*)o;
+	int64_t ret_conv = Retry_hash(o_conv);
+	return ret_conv;
 }
 
 void  __attribute__((export_name("TS_PaymentError_free"))) TS_PaymentError_free(uint32_t this_ptr) {
@@ -40857,20 +44531,20 @@ void  __attribute__((export_name("TS_PaymentError_free"))) TS_PaymentError_free(
 static inline uintptr_t PaymentError_clone_ptr(LDKPaymentError *NONNULL_PTR arg) {
 	LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError");
 	*ret_copy = PaymentError_clone(arg);
-uintptr_t ret_ref = (uintptr_t)ret_copy;
+uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
-intptr_t  __attribute__((export_name("TS_PaymentError_clone_ptr"))) TS_PaymentError_clone_ptr(uint32_t arg) {
+uint32_t  __attribute__((export_name("TS_PaymentError_clone_ptr"))) TS_PaymentError_clone_ptr(uint32_t arg) {
 	LDKPaymentError* arg_conv = (LDKPaymentError*)arg;
-	intptr_t ret_val = PaymentError_clone_ptr(arg_conv);
-	return ret_val;
+	uint32_t ret_conv = PaymentError_clone_ptr(arg_conv);
+	return ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_PaymentError_clone"))) TS_PaymentError_clone(uint32_t orig) {
 	LDKPaymentError* orig_conv = (LDKPaymentError*)orig;
 	LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError");
 	*ret_copy = PaymentError_clone(orig_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -40878,7 +44552,7 @@ uint32_t  __attribute__((export_name("TS_PaymentError_invoice"))) TS_PaymentErro
 	LDKStr a_conv = str_ref_to_owned_c(a);
 	LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError");
 	*ret_copy = PaymentError_invoice(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -40890,7 +44564,7 @@ uint32_t  __attribute__((export_name("TS_PaymentError_routing"))) TS_PaymentErro
 	a_conv = LightningError_clone(&a_conv);
 	LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError");
 	*ret_copy = PaymentError_routing(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
@@ -40901,17 +44575,25 @@ uint32_t  __attribute__((export_name("TS_PaymentError_sending"))) TS_PaymentErro
 	a_conv = PaymentSendFailure_clone((LDKPaymentSendFailure*)(((uintptr_t)a) & ~1));
 	LDKPaymentError *ret_copy = MALLOC(sizeof(LDKPaymentError), "LDKPaymentError");
 	*ret_copy = PaymentError_sending(a_conv);
-	uintptr_t ret_ref = (uintptr_t)ret_copy;
+	uint32_t ret_ref = (uintptr_t)ret_copy;
 	return ret_ref;
 }
 
-uint32_t  __attribute__((export_name("TS_InvoicePayer_new"))) TS_InvoicePayer_new(uint32_t payer, uint32_t router, uint32_t scorer, uint32_t logger, uint32_t event_handler, uint32_t retry_attempts) {
+uint32_t  __attribute__((export_name("TS_InvoicePayer_new"))) TS_InvoicePayer_new(uint32_t payer, uint32_t router, uint32_t scorer, uint32_t logger, uint32_t event_handler, uint32_t retry) {
 	void* payer_ptr = (void*)(((uintptr_t)payer) & ~1);
 	CHECK_ACCESS(payer_ptr);
 	LDKPayer payer_conv = *(LDKPayer*)(payer_ptr);
+	if (payer_conv.free == LDKPayer_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKPayer_JCalls_cloned(&payer_conv);
+	}
 	void* router_ptr = (void*)(((uintptr_t)router) & ~1);
 	CHECK_ACCESS(router_ptr);
 	LDKRouter router_conv = *(LDKRouter*)(router_ptr);
+	if (router_conv.free == LDKRouter_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKRouter_JCalls_cloned(&router_conv);
+	}
 	LDKMultiThreadedLockableScore scorer_conv;
 	scorer_conv.inner = (void*)(scorer & (~1));
 	scorer_conv.is_owned = false;
@@ -40919,16 +44601,23 @@ uint32_t  __attribute__((export_name("TS_InvoicePayer_new"))) TS_InvoicePayer_ne
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
 	void* event_handler_ptr = (void*)(((uintptr_t)event_handler) & ~1);
 	CHECK_ACCESS(event_handler_ptr);
 	LDKEventHandler event_handler_conv = *(LDKEventHandler*)(event_handler_ptr);
-	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);
-	uintptr_t ret_ref = 0;
+	if (event_handler_conv.free == LDKEventHandler_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKEventHandler_JCalls_cloned(&event_handler_conv);
+	}
+	void* retry_ptr = (void*)(((uintptr_t)retry) & ~1);
+	CHECK_ACCESS(retry_ptr);
+	LDKRetry retry_conv = *(LDKRetry*)(retry_ptr);
+	retry_conv = Retry_clone((LDKRetry*)(((uintptr_t)retry) & ~1));
+	LDKInvoicePayer ret_var = InvoicePayer_new(payer_conv, router_conv, &scorer_conv, logger_conv, event_handler_conv, retry_conv);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -40950,7 +44639,7 @@ uint32_t  __attribute__((export_name("TS_InvoicePayer_pay_invoice"))) TS_Invoice
 	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 (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_InvoicePayer_pay_zero_value_invoice"))) TS_InvoicePayer_pay_zero_value_invoice(uint32_t this_arg, uint32_t invoice, int64_t amount_msats) {
@@ -40964,7 +44653,7 @@ uint32_t  __attribute__((export_name("TS_InvoicePayer_pay_zero_value_invoice")))
 	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 (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_InvoicePayer_pay_pubkey"))) TS_InvoicePayer_pay_pubkey(uint32_t this_arg, int8_tArray pubkey, int8_tArray payment_preimage, int64_t amount_msats, int32_t final_cltv_expiry_delta) {
@@ -40980,7 +44669,7 @@ uint32_t  __attribute__((export_name("TS_InvoicePayer_pay_pubkey"))) TS_InvoiceP
 	memcpy(payment_preimage_ref.data, payment_preimage->elems, 32); FREE(payment_preimage);
 	LDKCResult_PaymentIdPaymentErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_PaymentIdPaymentErrorZ), "LDKCResult_PaymentIdPaymentErrorZ");
 	*ret_conv = InvoicePayer_pay_pubkey(&this_arg_conv, pubkey_ref, payment_preimage_ref, amount_msats, final_cltv_expiry_delta);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_InvoicePayer_remove_cached_payment"))) TS_InvoicePayer_remove_cached_payment(uint32_t this_arg, int8_tArray payment_hash) {
@@ -41002,10 +44691,10 @@ uint32_t  __attribute__((export_name("TS_InvoicePayer_as_EventHandler"))) TS_Inv
 	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 (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
-uint32_t  __attribute__((export_name("TS_create_invoice_from_channelmanager_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_and_duration_since_epoch(uint32_t channelmanager, uint32_t keys_manager, uint32_t network, uint32_t amt_msat, jstring description, int64_t duration_since_epoch) {
+uint32_t  __attribute__((export_name("TS_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(uint32_t channelmanager, uint32_t keys_manager, uint32_t network, uint32_t amt_msat, uint32_t description_hash, int64_t duration_since_epoch, int32_t invoice_expiry_delta_secs) {
 	LDKChannelManager channelmanager_conv;
 	channelmanager_conv.inner = (void*)(channelmanager & (~1));
 	channelmanager_conv.is_owned = false;
@@ -41013,6 +44702,37 @@ uint32_t  __attribute__((export_name("TS_create_invoice_from_channelmanager_and_
 	void* keys_manager_ptr = (void*)(((uintptr_t)keys_manager) & ~1);
 	CHECK_ACCESS(keys_manager_ptr);
 	LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr);
+	if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKKeysInterface_JCalls_cloned(&keys_manager_conv);
+	}
+	LDKCurrency network_conv = LDKCurrency_from_js(network);
+	void* amt_msat_ptr = (void*)(((uintptr_t)amt_msat) & ~1);
+	CHECK_ACCESS(amt_msat_ptr);
+	LDKCOption_u64Z amt_msat_conv = *(LDKCOption_u64Z*)(amt_msat_ptr);
+	amt_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)amt_msat) & ~1));
+	LDKSha256 description_hash_conv;
+	description_hash_conv.inner = (void*)(description_hash & (~1));
+	description_hash_conv.is_owned = (description_hash & 1) || (description_hash == 0);
+	CHECK_INNER_FIELD_ACCESS_OR_NULL(description_hash_conv);
+	description_hash_conv = Sha256_clone(&description_hash_conv);
+	LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ");
+	*ret_conv = create_invoice_from_channelmanager_with_description_hash_and_duration_since_epoch(&channelmanager_conv, keys_manager_conv, network_conv, amt_msat_conv, description_hash_conv, duration_since_epoch, invoice_expiry_delta_secs);
+	return (uint32_t)ret_conv;
+}
+
+uint32_t  __attribute__((export_name("TS_create_invoice_from_channelmanager_and_duration_since_epoch"))) TS_create_invoice_from_channelmanager_and_duration_since_epoch(uint32_t channelmanager, uint32_t keys_manager, uint32_t network, uint32_t amt_msat, jstring description, int64_t duration_since_epoch, int32_t invoice_expiry_delta_secs) {
+	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*)(((uintptr_t)keys_manager) & ~1);
+	CHECK_ACCESS(keys_manager_ptr);
+	LDKKeysInterface keys_manager_conv = *(LDKKeysInterface*)(keys_manager_ptr);
+	if (keys_manager_conv.free == LDKKeysInterface_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKKeysInterface_JCalls_cloned(&keys_manager_conv);
+	}
 	LDKCurrency network_conv = LDKCurrency_from_js(network);
 	void* amt_msat_ptr = (void*)(((uintptr_t)amt_msat) & ~1);
 	CHECK_ACCESS(amt_msat_ptr);
@@ -41020,8 +44740,8 @@ uint32_t  __attribute__((export_name("TS_create_invoice_from_channelmanager_and_
 	amt_msat_conv = COption_u64Z_clone((LDKCOption_u64Z*)(((uintptr_t)amt_msat) & ~1));
 	LDKStr description_conv = str_ref_to_owned_c(description);
 	LDKCResult_InvoiceSignOrCreationErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceSignOrCreationErrorZ), "LDKCResult_InvoiceSignOrCreationErrorZ");
-	*ret_conv = create_invoice_from_channelmanager_and_duration_since_epoch(&channelmanager_conv, keys_manager_conv, network_conv, amt_msat_conv, description_conv, duration_since_epoch);
-	return (uintptr_t)ret_conv;
+	*ret_conv = create_invoice_from_channelmanager_and_duration_since_epoch(&channelmanager_conv, keys_manager_conv, network_conv, amt_msat_conv, description_conv, duration_since_epoch, invoice_expiry_delta_secs);
+	return (uint32_t)ret_conv;
 }
 
 void  __attribute__((export_name("TS_DefaultRouter_free"))) TS_DefaultRouter_free(uint32_t this_obj) {
@@ -41032,7 +44752,7 @@ void  __attribute__((export_name("TS_DefaultRouter_free"))) TS_DefaultRouter_fre
 	DefaultRouter_free(this_obj_conv);
 }
 
-uint32_t  __attribute__((export_name("TS_DefaultRouter_new"))) TS_DefaultRouter_new(uint32_t network_graph, uint32_t logger) {
+uint32_t  __attribute__((export_name("TS_DefaultRouter_new"))) TS_DefaultRouter_new(uint32_t network_graph, uint32_t logger, int8_tArray random_seed_bytes) {
 	LDKNetworkGraph network_graph_conv;
 	network_graph_conv.inner = (void*)(network_graph & (~1));
 	network_graph_conv.is_owned = false;
@@ -41040,8 +44760,15 @@ uint32_t  __attribute__((export_name("TS_DefaultRouter_new"))) TS_DefaultRouter_
 	void* logger_ptr = (void*)(((uintptr_t)logger) & ~1);
 	CHECK_ACCESS(logger_ptr);
 	LDKLogger logger_conv = *(LDKLogger*)(logger_ptr);
-	LDKDefaultRouter ret_var = DefaultRouter_new(&network_graph_conv, logger_conv);
-	uintptr_t ret_ref = 0;
+	if (logger_conv.free == LDKLogger_JCalls_free) {
+		// If this_arg is a JCalls struct, then we need to increment the refcnt in it.
+		LDKLogger_JCalls_cloned(&logger_conv);
+	}
+	LDKThirtyTwoBytes random_seed_bytes_ref;
+	CHECK(random_seed_bytes->arr_len == 32);
+	memcpy(random_seed_bytes_ref.data, random_seed_bytes->elems, 32); FREE(random_seed_bytes);
+	LDKDefaultRouter ret_var = DefaultRouter_new(&network_graph_conv, logger_conv, random_seed_bytes_ref);
+	uint32_t ret_ref = 0;
 	CHECK((((uintptr_t)ret_var.inner) & 1) == 0); // We rely on a free low bit, malloc guarantees this.
 	CHECK((((uintptr_t)&ret_var) & 1) == 0); // We rely on a free low bit, pointer alignment guarantees this.
 	CHECK_INNER_FIELD_ACCESS_OR_NULL(ret_var);
@@ -41059,7 +44786,7 @@ uint32_t  __attribute__((export_name("TS_DefaultRouter_as_Router"))) TS_DefaultR
 	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 (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_ChannelManager_as_Payer"))) TS_ChannelManager_as_Payer(uint32_t this_arg) {
@@ -41069,28 +44796,44 @@ uint32_t  __attribute__((export_name("TS_ChannelManager_as_Payer"))) TS_ChannelM
 	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 (uintptr_t)ret_ret;
+	return (uint32_t)ret_ret;
 }
 
 uint32_t  __attribute__((export_name("TS_SiPrefix_from_str"))) TS_SiPrefix_from_str(jstring s) {
 	LDKStr s_conv = str_ref_to_owned_c(s);
-	LDKCResult_SiPrefixNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixNoneZ), "LDKCResult_SiPrefixNoneZ");
+	LDKCResult_SiPrefixParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SiPrefixParseErrorZ), "LDKCResult_SiPrefixParseErrorZ");
 	*ret_conv = SiPrefix_from_str(s_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_Invoice_from_str"))) TS_Invoice_from_str(jstring s) {
 	LDKStr s_conv = str_ref_to_owned_c(s);
-	LDKCResult_InvoiceNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceNoneZ), "LDKCResult_InvoiceNoneZ");
+	LDKCResult_InvoiceParseOrSemanticErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_InvoiceParseOrSemanticErrorZ), "LDKCResult_InvoiceParseOrSemanticErrorZ");
 	*ret_conv = Invoice_from_str(s_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
 }
 
 uint32_t  __attribute__((export_name("TS_SignedRawInvoice_from_str"))) TS_SignedRawInvoice_from_str(jstring s) {
 	LDKStr s_conv = str_ref_to_owned_c(s);
-	LDKCResult_SignedRawInvoiceNoneZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceNoneZ), "LDKCResult_SignedRawInvoiceNoneZ");
+	LDKCResult_SignedRawInvoiceParseErrorZ* ret_conv = MALLOC(sizeof(LDKCResult_SignedRawInvoiceParseErrorZ), "LDKCResult_SignedRawInvoiceParseErrorZ");
 	*ret_conv = SignedRawInvoice_from_str(s_conv);
-	return (uintptr_t)ret_conv;
+	return (uint32_t)ret_conv;
+}
+
+jstring  __attribute__((export_name("TS_ParseError_to_str"))) TS_ParseError_to_str(uint32_t o) {
+	LDKParseError* o_conv = (LDKParseError*)o;
+	LDKStr ret_str = ParseError_to_str(o_conv);
+	jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len);
+	Str_free(ret_str);
+	return ret_conv;
+}
+
+jstring  __attribute__((export_name("TS_ParseOrSemanticError_to_str"))) TS_ParseOrSemanticError_to_str(uint32_t o) {
+	LDKParseOrSemanticError* o_conv = (LDKParseOrSemanticError*)o;
+	LDKStr ret_str = ParseOrSemanticError_to_str(o_conv);
+	jstring ret_conv = str_ref_to_ts(ret_str.chars, ret_str.len);
+	Str_free(ret_str);
+	return ret_conv;
 }
 
 jstring  __attribute__((export_name("TS_Invoice_to_str"))) TS_Invoice_to_str(uint32_t o) {