X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FInMemoryChannelKeys.ts;h=4e4e375f28f63bacd47dfb8b23d9751753ee508e;hb=22f5f4208b1f3b5542292250f1612b944f5cd7fd;hp=d3517b54fae0394d95795e14a9874eed512e0ce9;hpb=56e9910ffaa7fccf2cb777dc9cf55e01a9681543;p=ldk-java

diff --git a/ts/structs/InMemoryChannelKeys.ts b/ts/structs/InMemoryChannelKeys.ts
index d3517b54..4e4e375f 100644
--- a/ts/structs/InMemoryChannelKeys.ts
+++ b/ts/structs/InMemoryChannelKeys.ts
@@ -1,94 +1,102 @@
 
+            
 import CommonBase from './CommonBase';
 import * as bindings from '../bindings' // TODO: figure out location
 
-public class InMemoryChannelKeys extends CommonBase {
-	InMemoryChannelKeys(Object _dummy, long ptr) { super(ptr); }
-	@Override @SuppressWarnings("deprecation")
-	protected void finalize() throws Throwable {
-		super.finalize();
-		if (ptr != 0) { bindings.InMemoryChannelKeys_free(ptr); }
-	}
 
+
+            export default class InMemoryChannelKeys extends CommonBase {
+                constructor(_dummy: object, ptr: number) {
+                    super(ptr);
+                }
+
+                
+                protected finalize() {
+                    super.finalize();
+
+                    if (this.ptr != 0) {
+                        bindings.InMemoryChannelKeys_free(this.ptr);
+                    }
+                }
 	public InMemoryChannelKeys clone() {
-		uint32_t ret = bindings.InMemoryChannelKeys_clone(this.ptr);
-		InMemoryChannelKeys ret_hu_conv = new InMemoryChannelKeys(null, ret);
+		number ret = bindings.InMemoryChannelKeys_clone(this.ptr);
+		const ret_hu_conv: InMemoryChannelKeys = new InMemoryChannelKeys(null, ret);
 		return ret_hu_conv;
 	}
 
-	public byte[] get_funding_key() {
-		byte[] ret = bindings.InMemoryChannelKeys_get_funding_key(this.ptr);
+	public Uint8Array get_funding_key() {
+		Uint8Array ret = bindings.InMemoryChannelKeys_get_funding_key(this.ptr);
 		return ret;
 	}
 
-	public void set_funding_key(byte[] val) {
+	public void set_funding_key(Uint8Array val) {
 		bindings.InMemoryChannelKeys_set_funding_key(this.ptr, val);
 	}
 
-	public byte[] get_revocation_base_key() {
-		byte[] ret = bindings.InMemoryChannelKeys_get_revocation_base_key(this.ptr);
+	public Uint8Array get_revocation_base_key() {
+		Uint8Array ret = bindings.InMemoryChannelKeys_get_revocation_base_key(this.ptr);
 		return ret;
 	}
 
-	public void set_revocation_base_key(byte[] val) {
+	public void set_revocation_base_key(Uint8Array val) {
 		bindings.InMemoryChannelKeys_set_revocation_base_key(this.ptr, val);
 	}
 
-	public byte[] get_payment_key() {
-		byte[] ret = bindings.InMemoryChannelKeys_get_payment_key(this.ptr);
+	public Uint8Array get_payment_key() {
+		Uint8Array ret = bindings.InMemoryChannelKeys_get_payment_key(this.ptr);
 		return ret;
 	}
 
-	public void set_payment_key(byte[] val) {
+	public void set_payment_key(Uint8Array val) {
 		bindings.InMemoryChannelKeys_set_payment_key(this.ptr, val);
 	}
 
-	public byte[] get_delayed_payment_base_key() {
-		byte[] ret = bindings.InMemoryChannelKeys_get_delayed_payment_base_key(this.ptr);
+	public Uint8Array get_delayed_payment_base_key() {
+		Uint8Array ret = bindings.InMemoryChannelKeys_get_delayed_payment_base_key(this.ptr);
 		return ret;
 	}
 
-	public void set_delayed_payment_base_key(byte[] val) {
+	public void set_delayed_payment_base_key(Uint8Array val) {
 		bindings.InMemoryChannelKeys_set_delayed_payment_base_key(this.ptr, val);
 	}
 
-	public byte[] get_htlc_base_key() {
-		byte[] ret = bindings.InMemoryChannelKeys_get_htlc_base_key(this.ptr);
+	public Uint8Array get_htlc_base_key() {
+		Uint8Array ret = bindings.InMemoryChannelKeys_get_htlc_base_key(this.ptr);
 		return ret;
 	}
 
-	public void set_htlc_base_key(byte[] val) {
+	public void set_htlc_base_key(Uint8Array val) {
 		bindings.InMemoryChannelKeys_set_htlc_base_key(this.ptr, val);
 	}
 
-	public byte[] get_commitment_seed() {
-		byte[] ret = bindings.InMemoryChannelKeys_get_commitment_seed(this.ptr);
+	public Uint8Array get_commitment_seed() {
+		Uint8Array ret = bindings.InMemoryChannelKeys_get_commitment_seed(this.ptr);
 		return ret;
 	}
 
-	public void set_commitment_seed(byte[] val) {
+	public void set_commitment_seed(Uint8Array val) {
 		bindings.InMemoryChannelKeys_set_commitment_seed(this.ptr, val);
 	}
 
-	public static InMemoryChannelKeys constructor_new(byte[] funding_key, byte[] revocation_base_key, byte[] payment_key, byte[] delayed_payment_base_key, byte[] htlc_base_key, byte[] commitment_seed, long channel_value_satoshis, TwoTuple<Long, Long> key_derivation_params) {
-		uint32_t ret = bindings.InMemoryChannelKeys_new(funding_key, revocation_base_key, payment_key, delayed_payment_base_key, htlc_base_key, commitment_seed, channel_value_satoshis, bindings.C2Tuple_u64u64Z_new(key_derivation_params.a, key_derivation_params.b));
-		InMemoryChannelKeys ret_hu_conv = new InMemoryChannelKeys(null, ret);
+	public static InMemoryChannelKeys constructor_new(Uint8Array funding_key, Uint8Array revocation_base_key, Uint8Array payment_key, Uint8Array delayed_payment_base_key, Uint8Array htlc_base_key, Uint8Array commitment_seed, number channel_value_satoshis, TwoTuple<Number, Number> key_derivation_params) {
+		number ret = bindings.InMemoryChannelKeys_new(funding_key, revocation_base_key, payment_key, delayed_payment_base_key, htlc_base_key, commitment_seed, channel_value_satoshis, bindings.C2Tuple_u64u64Z_new(key_derivation_params.a, key_derivation_params.b));
+		const ret_hu_conv: InMemoryChannelKeys = new InMemoryChannelKeys(null, ret);
 		return ret_hu_conv;
 	}
 
 	public ChannelPublicKeys counterparty_pubkeys() {
-		uint32_t ret = bindings.InMemoryChannelKeys_counterparty_pubkeys(this.ptr);
-		ChannelPublicKeys ret_hu_conv = new ChannelPublicKeys(null, ret);
+		number ret = bindings.InMemoryChannelKeys_counterparty_pubkeys(this.ptr);
+		const ret_hu_conv: ChannelPublicKeys = new ChannelPublicKeys(null, ret);
 		return ret_hu_conv;
 	}
 
-	public short counterparty_selected_contest_delay() {
-		short ret = bindings.InMemoryChannelKeys_counterparty_selected_contest_delay(this.ptr);
+	public number counterparty_selected_contest_delay() {
+		number ret = bindings.InMemoryChannelKeys_counterparty_selected_contest_delay(this.ptr);
 		return ret;
 	}
 
-	public short holder_selected_contest_delay() {
-		short ret = bindings.InMemoryChannelKeys_holder_selected_contest_delay(this.ptr);
+	public number holder_selected_contest_delay() {
+		number ret = bindings.InMemoryChannelKeys_holder_selected_contest_delay(this.ptr);
 		return ret;
 	}
 
@@ -98,31 +106,31 @@ public class InMemoryChannelKeys extends CommonBase {
 	}
 
 	public OutPoint funding_outpoint() {
-		uint32_t ret = bindings.InMemoryChannelKeys_funding_outpoint(this.ptr);
-		OutPoint ret_hu_conv = new OutPoint(null, ret);
+		number ret = bindings.InMemoryChannelKeys_funding_outpoint(this.ptr);
+		const ret_hu_conv: OutPoint = new OutPoint(null, ret);
 		return ret_hu_conv;
 	}
 
 	public ChannelTransactionParameters get_channel_parameters() {
-		uint32_t ret = bindings.InMemoryChannelKeys_get_channel_parameters(this.ptr);
-		ChannelTransactionParameters ret_hu_conv = new ChannelTransactionParameters(null, ret);
+		number ret = bindings.InMemoryChannelKeys_get_channel_parameters(this.ptr);
+		const ret_hu_conv: ChannelTransactionParameters = new ChannelTransactionParameters(null, ret);
 		return ret_hu_conv;
 	}
 
 	public ChannelKeys as_ChannelKeys() {
-		uint32_t ret = bindings.InMemoryChannelKeys_as_ChannelKeys(this.ptr);
+		number ret = bindings.InMemoryChannelKeys_as_ChannelKeys(this.ptr);
 		ChannelKeys ret_hu_conv = new ChannelKeys(null, ret);
 		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
-	public byte[] write() {
-		byte[] ret = bindings.InMemoryChannelKeys_write(this.ptr);
+	public Uint8Array write() {
+		Uint8Array ret = bindings.InMemoryChannelKeys_write(this.ptr);
 		return ret;
 	}
 
-	public static Result_InMemoryChannelKeysDecodeErrorZ constructor_read(byte[] ser) {
-		uint32_t ret = bindings.InMemoryChannelKeys_read(ser);
+	public static Result_InMemoryChannelKeysDecodeErrorZ constructor_read(Uint8Array ser) {
+		number ret = bindings.InMemoryChannelKeys_read(ser);
 		Result_InMemoryChannelKeysDecodeErrorZ ret_hu_conv = Result_InMemoryChannelKeysDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}