From 5b5e177b4153a625ceb7bd45f5156a2372ec25e0 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Thu, 27 Aug 2020 21:33:07 -0400 Subject: [PATCH] Support u16s --- genbindings.py | 4 + src/main/java/org/ldk/impl/bindings.java | 90 ++++---- src/main/jni/bindings.c | 268 ++++++++--------------- src/main/jni/org_ldk_impl_bindings.h | 176 +++++++-------- 4 files changed, 225 insertions(+), 313 deletions(-) diff --git a/genbindings.py b/genbindings.py index c03d033a..53998588 100755 --- a/genbindings.py +++ b/genbindings.py @@ -30,6 +30,10 @@ with open(sys.argv[1]) as in_h, open(sys.argv[2], "w") as out_java, open(sys.arg java_ty = "byte" c_ty = "jbyte" fn_arg = fn_arg[7:].strip() + elif fn_arg.startswith("uint16_t"): + java_ty = "short" + c_ty = "jshort" + fn_arg = fn_arg[8:].strip() elif fn_arg.startswith("uint32_t"): java_ty = "int" c_ty = "jint" diff --git a/src/main/java/org/ldk/impl/bindings.java b/src/main/java/org/ldk/impl/bindings.java index 64f8d6a5..b79be037 100644 --- a/src/main/java/org/ldk/impl/bindings.java +++ b/src/main/java/org/ldk/impl/bindings.java @@ -50,7 +50,7 @@ public class bindings { long sign_remote_htlc_transaction(long htlc_tx, long input, long amount, long per_commitment_point, long htlc); long sign_closing_transaction(long closing_tx); long sign_channel_announcement(long msg); - void on_accept(long channel_points, long remote_to_self_delay, long local_to_self_delay); + void on_accept(long channel_points, short remote_to_self_delay, short local_to_self_delay); } public static native long LDKChannelKeys_new(LDKChannelKeys impl); public interface LDKKeysInterface { @@ -289,15 +289,15 @@ public class bindings { /// void ChannelHandshakeConfig_set_minimum_depth(LDKChannelHandshakeConfig *this_ptr, uint32_t val); public static native void ChannelHandshakeConfig_set_minimum_depth(long this_ptr, int val); /// uint16_t ChannelHandshakeConfig_get_our_to_self_delay(const LDKChannelHandshakeConfig *this_ptr); - public static native long ChannelHandshakeConfig_get_our_to_self_delay(long this_ptr); + public static native short ChannelHandshakeConfig_get_our_to_self_delay(long this_ptr); /// void ChannelHandshakeConfig_set_our_to_self_delay(LDKChannelHandshakeConfig *this_ptr, uint16_t val); - public static native void ChannelHandshakeConfig_set_our_to_self_delay(long this_ptr, long val); + public static native void ChannelHandshakeConfig_set_our_to_self_delay(long this_ptr, short val); /// uint64_t ChannelHandshakeConfig_get_our_htlc_minimum_msat(const LDKChannelHandshakeConfig *this_ptr); public static native long ChannelHandshakeConfig_get_our_htlc_minimum_msat(long this_ptr); /// void ChannelHandshakeConfig_set_our_htlc_minimum_msat(LDKChannelHandshakeConfig *this_ptr, uint64_t val); public static native void ChannelHandshakeConfig_set_our_htlc_minimum_msat(long this_ptr, long val); /// MUST_USE_RES LDKChannelHandshakeConfig ChannelHandshakeConfig_new(uint32_t minimum_depth_arg, uint16_t our_to_self_delay_arg, uint64_t our_htlc_minimum_msat_arg); - public static native long ChannelHandshakeConfig_new(int minimum_depth_arg, long our_to_self_delay_arg, long our_htlc_minimum_msat_arg); + public static native long ChannelHandshakeConfig_new(int minimum_depth_arg, short our_to_self_delay_arg, long our_htlc_minimum_msat_arg); /// MUST_USE_RES LDKChannelHandshakeConfig ChannelHandshakeConfig_default(void); public static native long ChannelHandshakeConfig_default(); /// void ChannelHandshakeLimits_free(LDKChannelHandshakeLimits this_ptr); @@ -319,9 +319,9 @@ public class bindings { /// void ChannelHandshakeLimits_set_max_channel_reserve_satoshis(LDKChannelHandshakeLimits *this_ptr, uint64_t val); public static native void ChannelHandshakeLimits_set_max_channel_reserve_satoshis(long this_ptr, long val); /// uint16_t ChannelHandshakeLimits_get_min_max_accepted_htlcs(const LDKChannelHandshakeLimits *this_ptr); - public static native long ChannelHandshakeLimits_get_min_max_accepted_htlcs(long this_ptr); + public static native short ChannelHandshakeLimits_get_min_max_accepted_htlcs(long this_ptr); /// void ChannelHandshakeLimits_set_min_max_accepted_htlcs(LDKChannelHandshakeLimits *this_ptr, uint16_t val); - public static native void ChannelHandshakeLimits_set_min_max_accepted_htlcs(long this_ptr, long val); + public static native void ChannelHandshakeLimits_set_min_max_accepted_htlcs(long this_ptr, short val); /// uint64_t ChannelHandshakeLimits_get_min_dust_limit_satoshis(const LDKChannelHandshakeLimits *this_ptr); public static native long ChannelHandshakeLimits_get_min_dust_limit_satoshis(long this_ptr); /// void ChannelHandshakeLimits_set_min_dust_limit_satoshis(LDKChannelHandshakeLimits *this_ptr, uint64_t val); @@ -339,11 +339,11 @@ public class bindings { /// void ChannelHandshakeLimits_set_force_announced_channel_preference(LDKChannelHandshakeLimits *this_ptr, bool val); public static native void ChannelHandshakeLimits_set_force_announced_channel_preference(long this_ptr, boolean val); /// uint16_t ChannelHandshakeLimits_get_their_to_self_delay(const LDKChannelHandshakeLimits *this_ptr); - public static native long ChannelHandshakeLimits_get_their_to_self_delay(long this_ptr); + public static native short ChannelHandshakeLimits_get_their_to_self_delay(long this_ptr); /// void ChannelHandshakeLimits_set_their_to_self_delay(LDKChannelHandshakeLimits *this_ptr, uint16_t val); - public static native void ChannelHandshakeLimits_set_their_to_self_delay(long this_ptr, long val); + public static native void ChannelHandshakeLimits_set_their_to_self_delay(long this_ptr, short val); /// MUST_USE_RES LDKChannelHandshakeLimits ChannelHandshakeLimits_new(uint64_t min_funding_satoshis_arg, uint64_t max_htlc_minimum_msat_arg, uint64_t min_max_htlc_value_in_flight_msat_arg, uint64_t max_channel_reserve_satoshis_arg, uint16_t min_max_accepted_htlcs_arg, uint64_t min_dust_limit_satoshis_arg, uint64_t max_dust_limit_satoshis_arg, uint32_t max_minimum_depth_arg, bool force_announced_channel_preference_arg, uint16_t their_to_self_delay_arg); - public static native long ChannelHandshakeLimits_new(long min_funding_satoshis_arg, long max_htlc_minimum_msat_arg, long min_max_htlc_value_in_flight_msat_arg, long max_channel_reserve_satoshis_arg, long min_max_accepted_htlcs_arg, long min_dust_limit_satoshis_arg, long max_dust_limit_satoshis_arg, int max_minimum_depth_arg, boolean force_announced_channel_preference_arg, long their_to_self_delay_arg); + public static native long ChannelHandshakeLimits_new(long min_funding_satoshis_arg, long max_htlc_minimum_msat_arg, long min_max_htlc_value_in_flight_msat_arg, long max_channel_reserve_satoshis_arg, short min_max_accepted_htlcs_arg, long min_dust_limit_satoshis_arg, long max_dust_limit_satoshis_arg, int max_minimum_depth_arg, boolean force_announced_channel_preference_arg, short their_to_self_delay_arg); /// MUST_USE_RES LDKChannelHandshakeLimits ChannelHandshakeLimits_default(void); public static native long ChannelHandshakeLimits_default(); /// void ChannelConfig_free(LDKChannelConfig this_ptr); @@ -433,11 +433,11 @@ public class bindings { /// void OutPoint_set_txid(LDKOutPoint *this_ptr, LDKThirtyTwoBytes val); public static native void OutPoint_set_txid(long this_ptr, long val); /// uint16_t OutPoint_get_index(const LDKOutPoint *this_ptr); - public static native long OutPoint_get_index(long this_ptr); + public static native short OutPoint_get_index(long this_ptr); /// void OutPoint_set_index(LDKOutPoint *this_ptr, uint16_t val); - public static native void OutPoint_set_index(long this_ptr, long val); + public static native void OutPoint_set_index(long this_ptr, short val); /// MUST_USE_RES LDKOutPoint OutPoint_new(LDKThirtyTwoBytes txid_arg, uint16_t index_arg); - public static native long OutPoint_new(long txid_arg, long index_arg); + public static native long OutPoint_new(long txid_arg, short index_arg); /// MUST_USE_RES LDKThirtyTwoBytes OutPoint_to_channel_id(const LDKOutPoint *this_arg); public static native long OutPoint_to_channel_id(long this_arg); /// LDKCVec_u8Z OutPoint_write(const LDKOutPoint *obj); @@ -481,9 +481,9 @@ public class bindings { /// MUST_USE_RES LDKChannelPublicKeys InMemoryChannelKeys_remote_pubkeys(const LDKInMemoryChannelKeys *this_arg); public static native long InMemoryChannelKeys_remote_pubkeys(long this_arg); /// MUST_USE_RES uint16_t InMemoryChannelKeys_remote_to_self_delay(const LDKInMemoryChannelKeys *this_arg); - public static native long InMemoryChannelKeys_remote_to_self_delay(long this_arg); + public static native short InMemoryChannelKeys_remote_to_self_delay(long this_arg); /// MUST_USE_RES uint16_t InMemoryChannelKeys_local_to_self_delay(const LDKInMemoryChannelKeys *this_arg); - public static native long InMemoryChannelKeys_local_to_self_delay(long this_arg); + public static native short InMemoryChannelKeys_local_to_self_delay(long this_arg); /// LDKChannelKeys InMemoryChannelKeys_as_ChannelKeys(const LDKInMemoryChannelKeys *this_arg); public static native long InMemoryChannelKeys_as_ChannelKeys(long this_arg); /// LDKCVec_u8Z InMemoryChannelKeys_write(const LDKInMemoryChannelKeys *obj); @@ -659,23 +659,23 @@ public class bindings { /// void Ping_free(LDKPing this_ptr); public static native void Ping_free(long this_ptr); /// uint16_t Ping_get_ponglen(const LDKPing *this_ptr); - public static native long Ping_get_ponglen(long this_ptr); + public static native short Ping_get_ponglen(long this_ptr); /// void Ping_set_ponglen(LDKPing *this_ptr, uint16_t val); - public static native void Ping_set_ponglen(long this_ptr, long val); + public static native void Ping_set_ponglen(long this_ptr, short val); /// uint16_t Ping_get_byteslen(const LDKPing *this_ptr); - public static native long Ping_get_byteslen(long this_ptr); + public static native short Ping_get_byteslen(long this_ptr); /// void Ping_set_byteslen(LDKPing *this_ptr, uint16_t val); - public static native void Ping_set_byteslen(long this_ptr, long val); + public static native void Ping_set_byteslen(long this_ptr, short val); /// MUST_USE_RES LDKPing Ping_new(uint16_t ponglen_arg, uint16_t byteslen_arg); - public static native long Ping_new(long ponglen_arg, long byteslen_arg); + public static native long Ping_new(short ponglen_arg, short byteslen_arg); /// void Pong_free(LDKPong this_ptr); public static native void Pong_free(long this_ptr); /// uint16_t Pong_get_byteslen(const LDKPong *this_ptr); - public static native long Pong_get_byteslen(long this_ptr); + public static native short Pong_get_byteslen(long this_ptr); /// void Pong_set_byteslen(LDKPong *this_ptr, uint16_t val); - public static native void Pong_set_byteslen(long this_ptr, long val); + public static native void Pong_set_byteslen(long this_ptr, short val); /// MUST_USE_RES LDKPong Pong_new(uint16_t byteslen_arg); - public static native long Pong_new(long byteslen_arg); + public static native long Pong_new(short byteslen_arg); /// void OpenChannel_free(LDKOpenChannel this_ptr); public static native void OpenChannel_free(long this_ptr); /// const uint8_t (*OpenChannel_get_chain_hash(const LDKOpenChannel *this_ptr))[32]; @@ -715,13 +715,13 @@ public class bindings { /// void OpenChannel_set_feerate_per_kw(LDKOpenChannel *this_ptr, uint32_t val); public static native void OpenChannel_set_feerate_per_kw(long this_ptr, int val); /// uint16_t OpenChannel_get_to_self_delay(const LDKOpenChannel *this_ptr); - public static native long OpenChannel_get_to_self_delay(long this_ptr); + public static native short OpenChannel_get_to_self_delay(long this_ptr); /// void OpenChannel_set_to_self_delay(LDKOpenChannel *this_ptr, uint16_t val); - public static native void OpenChannel_set_to_self_delay(long this_ptr, long val); + public static native void OpenChannel_set_to_self_delay(long this_ptr, short val); /// uint16_t OpenChannel_get_max_accepted_htlcs(const LDKOpenChannel *this_ptr); - public static native long OpenChannel_get_max_accepted_htlcs(long this_ptr); + public static native short OpenChannel_get_max_accepted_htlcs(long this_ptr); /// void OpenChannel_set_max_accepted_htlcs(LDKOpenChannel *this_ptr, uint16_t val); - public static native void OpenChannel_set_max_accepted_htlcs(long this_ptr, long val); + public static native void OpenChannel_set_max_accepted_htlcs(long this_ptr, short val); /// LDKPublicKey OpenChannel_get_funding_pubkey(const LDKOpenChannel *this_ptr); public static native long OpenChannel_get_funding_pubkey(long this_ptr); /// void OpenChannel_set_funding_pubkey(LDKOpenChannel *this_ptr, LDKPublicKey val); @@ -777,13 +777,13 @@ public class bindings { /// void AcceptChannel_set_minimum_depth(LDKAcceptChannel *this_ptr, uint32_t val); public static native void AcceptChannel_set_minimum_depth(long this_ptr, int val); /// uint16_t AcceptChannel_get_to_self_delay(const LDKAcceptChannel *this_ptr); - public static native long AcceptChannel_get_to_self_delay(long this_ptr); + public static native short AcceptChannel_get_to_self_delay(long this_ptr); /// void AcceptChannel_set_to_self_delay(LDKAcceptChannel *this_ptr, uint16_t val); - public static native void AcceptChannel_set_to_self_delay(long this_ptr, long val); + public static native void AcceptChannel_set_to_self_delay(long this_ptr, short val); /// uint16_t AcceptChannel_get_max_accepted_htlcs(const LDKAcceptChannel *this_ptr); - public static native long AcceptChannel_get_max_accepted_htlcs(long this_ptr); + public static native short AcceptChannel_get_max_accepted_htlcs(long this_ptr); /// void AcceptChannel_set_max_accepted_htlcs(LDKAcceptChannel *this_ptr, uint16_t val); - public static native void AcceptChannel_set_max_accepted_htlcs(long this_ptr, long val); + public static native void AcceptChannel_set_max_accepted_htlcs(long this_ptr, short val); /// LDKPublicKey AcceptChannel_get_funding_pubkey(const LDKAcceptChannel *this_ptr); public static native long AcceptChannel_get_funding_pubkey(long this_ptr); /// void AcceptChannel_set_funding_pubkey(LDKAcceptChannel *this_ptr, LDKPublicKey val); @@ -819,15 +819,15 @@ public class bindings { /// void FundingCreated_set_funding_txid(LDKFundingCreated *this_ptr, LDKThirtyTwoBytes val); public static native void FundingCreated_set_funding_txid(long this_ptr, long val); /// uint16_t FundingCreated_get_funding_output_index(const LDKFundingCreated *this_ptr); - public static native long FundingCreated_get_funding_output_index(long this_ptr); + public static native short FundingCreated_get_funding_output_index(long this_ptr); /// void FundingCreated_set_funding_output_index(LDKFundingCreated *this_ptr, uint16_t val); - public static native void FundingCreated_set_funding_output_index(long this_ptr, long val); + public static native void FundingCreated_set_funding_output_index(long this_ptr, short val); /// LDKSignature FundingCreated_get_signature(const LDKFundingCreated *this_ptr); public static native long FundingCreated_get_signature(long this_ptr); /// void FundingCreated_set_signature(LDKFundingCreated *this_ptr, LDKSignature val); public static native void FundingCreated_set_signature(long this_ptr, long val); /// MUST_USE_RES LDKFundingCreated FundingCreated_new(LDKThirtyTwoBytes temporary_channel_id_arg, LDKThirtyTwoBytes funding_txid_arg, uint16_t funding_output_index_arg, LDKSignature signature_arg); - public static native long FundingCreated_new(long temporary_channel_id_arg, long funding_txid_arg, long funding_output_index_arg, long signature_arg); + public static native long FundingCreated_new(long temporary_channel_id_arg, long funding_txid_arg, short funding_output_index_arg, long signature_arg); /// void FundingSigned_free(LDKFundingSigned this_ptr); public static native void FundingSigned_free(long this_ptr); /// const uint8_t (*FundingSigned_get_channel_id(const LDKFundingSigned *this_ptr))[32]; @@ -939,9 +939,9 @@ public class bindings { /// void UpdateFailMalformedHTLC_set_htlc_id(LDKUpdateFailMalformedHTLC *this_ptr, uint64_t val); public static native void UpdateFailMalformedHTLC_set_htlc_id(long this_ptr, long val); /// uint16_t UpdateFailMalformedHTLC_get_failure_code(const LDKUpdateFailMalformedHTLC *this_ptr); - public static native long UpdateFailMalformedHTLC_get_failure_code(long this_ptr); + public static native short UpdateFailMalformedHTLC_get_failure_code(long this_ptr); /// void UpdateFailMalformedHTLC_set_failure_code(LDKUpdateFailMalformedHTLC *this_ptr, uint16_t val); - public static native void UpdateFailMalformedHTLC_set_failure_code(long this_ptr, long val); + public static native void UpdateFailMalformedHTLC_set_failure_code(long this_ptr, short val); /// void CommitmentSigned_free(LDKCommitmentSigned this_ptr); public static native void CommitmentSigned_free(long this_ptr); /// const uint8_t (*CommitmentSigned_get_channel_id(const LDKCommitmentSigned *this_ptr))[32]; @@ -1133,9 +1133,9 @@ public class bindings { /// void UnsignedChannelUpdate_set_flags(LDKUnsignedChannelUpdate *this_ptr, uint8_t val); public static native void UnsignedChannelUpdate_set_flags(long this_ptr, byte val); /// uint16_t UnsignedChannelUpdate_get_cltv_expiry_delta(const LDKUnsignedChannelUpdate *this_ptr); - public static native long UnsignedChannelUpdate_get_cltv_expiry_delta(long this_ptr); + public static native short UnsignedChannelUpdate_get_cltv_expiry_delta(long this_ptr); /// void UnsignedChannelUpdate_set_cltv_expiry_delta(LDKUnsignedChannelUpdate *this_ptr, uint16_t val); - public static native void UnsignedChannelUpdate_set_cltv_expiry_delta(long this_ptr, long val); + public static native void UnsignedChannelUpdate_set_cltv_expiry_delta(long this_ptr, short val); /// uint64_t UnsignedChannelUpdate_get_htlc_minimum_msat(const LDKUnsignedChannelUpdate *this_ptr); public static native long UnsignedChannelUpdate_get_htlc_minimum_msat(long this_ptr); /// void UnsignedChannelUpdate_set_htlc_minimum_msat(LDKUnsignedChannelUpdate *this_ptr, uint64_t val); @@ -1415,7 +1415,7 @@ public class bindings { /// MUST_USE_RES LDKCResult_TxCreationKeysSecpErrorZ TxCreationKeys_derive_new(LDKPublicKey per_commitment_point, LDKPublicKey a_delayed_payment_base, LDKPublicKey a_htlc_base, LDKPublicKey b_revocation_base, LDKPublicKey b_htlc_base); public static native long TxCreationKeys_derive_new(long per_commitment_point, long a_delayed_payment_base, long a_htlc_base, long b_revocation_base, long b_htlc_base); /// LDKCVec_u8Z get_revokeable_redeemscript(LDKPublicKey revocation_key, uint16_t to_self_delay, LDKPublicKey delayed_payment_key); - public static native long get_revokeable_redeemscript(long revocation_key, long to_self_delay, long delayed_payment_key); + public static native long get_revokeable_redeemscript(long revocation_key, short to_self_delay, long delayed_payment_key); /// void HTLCOutputInCommitment_free(LDKHTLCOutputInCommitment this_ptr); public static native void HTLCOutputInCommitment_free(long this_ptr); /// bool HTLCOutputInCommitment_get_offered(const LDKHTLCOutputInCommitment *this_ptr); @@ -1443,7 +1443,7 @@ public class bindings { /// LDKCVec_u8Z make_funding_redeemscript(LDKPublicKey a, LDKPublicKey b); public static native long make_funding_redeemscript(long a, long b); /// LDKCVec_u8Z build_htlc_transaction(const uint8_t (*prev_hash)[32], uint32_t feerate_per_kw, uint16_t to_self_delay, const LDKHTLCOutputInCommitment *htlc, LDKPublicKey a_delayed_payment_key, LDKPublicKey revocation_key); - public static native long build_htlc_transaction(byte[] prev_hash, int feerate_per_kw, long to_self_delay, long htlc, long a_delayed_payment_key, long revocation_key); + public static native long build_htlc_transaction(byte[] prev_hash, int feerate_per_kw, short to_self_delay, long htlc, long a_delayed_payment_key, long revocation_key); /// void LocalCommitmentTransaction_free(LDKLocalCommitmentTransaction this_ptr); public static native void LocalCommitmentTransaction_free(long this_ptr); /// LDKCVec_u8Z LocalCommitmentTransaction_get_unsigned_tx(const LDKLocalCommitmentTransaction *this_ptr); @@ -1469,7 +1469,7 @@ public class bindings { /// MUST_USE_RES LDKSignature LocalCommitmentTransaction_get_local_sig(const LDKLocalCommitmentTransaction *this_arg, const uint8_t (*funding_key)[32], LDKu8slice funding_redeemscript, uint64_t channel_value_satoshis); public static native long LocalCommitmentTransaction_get_local_sig(long this_arg, byte[] funding_key, long funding_redeemscript, long channel_value_satoshis); /// MUST_USE_RES LDKCResult_CVec_SignatureZNoneZ LocalCommitmentTransaction_get_htlc_sigs(const LDKLocalCommitmentTransaction *this_arg, const uint8_t (*htlc_base_key)[32], uint16_t local_csv); - public static native long LocalCommitmentTransaction_get_htlc_sigs(long this_arg, byte[] htlc_base_key, long local_csv); + public static native long LocalCommitmentTransaction_get_htlc_sigs(long this_arg, byte[] htlc_base_key, short local_csv); /// LDKCVec_u8Z LocalCommitmentTransaction_write(const LDKLocalCommitmentTransaction *obj); public static native long LocalCommitmentTransaction_write(long obj); /// LDKLocalCommitmentTransaction LocalCommitmentTransaction_read(LDKu8slice ser); @@ -1523,15 +1523,15 @@ public class bindings { /// void RouteHint_set_fees(LDKRouteHint *this_ptr, LDKRoutingFees val); public static native void RouteHint_set_fees(long this_ptr, long val); /// uint16_t RouteHint_get_cltv_expiry_delta(const LDKRouteHint *this_ptr); - public static native long RouteHint_get_cltv_expiry_delta(long this_ptr); + public static native short RouteHint_get_cltv_expiry_delta(long this_ptr); /// void RouteHint_set_cltv_expiry_delta(LDKRouteHint *this_ptr, uint16_t val); - public static native void RouteHint_set_cltv_expiry_delta(long this_ptr, long val); + public static native void RouteHint_set_cltv_expiry_delta(long this_ptr, short val); /// uint64_t RouteHint_get_htlc_minimum_msat(const LDKRouteHint *this_ptr); public static native long RouteHint_get_htlc_minimum_msat(long this_ptr); /// void RouteHint_set_htlc_minimum_msat(LDKRouteHint *this_ptr, uint64_t val); public static native void RouteHint_set_htlc_minimum_msat(long this_ptr, long val); /// MUST_USE_RES LDKRouteHint RouteHint_new(LDKPublicKey src_node_id_arg, uint64_t short_channel_id_arg, LDKRoutingFees fees_arg, uint16_t cltv_expiry_delta_arg, uint64_t htlc_minimum_msat_arg); - public static native long RouteHint_new(long src_node_id_arg, long short_channel_id_arg, long fees_arg, long cltv_expiry_delta_arg, long htlc_minimum_msat_arg); + public static native long RouteHint_new(long src_node_id_arg, long short_channel_id_arg, long fees_arg, short cltv_expiry_delta_arg, long htlc_minimum_msat_arg); /// LDKCResult_RouteLightningErrorZ get_route(LDKPublicKey our_node_id, const LDKNetworkGraph *network, LDKPublicKey target, LDKCVec_ChannelDetailsZ *first_hops, LDKCVec_RouteHintZ last_hops, uint64_t final_value_msat, uint32_t final_cltv, LDKLogger logger); public static native long get_route(long our_node_id, long network, long target, long first_hops, long last_hops, long final_value_msat, int final_cltv, long logger); /// void NetworkGraph_free(LDKNetworkGraph this_ptr); @@ -1561,9 +1561,9 @@ public class bindings { /// void DirectionalChannelInfo_set_enabled(LDKDirectionalChannelInfo *this_ptr, bool val); public static native void DirectionalChannelInfo_set_enabled(long this_ptr, boolean val); /// uint16_t DirectionalChannelInfo_get_cltv_expiry_delta(const LDKDirectionalChannelInfo *this_ptr); - public static native long DirectionalChannelInfo_get_cltv_expiry_delta(long this_ptr); + public static native short DirectionalChannelInfo_get_cltv_expiry_delta(long this_ptr); /// void DirectionalChannelInfo_set_cltv_expiry_delta(LDKDirectionalChannelInfo *this_ptr, uint16_t val); - public static native void DirectionalChannelInfo_set_cltv_expiry_delta(long this_ptr, long val); + public static native void DirectionalChannelInfo_set_cltv_expiry_delta(long this_ptr, short val); /// uint64_t DirectionalChannelInfo_get_htlc_minimum_msat(const LDKDirectionalChannelInfo *this_ptr); public static native long DirectionalChannelInfo_get_htlc_minimum_msat(long this_ptr); /// void DirectionalChannelInfo_set_htlc_minimum_msat(LDKDirectionalChannelInfo *this_ptr, uint64_t val); diff --git a/src/main/jni/bindings.c b/src/main/jni/bindings.c index cc4fb231..57f0089c 100644 --- a/src/main/jni/bindings.c +++ b/src/main/jni/bindings.c @@ -1494,18 +1494,14 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1set_1m return ChannelHandshakeConfig_set_minimum_depth(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1get_1our_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1get_1our_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelHandshakeConfig* this_ptr_conv = (LDKChannelHandshakeConfig*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = ChannelHandshakeConfig_get_our_to_self_delay(this_ptr_conv); - return (long)ret; + return ChannelHandshakeConfig_get_our_to_self_delay(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1set_1our_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1set_1our_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKChannelHandshakeConfig* this_ptr_conv = (LDKChannelHandshakeConfig*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return ChannelHandshakeConfig_set_our_to_self_delay(this_ptr_conv, val_conv); + return ChannelHandshakeConfig_set_our_to_self_delay(this_ptr_conv, val); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1get_1our_1htlc_1minimum_1msat(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -1518,11 +1514,9 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1set_1o return ChannelHandshakeConfig_set_our_htlc_minimum_msat(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1new(JNIEnv * _env, jclass _b, jint minimum_depth_arg, jlong our_to_self_delay_arg, jlong our_htlc_minimum_msat_arg) { - uint16_t our_to_self_delay_arg_conv = *(uint16_t*)our_to_self_delay_arg; - free((void*)our_to_self_delay_arg); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1new(JNIEnv * _env, jclass _b, jint minimum_depth_arg, jshort our_to_self_delay_arg, jlong our_htlc_minimum_msat_arg) { LDKChannelHandshakeConfig* ret = malloc(sizeof(LDKChannelHandshakeConfig)); - *ret = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg_conv, our_htlc_minimum_msat_arg); + *ret = ChannelHandshakeConfig_new(minimum_depth_arg, our_to_self_delay_arg, our_htlc_minimum_msat_arg); assert(!ret->_underlying_ref); ret->_underlying_ref = true; return (long)ret; @@ -1583,18 +1577,14 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1m return ChannelHandshakeLimits_set_max_channel_reserve_satoshis(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1get_1min_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1get_1min_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelHandshakeLimits* this_ptr_conv = (LDKChannelHandshakeLimits*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = ChannelHandshakeLimits_get_min_max_accepted_htlcs(this_ptr_conv); - return (long)ret; + return ChannelHandshakeLimits_get_min_max_accepted_htlcs(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1min_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1min_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKChannelHandshakeLimits* this_ptr_conv = (LDKChannelHandshakeLimits*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return ChannelHandshakeLimits_set_min_max_accepted_htlcs(this_ptr_conv, val_conv); + return ChannelHandshakeLimits_set_min_max_accepted_htlcs(this_ptr_conv, val); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1get_1min_1dust_1limit_1satoshis(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -1637,27 +1627,19 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1f return ChannelHandshakeLimits_set_force_announced_channel_preference(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1get_1their_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1get_1their_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKChannelHandshakeLimits* this_ptr_conv = (LDKChannelHandshakeLimits*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = ChannelHandshakeLimits_get_their_to_self_delay(this_ptr_conv); - return (long)ret; + return ChannelHandshakeLimits_get_their_to_self_delay(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1their_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1their_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKChannelHandshakeLimits* this_ptr_conv = (LDKChannelHandshakeLimits*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return ChannelHandshakeLimits_set_their_to_self_delay(this_ptr_conv, val_conv); + return ChannelHandshakeLimits_set_their_to_self_delay(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1new(JNIEnv * _env, jclass _b, jlong min_funding_satoshis_arg, jlong max_htlc_minimum_msat_arg, jlong min_max_htlc_value_in_flight_msat_arg, jlong max_channel_reserve_satoshis_arg, jlong min_max_accepted_htlcs_arg, jlong min_dust_limit_satoshis_arg, jlong max_dust_limit_satoshis_arg, jint max_minimum_depth_arg, jboolean force_announced_channel_preference_arg, jlong their_to_self_delay_arg) { - uint16_t min_max_accepted_htlcs_arg_conv = *(uint16_t*)min_max_accepted_htlcs_arg; - free((void*)min_max_accepted_htlcs_arg); - uint16_t their_to_self_delay_arg_conv = *(uint16_t*)their_to_self_delay_arg; - free((void*)their_to_self_delay_arg); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1new(JNIEnv * _env, jclass _b, jlong min_funding_satoshis_arg, jlong max_htlc_minimum_msat_arg, jlong min_max_htlc_value_in_flight_msat_arg, jlong max_channel_reserve_satoshis_arg, jshort min_max_accepted_htlcs_arg, jlong min_dust_limit_satoshis_arg, jlong max_dust_limit_satoshis_arg, jint max_minimum_depth_arg, jboolean force_announced_channel_preference_arg, jshort their_to_self_delay_arg) { LDKChannelHandshakeLimits* ret = malloc(sizeof(LDKChannelHandshakeLimits)); - *ret = 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_conv, min_dust_limit_satoshis_arg, max_dust_limit_satoshis_arg, max_minimum_depth_arg, force_announced_channel_preference_arg, their_to_self_delay_arg_conv); + *ret = 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, min_dust_limit_satoshis_arg, max_dust_limit_satoshis_arg, max_minimum_depth_arg, force_announced_channel_preference_arg, their_to_self_delay_arg); assert(!ret->_underlying_ref); ret->_underlying_ref = true; return (long)ret; @@ -1997,27 +1979,21 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OutPoint_1set_1txid(JNIEnv * _ return OutPoint_set_txid(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1get_1index(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_OutPoint_1get_1index(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKOutPoint* this_ptr_conv = (LDKOutPoint*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = OutPoint_get_index(this_ptr_conv); - return (long)ret; + return OutPoint_get_index(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OutPoint_1set_1index(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OutPoint_1set_1index(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKOutPoint* this_ptr_conv = (LDKOutPoint*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return OutPoint_set_index(this_ptr_conv, val_conv); + return OutPoint_set_index(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1new(JNIEnv * _env, jclass _b, jlong txid_arg, jlong index_arg) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1new(JNIEnv * _env, jclass _b, jlong txid_arg, jshort index_arg) { LDKThirtyTwoBytes txid_arg_conv = *(LDKThirtyTwoBytes*)txid_arg; free((void*)txid_arg); - uint16_t index_arg_conv = *(uint16_t*)index_arg; - free((void*)index_arg); LDKOutPoint* ret = malloc(sizeof(LDKOutPoint)); - *ret = OutPoint_new(txid_arg_conv, index_arg_conv); + *ret = OutPoint_new(txid_arg_conv, index_arg); assert(!ret->_underlying_ref); ret->_underlying_ref = true; return (long)ret; @@ -2187,18 +2163,14 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1remote_1 return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1remote_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_arg) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1remote_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_arg) { LDKInMemoryChannelKeys* this_arg_conv = (LDKInMemoryChannelKeys*)this_arg; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = InMemoryChannelKeys_remote_to_self_delay(this_arg_conv); - return (long)ret; + return InMemoryChannelKeys_remote_to_self_delay(this_arg_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1local_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_arg) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1local_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_arg) { LDKInMemoryChannelKeys* this_arg_conv = (LDKInMemoryChannelKeys*)this_arg; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = InMemoryChannelKeys_local_to_self_delay(this_arg_conv); - return (long)ret; + return InMemoryChannelKeys_local_to_self_delay(this_arg_conv); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1as_1ChannelKeys(JNIEnv * _env, jclass _b, jlong this_arg) { @@ -2861,41 +2833,29 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1free(JNIEnv * _env, jcla return Ping_free(this_ptr_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1get_1ponglen(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_Ping_1get_1ponglen(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKPing* this_ptr_conv = (LDKPing*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = Ping_get_ponglen(this_ptr_conv); - return (long)ret; + return Ping_get_ponglen(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1set_1ponglen(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1set_1ponglen(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKPing* this_ptr_conv = (LDKPing*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return Ping_set_ponglen(this_ptr_conv, val_conv); + return Ping_set_ponglen(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1get_1byteslen(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_Ping_1get_1byteslen(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKPing* this_ptr_conv = (LDKPing*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = Ping_get_byteslen(this_ptr_conv); - return (long)ret; + return Ping_get_byteslen(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1set_1byteslen(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1set_1byteslen(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKPing* this_ptr_conv = (LDKPing*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return Ping_set_byteslen(this_ptr_conv, val_conv); + return Ping_set_byteslen(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1new(JNIEnv * _env, jclass _b, jlong ponglen_arg, jlong byteslen_arg) { - uint16_t ponglen_arg_conv = *(uint16_t*)ponglen_arg; - free((void*)ponglen_arg); - uint16_t byteslen_arg_conv = *(uint16_t*)byteslen_arg; - free((void*)byteslen_arg); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1new(JNIEnv * _env, jclass _b, jshort ponglen_arg, jshort byteslen_arg) { LDKPing* ret = malloc(sizeof(LDKPing)); - *ret = Ping_new(ponglen_arg_conv, byteslen_arg_conv); + *ret = Ping_new(ponglen_arg, byteslen_arg); assert(!ret->_underlying_ref); ret->_underlying_ref = true; return (long)ret; @@ -2908,25 +2868,19 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Pong_1free(JNIEnv * _env, jcla return Pong_free(this_ptr_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1get_1byteslen(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_Pong_1get_1byteslen(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKPong* this_ptr_conv = (LDKPong*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = Pong_get_byteslen(this_ptr_conv); - return (long)ret; + return Pong_get_byteslen(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Pong_1set_1byteslen(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Pong_1set_1byteslen(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKPong* this_ptr_conv = (LDKPong*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return Pong_set_byteslen(this_ptr_conv, val_conv); + return Pong_set_byteslen(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1new(JNIEnv * _env, jclass _b, jlong byteslen_arg) { - uint16_t byteslen_arg_conv = *(uint16_t*)byteslen_arg; - free((void*)byteslen_arg); +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1new(JNIEnv * _env, jclass _b, jshort byteslen_arg) { LDKPong* ret = malloc(sizeof(LDKPong)); - *ret = Pong_new(byteslen_arg_conv); + *ret = Pong_new(byteslen_arg); assert(!ret->_underlying_ref); ret->_underlying_ref = true; return (long)ret; @@ -3037,32 +2991,24 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1feerate_1per return OpenChannel_set_feerate_per_kw(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKOpenChannel* this_ptr_conv = (LDKOpenChannel*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = OpenChannel_get_to_self_delay(this_ptr_conv); - return (long)ret; + return OpenChannel_get_to_self_delay(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKOpenChannel* this_ptr_conv = (LDKOpenChannel*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return OpenChannel_set_to_self_delay(this_ptr_conv, val_conv); + return OpenChannel_set_to_self_delay(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKOpenChannel* this_ptr_conv = (LDKOpenChannel*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = OpenChannel_get_max_accepted_htlcs(this_ptr_conv); - return (long)ret; + return OpenChannel_get_max_accepted_htlcs(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKOpenChannel* this_ptr_conv = (LDKOpenChannel*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return OpenChannel_set_max_accepted_htlcs(this_ptr_conv, val_conv); + return OpenChannel_set_max_accepted_htlcs(this_ptr_conv, val); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -3230,32 +3176,24 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1minimum_1d return AcceptChannel_set_minimum_depth(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKAcceptChannel* this_ptr_conv = (LDKAcceptChannel*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = AcceptChannel_get_to_self_delay(this_ptr_conv); - return (long)ret; + return AcceptChannel_get_to_self_delay(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1to_1self_1delay(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKAcceptChannel* this_ptr_conv = (LDKAcceptChannel*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return AcceptChannel_set_to_self_delay(this_ptr_conv, val_conv); + return AcceptChannel_set_to_self_delay(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKAcceptChannel* this_ptr_conv = (LDKAcceptChannel*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = AcceptChannel_get_max_accepted_htlcs(this_ptr_conv); - return (long)ret; + return AcceptChannel_get_max_accepted_htlcs(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1max_1accepted_1htlcs(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKAcceptChannel* this_ptr_conv = (LDKAcceptChannel*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return AcceptChannel_set_max_accepted_htlcs(this_ptr_conv, val_conv); + return AcceptChannel_set_max_accepted_htlcs(this_ptr_conv, val); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1funding_1pubkey(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -3377,18 +3315,14 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1set_1funding_1 return FundingCreated_set_funding_txid(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1get_1funding_1output_1index(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_FundingCreated_1get_1funding_1output_1index(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKFundingCreated* this_ptr_conv = (LDKFundingCreated*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = FundingCreated_get_funding_output_index(this_ptr_conv); - return (long)ret; + return FundingCreated_get_funding_output_index(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1set_1funding_1output_1index(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1set_1funding_1output_1index(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKFundingCreated* this_ptr_conv = (LDKFundingCreated*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return FundingCreated_set_funding_output_index(this_ptr_conv, val_conv); + return FundingCreated_set_funding_output_index(this_ptr_conv, val); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1get_1signature(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -3405,17 +3339,15 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1set_1signature return FundingCreated_set_signature(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1new(JNIEnv * _env, jclass _b, jlong temporary_channel_id_arg, jlong funding_txid_arg, jlong funding_output_index_arg, jlong signature_arg) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1new(JNIEnv * _env, jclass _b, jlong temporary_channel_id_arg, jlong funding_txid_arg, jshort funding_output_index_arg, jlong signature_arg) { LDKThirtyTwoBytes temporary_channel_id_arg_conv = *(LDKThirtyTwoBytes*)temporary_channel_id_arg; free((void*)temporary_channel_id_arg); LDKThirtyTwoBytes funding_txid_arg_conv = *(LDKThirtyTwoBytes*)funding_txid_arg; free((void*)funding_txid_arg); - uint16_t funding_output_index_arg_conv = *(uint16_t*)funding_output_index_arg; - free((void*)funding_output_index_arg); LDKSignature signature_arg_conv = *(LDKSignature*)signature_arg; free((void*)signature_arg); LDKFundingCreated* ret = malloc(sizeof(LDKFundingCreated)); - *ret = FundingCreated_new(temporary_channel_id_arg_conv, funding_txid_arg_conv, funding_output_index_arg_conv, signature_arg_conv); + *ret = FundingCreated_new(temporary_channel_id_arg_conv, funding_txid_arg_conv, funding_output_index_arg, signature_arg_conv); assert(!ret->_underlying_ref); ret->_underlying_ref = true; return (long)ret; @@ -3803,18 +3735,14 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1set_1 return UpdateFailMalformedHTLC_set_htlc_id(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1get_1failure_1code(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1get_1failure_1code(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUpdateFailMalformedHTLC* this_ptr_conv = (LDKUpdateFailMalformedHTLC*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = UpdateFailMalformedHTLC_get_failure_code(this_ptr_conv); - return (long)ret; + return UpdateFailMalformedHTLC_get_failure_code(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1set_1failure_1code(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1set_1failure_1code(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKUpdateFailMalformedHTLC* this_ptr_conv = (LDKUpdateFailMalformedHTLC*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return UpdateFailMalformedHTLC_set_failure_code(this_ptr_conv, val_conv); + return UpdateFailMalformedHTLC_set_failure_code(this_ptr_conv, val); } JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_CommitmentSigned_1free(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -4498,18 +4426,14 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1set_1fl return UnsignedChannelUpdate_set_flags(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1get_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1get_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKUnsignedChannelUpdate* this_ptr_conv = (LDKUnsignedChannelUpdate*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = UnsignedChannelUpdate_get_cltv_expiry_delta(this_ptr_conv); - return (long)ret; + return UnsignedChannelUpdate_get_cltv_expiry_delta(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1set_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1set_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKUnsignedChannelUpdate* this_ptr_conv = (LDKUnsignedChannelUpdate*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return UnsignedChannelUpdate_set_cltv_expiry_delta(this_ptr_conv, val_conv); + return UnsignedChannelUpdate_set_cltv_expiry_delta(this_ptr_conv, val); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1get_1htlc_1minimum_1msat(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -5640,15 +5564,13 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1derive_1new(J return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1revokeable_1redeemscript(JNIEnv * _env, jclass _b, jlong revocation_key, jlong to_self_delay, jlong delayed_payment_key) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1revokeable_1redeemscript(JNIEnv * _env, jclass _b, jlong revocation_key, jshort to_self_delay, jlong delayed_payment_key) { LDKPublicKey revocation_key_conv = *(LDKPublicKey*)revocation_key; free((void*)revocation_key); - uint16_t to_self_delay_conv = *(uint16_t*)to_self_delay; - free((void*)to_self_delay); LDKPublicKey delayed_payment_key_conv = *(LDKPublicKey*)delayed_payment_key; free((void*)delayed_payment_key); LDKCVec_u8Z* ret = malloc(sizeof(LDKCVec_u8Z)); - *ret = get_revokeable_redeemscript(revocation_key_conv, to_self_delay_conv, delayed_payment_key_conv); + *ret = get_revokeable_redeemscript(revocation_key_conv, to_self_delay, delayed_payment_key_conv); return (long)ret; } @@ -5738,19 +5660,17 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_make_1funding_1redeemscript(J return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_build_1htlc_1transaction(JNIEnv * _env, jclass _b, jbyteArray prev_hash, jint feerate_per_kw, jlong to_self_delay, jlong htlc, jlong a_delayed_payment_key, jlong revocation_key) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_build_1htlc_1transaction(JNIEnv * _env, jclass _b, jbyteArray prev_hash, jint feerate_per_kw, jshort to_self_delay, jlong htlc, jlong a_delayed_payment_key, jlong revocation_key) { unsigned char prev_hash_arr[32]; (*_env)->GetByteArrayRegion (_env, prev_hash, 0, 32, prev_hash_arr); unsigned char (*prev_hash_ref)[32] = &prev_hash_arr; - uint16_t to_self_delay_conv = *(uint16_t*)to_self_delay; - free((void*)to_self_delay); LDKHTLCOutputInCommitment* htlc_conv = (LDKHTLCOutputInCommitment*)htlc; LDKPublicKey a_delayed_payment_key_conv = *(LDKPublicKey*)a_delayed_payment_key; free((void*)a_delayed_payment_key); LDKPublicKey revocation_key_conv = *(LDKPublicKey*)revocation_key; free((void*)revocation_key); LDKCVec_u8Z* ret = malloc(sizeof(LDKCVec_u8Z)); - *ret = build_htlc_transaction(prev_hash_ref, feerate_per_kw, to_self_delay_conv, htlc_conv, a_delayed_payment_key_conv, revocation_key_conv); + *ret = build_htlc_transaction(prev_hash_ref, feerate_per_kw, to_self_delay, htlc_conv, a_delayed_payment_key_conv, revocation_key_conv); return (long)ret; } @@ -5855,15 +5775,13 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1g return (long)ret; } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1get_1htlc_1sigs(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray htlc_base_key, jlong local_csv) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1get_1htlc_1sigs(JNIEnv * _env, jclass _b, jlong this_arg, jbyteArray htlc_base_key, jshort local_csv) { LDKLocalCommitmentTransaction* this_arg_conv = (LDKLocalCommitmentTransaction*)this_arg; unsigned char htlc_base_key_arr[32]; (*_env)->GetByteArrayRegion (_env, htlc_base_key, 0, 32, htlc_base_key_arr); unsigned char (*htlc_base_key_ref)[32] = &htlc_base_key_arr; - uint16_t local_csv_conv = *(uint16_t*)local_csv; - free((void*)local_csv); LDKCResult_CVec_SignatureZNoneZ* ret = malloc(sizeof(LDKCResult_CVec_SignatureZNoneZ)); - *ret = LocalCommitmentTransaction_get_htlc_sigs(this_arg_conv, htlc_base_key_ref, local_csv_conv); + *ret = LocalCommitmentTransaction_get_htlc_sigs(this_arg_conv, htlc_base_key_ref, local_csv); return (long)ret; } @@ -6045,18 +5963,14 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1fees(JNIEnv * return RouteHint_set_fees(this_ptr_conv, val_conv); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1get_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_RouteHint_1get_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKRouteHint* this_ptr_conv = (LDKRouteHint*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = RouteHint_get_cltv_expiry_delta(this_ptr_conv); - return (long)ret; + return RouteHint_get_cltv_expiry_delta(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKRouteHint* this_ptr_conv = (LDKRouteHint*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return RouteHint_set_cltv_expiry_delta(this_ptr_conv, val_conv); + return RouteHint_set_cltv_expiry_delta(this_ptr_conv, val); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1get_1htlc_1minimum_1msat(JNIEnv * _env, jclass _b, jlong this_ptr) { @@ -6069,16 +5983,14 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1htlc_1minimum_ return RouteHint_set_htlc_minimum_msat(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1new(JNIEnv * _env, jclass _b, jlong src_node_id_arg, jlong short_channel_id_arg, jlong fees_arg, jlong cltv_expiry_delta_arg, jlong htlc_minimum_msat_arg) { +JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1new(JNIEnv * _env, jclass _b, jlong src_node_id_arg, jlong short_channel_id_arg, jlong fees_arg, jshort cltv_expiry_delta_arg, jlong htlc_minimum_msat_arg) { LDKPublicKey src_node_id_arg_conv = *(LDKPublicKey*)src_node_id_arg; free((void*)src_node_id_arg); LDKRoutingFees fees_arg_conv = *(LDKRoutingFees*)fees_arg; free((void*)fees_arg); fees_arg_conv._underlying_ref = false; - uint16_t cltv_expiry_delta_arg_conv = *(uint16_t*)cltv_expiry_delta_arg; - free((void*)cltv_expiry_delta_arg); LDKRouteHint* ret = malloc(sizeof(LDKRouteHint)); - *ret = RouteHint_new(src_node_id_arg_conv, short_channel_id_arg, fees_arg_conv, cltv_expiry_delta_arg_conv, htlc_minimum_msat_arg); + *ret = RouteHint_new(src_node_id_arg_conv, short_channel_id_arg, fees_arg_conv, cltv_expiry_delta_arg, htlc_minimum_msat_arg); assert(!ret->_underlying_ref); ret->_underlying_ref = true; return (long)ret; @@ -6200,18 +6112,14 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1set_1e return DirectionalChannelInfo_set_enabled(this_ptr_conv, val); } -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1get_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr) { +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1get_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr) { LDKDirectionalChannelInfo* this_ptr_conv = (LDKDirectionalChannelInfo*)this_ptr; - uint16_t* ret = malloc(sizeof(uint16_t)); - *ret = DirectionalChannelInfo_get_cltv_expiry_delta(this_ptr_conv); - return (long)ret; + return DirectionalChannelInfo_get_cltv_expiry_delta(this_ptr_conv); } -JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1set_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr, jlong val) { +JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1set_1cltv_1expiry_1delta(JNIEnv * _env, jclass _b, jlong this_ptr, jshort val) { LDKDirectionalChannelInfo* this_ptr_conv = (LDKDirectionalChannelInfo*)this_ptr; - uint16_t val_conv = *(uint16_t*)val; - free((void*)val); - return DirectionalChannelInfo_set_cltv_expiry_delta(this_ptr_conv, val_conv); + return DirectionalChannelInfo_set_cltv_expiry_delta(this_ptr_conv, val); } JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1get_1htlc_1minimum_1msat(JNIEnv * _env, jclass _b, jlong this_ptr) { diff --git a/src/main/jni/org_ldk_impl_bindings.h b/src/main/jni/org_ldk_impl_bindings.h index 0f4860ca..f9659310 100644 --- a/src/main/jni/org_ldk_impl_bindings.h +++ b/src/main/jni/org_ldk_impl_bindings.h @@ -842,18 +842,18 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1set_1m /* * Class: org_ldk_impl_bindings * Method: ChannelHandshakeConfig_get_our_to_self_delay - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1get_1our_1to_1self_1delay +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1get_1our_1to_1self_1delay (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: ChannelHandshakeConfig_set_our_to_self_delay - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1set_1our_1to_1self_1delay - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings @@ -874,10 +874,10 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1set_1o /* * Class: org_ldk_impl_bindings * Method: ChannelHandshakeConfig_new - * Signature: (IJJ)J + * Signature: (ISJ)J */ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeConfig_1new - (JNIEnv *, jclass, jint, jlong, jlong); + (JNIEnv *, jclass, jint, jshort, jlong); /* * Class: org_ldk_impl_bindings @@ -962,18 +962,18 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1m /* * Class: org_ldk_impl_bindings * Method: ChannelHandshakeLimits_get_min_max_accepted_htlcs - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1get_1min_1max_1accepted_1htlcs +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1get_1min_1max_1accepted_1htlcs (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: ChannelHandshakeLimits_set_min_max_accepted_htlcs - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1min_1max_1accepted_1htlcs - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings @@ -1042,26 +1042,26 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1f /* * Class: org_ldk_impl_bindings * Method: ChannelHandshakeLimits_get_their_to_self_delay - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1get_1their_1to_1self_1delay +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1get_1their_1to_1self_1delay (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: ChannelHandshakeLimits_set_their_to_self_delay - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1set_1their_1to_1self_1delay - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings * Method: ChannelHandshakeLimits_new - * Signature: (JJJJJJJIZJ)J + * Signature: (JJJJSJJIZS)J */ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_ChannelHandshakeLimits_1new - (JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong, jlong, jlong, jint, jboolean, jlong); + (JNIEnv *, jclass, jlong, jlong, jlong, jlong, jshort, jlong, jlong, jint, jboolean, jshort); /* * Class: org_ldk_impl_bindings @@ -1418,26 +1418,26 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OutPoint_1set_1txid /* * Class: org_ldk_impl_bindings * Method: OutPoint_get_index - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1get_1index +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_OutPoint_1get_1index (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: OutPoint_set_index - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OutPoint_1set_1index - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings * Method: OutPoint_new - * Signature: (JJ)J + * Signature: (JS)J */ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OutPoint_1new - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings @@ -1610,17 +1610,17 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1remote_1 /* * Class: org_ldk_impl_bindings * Method: InMemoryChannelKeys_remote_to_self_delay - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1remote_1to_1self_1delay +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1remote_1to_1self_1delay (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: InMemoryChannelKeys_local_to_self_delay - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1local_1to_1self_1delay +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_InMemoryChannelKeys_1local_1to_1self_1delay (JNIEnv *, jclass, jlong); /* @@ -2322,42 +2322,42 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1free /* * Class: org_ldk_impl_bindings * Method: Ping_get_ponglen - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1get_1ponglen +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_Ping_1get_1ponglen (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: Ping_set_ponglen - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1set_1ponglen - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings * Method: Ping_get_byteslen - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1get_1byteslen +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_Ping_1get_1byteslen (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: Ping_set_byteslen - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Ping_1set_1byteslen - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings * Method: Ping_new - * Signature: (JJ)J + * Signature: (SS)J */ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Ping_1new - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jshort, jshort); /* * Class: org_ldk_impl_bindings @@ -2370,26 +2370,26 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Pong_1free /* * Class: org_ldk_impl_bindings * Method: Pong_get_byteslen - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1get_1byteslen +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_Pong_1get_1byteslen (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: Pong_set_byteslen - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_Pong_1set_1byteslen - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings * Method: Pong_new - * Signature: (J)J + * Signature: (S)J */ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_Pong_1new - (JNIEnv *, jclass, jlong); + (JNIEnv *, jclass, jshort); /* * Class: org_ldk_impl_bindings @@ -2546,34 +2546,34 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1feerate_1per /* * Class: org_ldk_impl_bindings * Method: OpenChannel_get_to_self_delay - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1to_1self_1delay +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1to_1self_1delay (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: OpenChannel_set_to_self_delay - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1to_1self_1delay - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings * Method: OpenChannel_get_max_accepted_htlcs - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1max_1accepted_1htlcs +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_OpenChannel_1get_1max_1accepted_1htlcs (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: OpenChannel_set_max_accepted_htlcs - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_OpenChannel_1set_1max_1accepted_1htlcs - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings @@ -2794,34 +2794,34 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1minimum_1d /* * Class: org_ldk_impl_bindings * Method: AcceptChannel_get_to_self_delay - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1to_1self_1delay +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1to_1self_1delay (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: AcceptChannel_set_to_self_delay - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1to_1self_1delay - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings * Method: AcceptChannel_get_max_accepted_htlcs - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1max_1accepted_1htlcs +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1get_1max_1accepted_1htlcs (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: AcceptChannel_set_max_accepted_htlcs - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_AcceptChannel_1set_1max_1accepted_1htlcs - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings @@ -2962,18 +2962,18 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1set_1funding_1 /* * Class: org_ldk_impl_bindings * Method: FundingCreated_get_funding_output_index - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1get_1funding_1output_1index +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_FundingCreated_1get_1funding_1output_1index (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: FundingCreated_set_funding_output_index - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1set_1funding_1output_1index - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings @@ -2994,10 +2994,10 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_FundingCreated_1set_1signature /* * Class: org_ldk_impl_bindings * Method: FundingCreated_new - * Signature: (JJJJ)J + * Signature: (JJSJ)J */ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_FundingCreated_1new - (JNIEnv *, jclass, jlong, jlong, jlong, jlong); + (JNIEnv *, jclass, jlong, jlong, jshort, jlong); /* * Class: org_ldk_impl_bindings @@ -3442,18 +3442,18 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1set_1 /* * Class: org_ldk_impl_bindings * Method: UpdateFailMalformedHTLC_get_failure_code - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1get_1failure_1code +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1get_1failure_1code (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: UpdateFailMalformedHTLC_set_failure_code - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UpdateFailMalformedHTLC_1set_1failure_1code - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings @@ -4218,18 +4218,18 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1set_1fl /* * Class: org_ldk_impl_bindings * Method: UnsignedChannelUpdate_get_cltv_expiry_delta - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1get_1cltv_1expiry_1delta +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1get_1cltv_1expiry_1delta (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: UnsignedChannelUpdate_set_cltv_expiry_delta - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_UnsignedChannelUpdate_1set_1cltv_1expiry_1delta - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings @@ -5346,10 +5346,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_TxCreationKeys_1derive_1new /* * Class: org_ldk_impl_bindings * Method: get_revokeable_redeemscript - * Signature: (JJJ)J + * Signature: (JSJ)J */ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_get_1revokeable_1redeemscript - (JNIEnv *, jclass, jlong, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort, jlong); /* * Class: org_ldk_impl_bindings @@ -5458,10 +5458,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_make_1funding_1redeemscript /* * Class: org_ldk_impl_bindings * Method: build_htlc_transaction - * Signature: ([BIJJJJ)J + * Signature: ([BISJJJ)J */ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_build_1htlc_1transaction - (JNIEnv *, jclass, jbyteArray, jint, jlong, jlong, jlong, jlong); + (JNIEnv *, jclass, jbyteArray, jint, jshort, jlong, jlong, jlong); /* * Class: org_ldk_impl_bindings @@ -5562,10 +5562,10 @@ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1g /* * Class: org_ldk_impl_bindings * Method: LocalCommitmentTransaction_get_htlc_sigs - * Signature: (J[BJ)J + * Signature: (J[BS)J */ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_LocalCommitmentTransaction_1get_1htlc_1sigs - (JNIEnv *, jclass, jlong, jbyteArray, jlong); + (JNIEnv *, jclass, jlong, jbyteArray, jshort); /* * Class: org_ldk_impl_bindings @@ -5778,18 +5778,18 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1fees /* * Class: org_ldk_impl_bindings * Method: RouteHint_get_cltv_expiry_delta - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1get_1cltv_1expiry_1delta +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_RouteHint_1get_1cltv_1expiry_1delta (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: RouteHint_set_cltv_expiry_delta - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1cltv_1expiry_1delta - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings @@ -5810,10 +5810,10 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_RouteHint_1set_1htlc_1minimum_ /* * Class: org_ldk_impl_bindings * Method: RouteHint_new - * Signature: (JJJJJ)J + * Signature: (JJJSJ)J */ JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_RouteHint_1new - (JNIEnv *, jclass, jlong, jlong, jlong, jlong, jlong); + (JNIEnv *, jclass, jlong, jlong, jlong, jshort, jlong); /* * Class: org_ldk_impl_bindings @@ -5930,18 +5930,18 @@ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1set_1e /* * Class: org_ldk_impl_bindings * Method: DirectionalChannelInfo_get_cltv_expiry_delta - * Signature: (J)J + * Signature: (J)S */ -JNIEXPORT jlong JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1get_1cltv_1expiry_1delta +JNIEXPORT jshort JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1get_1cltv_1expiry_1delta (JNIEnv *, jclass, jlong); /* * Class: org_ldk_impl_bindings * Method: DirectionalChannelInfo_set_cltv_expiry_delta - * Signature: (JJ)V + * Signature: (JS)V */ JNIEXPORT void JNICALL Java_org_ldk_impl_bindings_DirectionalChannelInfo_1set_1cltv_1expiry_1delta - (JNIEnv *, jclass, jlong, jlong); + (JNIEnv *, jclass, jlong, jshort); /* * Class: org_ldk_impl_bindings -- 2.30.2