Update auto-generated bindings

Author: TheBlueMatt

liblightningjni_debug.so

@@ -0,0 +1,27 @@
+package org.ldk.enums;
+
+/**
+ * Represents an IO Error. Note that some information is lost in the conversion from Rust.
+ */
+public enum LDKIOError {
+	LDKIOError_NotFound,
+	LDKIOError_PermissionDenied,
+	LDKIOError_ConnectionRefused,
+	LDKIOError_ConnectionReset,
+	LDKIOError_ConnectionAborted,
+	LDKIOError_NotConnected,
+	LDKIOError_AddrInUse,
+	LDKIOError_AddrNotAvailable,
+	LDKIOError_BrokenPipe,
+	LDKIOError_AlreadyExists,
+	LDKIOError_WouldBlock,
+	LDKIOError_InvalidInput,
+	LDKIOError_InvalidData,
+	LDKIOError_TimedOut,
+	LDKIOError_WriteZero,
+	LDKIOError_Interrupted,
+	LDKIOError_Other,
+	LDKIOError_UnexpectedEof,
+	; static native void init();
+	static { init(); }
+}

liblightningjni_release.so

@@ -0,0 +1,67 @@
+package org.ldk.structs;
+
+import org.ldk.impl.bindings;
+import org.ldk.enums.*;
+import org.ldk.util.*;
+import java.util.Arrays;
+
+
+/**
+ * The best known block as identified by its hash and height.
+ */
+@SuppressWarnings("unchecked") // We correctly assign various generic arrays
+public class BestBlock extends CommonBase {
+	BestBlock(Object _dummy, long ptr) { super(ptr); }
+	@Override @SuppressWarnings("deprecation")
+	protected void finalize() throws Throwable {
+		super.finalize();
+		if (ptr != 0) { bindings.BestBlock_free(ptr); }
+	}
+
+	/**
+	 * Creates a copy of the BestBlock
+	 */
+	public BestBlock clone() {
+		long ret = bindings.BestBlock_clone(this.ptr);
+		BestBlock ret_hu_conv = new BestBlock(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Returns the best block from the genesis of the given network.
+	 */
+	public static BestBlock constructor_from_genesis(LDKNetwork network) {
+		long ret = bindings.BestBlock_from_genesis(network);
+		BestBlock ret_hu_conv = new BestBlock(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Returns the best block as identified by the given block hash and height.
+	 */
+	public static BestBlock constructor_new(byte[] block_hash, int height) {
+		long ret = bindings.BestBlock_new(block_hash, height);
+		BestBlock ret_hu_conv = new BestBlock(null, ret);
+		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		return ret_hu_conv;
+	}
+
+	/**
+	 * Returns the best block hash.
+	 */
+	public byte[] block_hash() {
+		byte[] ret = bindings.BestBlock_block_hash(this.ptr);
+		return ret;
+	}
+
+	/**
+	 * Returns the best block height.
+	 */
+	public int height() {
+		int ret = bindings.BestBlock_height(this.ptr);
+		return ret;
+	}
+
+}

src/main/java/org/ldk/enums/LDKIOError.java

@@ -42,6 +42,45 @@ public void block_connected(byte[] header, TwoTuple<Long, byte[]>[] txdata, int
 		/* TODO 2 TwoTuple<Long, byte[]>  */;
 	}
 
+	/**
+	 * Dispatches to per-channel monitors, which are responsible for updating their on-chain view
+	 * of a channel and reacting accordingly to newly confirmed transactions. For details, see
+	 * [`ChannelMonitor::transactions_confirmed`].
+	 * 
+	 * Used instead of [`block_connected`] by clients that are notified of transactions rather than
+	 * blocks. May be called before or after [`update_best_block`] for transactions in the
+	 * corresponding block. See [`update_best_block`] for further calling expectations.
+	 * 
+	 * [`block_connected`]: Self::block_connected
+	 * [`update_best_block`]: Self::update_best_block
+	 */
+	public void transactions_confirmed(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height) {
+		bindings.ChainMonitor_transactions_confirmed(this.ptr, header, Arrays.stream(txdata).mapToLong(txdata_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_24.a, txdata_conv_24.b)).toArray(), height);
+		/* TODO 2 TwoTuple<Long, byte[]>  */;
+	}
+
+	/**
+	 * Dispatches to per-channel monitors, which are responsible for updating their on-chain view
+	 * of a channel and reacting accordingly based on the new chain tip. For details, see
+	 * [`ChannelMonitor::update_best_block`].
+	 * 
+	 * Used instead of [`block_connected`] by clients that are notified of transactions rather than
+	 * blocks. May be called before or after [`transactions_confirmed`] for the corresponding
+	 * block.
+	 * 
+	 * Must be called after new blocks become available for the most recent block. Intermediary
+	 * blocks, however, may be safely skipped. In the event of a chain re-organization, this only
+	 * needs to be called for the most recent block assuming `transaction_unconfirmed` is called
+	 * for any affected transactions.
+	 * 
+	 * [`block_connected`]: Self::block_connected
+	 * [`transactions_confirmed`]: Self::transactions_confirmed
+	 * [`transaction_unconfirmed`]: Self::transaction_unconfirmed
+	 */
+	public void update_best_block(byte[] header, int height) {
+		bindings.ChainMonitor_update_best_block(this.ptr, header, height);
+	}
+
 	/**
 	 * Dispatches to per-channel monitors, which are responsible for updating their on-chain view
 	 * of a channel based on the disconnected block. See [`ChannelMonitor::block_disconnected`] for
@@ -51,6 +90,30 @@ public void block_disconnected(byte[] header, int disconnected_height) {
 		bindings.ChainMonitor_block_disconnected(this.ptr, header, disconnected_height);
 	}
 
+	/**
+	 * Dispatches to per-channel monitors, which are responsible for updating their on-chain view
+	 * of a channel based on transactions unconfirmed as a result of a chain reorganization. See
+	 * [`ChannelMonitor::transaction_unconfirmed`] for details.
+	 * 
+	 * Used instead of [`block_disconnected`] by clients that are notified of transactions rather
+	 * than blocks. May be called before or after [`update_best_block`] for transactions in the
+	 * corresponding block. See [`update_best_block`] for further calling expectations.
+	 * 
+	 * [`block_disconnected`]: Self::block_disconnected
+	 * [`update_best_block`]: Self::update_best_block
+	 */
+	public void transaction_unconfirmed(byte[] txid) {
+		bindings.ChainMonitor_transaction_unconfirmed(this.ptr, txid);
+	}
+
+	/**
+	 * Returns the set of txids that should be monitored for re-organization out of the chain.
+	 */
+	public byte[][] get_relevant_txids() {
+		byte[][] ret = bindings.ChainMonitor_get_relevant_txids(this.ptr);
+		return ret;
+	}
+
 	/**
 	 * Creates a new `ChainMonitor` used to watch on-chain activity pertaining to channels.
 	 * 

src/main/java/org/ldk/impl/bindings.java

@@ -38,46 +38,35 @@ public void set_network(LDKNetwork val) {
 	}
 
 	/**
-	 * The hash of the latest block successfully connected.
-	 */
-	public byte[] get_latest_hash() {
-		byte[] ret = bindings.ChainParameters_get_latest_hash(this.ptr);
-		return ret;
-	}
-
-	/**
-	 * The hash of the latest block successfully connected.
-	 */
-	public void set_latest_hash(byte[] val) {
-		bindings.ChainParameters_set_latest_hash(this.ptr, val);
-	}
-
-	/**
-	 * The height of the latest block successfully connected.
+	 * The hash and height of the latest block successfully connected.
 	 * 
 	 * Used to track on-chain channel funding outputs and send payments with reliable timelocks.
 	 */
-	public long get_latest_height() {
-		long ret = bindings.ChainParameters_get_latest_height(this.ptr);
-		return ret;
+	public BestBlock get_best_block() {
+		long ret = bindings.ChainParameters_get_best_block(this.ptr);
+		BestBlock ret_hu_conv = new BestBlock(null, ret);
+		ret_hu_conv.ptrs_to.add(this);
+		return ret_hu_conv;
 	}
 
 	/**
-	 * The height of the latest block successfully connected.
+	 * The hash and height of the latest block successfully connected.
 	 * 
 	 * Used to track on-chain channel funding outputs and send payments with reliable timelocks.
 	 */
-	public void set_latest_height(long val) {
-		bindings.ChainParameters_set_latest_height(this.ptr, val);
+	public void set_best_block(BestBlock val) {
+		bindings.ChainParameters_set_best_block(this.ptr, val == null ? 0 : val.ptr & ~1);
+		this.ptrs_to.add(val);
 	}
 
 	/**
 	 * Constructs a new ChainParameters given each field
 	 */
-	public static ChainParameters constructor_new(LDKNetwork network_arg, byte[] latest_hash_arg, long latest_height_arg) {
-		long ret = bindings.ChainParameters_new(network_arg, latest_hash_arg, latest_height_arg);
+	public static ChainParameters constructor_new(LDKNetwork network_arg, BestBlock best_block_arg) {
+		long ret = bindings.ChainParameters_new(network_arg, best_block_arg == null ? 0 : best_block_arg.ptr & ~1);
 		ChainParameters ret_hu_conv = new ChainParameters(null, ret);
 		ret_hu_conv.ptrs_to.add(ret_hu_conv);
+		ret_hu_conv.ptrs_to.add(best_block_arg);
 		return ret_hu_conv;
 	}