Merge pull request #45 from TheBlueMatt/main
[ldk-java] / src / main / java / org / ldk / structs / ChannelMonitor.java
index 32d870a6a27dbcc9bc2f5836ca1cd4986da6ad93..df8456c3bdb2b9f092775ddff8b7cb305d146fad 100644 (file)
@@ -4,6 +4,7 @@ import org.ldk.impl.bindings;
 import org.ldk.enums.*;
 import org.ldk.util.*;
 import java.util.Arrays;
+import javax.annotation.Nullable;
 
 
 /**
@@ -38,6 +39,7 @@ public class ChannelMonitor extends CommonBase {
         */
        public ChannelMonitor clone() {
                long ret = bindings.ChannelMonitor_clone(this.ptr);
+               if (ret < 1024) { return null; }
                ChannelMonitor ret_hu_conv = new ChannelMonitor(null, ret);
                ret_hu_conv.ptrs_to.add(this);
                return ret_hu_conv;
@@ -59,6 +61,7 @@ public class ChannelMonitor extends CommonBase {
         */
        public Result_NoneMonitorUpdateErrorZ update_monitor(ChannelMonitorUpdate updates, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
                long ret = bindings.ChannelMonitor_update_monitor(this.ptr, updates == null ? 0 : updates.ptr & ~1, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+               if (ret < 1024) { return null; }
                Result_NoneMonitorUpdateErrorZ ret_hu_conv = Result_NoneMonitorUpdateErrorZ.constr_from_ptr(ret);
                this.ptrs_to.add(updates);
                this.ptrs_to.add(broadcaster);
@@ -81,6 +84,7 @@ public class ChannelMonitor extends CommonBase {
         */
        public TwoTuple<OutPoint, byte[]> get_funding_txo() {
                long ret = bindings.ChannelMonitor_get_funding_txo(this.ptr);
+               if (ret < 1024) { return null; }
                long ret_a = bindings.LDKC2Tuple_OutPointScriptZ_get_a(ret);
                OutPoint ret_a_hu_conv = new OutPoint(null, ret_a);
                ret_a_hu_conv.ptrs_to.add(this);;
@@ -197,7 +201,7 @@ public class ChannelMonitor extends CommonBase {
         * [`get_outputs_to_watch`]: #method.get_outputs_to_watch
         */
        public TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] block_connected(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-               long[] ret = bindings.ChannelMonitor_block_connected(this.ptr, header, Arrays.stream(txdata).mapToLong(txdata_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_24.a, txdata_conv_24.b)).toArray(), height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+               long[] ret = bindings.ChannelMonitor_block_connected(this.ptr, header, txdata != null ? Arrays.stream(txdata).mapToLong(txdata_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_24.a, txdata_conv_24.b)).toArray() : null, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
                TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] ret_conv_46_arr = new TwoTuple[ret.length];
                for (int u = 0; u < ret.length; u++) {
                        long ret_conv_46 = ret[u];
@@ -219,7 +223,6 @@ public class ChannelMonitor extends CommonBase {
                        // Warning: We may not free the C tuple object!
                        ret_conv_46_arr[u] = ret_conv_46_conv;
                }
-               /* TODO 2 TwoTuple<Long, byte[]>  */;
                this.ptrs_to.add(broadcaster);
                this.ptrs_to.add(fee_estimator);
                this.ptrs_to.add(logger);
@@ -242,14 +245,12 @@ public class ChannelMonitor extends CommonBase {
         * outputs to watch. See [`block_connected`] for details.
         * 
         * 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.
+        * blocks. See [`chain::Confirm`] for calling expectations.
         * 
         * [`block_connected`]: Self::block_connected
-        * [`update_best_block`]: Self::update_best_block
         */
        public TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] transactions_confirmed(byte[] header, TwoTuple<Long, byte[]>[] txdata, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-               long[] ret = bindings.ChannelMonitor_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, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+               long[] ret = bindings.ChannelMonitor_transactions_confirmed(this.ptr, header, txdata != null ? Arrays.stream(txdata).mapToLong(txdata_conv_24 -> bindings.C2Tuple_usizeTransactionZ_new(txdata_conv_24.a, txdata_conv_24.b)).toArray() : null, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
                TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] ret_conv_46_arr = new TwoTuple[ret.length];
                for (int u = 0; u < ret.length; u++) {
                        long ret_conv_46 = ret[u];
@@ -271,7 +272,6 @@ public class ChannelMonitor extends CommonBase {
                        // Warning: We may not free the C tuple object!
                        ret_conv_46_arr[u] = ret_conv_46_conv;
                }
-               /* TODO 2 TwoTuple<Long, byte[]>  */;
                this.ptrs_to.add(broadcaster);
                this.ptrs_to.add(fee_estimator);
                this.ptrs_to.add(logger);
@@ -282,11 +282,9 @@ public class ChannelMonitor extends CommonBase {
         * Processes a transaction that was reorganized out of the chain.
         * 
         * 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.
+        * than blocks. See [`chain::Confirm`] for calling expectations.
         * 
         * [`block_disconnected`]: Self::block_disconnected
-        * [`update_best_block`]: Self::update_best_block
         */
        public void transaction_unconfirmed(byte[] txid, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
                bindings.ChannelMonitor_transaction_unconfirmed(this.ptr, txid, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
@@ -300,20 +298,12 @@ public class ChannelMonitor extends CommonBase {
         * [`block_connected`] for details.
         * 
         * 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.
+        * blocks. See [`chain::Confirm`] for calling expectations.
         * 
         * [`block_connected`]: Self::block_connected
-        * [`transactions_confirmed`]: Self::transactions_confirmed
-        * [`transaction_unconfirmed`]: Self::transaction_unconfirmed
         */
-       public TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] update_best_block(byte[] header, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
-               long[] ret = bindings.ChannelMonitor_update_best_block(this.ptr, header, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
+       public TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] best_block_updated(byte[] header, int height, BroadcasterInterface broadcaster, FeeEstimator fee_estimator, Logger logger) {
+               long[] ret = bindings.ChannelMonitor_best_block_updated(this.ptr, header, height, broadcaster == null ? 0 : broadcaster.ptr, fee_estimator == null ? 0 : fee_estimator.ptr, logger == null ? 0 : logger.ptr);
                TwoTuple<byte[], TwoTuple<Integer, TxOut>[]>[] ret_conv_46_arr = new TwoTuple[ret.length];
                for (int u = 0; u < ret.length; u++) {
                        long ret_conv_46 = ret[u];
@@ -349,4 +339,44 @@ public class ChannelMonitor extends CommonBase {
                return ret;
        }
 
+       /**
+        * Gets the latest best block which was connected either via the [`chain::Listen`] or
+        * [`chain::Confirm`] interfaces.
+        */
+       public BestBlock current_best_block() {
+               long ret = bindings.ChannelMonitor_current_best_block(this.ptr);
+               if (ret < 1024) { return null; }
+               BestBlock ret_hu_conv = new BestBlock(null, ret);
+               ret_hu_conv.ptrs_to.add(this);
+               return ret_hu_conv;
+       }
+
+       /**
+        * Gets the balances in this channel which are either claimable by us if we were to
+        * force-close the channel now or which are claimable on-chain (possibly awaiting
+        * confirmation).
+        * 
+        * Any balances in the channel which are available on-chain (excluding on-chain fees) are
+        * included here until an [`Event::SpendableOutputs`] event has been generated for the
+        * balance, or until our counterparty has claimed the balance and accrued several
+        * confirmations on the claim transaction.
+        * 
+        * Note that the balances available when you or your counterparty have broadcasted revoked
+        * state(s) may not be fully captured here.
+        * 
+        * See [`Balance`] for additional details on the types of claimable balances which
+        * may be returned here and their meanings.
+        */
+       public Balance[] get_claimable_balances() {
+               long[] ret = bindings.ChannelMonitor_get_claimable_balances(this.ptr);
+               Balance[] ret_conv_9_arr = new Balance[ret.length];
+               for (int j = 0; j < ret.length; j++) {
+                       long ret_conv_9 = ret[j];
+                       Balance ret_conv_9_hu_conv = Balance.constr_from_ptr(ret_conv_9);
+                       ret_conv_9_hu_conv.ptrs_to.add(this);
+                       ret_conv_9_arr[j] = ret_conv_9_hu_conv;
+               }
+               return ret_conv_9_arr;
+       }
+
 }