X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FOpenChannel.java;h=5d4e8870e1c8b94b577e540487cb660664e3a8f0;hb=1854b5cebef22ace9e9e4dd191f609818df9ce08;hp=ce1dd35be1603be7b60e4974819390a9367f3875;hpb=17113550a5fefab21f39f27fbfe02646b8db53ae;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/OpenChannel.java b/src/main/java/org/ldk/structs/OpenChannel.java
index ce1dd35b..5d4e8870 100644
--- a/src/main/java/org/ldk/structs/OpenChannel.java
+++ b/src/main/java/org/ldk/structs/OpenChannel.java
@@ -4,6 +4,8 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import java.lang.ref.Reference;
+import javax.annotation.Nullable;
 
 
 /**
@@ -23,6 +25,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public byte[] get_chain_hash() {
 		byte[] ret = bindings.OpenChannel_get_chain_hash(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -30,7 +33,9 @@ public class OpenChannel extends CommonBase {
 	 * The genesis hash of the blockchain where the channel is to be opened
 	 */
 	public void set_chain_hash(byte[] val) {
-		bindings.OpenChannel_set_chain_hash(this.ptr, val);
+		bindings.OpenChannel_set_chain_hash(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -38,6 +43,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public byte[] get_temporary_channel_id() {
 		byte[] ret = bindings.OpenChannel_get_temporary_channel_id(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -45,7 +51,9 @@ public class OpenChannel extends CommonBase {
 	 * A temporary channel ID, until the funding outpoint is announced
 	 */
 	public void set_temporary_channel_id(byte[] val) {
-		bindings.OpenChannel_set_temporary_channel_id(this.ptr, val);
+		bindings.OpenChannel_set_temporary_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -53,6 +61,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public long get_funding_satoshis() {
 		long ret = bindings.OpenChannel_get_funding_satoshis(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -61,6 +70,8 @@ public class OpenChannel extends CommonBase {
 	 */
 	public void set_funding_satoshis(long val) {
 		bindings.OpenChannel_set_funding_satoshis(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -68,6 +79,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public long get_push_msat() {
 		long ret = bindings.OpenChannel_get_push_msat(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -76,6 +88,8 @@ public class OpenChannel extends CommonBase {
 	 */
 	public void set_push_msat(long val) {
 		bindings.OpenChannel_set_push_msat(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -83,6 +97,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public long get_dust_limit_satoshis() {
 		long ret = bindings.OpenChannel_get_dust_limit_satoshis(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -91,6 +106,8 @@ public class OpenChannel extends CommonBase {
 	 */
 	public void set_dust_limit_satoshis(long val) {
 		bindings.OpenChannel_set_dust_limit_satoshis(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -98,6 +115,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public long get_max_htlc_value_in_flight_msat() {
 		long ret = bindings.OpenChannel_get_max_htlc_value_in_flight_msat(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -106,6 +124,8 @@ public class OpenChannel extends CommonBase {
 	 */
 	public void set_max_htlc_value_in_flight_msat(long val) {
 		bindings.OpenChannel_set_max_htlc_value_in_flight_msat(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -113,6 +133,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public long get_channel_reserve_satoshis() {
 		long ret = bindings.OpenChannel_get_channel_reserve_satoshis(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -121,6 +142,8 @@ public class OpenChannel extends CommonBase {
 	 */
 	public void set_channel_reserve_satoshis(long val) {
 		bindings.OpenChannel_set_channel_reserve_satoshis(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -128,6 +151,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public long get_htlc_minimum_msat() {
 		long ret = bindings.OpenChannel_get_htlc_minimum_msat(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -136,6 +160,8 @@ public class OpenChannel extends CommonBase {
 	 */
 	public void set_htlc_minimum_msat(long val) {
 		bindings.OpenChannel_set_htlc_minimum_msat(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -143,6 +169,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public int get_feerate_per_kw() {
 		int ret = bindings.OpenChannel_get_feerate_per_kw(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -151,6 +178,8 @@ public class OpenChannel extends CommonBase {
 	 */
 	public void set_feerate_per_kw(int val) {
 		bindings.OpenChannel_set_feerate_per_kw(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -158,6 +187,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public short get_to_self_delay() {
 		short ret = bindings.OpenChannel_get_to_self_delay(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -166,6 +196,8 @@ public class OpenChannel extends CommonBase {
 	 */
 	public void set_to_self_delay(short val) {
 		bindings.OpenChannel_set_to_self_delay(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -173,6 +205,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public short get_max_accepted_htlcs() {
 		short ret = bindings.OpenChannel_get_max_accepted_htlcs(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -181,6 +214,8 @@ public class OpenChannel extends CommonBase {
 	 */
 	public void set_max_accepted_htlcs(short val) {
 		bindings.OpenChannel_set_max_accepted_htlcs(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -188,6 +223,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public byte[] get_funding_pubkey() {
 		byte[] ret = bindings.OpenChannel_get_funding_pubkey(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -195,7 +231,9 @@ public class OpenChannel extends CommonBase {
 	 * The sender's key controlling the funding transaction
 	 */
 	public void set_funding_pubkey(byte[] val) {
-		bindings.OpenChannel_set_funding_pubkey(this.ptr, val);
+		bindings.OpenChannel_set_funding_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -203,6 +241,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public byte[] get_revocation_basepoint() {
 		byte[] ret = bindings.OpenChannel_get_revocation_basepoint(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -210,7 +249,9 @@ public class OpenChannel extends CommonBase {
 	 * Used to derive a revocation key for transactions broadcast by counterparty
 	 */
 	public void set_revocation_basepoint(byte[] val) {
-		bindings.OpenChannel_set_revocation_basepoint(this.ptr, val);
+		bindings.OpenChannel_set_revocation_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -218,6 +259,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public byte[] get_payment_point() {
 		byte[] ret = bindings.OpenChannel_get_payment_point(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -225,7 +267,9 @@ public class OpenChannel extends CommonBase {
 	 * A payment key to sender for transactions broadcast by counterparty
 	 */
 	public void set_payment_point(byte[] val) {
-		bindings.OpenChannel_set_payment_point(this.ptr, val);
+		bindings.OpenChannel_set_payment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -233,6 +277,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public byte[] get_delayed_payment_basepoint() {
 		byte[] ret = bindings.OpenChannel_get_delayed_payment_basepoint(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -240,7 +285,9 @@ public class OpenChannel extends CommonBase {
 	 * Used to derive a payment key to sender for transactions broadcast by sender
 	 */
 	public void set_delayed_payment_basepoint(byte[] val) {
-		bindings.OpenChannel_set_delayed_payment_basepoint(this.ptr, val);
+		bindings.OpenChannel_set_delayed_payment_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -248,6 +295,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public byte[] get_htlc_basepoint() {
 		byte[] ret = bindings.OpenChannel_get_htlc_basepoint(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -255,7 +303,9 @@ public class OpenChannel extends CommonBase {
 	 * Used to derive an HTLC payment key to sender
 	 */
 	public void set_htlc_basepoint(byte[] val) {
-		bindings.OpenChannel_set_htlc_basepoint(this.ptr, val);
+		bindings.OpenChannel_set_htlc_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -263,6 +313,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public byte[] get_first_per_commitment_point() {
 		byte[] ret = bindings.OpenChannel_get_first_per_commitment_point(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -270,7 +321,9 @@ public class OpenChannel extends CommonBase {
 	 * The first to-be-broadcast-by-sender transaction's per commitment point
 	 */
 	public void set_first_per_commitment_point(byte[] val) {
-		bindings.OpenChannel_set_first_per_commitment_point(this.ptr, val);
+		bindings.OpenChannel_set_first_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
 	}
 
 	/**
@@ -278,6 +331,7 @@ public class OpenChannel extends CommonBase {
 	 */
 	public byte get_channel_flags() {
 		byte ret = bindings.OpenChannel_get_channel_flags(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
@@ -286,6 +340,44 @@ public class OpenChannel extends CommonBase {
 	 */
 	public void set_channel_flags(byte val) {
 		bindings.OpenChannel_set_channel_flags(this.ptr, val);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	/**
+	 * The channel type that this channel will represent. If none is set, we derive the channel
+	 * type from the intersection of our feature bits with our counterparty's feature bits from
+	 * the Init message.
+	 * 
+	 * Note that the return value (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	@Nullable
+	public ChannelTypeFeatures get_channel_type() {
+		long ret = bindings.OpenChannel_get_channel_type(this.ptr);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		ChannelTypeFeatures ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new ChannelTypeFeatures(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * The channel type that this channel will represent. If none is set, we derive the channel
+	 * type from the intersection of our feature bits with our counterparty's feature bits from
+	 * the Init message.
+	 * 
+	 * Note that val (or a relevant inner pointer) may be NULL or all-0s to represent None
+	 */
+	public void set_channel_type(@Nullable ChannelTypeFeatures val) {
+		bindings.OpenChannel_set_channel_type(this.ptr, val == null ? 0 : val.ptr & ~1);
+		Reference.reachabilityFence(this);
+		Reference.reachabilityFence(val);
+	}
+
+	long clone_ptr() {
+		long ret = bindings.OpenChannel_clone_ptr(this.ptr);
+		Reference.reachabilityFence(this);
+		return ret;
 	}
 
 	/**
@@ -293,7 +385,9 @@ public class OpenChannel extends CommonBase {
 	 */
 	public OpenChannel clone() {
 		long ret = bindings.OpenChannel_clone(this.ptr);
-		OpenChannel ret_hu_conv = new OpenChannel(null, ret);
+		Reference.reachabilityFence(this);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		OpenChannel ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new OpenChannel(null, ret); }
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
@@ -303,14 +397,17 @@ public class OpenChannel extends CommonBase {
 	 */
 	public byte[] write() {
 		byte[] ret = bindings.OpenChannel_write(this.ptr);
+		Reference.reachabilityFence(this);
 		return ret;
 	}
 
 	/**
 	 * Read a OpenChannel from a byte array, created by OpenChannel_write
 	 */
-	public static Result_OpenChannelDecodeErrorZ constructor_read(byte[] ser) {
+	public static Result_OpenChannelDecodeErrorZ read(byte[] ser) {
 		long ret = bindings.OpenChannel_read(ser);
+		Reference.reachabilityFence(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
 		Result_OpenChannelDecodeErrorZ ret_hu_conv = Result_OpenChannelDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}