X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FBaseSign.ts;h=b76963c707fe63aaeed6ed5ff1e0ab051b53665c;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=1aa749f69f5679605c8cf8dc1862931ad1d9ba04;hpb=e30b350e325e7d517ea744578876d473839ad495;p=ldk-java

diff --git a/ts/structs/BaseSign.ts b/ts/structs/BaseSign.ts
index 1aa749f6..b76963c7 100644
--- a/ts/structs/BaseSign.ts
+++ b/ts/structs/BaseSign.ts
@@ -15,7 +15,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 				        this.bindings_instance = null;
 				    } else {
 				        // TODO: private constructor instantiation
-				        super(bindings.LDKBaseSign_new(arg, pubkeys == null ? 0 : pubkeys.ptr & ~1));
+				        super(bindings.LDKBaseSign_new(arg, pubkeys == null ? 0 : pubkeys.clone_ptr()));
 				        this.ptrs_to.push(arg);
 				        
 				    }
@@ -34,77 +34,80 @@ import * as bindings from '../bindings' // TODO: figure out location
                         // todo: in-line interface filling
                         get_per_commitment_point (idx: number): Uint8Array {
 							Uint8Array ret = arg.get_per_commitment_point(idx);
-				return ret;
+				result: Uint8Array = InternalUtils.check_arr_len(ret, 33);
+				return result;
 						},
 
 						release_commitment_secret (idx: number): Uint8Array {
 							Uint8Array ret = arg.release_commitment_secret(idx);
-				return ret;
+				result: Uint8Array = InternalUtils.check_arr_len(ret, 32);
+				return result;
 						},
 
 						validate_holder_commitment (holder_tx: number): number {
 							const holder_tx_hu_conv: HolderCommitmentTransaction = new HolderCommitmentTransaction(null, holder_tx);
 							Result_NoneNoneZ ret = arg.validate_holder_commitment(holder_tx_hu_conv);
-				result: number = ret != null ? ret.ptr : 0;
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
 						channel_keys_id (): Uint8Array {
 							Uint8Array ret = arg.channel_keys_id();
-				return ret;
+				result: Uint8Array = InternalUtils.check_arr_len(ret, 32);
+				return result;
 						},
 
 						sign_counterparty_commitment (commitment_tx: number): number {
 							const commitment_tx_hu_conv: CommitmentTransaction = new CommitmentTransaction(null, commitment_tx);
 							Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret = arg.sign_counterparty_commitment(commitment_tx_hu_conv);
-				result: number = ret != null ? ret.ptr : 0;
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
 						validate_counterparty_revocation (idx: number, secret: Uint8Array): number {
 							Result_NoneNoneZ ret = arg.validate_counterparty_revocation(idx, secret);
-				result: number = ret != null ? ret.ptr : 0;
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
 						sign_holder_commitment_and_htlcs (commitment_tx: number): number {
 							const commitment_tx_hu_conv: HolderCommitmentTransaction = new HolderCommitmentTransaction(null, commitment_tx);
 							Result_C2Tuple_SignatureCVec_SignatureZZNoneZ ret = arg.sign_holder_commitment_and_htlcs(commitment_tx_hu_conv);
-				result: number = ret != null ? ret.ptr : 0;
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
 						sign_justice_revoked_output (justice_tx: Uint8Array, input: number, amount: number, per_commitment_key: Uint8Array): number {
 							Result_SignatureNoneZ ret = arg.sign_justice_revoked_output(justice_tx, input, amount, per_commitment_key);
-				result: number = ret != null ? ret.ptr : 0;
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
 						sign_justice_revoked_htlc (justice_tx: Uint8Array, input: number, amount: number, per_commitment_key: Uint8Array, htlc: number): number {
 							const htlc_hu_conv: HTLCOutputInCommitment = new HTLCOutputInCommitment(null, htlc);
 							Result_SignatureNoneZ ret = arg.sign_justice_revoked_htlc(justice_tx, input, amount, per_commitment_key, htlc_hu_conv);
-				result: number = ret != null ? ret.ptr : 0;
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
 						sign_counterparty_htlc_transaction (htlc_tx: Uint8Array, input: number, amount: number, per_commitment_point: Uint8Array, htlc: number): number {
 							const htlc_hu_conv: HTLCOutputInCommitment = new HTLCOutputInCommitment(null, htlc);
 							Result_SignatureNoneZ ret = arg.sign_counterparty_htlc_transaction(htlc_tx, input, amount, per_commitment_point, htlc_hu_conv);
-				result: number = ret != null ? ret.ptr : 0;
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
 						sign_closing_transaction (closing_tx: number): number {
 							const closing_tx_hu_conv: ClosingTransaction = new ClosingTransaction(null, closing_tx);
 							Result_SignatureNoneZ ret = arg.sign_closing_transaction(closing_tx_hu_conv);
-				result: number = ret != null ? ret.ptr : 0;
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
 						sign_channel_announcement (msg: number): number {
 							const msg_hu_conv: UnsignedChannelAnnouncement = new UnsignedChannelAnnouncement(null, msg);
 							Result_SignatureNoneZ ret = arg.sign_channel_announcement(msg_hu_conv);
-				result: number = ret != null ? ret.ptr : 0;
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
@@ -169,7 +172,7 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public Result_NoneNoneZ validate_counterparty_revocation(number idx, Uint8Array secret) {
-		number ret = bindings.BaseSign_validate_counterparty_revocation(this.ptr, idx, secret);
+		number ret = bindings.BaseSign_validate_counterparty_revocation(this.ptr, idx, InternalUtils.check_arr_len(secret, 32));
 		Result_NoneNoneZ ret_hu_conv = Result_NoneNoneZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
@@ -182,20 +185,20 @@ import * as bindings from '../bindings' // TODO: figure out location
 	}
 
 	public Result_SignatureNoneZ sign_justice_revoked_output(Uint8Array justice_tx, number input, number amount, Uint8Array per_commitment_key) {
-		number ret = bindings.BaseSign_sign_justice_revoked_output(this.ptr, justice_tx, input, amount, per_commitment_key);
+		number ret = bindings.BaseSign_sign_justice_revoked_output(this.ptr, justice_tx, input, amount, InternalUtils.check_arr_len(per_commitment_key, 32));
 		Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
 		return ret_hu_conv;
 	}
 
 	public Result_SignatureNoneZ sign_justice_revoked_htlc(Uint8Array justice_tx, number input, number amount, Uint8Array per_commitment_key, HTLCOutputInCommitment htlc) {
-		number ret = bindings.BaseSign_sign_justice_revoked_htlc(this.ptr, justice_tx, input, amount, per_commitment_key, htlc == null ? 0 : htlc.ptr & ~1);
+		number ret = bindings.BaseSign_sign_justice_revoked_htlc(this.ptr, justice_tx, input, amount, InternalUtils.check_arr_len(per_commitment_key, 32), htlc == null ? 0 : htlc.ptr & ~1);
 		Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
 		this.ptrs_to.add(htlc);
 		return ret_hu_conv;
 	}
 
 	public Result_SignatureNoneZ sign_counterparty_htlc_transaction(Uint8Array htlc_tx, number input, number amount, Uint8Array per_commitment_point, HTLCOutputInCommitment htlc) {
-		number ret = bindings.BaseSign_sign_counterparty_htlc_transaction(this.ptr, htlc_tx, input, amount, per_commitment_point, htlc == null ? 0 : htlc.ptr & ~1);
+		number ret = bindings.BaseSign_sign_counterparty_htlc_transaction(this.ptr, htlc_tx, input, amount, InternalUtils.check_arr_len(per_commitment_point, 33), htlc == null ? 0 : htlc.ptr & ~1);
 		Result_SignatureNoneZ ret_hu_conv = Result_SignatureNoneZ.constr_from_ptr(ret);
 		this.ptrs_to.add(htlc);
 		return ret_hu_conv;