X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FEvent.ts;h=7e6d6e31cec519e84a1d6fc03cab453440b0ad34;hb=6f84978154512148a47502caad48038e3f264392;hp=bddf17ba07a3497c23656b24cb62c1338e0bda40;hpb=822471992c6bf6f9985e531cc5940e4cc35e3e4c;p=ldk-java

diff --git a/ts/structs/Event.ts b/ts/structs/Event.ts
index bddf17ba..7e6d6e31 100644
--- a/ts/structs/Event.ts
+++ b/ts/structs/Event.ts
@@ -13,9 +13,6 @@ export default class Event extends CommonBase {
 		if (raw_val instanceof bindings.LDKEvent.FundingGenerationReady) {
 			return new FundingGenerationReady(this.ptr, raw_val);
 		}
-		if (raw_val instanceof bindings.LDKEvent.FundingBroadcastSafe) {
-			return new FundingBroadcastSafe(this.ptr, raw_val);
-		}
 		if (raw_val instanceof bindings.LDKEvent.PaymentReceived) {
 			return new PaymentReceived(this.ptr, raw_val);
 		}
@@ -36,10 +33,10 @@ export default class Event extends CommonBase {
 
 }
 export class FundingGenerationReady extends Event {
-	public temporary_channel_id: byte[];
-	public channel_value_satoshis: long;
-	public output_script: byte[];
-	public user_channel_id: long;
+	public temporary_channel_id: Uint8Array;
+	public channel_value_satoshis: number;
+	public output_script: Uint8Array;
+	public user_channel_id: number;
 	private constructor(ptr: number, obj: bindings.LDKEvent.FundingGenerationReady) {
 		super(null, ptr);
 		this.temporary_channel_id = obj.temporary_channel_id;
@@ -48,21 +45,10 @@ export class FundingGenerationReady extends Event {
 		this.user_channel_id = obj.user_channel_id;
 	}
 }
-export class FundingBroadcastSafe extends Event {
-	public funding_txo: OutPoint;
-	public user_channel_id: long;
-	private constructor(ptr: number, obj: bindings.LDKEvent.FundingBroadcastSafe) {
-		super(null, ptr);
-		const funding_txo: uint32_t = obj.funding_txo;
-		OutPoint funding_txo_hu_conv = new OutPoint(null, funding_txo);
-		this.funding_txo = funding_txo_hu_conv;
-		this.user_channel_id = obj.user_channel_id;
-	}
-}
 export class PaymentReceived extends Event {
-	public payment_hash: byte[];
-	public payment_secret: byte[];
-	public amt: long;
+	public payment_hash: Uint8Array;
+	public payment_secret: Uint8Array;
+	public amt: number;
 	private constructor(ptr: number, obj: bindings.LDKEvent.PaymentReceived) {
 		super(null, ptr);
 		this.payment_hash = obj.payment_hash;
@@ -71,14 +57,14 @@ export class PaymentReceived extends Event {
 	}
 }
 export class PaymentSent extends Event {
-	public payment_preimage: byte[];
+	public payment_preimage: Uint8Array;
 	private constructor(ptr: number, obj: bindings.LDKEvent.PaymentSent) {
 		super(null, ptr);
 		this.payment_preimage = obj.payment_preimage;
 	}
 }
 export class PaymentFailed extends Event {
-	public payment_hash: byte[];
+	public payment_hash: Uint8Array;
 	public rejected_by_dest: boolean;
 	private constructor(ptr: number, obj: bindings.LDKEvent.PaymentFailed) {
 		super(null, ptr);
@@ -87,7 +73,7 @@ export class PaymentFailed extends Event {
 	}
 }
 export class PendingHTLCsForwardable extends Event {
-	public time_forwardable: long;
+	public time_forwardable: number;
 	private constructor(ptr: number, obj: bindings.LDKEvent.PendingHTLCsForwardable) {
 		super(null, ptr);
 		this.time_forwardable = obj.time_forwardable;
@@ -97,14 +83,27 @@ export class SpendableOutputs extends Event {
 	public outputs: SpendableOutputDescriptor[];
 	private constructor(ptr: number, obj: bindings.LDKEvent.SpendableOutputs) {
 		super(null, ptr);
-		const outputs: uint32_t[] = obj.outputs;
-		SpendableOutputDescriptor[] arr_conv_27_arr = new SpendableOutputDescriptor[outputs.length];
+		const outputs: number[] = obj.outputs;
+		SpendableOutputDescriptor[] outputs_conv_27_arr = new SpendableOutputDescriptor[outputs.length];
 			for (int b = 0; b < outputs.length; b++) {
-				uint32_t arr_conv_27 = outputs[b];
-				SpendableOutputDescriptor arr_conv_27_hu_conv = SpendableOutputDescriptor.constr_from_ptr(arr_conv_27);
-				arr_conv_27_hu_conv.ptrs_to.add(this);
-				arr_conv_27_arr[b] = arr_conv_27_hu_conv;
+				number outputs_conv_27 = outputs[b];
+				SpendableOutputDescriptor outputs_conv_27_hu_conv = SpendableOutputDescriptor.constr_from_ptr(outputs_conv_27);
+				outputs_conv_27_hu_conv.ptrs_to.add(this);
+				outputs_conv_27_arr[b] = outputs_conv_27_hu_conv;
 			}
-		this.outputs = arr_conv_27_arr;
+		this.outputs = outputs_conv_27_arr;
 	}
+}
+	public Event clone() {
+		number ret = bindings.Event_clone(this.ptr);
+		Event ret_hu_conv = Event.constr_from_ptr(ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	public Uint8Array write() {
+		Uint8Array ret = bindings.Event_write(this.ptr);
+		return ret;
+	}
+
 }