X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FSpendableOutputDescriptor.mts;h=681706f5ead4d2f48283a69c47e9756ffb6d55f7;hb=31a1b84c2ca25db2978865e9ca9573974f79cc79;hp=0764c6d15b245f85097c10a900acb656b325f006;hpb=293bcee787de3eb181b82175a1784a4ef311e012;p=ldk-java diff --git a/ts/structs/SpendableOutputDescriptor.mts b/ts/structs/SpendableOutputDescriptor.mts index 0764c6d1..681706f5 100644 --- a/ts/structs/SpendableOutputDescriptor.mts +++ b/ts/structs/SpendableOutputDescriptor.mts @@ -67,6 +67,9 @@ import { Result_PaymentPurposeDecodeErrorZ } from '../structs/Result_PaymentPurp import { ClosureReason } from '../structs/ClosureReason.mjs'; import { Option_ClosureReasonZ } from '../structs/Option_ClosureReasonZ.mjs'; import { Result_COption_ClosureReasonZDecodeErrorZ } from '../structs/Result_COption_ClosureReasonZDecodeErrorZ.mjs'; +import { HTLCDestination } from '../structs/HTLCDestination.mjs'; +import { Option_HTLCDestinationZ } from '../structs/Option_HTLCDestinationZ.mjs'; +import { Result_COption_HTLCDestinationZDecodeErrorZ } from '../structs/Result_COption_HTLCDestinationZDecodeErrorZ.mjs'; import { ChannelUpdate } from '../structs/ChannelUpdate.mjs'; import { NetworkUpdate } from '../structs/NetworkUpdate.mjs'; import { Option_NetworkUpdateZ } from '../structs/Option_NetworkUpdateZ.mjs'; @@ -103,7 +106,7 @@ import { TwoTuple_usizeTransactionZ } from '../structs/TwoTuple_usizeTransaction import { Result_NoneChannelMonitorUpdateErrZ } from '../structs/Result_NoneChannelMonitorUpdateErrZ.mjs'; import { HTLCUpdate } from '../structs/HTLCUpdate.mjs'; import { MonitorEvent } from '../structs/MonitorEvent.mjs'; -import { TwoTuple_OutPointCVec_MonitorEventZZ } from '../structs/TwoTuple_OutPointCVec_MonitorEventZZ.mjs'; +import { ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ } from '../structs/ThreeTuple_OutPointCVec_MonitorEventZPublicKeyZ.mjs'; import { Option_C2Tuple_usizeTransactionZZ } from '../structs/Option_C2Tuple_usizeTransactionZZ.mjs'; import { FixedPenaltyScorer } from '../structs/FixedPenaltyScorer.mjs'; import { Result_FixedPenaltyScorerDecodeErrorZ } from '../structs/Result_FixedPenaltyScorerDecodeErrorZ.mjs'; @@ -137,6 +140,7 @@ import { ChannelInfo } from '../structs/ChannelInfo.mjs'; import { Result_ChannelInfoDecodeErrorZ } from '../structs/Result_ChannelInfoDecodeErrorZ.mjs'; import { RoutingFees } from '../structs/RoutingFees.mjs'; import { Result_RoutingFeesDecodeErrorZ } from '../structs/Result_RoutingFeesDecodeErrorZ.mjs'; +import { Hostname } from '../structs/Hostname.mjs'; import { NetAddress } from '../structs/NetAddress.mjs'; import { NodeAnnouncementInfo } from '../structs/NodeAnnouncementInfo.mjs'; import { Result_NodeAnnouncementInfoDecodeErrorZ } from '../structs/Result_NodeAnnouncementInfoDecodeErrorZ.mjs'; @@ -359,9 +363,9 @@ import * as bindings from '../bindings.mjs' * that txid/index, and any keys or other information required to sign. */ export class SpendableOutputDescriptor extends CommonBase { - protected constructor(_dummy: object, ptr: number) { super(ptr, bindings.SpendableOutputDescriptor_free); } + protected constructor(_dummy: object, ptr: bigint) { super(ptr, bindings.SpendableOutputDescriptor_free); } /* @internal */ - public static constr_from_ptr(ptr: number): SpendableOutputDescriptor { + public static constr_from_ptr(ptr: bigint): SpendableOutputDescriptor { const raw_ty: number = bindings.LDKSpendableOutputDescriptor_ty_from_ptr(ptr); switch (raw_ty) { case 0: return new SpendableOutputDescriptor_StaticOutput(ptr); @@ -372,8 +376,8 @@ export class SpendableOutputDescriptor extends CommonBase { } } - public clone_ptr(): number { - const ret: number = bindings.SpendableOutputDescriptor_clone_ptr(this.ptr); + public clone_ptr(): bigint { + const ret: bigint = bindings.SpendableOutputDescriptor_clone_ptr(this.ptr); return ret; } @@ -381,7 +385,7 @@ export class SpendableOutputDescriptor extends CommonBase { * Creates a copy of the SpendableOutputDescriptor */ public clone(): SpendableOutputDescriptor { - const ret: number = bindings.SpendableOutputDescriptor_clone(this.ptr); + const ret: bigint = bindings.SpendableOutputDescriptor_clone(this.ptr); const ret_hu_conv: SpendableOutputDescriptor = SpendableOutputDescriptor.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, this); return ret_hu_conv; @@ -391,9 +395,10 @@ export class SpendableOutputDescriptor extends CommonBase { * Utility method to constructs a new StaticOutput-variant SpendableOutputDescriptor */ public static constructor_static_output(outpoint: OutPoint, output: TxOut): SpendableOutputDescriptor { - const ret: number = bindings.SpendableOutputDescriptor_static_output(outpoint == null ? 0 : CommonBase.get_ptr_of(outpoint) & ~1, CommonBase.get_ptr_of(output)); + const ret: bigint = bindings.SpendableOutputDescriptor_static_output(outpoint == null ? 0n : CommonBase.get_ptr_of(outpoint), CommonBase.get_ptr_of(output)); const ret_hu_conv: SpendableOutputDescriptor = SpendableOutputDescriptor.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, outpoint); return ret_hu_conv; } @@ -401,9 +406,10 @@ export class SpendableOutputDescriptor extends CommonBase { * Utility method to constructs a new DelayedPaymentOutput-variant SpendableOutputDescriptor */ public static constructor_delayed_payment_output(a: DelayedPaymentOutputDescriptor): SpendableOutputDescriptor { - const ret: number = bindings.SpendableOutputDescriptor_delayed_payment_output(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1); + const ret: bigint = bindings.SpendableOutputDescriptor_delayed_payment_output(a == null ? 0n : CommonBase.get_ptr_of(a)); const ret_hu_conv: SpendableOutputDescriptor = SpendableOutputDescriptor.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); return ret_hu_conv; } @@ -411,9 +417,10 @@ export class SpendableOutputDescriptor extends CommonBase { * Utility method to constructs a new StaticPaymentOutput-variant SpendableOutputDescriptor */ public static constructor_static_payment_output(a: StaticPaymentOutputDescriptor): SpendableOutputDescriptor { - const ret: number = bindings.SpendableOutputDescriptor_static_payment_output(a == null ? 0 : CommonBase.get_ptr_of(a) & ~1); + const ret: bigint = bindings.SpendableOutputDescriptor_static_payment_output(a == null ? 0n : CommonBase.get_ptr_of(a)); const ret_hu_conv: SpendableOutputDescriptor = SpendableOutputDescriptor.constr_from_ptr(ret); CommonBase.add_ref_from(ret_hu_conv, ret_hu_conv); + CommonBase.add_ref_from(ret_hu_conv, a); return ret_hu_conv; } @@ -430,7 +437,7 @@ export class SpendableOutputDescriptor extends CommonBase { * Read a SpendableOutputDescriptor from a byte array, created by SpendableOutputDescriptor_write */ public static constructor_read(ser: Uint8Array): Result_SpendableOutputDescriptorDecodeErrorZ { - const ret: number = bindings.SpendableOutputDescriptor_read(bindings.encodeUint8Array(ser)); + const ret: bigint = bindings.SpendableOutputDescriptor_read(bindings.encodeUint8Array(ser)); const ret_hu_conv: Result_SpendableOutputDescriptorDecodeErrorZ = Result_SpendableOutputDescriptorDecodeErrorZ.constr_from_ptr(ret); return ret_hu_conv; } @@ -447,13 +454,13 @@ export class SpendableOutputDescriptor_StaticOutput extends SpendableOutputDescr */ public output: TxOut; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const outpoint: number = bindings.LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(ptr); + const outpoint: bigint = bindings.LDKSpendableOutputDescriptor_StaticOutput_get_outpoint(ptr); const outpoint_hu_conv: OutPoint = new OutPoint(null, outpoint); CommonBase.add_ref_from(outpoint_hu_conv, this); this.outpoint = outpoint_hu_conv; - const output: number = bindings.LDKSpendableOutputDescriptor_StaticOutput_get_output(ptr); + const output: bigint = bindings.LDKSpendableOutputDescriptor_StaticOutput_get_output(ptr); const output_conv: TxOut = new TxOut(null, output); this.output = output_conv; } @@ -462,9 +469,9 @@ export class SpendableOutputDescriptor_StaticOutput extends SpendableOutputDescr export class SpendableOutputDescriptor_DelayedPaymentOutput extends SpendableOutputDescriptor { public delayed_payment_output: DelayedPaymentOutputDescriptor; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const delayed_payment_output: number = bindings.LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output(ptr); + const delayed_payment_output: bigint = bindings.LDKSpendableOutputDescriptor_DelayedPaymentOutput_get_delayed_payment_output(ptr); const delayed_payment_output_hu_conv: DelayedPaymentOutputDescriptor = new DelayedPaymentOutputDescriptor(null, delayed_payment_output); CommonBase.add_ref_from(delayed_payment_output_hu_conv, this); this.delayed_payment_output = delayed_payment_output_hu_conv; @@ -474,9 +481,9 @@ export class SpendableOutputDescriptor_DelayedPaymentOutput extends SpendableOut export class SpendableOutputDescriptor_StaticPaymentOutput extends SpendableOutputDescriptor { public static_payment_output: StaticPaymentOutputDescriptor; /* @internal */ - public constructor(ptr: number) { + public constructor(ptr: bigint) { super(null, ptr); - const static_payment_output: number = bindings.LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output(ptr); + const static_payment_output: bigint = bindings.LDKSpendableOutputDescriptor_StaticPaymentOutput_get_static_payment_output(ptr); const static_payment_output_hu_conv: StaticPaymentOutputDescriptor = new StaticPaymentOutputDescriptor(null, static_payment_output); CommonBase.add_ref_from(static_payment_output_hu_conv, this); this.static_payment_output = static_payment_output_hu_conv;