Merge pull request #106 from TheBlueMatt/main

0.0.109.0

Author: TheBlueMatt

.github/workflows/build.yml

@@ -39,11 +39,11 @@ jobs:
           # Note this is a different endpoint, as we need one non-upstream commit!
           git clone https://git.bitcoin.ninja/rust-lightning
           cd rust-lightning
-          git checkout origin/2022-06-108-java-bindings
+          git checkout origin/2022-07-109-java-bindings
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          git checkout 0.0.108
+          git checkout 0.0.109
       - name: Rebuild C bindings without STD
         run: |
           cd ldk-c-bindings
@@ -129,11 +129,11 @@ jobs:
           # Note this is a different endpoint, as we need one non-upstream commit!
           git clone https://git.bitcoin.ninja/rust-lightning
           cd rust-lightning
-          git checkout origin/2022-06-108-java-bindings
+          git checkout origin/2022-07-109-java-bindings
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          git checkout 0.0.108
+          git checkout 0.0.109
       - name: Rebuild C bindings, and check the sample app builds + links
         run: |
           cd ldk-c-bindings
@@ -184,11 +184,11 @@ jobs:
           # Note this is a different endpoint, as we need one non-upstream commit!
           git clone https://git.bitcoin.ninja/rust-lightning
           cd rust-lightning
-          git checkout origin/2022-06-108-java-bindings
+          git checkout origin/2022-07-109-java-bindings
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          git checkout 0.0.108
+          git checkout 0.0.109
       - name: Rebuild C bindings, and check the sample app builds + links
         run: |
           cd ldk-c-bindings
@@ -287,11 +287,11 @@ jobs:
           # Note this is a different endpoint, as we need one non-upstream commit!
           git clone https://git.bitcoin.ninja/rust-lightning
           cd rust-lightning
-          git checkout origin/2022-06-108-java-bindings
+          git checkout origin/2022-07-109-java-bindings
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          git checkout 0.0.108
+          git checkout 0.0.109
       - name: Checkout Android AAR binaries and artifacts
         run: |
           # Gitweb only allows snapshots of folders by providing the object hash, which we have to extract:
@@ -367,11 +367,11 @@ jobs:
           # Note this is a different endpoint, as we need one non-upstream commit!
           git clone https://git.bitcoin.ninja/rust-lightning
           cd rust-lightning
-          git checkout origin/2022-06-108-java-bindings
+          git checkout origin/2022-07-109-java-bindings
           cd ..
           git clone https://github.com/lightningdevkit/ldk-c-bindings
           cd ldk-c-bindings
-          git checkout 0.0.108
+          git checkout 0.0.109
       - name: Rebuild C bindings with upstream clang, and check the sample app builds + links
         run: |
           export PATH=`pwd`/clang+llvm-14.0.5-x86_64-apple-darwin/bin:$PATH

README.md

@@ -14,7 +14,7 @@ A release build of the Java bindings library for Linux is available in git. Thus
 
 To build the bindings locally, the bindings require some additional work which is still making its
 way upstream, for now it should be built against the
