X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Forg%2Fldk%2Fstructs%2FAcceptChannel.java;h=ada6053ccc4d8674ad118b70276de89cf16f5710;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=5397d48e6def25a9b49f23b4facd2a96839d5542;hpb=592c4f92dd3011a2f2a7988ce66ed166c3a8f58c;p=ldk-java

diff --git a/src/main/java/org/ldk/structs/AcceptChannel.java b/src/main/java/org/ldk/structs/AcceptChannel.java
index 5397d48e..ada6053c 100644
--- a/src/main/java/org/ldk/structs/AcceptChannel.java
+++ b/src/main/java/org/ldk/structs/AcceptChannel.java
@@ -2,182 +2,265 @@ package org.ldk.structs;
 
 import org.ldk.impl.bindings;
 import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
+import javax.annotation.Nullable;
 
+
+/**
+ * An accept_channel message to be sent or received from a peer
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
 public class AcceptChannel extends CommonBase {
 	AcceptChannel(Object _dummy, long ptr) { super(ptr); }
 	@Override @SuppressWarnings("deprecation")
 	protected void finalize() throws Throwable {
 		super.finalize();
-		bindings.AcceptChannel_free(ptr);
+		if (ptr != 0) { bindings.AcceptChannel_free(ptr); }
+	}
+
+	/**
+	 * A temporary channel ID, until the funding outpoint is announced
+	 */
+	public byte[] get_temporary_channel_id() {
+		byte[] ret = bindings.AcceptChannel_get_temporary_channel_id(this.ptr);
+		return ret;
 	}
 
