From ce001517b6e51409a2a1be9737494756ae6d375f Mon Sep 17 00:00:00 2001 From: yangkun Date: Sat, 29 Dec 2018 16:55:28 +0800 Subject: [PATCH] add param include_watchonly for listSinceBlock rpc call --- .../javabitcoindrpcclient/BitcoinJSONRPCClient.java | 6 ++++++ .../javabitcoindrpcclient/BitcoindRpcClient.java | 13 +++++++++++++ 2 files changed, 19 insertions(+) diff --git a/src/main/java/wf/bitcoin/javabitcoindrpcclient/BitcoinJSONRPCClient.java b/src/main/java/wf/bitcoin/javabitcoindrpcclient/BitcoinJSONRPCClient.java index 328e793..b943ab9 100644 --- a/src/main/java/wf/bitcoin/javabitcoindrpcclient/BitcoinJSONRPCClient.java +++ b/src/main/java/wf/bitcoin/javabitcoindrpcclient/BitcoinJSONRPCClient.java @@ -517,6 +517,12 @@ public TransactionsSinceBlock listSinceBlock(String blockHash) throws GenericRpc public TransactionsSinceBlock listSinceBlock(String blockHash, int targetConfirmations) throws GenericRpcException { return new TransactionsSinceBlockImpl((Map) query("listsinceblock", blockHash, targetConfirmations)); } + + @Override + @SuppressWarnings("unchecked") + public TransactionsSinceBlock listSinceBlock(String blockHash, int targetConfirmations, boolean includeWatchonly) throws GenericRpcException { + return new TransactionsSinceBlockImpl((Map) query("listsinceblock", blockHash, targetConfirmations, includeWatchonly)); + } @Override @SuppressWarnings("unchecked") diff --git a/src/main/java/wf/bitcoin/javabitcoindrpcclient/BitcoindRpcClient.java b/src/main/java/wf/bitcoin/javabitcoindrpcclient/BitcoindRpcClient.java index 2f85d0b..e2cf02f 100644 --- a/src/main/java/wf/bitcoin/javabitcoindrpcclient/BitcoindRpcClient.java +++ b/src/main/java/wf/bitcoin/javabitcoindrpcclient/BitcoindRpcClient.java @@ -903,6 +903,19 @@ public interface BitcoindRpcClient { * @see listsinceblock */ TransactionsSinceBlock listSinceBlock(String blockHash, int targetConfirmations) throws GenericRpcException; + + /** + * The listsinceblock RPC gets all transactions affecting the wallet which have occurred since a particular block, plus the header hash of a block at a particular depth. + * + * @param blockHash The hash of a block header encoded as hex in RPC byte order. + * @param targetConfirmations Sets the lastblock field of the results to the header hash of a block with this many confirmations. + * @param includeWatchonly Include transactions to watch-only addresses. + * + * @return An object containing an array of transactions and the lastblock field + * + * @see listsinceblock + */ + TransactionsSinceBlock listSinceBlock(String blockHash, int targetConfirmations, boolean includeWatchonly) throws GenericRpcException; /** * The listtransactions RPC returns the most recent transactions that affect the wallet.