X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=ldk-java;a=blobdiff_plain;f=ts%2Fstructs%2FWatchedOutput.mts;h=018efefb5651d197c3a119454da69feb5c5421c7;hp=b2eb416983742fa0b90ba3c733dd292998ca5e34;hb=7d372e434499e36b8be0d090ef733a03650dec6e;hpb=d87886bb194886ef86d3597a5cdc142b6ccc89e9 diff --git a/ts/structs/WatchedOutput.mts b/ts/structs/WatchedOutput.mts index b2eb4169..018efefb 100644 --- a/ts/structs/WatchedOutput.mts +++ b/ts/structs/WatchedOutput.mts @@ -279,7 +279,6 @@ import { MultiThreadedLockableScore } from '../structs/MultiThreadedLockableScor import CommonBase from './CommonBase.mjs'; import * as bindings from '../bindings.mjs' -import * as InternalUtils from '../InternalUtils.mjs' export class WatchedOutput extends CommonBase { @@ -289,12 +288,13 @@ export class WatchedOutput extends CommonBase { } public get_block_hash(): Uint8Array { - const ret: Uint8Array = bindings.WatchedOutput_get_block_hash(this.ptr); - return ret; + const ret: number = bindings.WatchedOutput_get_block_hash(this.ptr); + const ret_conv: Uint8Array = bindings.decodeUint8Array(ret); + return ret_conv; } public set_block_hash(val: Uint8Array): void { - bindings.WatchedOutput_set_block_hash(this.ptr, InternalUtils.check_arr_len(val, 32)); + bindings.WatchedOutput_set_block_hash(this.ptr, bindings.encodeUint8Array(bindings.check_arr_len(val, 32))); } public get_outpoint(): OutPoint { @@ -309,16 +309,17 @@ export class WatchedOutput extends CommonBase { } public get_script_pubkey(): Uint8Array { - const ret: Uint8Array = bindings.WatchedOutput_get_script_pubkey(this.ptr); - return ret; + const ret: number = bindings.WatchedOutput_get_script_pubkey(this.ptr); + const ret_conv: Uint8Array = bindings.decodeUint8Array(ret); + return ret_conv; } public set_script_pubkey(val: Uint8Array): void { - bindings.WatchedOutput_set_script_pubkey(this.ptr, val); + bindings.WatchedOutput_set_script_pubkey(this.ptr, bindings.encodeUint8Array(val)); } public static constructor_new(block_hash_arg: Uint8Array, outpoint_arg: OutPoint, script_pubkey_arg: Uint8Array): WatchedOutput { - const ret: number = bindings.WatchedOutput_new(InternalUtils.check_arr_len(block_hash_arg, 32), outpoint_arg == null ? 0 : CommonBase.get_ptr_of(outpoint_arg) & ~1, script_pubkey_arg); + const ret: number = bindings.WatchedOutput_new(bindings.encodeUint8Array(bindings.check_arr_len(block_hash_arg, 32)), outpoint_arg == null ? 0 : CommonBase.get_ptr_of(outpoint_arg) & ~1, bindings.encodeUint8Array(script_pubkey_arg)); const ret_hu_conv: WatchedOutput = new WatchedOutput(null, ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); return ret_hu_conv; @@ -336,8 +337,8 @@ export class WatchedOutput extends CommonBase { return ret_hu_conv; } - public hash(): number { - const ret: number = bindings.WatchedOutput_hash(this.ptr); + public hash(): bigint { + const ret: bigint = bindings.WatchedOutput_hash(this.ptr); return ret; }