-	public AcceptChannel(AcceptChannel orig) {
-		super(bindings.AcceptChannel_clone(orig == null ? 0 : orig.ptr & ~1));
-		this.ptrs_to.add(orig);
+	/**
+	 * A temporary channel ID, until the funding outpoint is announced
+	 */
+	public void set_temporary_channel_id(byte[] val) {
+		bindings.AcceptChannel_set_temporary_channel_id(this.ptr, InternalUtils.check_arr_len(val, 32));
 	}
 
-	public byte[] get_temporary_channel_id(AcceptChannel this_ptr) {
-		byte[] ret = bindings.AcceptChannel_get_temporary_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The threshold below which outputs on transactions broadcast by sender will be omitted
+	 */
+	public long get_dust_limit_satoshis() {
+		long ret = bindings.AcceptChannel_get_dust_limit_satoshis(this.ptr);
 		return ret;
 	}
 
-	public void set_temporary_channel_id(AcceptChannel this_ptr, byte[] val) {
-		bindings.AcceptChannel_set_temporary_channel_id(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The threshold below which outputs on transactions broadcast by sender will be omitted
+	 */
+	public void set_dust_limit_satoshis(long val) {
+		bindings.AcceptChannel_set_dust_limit_satoshis(this.ptr, val);
 	}
 
-	public long get_dust_limit_satoshis(AcceptChannel this_ptr) {
-		long ret = bindings.AcceptChannel_get_dust_limit_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The maximum inbound HTLC value in flight towards sender, in milli-satoshi
+	 */
+	public long get_max_htlc_value_in_flight_msat() {
+		long ret = bindings.AcceptChannel_get_max_htlc_value_in_flight_msat(this.ptr);
 		return ret;
 	}
 
-	public void set_dust_limit_satoshis(AcceptChannel this_ptr, long val) {
-		bindings.AcceptChannel_set_dust_limit_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The maximum inbound HTLC value in flight towards sender, in milli-satoshi
+	 */
+	public void set_max_htlc_value_in_flight_msat(long val) {
+		bindings.AcceptChannel_set_max_htlc_value_in_flight_msat(this.ptr, val);
 	}
 
-	public long get_max_htlc_value_in_flight_msat(AcceptChannel this_ptr) {
-		long ret = bindings.AcceptChannel_get_max_htlc_value_in_flight_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The minimum value unencumbered by HTLCs for the counterparty to keep in the channel
+	 */
+	public long get_channel_reserve_satoshis() {
+		long ret = bindings.AcceptChannel_get_channel_reserve_satoshis(this.ptr);
 		return ret;
 	}
 
-	public void set_max_htlc_value_in_flight_msat(AcceptChannel this_ptr, long val) {
-		bindings.AcceptChannel_set_max_htlc_value_in_flight_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The minimum value unencumbered by HTLCs for the counterparty to keep in the channel
+	 */
+	public void set_channel_reserve_satoshis(long val) {
+		bindings.AcceptChannel_set_channel_reserve_satoshis(this.ptr, val);
 	}
 
-	public long get_channel_reserve_satoshis(AcceptChannel this_ptr) {
-		long ret = bindings.AcceptChannel_get_channel_reserve_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The minimum HTLC size incoming to sender, in milli-satoshi
+	 */
+	public long get_htlc_minimum_msat() {
+		long ret = bindings.AcceptChannel_get_htlc_minimum_msat(this.ptr);
 		return ret;
 	}
 
-	public void set_channel_reserve_satoshis(AcceptChannel this_ptr, long val) {
-		bindings.AcceptChannel_set_channel_reserve_satoshis(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The minimum HTLC size incoming to sender, in milli-satoshi
+	 */
+	public void set_htlc_minimum_msat(long val) {
+		bindings.AcceptChannel_set_htlc_minimum_msat(this.ptr, val);
 	}
 
-	public long get_htlc_minimum_msat(AcceptChannel this_ptr) {
-		long ret = bindings.AcceptChannel_get_htlc_minimum_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Minimum depth of the funding transaction before the channel is considered open
+	 */
+	public int get_minimum_depth() {
+		int ret = bindings.AcceptChannel_get_minimum_depth(this.ptr);
 		return ret;
 	}
 
-	public void set_htlc_minimum_msat(AcceptChannel this_ptr, long val) {
-		bindings.AcceptChannel_set_htlc_minimum_msat(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Minimum depth of the funding transaction before the channel is considered open
+	 */
+	public void set_minimum_depth(int val) {
+		bindings.AcceptChannel_set_minimum_depth(this.ptr, val);
 	}
 
-	public int get_minimum_depth(AcceptChannel this_ptr) {
-		int ret = bindings.AcceptChannel_get_minimum_depth(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The number of blocks which the counterparty will have to wait to claim on-chain funds if they broadcast a commitment transaction
+	 */
+	public short get_to_self_delay() {
+		short ret = bindings.AcceptChannel_get_to_self_delay(this.ptr);
 		return ret;
 	}
 
-	public void set_minimum_depth(AcceptChannel this_ptr, int val) {
-		bindings.AcceptChannel_set_minimum_depth(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The number of blocks which the counterparty will have to wait to claim on-chain funds if they broadcast a commitment transaction
+	 */
+	public void set_to_self_delay(short val) {
+		bindings.AcceptChannel_set_to_self_delay(this.ptr, val);
 	}
 
-	public short get_to_self_delay(AcceptChannel this_ptr) {
-		short ret = bindings.AcceptChannel_get_to_self_delay(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The maximum number of inbound HTLCs towards sender
+	 */
+	public short get_max_accepted_htlcs() {
+		short ret = bindings.AcceptChannel_get_max_accepted_htlcs(this.ptr);
 		return ret;
 	}
 
-	public void set_to_self_delay(AcceptChannel this_ptr, short val) {
-		bindings.AcceptChannel_set_to_self_delay(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The maximum number of inbound HTLCs towards sender
+	 */
+	public void set_max_accepted_htlcs(short val) {
+		bindings.AcceptChannel_set_max_accepted_htlcs(this.ptr, val);
 	}
 
-	public short get_max_accepted_htlcs(AcceptChannel this_ptr) {
-		short ret = bindings.AcceptChannel_get_max_accepted_htlcs(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The sender's key controlling the funding transaction
+	 */
+	public byte[] get_funding_pubkey() {
+		byte[] ret = bindings.AcceptChannel_get_funding_pubkey(this.ptr);
 		return ret;
 	}
 
-	public void set_max_accepted_htlcs(AcceptChannel this_ptr, short val) {
-		bindings.AcceptChannel_set_max_accepted_htlcs(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The sender's key controlling the funding transaction
+	 */
+	public void set_funding_pubkey(byte[] val) {
+		bindings.AcceptChannel_set_funding_pubkey(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
-	public byte[] get_funding_pubkey(AcceptChannel this_ptr) {
-		byte[] ret = bindings.AcceptChannel_get_funding_pubkey(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Used to derive a revocation key for transactions broadcast by counterparty
+	 */
+	public byte[] get_revocation_basepoint() {
+		byte[] ret = bindings.AcceptChannel_get_revocation_basepoint(this.ptr);
 		return ret;
 	}
 
-	public void set_funding_pubkey(AcceptChannel this_ptr, byte[] val) {
-		bindings.AcceptChannel_set_funding_pubkey(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Used to derive a revocation key for transactions broadcast by counterparty
+	 */
+	public void set_revocation_basepoint(byte[] val) {
+		bindings.AcceptChannel_set_revocation_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
-	public byte[] get_revocation_basepoint(AcceptChannel this_ptr) {
-		byte[] ret = bindings.AcceptChannel_get_revocation_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * A payment key to sender for transactions broadcast by counterparty
+	 */
+	public byte[] get_payment_point() {
+		byte[] ret = bindings.AcceptChannel_get_payment_point(this.ptr);
 		return ret;
 	}
 
-	public void set_revocation_basepoint(AcceptChannel this_ptr, byte[] val) {
-		bindings.AcceptChannel_set_revocation_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * A payment key to sender for transactions broadcast by counterparty
+	 */
+	public void set_payment_point(byte[] val) {
+		bindings.AcceptChannel_set_payment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
-	public byte[] get_payment_point(AcceptChannel this_ptr) {
-		byte[] ret = bindings.AcceptChannel_get_payment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Used to derive a payment key to sender for transactions broadcast by sender
+	 */
+	public byte[] get_delayed_payment_basepoint() {
+		byte[] ret = bindings.AcceptChannel_get_delayed_payment_basepoint(this.ptr);
 		return ret;
 	}
 
-	public void set_payment_point(AcceptChannel this_ptr, byte[] val) {
-		bindings.AcceptChannel_set_payment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Used to derive a payment key to sender for transactions broadcast by sender
+	 */
+	public void set_delayed_payment_basepoint(byte[] val) {
+		bindings.AcceptChannel_set_delayed_payment_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
-	public byte[] get_delayed_payment_basepoint(AcceptChannel this_ptr) {
-		byte[] ret = bindings.AcceptChannel_get_delayed_payment_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Used to derive an HTLC payment key to sender for transactions broadcast by counterparty
+	 */
+	public byte[] get_htlc_basepoint() {
+		byte[] ret = bindings.AcceptChannel_get_htlc_basepoint(this.ptr);
 		return ret;
 	}
 
-	public void set_delayed_payment_basepoint(AcceptChannel this_ptr, byte[] val) {
-		bindings.AcceptChannel_set_delayed_payment_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Used to derive an HTLC payment key to sender for transactions broadcast by counterparty
+	 */
+	public void set_htlc_basepoint(byte[] val) {
+		bindings.AcceptChannel_set_htlc_basepoint(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
-	public byte[] get_htlc_basepoint(AcceptChannel this_ptr) {
-		byte[] ret = bindings.AcceptChannel_get_htlc_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The first to-be-broadcast-by-sender transaction's per commitment point
+	 */
+	public byte[] get_first_per_commitment_point() {
+		byte[] ret = bindings.AcceptChannel_get_first_per_commitment_point(this.ptr);
 		return ret;
 	}
 
-	public void set_htlc_basepoint(AcceptChannel this_ptr, byte[] val) {
-		bindings.AcceptChannel_set_htlc_basepoint(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * The first to-be-broadcast-by-sender transaction's per commitment point
+	 */
+	public void set_first_per_commitment_point(byte[] val) {
+		bindings.AcceptChannel_set_first_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
-	public byte[] get_first_per_commitment_point(AcceptChannel this_ptr) {
-		byte[] ret = bindings.AcceptChannel_get_first_per_commitment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1);
-		this.ptrs_to.add(this_ptr);
+	long clone_ptr() {
+		long ret = bindings.AcceptChannel_clone_ptr(this.ptr);
 		return ret;
 	}
 
-	public void set_first_per_commitment_point(AcceptChannel this_ptr, byte[] val) {
-		bindings.AcceptChannel_set_first_per_commitment_point(this_ptr == null ? 0 : this_ptr.ptr & ~1, val);
-		this.ptrs_to.add(this_ptr);
+	/**
+	 * Creates a copy of the AcceptChannel
+	 */
+	public AcceptChannel clone() {
+		long ret = bindings.AcceptChannel_clone(this.ptr);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		AcceptChannel ret_hu_conv = null; if (ret < 0 || ret > 4096) { ret_hu_conv = new AcceptChannel(null, ret); }
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
-	public byte[] write(AcceptChannel obj) {
-		byte[] ret = bindings.AcceptChannel_write(obj == null ? 0 : obj.ptr & ~1);
-		this.ptrs_to.add(obj);
+	/**
+	 * Serialize the AcceptChannel object into a byte array which can be read by AcceptChannel_read
+	 */
+	public byte[] write() {
+		byte[] ret = bindings.AcceptChannel_write(this.ptr);
 		return ret;
 	}
 
-	public AcceptChannel(byte[] ser) {
-		super(bindings.AcceptChannel_read(ser));
+	/**
+	 * Read a AcceptChannel from a byte array, created by AcceptChannel_write
+	 */
+	public static Result_AcceptChannelDecodeErrorZ read(byte[] ser) {
+		long ret = bindings.AcceptChannel_read(ser);
+		if (ret >= 0 && ret <= 4096) { return null; }
+		Result_AcceptChannelDecodeErrorZ ret_hu_conv = Result_AcceptChannelDecodeErrorZ.constr_from_ptr(ret);
+		return ret_hu_conv;
 	}
 
 }