X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FTxCreationKeys.ts;h=7cdad7a5a23a649df6a8bd406e45fd05d5ec55b7;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=83aeb58883ddd46e52d7f9e1e519377e1e214049;hpb=acecce750cf1159a51f9d1a4dbfd717520739e92;p=ldk-java

diff --git a/ts/structs/TxCreationKeys.ts b/ts/structs/TxCreationKeys.ts
index 83aeb588..7cdad7a5 100644
--- a/ts/structs/TxCreationKeys.ts
+++ b/ts/structs/TxCreationKeys.ts
@@ -18,19 +18,13 @@ import * as bindings from '../bindings' // TODO: figure out location
                         bindings.TxCreationKeys_free(this.ptr);
                     }
                 }
-	public TxCreationKeys clone() {
-		number ret = bindings.TxCreationKeys_clone(this.ptr);
-		const ret_hu_conv: TxCreationKeys = new TxCreationKeys(null, ret);
-		return ret_hu_conv;
-	}
-
 	public Uint8Array get_per_commitment_point() {
 		Uint8Array ret = bindings.TxCreationKeys_get_per_commitment_point(this.ptr);
 		return ret;
 	}
 
 	public void set_per_commitment_point(Uint8Array val) {
-		bindings.TxCreationKeys_set_per_commitment_point(this.ptr, val);
+		bindings.TxCreationKeys_set_per_commitment_point(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
 	public Uint8Array get_revocation_key() {
@@ -39,7 +33,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public void set_revocation_key(Uint8Array val) {
-		bindings.TxCreationKeys_set_revocation_key(this.ptr, val);
+		bindings.TxCreationKeys_set_revocation_key(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
 	public Uint8Array get_broadcaster_htlc_key() {
@@ -48,7 +42,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public void set_broadcaster_htlc_key(Uint8Array val) {
-		bindings.TxCreationKeys_set_broadcaster_htlc_key(this.ptr, val);
+		bindings.TxCreationKeys_set_broadcaster_htlc_key(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
 	public Uint8Array get_countersignatory_htlc_key() {
@@ -57,7 +51,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public void set_countersignatory_htlc_key(Uint8Array val) {
-		bindings.TxCreationKeys_set_countersignatory_htlc_key(this.ptr, val);
+		bindings.TxCreationKeys_set_countersignatory_htlc_key(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
 	public Uint8Array get_broadcaster_delayed_payment_key() {
@@ -66,12 +60,25 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public void set_broadcaster_delayed_payment_key(Uint8Array val) {
-		bindings.TxCreationKeys_set_broadcaster_delayed_payment_key(this.ptr, val);
+		bindings.TxCreationKeys_set_broadcaster_delayed_payment_key(this.ptr, InternalUtils.check_arr_len(val, 33));
 	}
 
 	public static TxCreationKeys constructor_new(Uint8Array per_commitment_point_arg, Uint8Array revocation_key_arg, Uint8Array broadcaster_htlc_key_arg, Uint8Array countersignatory_htlc_key_arg, Uint8Array broadcaster_delayed_payment_key_arg) {
-		number ret = bindings.TxCreationKeys_new(per_commitment_point_arg, revocation_key_arg, broadcaster_htlc_key_arg, countersignatory_htlc_key_arg, broadcaster_delayed_payment_key_arg);
+		number ret = bindings.TxCreationKeys_new(InternalUtils.check_arr_len(per_commitment_point_arg, 33), InternalUtils.check_arr_len(revocation_key_arg, 33), InternalUtils.check_arr_len(broadcaster_htlc_key_arg, 33), InternalUtils.check_arr_len(countersignatory_htlc_key_arg, 33), InternalUtils.check_arr_len(broadcaster_delayed_payment_key_arg, 33));
+		const ret_hu_conv: TxCreationKeys = new TxCreationKeys(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	public number clone_ptr() {
+		number ret = bindings.TxCreationKeys_clone_ptr(this.ptr);
+		return ret;
+	}
+
+	public TxCreationKeys clone() {
+		number ret = bindings.TxCreationKeys_clone(this.ptr);
 		const ret_hu_conv: TxCreationKeys = new TxCreationKeys(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
 		return ret_hu_conv;
 	}
 
@@ -80,21 +87,21 @@ import * as bindings from '../bindings' // TODO: figure out location
 		return ret;
 	}
 
-	public static TxCreationKeys constructor_read(Uint8Array ser) {
+	public static Result_TxCreationKeysDecodeErrorZ constructor_read(Uint8Array ser) {
 		number ret = bindings.TxCreationKeys_read(ser);
-		const ret_hu_conv: TxCreationKeys = new TxCreationKeys(null, ret);
+		Result_TxCreationKeysDecodeErrorZ ret_hu_conv = Result_TxCreationKeysDecodeErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
 
-	public static Result_TxCreationKeysSecpErrorZ constructor_derive_new(Uint8Array per_commitment_point, Uint8Array broadcaster_delayed_payment_base, Uint8Array broadcaster_htlc_base, Uint8Array countersignatory_revocation_base, Uint8Array countersignatory_htlc_base) {
-		number ret = bindings.TxCreationKeys_derive_new(per_commitment_point, broadcaster_delayed_payment_base, broadcaster_htlc_base, countersignatory_revocation_base, countersignatory_htlc_base);
-		Result_TxCreationKeysSecpErrorZ ret_hu_conv = Result_TxCreationKeysSecpErrorZ.constr_from_ptr(ret);
+	public static Result_TxCreationKeysErrorZ constructor_derive_new(Uint8Array per_commitment_point, Uint8Array broadcaster_delayed_payment_base, Uint8Array broadcaster_htlc_base, Uint8Array countersignatory_revocation_base, Uint8Array countersignatory_htlc_base) {
+		number ret = bindings.TxCreationKeys_derive_new(InternalUtils.check_arr_len(per_commitment_point, 33), InternalUtils.check_arr_len(broadcaster_delayed_payment_base, 33), InternalUtils.check_arr_len(broadcaster_htlc_base, 33), InternalUtils.check_arr_len(countersignatory_revocation_base, 33), InternalUtils.check_arr_len(countersignatory_htlc_base, 33));
+		Result_TxCreationKeysErrorZ ret_hu_conv = Result_TxCreationKeysErrorZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
 
-	public static Result_TxCreationKeysSecpErrorZ constructor_from_channel_static_keys(Uint8Array per_commitment_point, ChannelPublicKeys broadcaster_keys, ChannelPublicKeys countersignatory_keys) {
-		number ret = bindings.TxCreationKeys_from_channel_static_keys(per_commitment_point, broadcaster_keys == null ? 0 : broadcaster_keys.ptr & ~1, countersignatory_keys == null ? 0 : countersignatory_keys.ptr & ~1);
-		Result_TxCreationKeysSecpErrorZ ret_hu_conv = Result_TxCreationKeysSecpErrorZ.constr_from_ptr(ret);
+	public static Result_TxCreationKeysErrorZ constructor_from_channel_static_keys(Uint8Array per_commitment_point, ChannelPublicKeys broadcaster_keys, ChannelPublicKeys countersignatory_keys) {
+		number ret = bindings.TxCreationKeys_from_channel_static_keys(InternalUtils.check_arr_len(per_commitment_point, 33), broadcaster_keys == null ? 0 : broadcaster_keys.ptr & ~1, countersignatory_keys == null ? 0 : countersignatory_keys.ptr & ~1);
+		Result_TxCreationKeysErrorZ ret_hu_conv = Result_TxCreationKeysErrorZ.constr_from_ptr(ret);
 		ret_hu_conv.ptrs_to.add(broadcaster_keys);
 		ret_hu_conv.ptrs_to.add(countersignatory_keys);
 		return ret_hu_conv;