X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=c_sharp%2Fsrc%2Forg%2Fldk%2Fstructs%2FUtxoLookup.cs;h=baa1ac394ce166d70fe2a5f673f9e9b7b30edcd9;hb=8de7213fbf663ff60322896282dad51e8ab2f001;hp=ebb18f7a28cb10a872e777c8861aedd2e0685caf;hpb=afc50e5d491a11364849383b75a8f939df703bac;p=ldk-java

diff --git a/c_sharp/src/org/ldk/structs/UtxoLookup.cs b/c_sharp/src/org/ldk/structs/UtxoLookup.cs
index ebb18f7a..baa1ac39 100644
--- a/c_sharp/src/org/ldk/structs/UtxoLookup.cs
+++ b/c_sharp/src/org/ldk/structs/UtxoLookup.cs
@@ -1,3 +1,4 @@
+
 using org.ldk.impl;
 using org.ldk.enums;
 using org.ldk.util;
@@ -5,59 +6,69 @@ using System;
 
 namespace org { namespace ldk { namespace structs {
 
+
+
+/** An implementation of UtxoLookup */
+public interface UtxoLookupInterface {
+	/**Returns the transaction output of a funding transaction encoded by [`short_channel_id`].
+	 * Returns an error if `chain_hash` is for a different chain or if such a transaction output is
+	 * unknown.
+	 * 
+	 * [`short_channel_id`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#definition-of-short_channel_id
+	 */
+	UtxoResult get_utxo(byte[] chain_hash, long short_channel_id);
+}
+
 /**
  * The `UtxoLookup` trait defines behavior for accessing on-chain UTXOs.
  */
 public class UtxoLookup : CommonBase {
-	internal readonly bindings.LDKUtxoLookup bindings_instance;
+	internal bindings.LDKUtxoLookup bindings_instance;
+	internal long instance_idx;
+
 	internal UtxoLookup(object _dummy, long ptr) : base(ptr) { bindings_instance = null; }
-	private UtxoLookup(bindings.LDKUtxoLookup arg) : base(bindings.LDKUtxoLookup_new(arg)) {
-		this.ptrs_to.AddLast(arg);
-		this.bindings_instance = arg;
-	}
 	~UtxoLookup() {
 		if (ptr != 0) { bindings.UtxoLookup_free(ptr); }
 	}
 
-	public interface UtxoLookupInterface {
-		/**
-		 * Returns the transaction output of a funding transaction encoded by [`short_channel_id`].
-		 * Returns an error if `genesis_hash` is for a different chain or if such a transaction output
-		 * is unknown.
-		 * 
-		 * [`short_channel_id`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#definition-of-short_channel_id
-		 */
-		UtxoResult get_utxo(byte[] _genesis_hash, long _short_channel_id);
-	}
 	private class LDKUtxoLookupHolder { internal UtxoLookup held; }
 	private class LDKUtxoLookupImpl : bindings.LDKUtxoLookup {
 		internal LDKUtxoLookupImpl(UtxoLookupInterface arg, LDKUtxoLookupHolder impl_holder) { this.arg = arg; this.impl_holder = impl_holder; }
 		private UtxoLookupInterface arg;
 		private LDKUtxoLookupHolder impl_holder;
-		public long get_utxo(byte[] _genesis_hash, long _short_channel_id) {
-			UtxoResult ret = arg.get_utxo(_genesis_hash, _short_channel_id);
+		public long get_utxo(long _chain_hash, long _short_channel_id) {
+			byte[] _chain_hash_conv = InternalUtils.decodeUint8Array(_chain_hash);
+			UtxoResult ret = arg.get_utxo(_chain_hash_conv, _short_channel_id);
 				GC.KeepAlive(arg);
 			long result = ret == null ? 0 : ret.clone_ptr();
 			if (impl_holder.held != null) { impl_holder.held.ptrs_to.AddLast(ret); };
 			return result;
 		}
 	}
+
+	/** Creates a new instance of UtxoLookup from a given implementation */
 	public static UtxoLookup new_impl(UtxoLookupInterface arg) {
 		LDKUtxoLookupHolder impl_holder = new LDKUtxoLookupHolder();
-		impl_holder.held = new UtxoLookup(new LDKUtxoLookupImpl(arg, impl_holder));
+		LDKUtxoLookupImpl impl = new LDKUtxoLookupImpl(arg, impl_holder);
+		long[] ptr_idx = bindings.LDKUtxoLookup_new(impl);
+
+		impl_holder.held = new UtxoLookup(null, ptr_idx[0]);
+		impl_holder.held.instance_idx = ptr_idx[1];
+		impl_holder.held.bindings_instance = impl;
 		return impl_holder.held;
 	}
+
 	/**
 	 * Returns the transaction output of a funding transaction encoded by [`short_channel_id`].
-	 * Returns an error if `genesis_hash` is for a different chain or if such a transaction output
-	 * is unknown.
+	 * Returns an error if `chain_hash` is for a different chain or if such a transaction output is
+	 * unknown.
 	 * 
 	 * [`short_channel_id`]: https://github.com/lightning/bolts/blob/master/07-routing-gossip.md#definition-of-short_channel_id
 	 */
-	public UtxoResult get_utxo(byte[] genesis_hash, long short_channel_id) {
-		long ret = bindings.UtxoLookup_get_utxo(this.ptr, InternalUtils.check_arr_len(genesis_hash, 32), short_channel_id);
+	public UtxoResult get_utxo(byte[] chain_hash, long short_channel_id) {
+		long ret = bindings.UtxoLookup_get_utxo(this.ptr, InternalUtils.encodeUint8Array(InternalUtils.check_arr_len(chain_hash, 32)), short_channel_id);
 		GC.KeepAlive(this);
-		GC.KeepAlive(genesis_hash);
+		GC.KeepAlive(chain_hash);
 		GC.KeepAlive(short_channel_id);
 		if (ret >= 0 && ret <= 4096) { return null; }
 		org.ldk.structs.UtxoResult ret_hu_conv = org.ldk.structs.UtxoResult.constr_from_ptr(ret);