-[rust-lightning 2021-03-java-bindings-base branch on git.bitcoin.ninja](https://git.bitcoin.ninja/?p=rust-lightning;a=shortlog;h=refs/heads/2021-03-java-bindings-base).
+[rust-lightning 2022-07-109-java-bindings branch on git.bitcoin.ninja](https://git.bitcoin.ninja/?p=rust-lightning;a=shortlog;h=refs/heads/2022-07-109-java-bindings).
 Check that branch out locally as well as [ldk-c-bindings](https://github.com/lightningdevkit/ldk-c-bindings)
 and run the `genbindings.sh` script in ldk-c-bindings to build the required binaries. Thereafter,
 in this repo, run the `genbindings.sh` script with the first argument pointing to the ldk-c-bindings

src/main/java/org/ldk/impl/bindings.java

@@ -76,7 +76,7 @@ protected void finalize() throws Throwable {
 	 * 
 	 * # Rapid Gossip Sync
 	 * 
-	 * If rapid gossip sync is meant to run at startup, pass a [`RapidGossipSync`] to `gossip_sync`
+	 * If rapid gossip sync is meant to run at startup, pass [`RapidGossipSync`] via `gossip_sync`
 	 * to indicate that the [`BackgroundProcessor`] should not prune the [`NetworkGraph`] instance
 	 * until the [`RapidGossipSync`] instance completes its first sync.
 	 * 

src/main/java/org/ldk/structs/BackgroundProcessor.java

@@ -143,82 +143,6 @@ public void set_cltv_expiry_delta(short val) {
 		Reference.reachabilityFence(val);
 	}
 
-	/**
-	 * Set to announce the channel publicly and notify all nodes that they can route via this
-	 * channel.
-	 * 
-	 * This should only be set to true for nodes which expect to be online reliably.
-	 * 
-	 * As the node which funds a channel picks this value this will only apply for new outbound
-	 * channels unless [`ChannelHandshakeLimits::force_announced_channel_preference`] is set.
-	 * 
-	 * This cannot be changed after the initial channel handshake.
-	 * 
-	 * Default value: false.
-	 */
-	public boolean get_announced_channel() {
-		boolean ret = bindings.ChannelConfig_get_announced_channel(this.ptr);
-		Reference.reachabilityFence(this);
-		return ret;
-	}
-
-	/**
-	 * Set to announce the channel publicly and notify all nodes that they can route via this
-	 * channel.
-	 * 
-	 * This should only be set to true for nodes which expect to be online reliably.
-	 * 
-	 * As the node which funds a channel picks this value this will only apply for new outbound
-	 * channels unless [`ChannelHandshakeLimits::force_announced_channel_preference`] is set.
-	 * 
-	 * This cannot be changed after the initial channel handshake.
-	 * 
-	 * Default value: false.
-	 */
-	public void set_announced_channel(boolean val) {
-		bindings.ChannelConfig_set_announced_channel(this.ptr, val);
-		Reference.reachabilityFence(this);
-		Reference.reachabilityFence(val);
-	}
-
-	/**
-	 * When set, we commit to an upfront shutdown_pubkey at channel open. If our counterparty
-	 * supports it, they will then enforce the mutual-close output to us matches what we provided
-	 * at intialization, preventing us from closing to an alternate pubkey.
-	 * 
-	 * This is set to true by default to provide a slight increase in security, though ultimately
-	 * any attacker who is able to take control of a channel can just as easily send the funds via
-	 * lightning payments, so we never require that our counterparties support this option.
-	 * 
-	 * This cannot be changed after a channel has been initialized.
-	 * 
-	 * Default value: true.
-	 */
-	public boolean get_commit_upfront_shutdown_pubkey() {
-		boolean ret = bindings.ChannelConfig_get_commit_upfront_shutdown_pubkey(this.ptr);
-		Reference.reachabilityFence(this);
-		return ret;
-	}
-
-	/**
-	 * When set, we commit to an upfront shutdown_pubkey at channel open. If our counterparty
-	 * supports it, they will then enforce the mutual-close output to us matches what we provided
-	 * at intialization, preventing us from closing to an alternate pubkey.
-	 * 
-	 * This is set to true by default to provide a slight increase in security, though ultimately
-	 * any attacker who is able to take control of a channel can just as easily send the funds via
-	 * lightning payments, so we never require that our counterparties support this option.
-	 * 
-	 * This cannot be changed after a channel has been initialized.
-	 * 
-	 * Default value: true.
-	 */
-	public void set_commit_upfront_shutdown_pubkey(boolean val) {
-		bindings.ChannelConfig_set_commit_upfront_shutdown_pubkey(this.ptr, val);
-		Reference.reachabilityFence(this);
-		Reference.reachabilityFence(val);
-	}
-
 	/**
 	 * Limit our total exposure to in-flight HTLCs which are burned to fees as they are too
 	 * small to claim on-chain.
@@ -328,13 +252,11 @@ public void set_force_close_avoidance_max_fee_satoshis(long val) {
 	/**
 	 * Constructs a new ChannelConfig given each field
 	 */
-	public static ChannelConfig of(int forwarding_fee_proportional_millionths_arg, int forwarding_fee_base_msat_arg, short cltv_expiry_delta_arg, boolean announced_channel_arg, boolean commit_upfront_shutdown_pubkey_arg, long max_dust_htlc_exposure_msat_arg, long force_close_avoidance_max_fee_satoshis_arg) {
-		long ret = bindings.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);
+	public static ChannelConfig of(int forwarding_fee_proportional_millionths_arg, int forwarding_fee_base_msat_arg, short cltv_expiry_delta_arg, long max_dust_htlc_exposure_msat_arg, long force_close_avoidance_max_fee_satoshis_arg) {
+		long ret = bindings.ChannelConfig_new(forwarding_fee_proportional_millionths_arg, forwarding_fee_base_msat_arg, cltv_expiry_delta_arg, max_dust_htlc_exposure_msat_arg, force_close_avoidance_max_fee_satoshis_arg);
 		Reference.reachabilityFence(forwarding_fee_proportional_millionths_arg);
 		Reference.reachabilityFence(forwarding_fee_base_msat_arg);
 		Reference.reachabilityFence(cltv_expiry_delta_arg);
-		Reference.reachabilityFence(announced_channel_arg);
-		Reference.reachabilityFence(commit_upfront_shutdown_pubkey_arg);
 		Reference.reachabilityFence(max_dust_htlc_exposure_msat_arg);
 		Reference.reachabilityFence(force_close_avoidance_max_fee_satoshis_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }

src/main/java/org/ldk/structs/ChannelConfig.java

@@ -665,11 +665,41 @@ public void set_inbound_htlc_maximum_msat(Option_u64Z val) {
 		Reference.reachabilityFence(val);
 	}
 
+	/**
+	 * Set of configurable parameters that affect channel operation.
+	 * 
+	 * This field is only `None` for `ChannelDetails` objects serialized prior to LDK 0.0.109.
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	@Nullable
+	public ChannelConfig get_config() {
+		long ret = bindings.ChannelDetails_get_config(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		org.ldk.structs.ChannelConfig ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelConfig(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Set of configurable parameters that affect channel operation.
+	 * 
+	 * This field is only `None` for `ChannelDetails` objects serialized prior to LDK 0.0.109.
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	public void set_config(@Nullable ChannelConfig val) {
+		bindings.ChannelDetails_set_config(this.ptr, val == null ? 0 : val.ptr & ~1);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
 	/**
 	 * Constructs a new ChannelDetails given each field
 	 */
-	public static ChannelDetails of(byte[] channel_id_arg, ChannelCounterparty counterparty_arg, OutPoint funding_txo_arg, ChannelTypeFeatures channel_type_arg, Option_u64Z short_channel_id_arg, Option_u64Z outbound_scid_alias_arg, Option_u64Z inbound_scid_alias_arg, long channel_value_satoshis_arg, Option_u64Z unspendable_punishment_reserve_arg, long user_channel_id_arg, long balance_msat_arg, long outbound_capacity_msat_arg, long next_outbound_htlc_limit_msat_arg, long inbound_capacity_msat_arg, Option_u32Z confirmations_required_arg, Option_u16Z force_close_spend_delay_arg, boolean is_outbound_arg, boolean is_channel_ready_arg, boolean is_usable_arg, boolean is_public_arg, Option_u64Z inbound_htlc_minimum_msat_arg, Option_u64Z inbound_htlc_maximum_msat_arg) {
-		long ret = bindings.ChannelDetails_new(InternalUtils.check_arr_len(channel_id_arg, 32), counterparty_arg == null ? 0 : counterparty_arg.ptr & ~1, funding_txo_arg == null ? 0 : funding_txo_arg.ptr & ~1, channel_type_arg == null ? 0 : channel_type_arg.ptr & ~1, short_channel_id_arg.ptr, outbound_scid_alias_arg.ptr, inbound_scid_alias_arg.ptr, channel_value_satoshis_arg, unspendable_punishment_reserve_arg.ptr, user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, next_outbound_htlc_limit_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg.ptr, force_close_spend_delay_arg.ptr, is_outbound_arg, is_channel_ready_arg, is_usable_arg, is_public_arg, inbound_htlc_minimum_msat_arg.ptr, inbound_htlc_maximum_msat_arg.ptr);
+	public static ChannelDetails of(byte[] channel_id_arg, ChannelCounterparty counterparty_arg, OutPoint funding_txo_arg, ChannelTypeFeatures channel_type_arg, Option_u64Z short_channel_id_arg, Option_u64Z outbound_scid_alias_arg, Option_u64Z inbound_scid_alias_arg, long channel_value_satoshis_arg, Option_u64Z unspendable_punishment_reserve_arg, long user_channel_id_arg, long balance_msat_arg, long outbound_capacity_msat_arg, long next_outbound_htlc_limit_msat_arg, long inbound_capacity_msat_arg, Option_u32Z confirmations_required_arg, Option_u16Z force_close_spend_delay_arg, boolean is_outbound_arg, boolean is_channel_ready_arg, boolean is_usable_arg, boolean is_public_arg, Option_u64Z inbound_htlc_minimum_msat_arg, Option_u64Z inbound_htlc_maximum_msat_arg, ChannelConfig config_arg) {
+		long ret = bindings.ChannelDetails_new(InternalUtils.check_arr_len(channel_id_arg, 32), counterparty_arg == null ? 0 : counterparty_arg.ptr & ~1, funding_txo_arg == null ? 0 : funding_txo_arg.ptr & ~1, channel_type_arg == null ? 0 : channel_type_arg.ptr & ~1, short_channel_id_arg.ptr, outbound_scid_alias_arg.ptr, inbound_scid_alias_arg.ptr, channel_value_satoshis_arg, unspendable_punishment_reserve_arg.ptr, user_channel_id_arg, balance_msat_arg, outbound_capacity_msat_arg, next_outbound_htlc_limit_msat_arg, inbound_capacity_msat_arg, confirmations_required_arg.ptr, force_close_spend_delay_arg.ptr, is_outbound_arg, is_channel_ready_arg, is_usable_arg, is_public_arg, inbound_htlc_minimum_msat_arg.ptr, inbound_htlc_maximum_msat_arg.ptr, config_arg == null ? 0 : config_arg.ptr & ~1);
 		Reference.reachabilityFence(channel_id_arg);
 		Reference.reachabilityFence(counterparty_arg);
 		Reference.reachabilityFence(funding_txo_arg);
@@ -692,6 +722,7 @@ public static ChannelDetails of(byte[] channel_id_arg, ChannelCounterparty count
 		Reference.reachabilityFence(is_public_arg);
 		Reference.reachabilityFence(inbound_htlc_minimum_msat_arg);
 		Reference.reachabilityFence(inbound_htlc_maximum_msat_arg);
+		Reference.reachabilityFence(config_arg);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.ChannelDetails ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new org.ldk.structs.ChannelDetails(null, ret); }
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);