X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=ts%2Fstructs%2FPersist.ts;h=3a4b734464a46d891b2d8405aaceb34a308dadb3;hb=f3e670e9341decac613d33fc52febf19cea32f20;hp=dbfc8aeb284ff549bcf8909a73abfb7e6aa86eb0;hpb=fed2245c60159f6c074c9ed5c0f3ce273ad9841b;p=ldk-java

diff --git a/ts/structs/Persist.ts b/ts/structs/Persist.ts
index dbfc8aeb..3a4b7344 100644
--- a/ts/structs/Persist.ts
+++ b/ts/structs/Persist.ts
@@ -32,22 +32,26 @@ import * as bindings from '../bindings' // TODO: figure out location
                     const impl_holder: LDKPersistHolder = new LDKPersistHolder();
                     let structImplementation = <bindings.LDKPersist>{
                         // todo: in-line interface filling
-                        persist_new_channel (id: number, data: number): number {
-							const id_hu_conv: OutPoint = new OutPoint(null, id);
-				id_hu_conv.ptrs_to.add(this);
+                        persist_new_channel (channel_id: number, data: number, update_id: number): number {
+							const channel_id_hu_conv: OutPoint = new OutPoint(null, channel_id);
+				channel_id_hu_conv.ptrs_to.add(this);
 							const data_hu_conv: ChannelMonitor = new ChannelMonitor(null, data);
-							Result_NoneChannelMonitorUpdateErrZ ret = arg.persist_new_channel(id_hu_conv, data_hu_conv);
-				result: number = ret != null ? ret.ptr : 0;
+							const update_id_hu_conv: MonitorUpdateId = new MonitorUpdateId(null, update_id);
+				update_id_hu_conv.ptrs_to.add(this);
+							Result_NoneChannelMonitorUpdateErrZ ret = arg.persist_new_channel(channel_id_hu_conv, data_hu_conv, update_id_hu_conv);
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
-						update_persisted_channel (id: number, update: number, data: number): number {
-							const id_hu_conv: OutPoint = new OutPoint(null, id);
-				id_hu_conv.ptrs_to.add(this);
+						update_persisted_channel (channel_id: number, update: number, data: number, update_id: number): number {
+							const channel_id_hu_conv: OutPoint = new OutPoint(null, channel_id);
+				channel_id_hu_conv.ptrs_to.add(this);
 							const update_hu_conv: ChannelMonitorUpdate = new ChannelMonitorUpdate(null, update);
 							const data_hu_conv: ChannelMonitor = new ChannelMonitor(null, data);
-							Result_NoneChannelMonitorUpdateErrZ ret = arg.update_persisted_channel(id_hu_conv, update_hu_conv, data_hu_conv);
-				result: number = ret != null ? ret.ptr : 0;
+							const update_id_hu_conv: MonitorUpdateId = new MonitorUpdateId(null, update_id);
+				update_id_hu_conv.ptrs_to.add(this);
+							Result_NoneChannelMonitorUpdateErrZ ret = arg.update_persisted_channel(channel_id_hu_conv, update_hu_conv, data_hu_conv, update_id_hu_conv);
+				result: number = ret == null ? 0 : ret.clone_ptr();
 				return result;
 						},
 
@@ -58,26 +62,24 @@ import * as bindings from '../bindings' // TODO: figure out location
             }
 
             export interface PersistInterface {
-                persist_new_channel(id: OutPoint, data: ChannelMonitor): Result_NoneChannelMonitorUpdateErrZ;
-				update_persisted_channel(id: OutPoint, update: ChannelMonitorUpdate, data: ChannelMonitor): Result_NoneChannelMonitorUpdateErrZ;
+                persist_new_channel(channel_id: OutPoint, data: ChannelMonitor, update_id: MonitorUpdateId): Result_NoneChannelMonitorUpdateErrZ;
+				update_persisted_channel(channel_id: OutPoint, update: ChannelMonitorUpdate, data: ChannelMonitor, update_id: MonitorUpdateId): Result_NoneChannelMonitorUpdateErrZ;
 				
             }
 
             class LDKPersistHolder {
                 held: Persist;
             }
-	public Result_NoneChannelMonitorUpdateErrZ persist_new_channel(OutPoint id, ChannelMonitor data) {
-		number ret = bindings.Persist_persist_new_channel(this.ptr, id == null ? 0 : id.ptr & ~1, data == null ? 0 : data.ptr & ~1);
+	public Result_NoneChannelMonitorUpdateErrZ persist_new_channel(OutPoint channel_id, ChannelMonitor data, MonitorUpdateId update_id) {
+		number ret = bindings.Persist_persist_new_channel(this.ptr, channel_id == null ? 0 : channel_id.ptr & ~1, data == null ? 0 : data.ptr & ~1, update_id == null ? 0 : update_id.ptr & ~1);
 		Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
-		this.ptrs_to.add(id);
 		this.ptrs_to.add(data);
 		return ret_hu_conv;
 	}
 
-	public Result_NoneChannelMonitorUpdateErrZ update_persisted_channel(OutPoint id, ChannelMonitorUpdate update, ChannelMonitor data) {
-		number ret = bindings.Persist_update_persisted_channel(this.ptr, id == null ? 0 : id.ptr & ~1, update == null ? 0 : update.ptr & ~1, data == null ? 0 : data.ptr & ~1);
+	public Result_NoneChannelMonitorUpdateErrZ update_persisted_channel(OutPoint channel_id, ChannelMonitorUpdate update, ChannelMonitor data, MonitorUpdateId update_id) {
+		number ret = bindings.Persist_update_persisted_channel(this.ptr, channel_id == null ? 0 : channel_id.ptr & ~1, update == null ? 0 : update.ptr & ~1, data == null ? 0 : data.ptr & ~1, update_id == null ? 0 : update_id.ptr & ~1);
 		Result_NoneChannelMonitorUpdateErrZ ret_hu_conv = Result_NoneChannelMonitorUpdateErrZ.constr_from_ptr(ret);
-		this.ptrs_to.add(id);
 		this.ptrs_to.add(update);
 		this.ptrs_to.add(data);
 		return ret_hu_conv;