X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FEvent.ts;h=022a0b5cb0fdc7ca2b647ecf758c5258942982f4;hb=197962d9373b042e0d3434937db9ccf0360489ea;hp=bd9ddd4d1a1da5957bc8765df1840f8741e18efa;hpb=0e5e33e2bb46c905f6c9478fbfcda11be6b309ff;p=ldk-java diff --git a/ts/structs/Event.ts b/ts/structs/Event.ts index bd9ddd4d..022a0b5c 100644 --- a/ts/structs/Event.ts +++ b/ts/structs/Event.ts @@ -69,23 +69,33 @@ export class PaymentReceived extends Event { } } export class PaymentSent extends Event { + public payment_id: Uint8Array; public payment_preimage: Uint8Array; public payment_hash: Uint8Array; + public fee_paid_msat: Option_u64Z; private constructor(ptr: number, obj: bindings.LDKEvent.PaymentSent) { super(null, ptr); + this.payment_id = obj.payment_id; this.payment_preimage = obj.payment_preimage; this.payment_hash = obj.payment_hash; + const fee_paid_msat: number = obj.fee_paid_msat; + Option_u64Z fee_paid_msat_hu_conv = Option_u64Z.constr_from_ptr(fee_paid_msat); + fee_paid_msat_hu_conv.ptrs_to.add(this); + this.fee_paid_msat = fee_paid_msat_hu_conv; } } export class PaymentPathFailed extends Event { + public payment_id: Uint8Array; public payment_hash: Uint8Array; public rejected_by_dest: boolean; public network_update: Option_NetworkUpdateZ; public all_paths_failed: boolean; public path: RouteHop[]; public short_channel_id: Option_u64Z; + public retry: RouteParameters; private constructor(ptr: number, obj: bindings.LDKEvent.PaymentPathFailed) { super(null, ptr); + this.payment_id = obj.payment_id; this.payment_hash = obj.payment_hash; this.rejected_by_dest = obj.rejected_by_dest; const network_update: number = obj.network_update; @@ -106,6 +116,10 @@ export class PaymentPathFailed extends Event { Option_u64Z short_channel_id_hu_conv = Option_u64Z.constr_from_ptr(short_channel_id); short_channel_id_hu_conv.ptrs_to.add(this); this.short_channel_id = short_channel_id_hu_conv; + const retry: number = obj.retry; + const retry_hu_conv: RouteParameters = new RouteParameters(null, retry); + retry_hu_conv.ptrs_to.add(this); + this.retry = retry_hu_conv; } } export class PendingHTLCsForwardable extends Event { @@ -165,6 +179,11 @@ export class DiscardFunding extends Event { this.transaction = obj.transaction; } } + public number clone_ptr() { + number ret = bindings.Event_clone_ptr(this.ptr); + return ret; + } + public Event clone() { number ret = bindings.Event_clone(this.ptr); Event ret_hu_conv = Event.constr_from_ptr(ret); @@ -173,28 +192,28 @@ export class DiscardFunding extends Event { } public static Event constructor_funding_generation_ready(Uint8Array temporary_channel_id, number channel_value_satoshis, Uint8Array output_script, number user_channel_id) { - number ret = bindings.Event_funding_generation_ready(temporary_channel_id, channel_value_satoshis, output_script, user_channel_id); + number ret = bindings.Event_funding_generation_ready(InternalUtils.check_arr_len(temporary_channel_id, 32), channel_value_satoshis, output_script, user_channel_id); Event ret_hu_conv = Event.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } public static Event constructor_payment_received(Uint8Array payment_hash, number amt, PaymentPurpose purpose) { - number ret = bindings.Event_payment_received(payment_hash, amt, purpose.ptr); + number ret = bindings.Event_payment_received(InternalUtils.check_arr_len(payment_hash, 32), amt, purpose.ptr); Event ret_hu_conv = Event.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } - public static Event constructor_payment_sent(Uint8Array payment_preimage, Uint8Array payment_hash) { - number ret = bindings.Event_payment_sent(payment_preimage, payment_hash); + public static Event constructor_payment_sent(Uint8Array payment_id, Uint8Array payment_preimage, Uint8Array payment_hash, Option_u64Z fee_paid_msat) { + number ret = bindings.Event_payment_sent(InternalUtils.check_arr_len(payment_id, 32), InternalUtils.check_arr_len(payment_preimage, 32), InternalUtils.check_arr_len(payment_hash, 32), fee_paid_msat.ptr); Event ret_hu_conv = Event.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } - public static Event constructor_payment_path_failed(Uint8Array payment_hash, boolean rejected_by_dest, Option_NetworkUpdateZ network_update, boolean all_paths_failed, RouteHop[] path, Option_u64Z short_channel_id) { - number ret = bindings.Event_payment_path_failed(payment_hash, rejected_by_dest, network_update.ptr, all_paths_failed, path != null ? Arrays.stream(path).map(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray(number[]::new) : null, short_channel_id.ptr); + public static Event constructor_payment_path_failed(Uint8Array payment_id, Uint8Array payment_hash, boolean rejected_by_dest, Option_NetworkUpdateZ network_update, boolean all_paths_failed, RouteHop[] path, Option_u64Z short_channel_id, RouteParameters retry) { + number ret = bindings.Event_payment_path_failed(InternalUtils.check_arr_len(payment_id, 32), InternalUtils.check_arr_len(payment_hash, 32), rejected_by_dest, network_update.ptr, all_paths_failed, path != null ? Arrays.stream(path).map(path_conv_10 -> path_conv_10 == null ? 0 : path_conv_10.ptr & ~1).toArray(number[]::new) : null, short_channel_id.ptr, retry == null ? 0 : retry.ptr & ~1); Event ret_hu_conv = Event.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; @@ -222,14 +241,14 @@ export class DiscardFunding extends Event { } public static Event constructor_channel_closed(Uint8Array channel_id, number user_channel_id, ClosureReason reason) { - number ret = bindings.Event_channel_closed(channel_id, user_channel_id, reason.ptr); + number ret = bindings.Event_channel_closed(InternalUtils.check_arr_len(channel_id, 32), user_channel_id, reason.ptr); Event ret_hu_conv = Event.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv; } public static Event constructor_discard_funding(Uint8Array channel_id, Uint8Array transaction) { - number ret = bindings.Event_discard_funding(channel_id, transaction); + number ret = bindings.Event_discard_funding(InternalUtils.check_arr_len(channel_id, 32), transaction); Event ret_hu_conv = Event.constr_from_ptr(ret); ret_hu_conv.ptrs_to.add(ret_hu_conv); return ret_hu_conv;