Merge remote-tracking branch 'origin/master'

Author: Polve

src/main/java/wf/bitcoin/javabitcoindrpcclient/BitcoinJSONRPCClient.java

@@ -50,6 +50,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Collectors;
+import java.util.Collections;
 
 import javax.net.ssl.HostnameVerifier;
 import javax.net.ssl.HttpsURLConnection;
@@ -77,7 +78,6 @@ public class BitcoinJSONRPCClient implements BitcoindRpcClient {
 
   public static final Charset QUERY_CHARSET = Charset.forName("ISO8859-1");
   public static final int CONNECT_TIMEOUT = (int) TimeUnit.MINUTES.toMillis(1);
-  public static final int READ_TIMEOUT = (int) TimeUnit.MINUTES.toMillis(5);
 
   static {
     String user = "user";
@@ -206,6 +206,8 @@ else if ((configFile = new File(home, "AppData" + File.separatorChar +
   private URL noAuthURL;
   private String authStr;
 
+  public int readTimeout = (int) TimeUnit.MINUTES.toMillis(5);
+
   public BitcoinJSONRPCClient(String rpcUrl) throws MalformedURLException {
     this(new URL(rpcUrl));
   }
@@ -349,7 +351,7 @@ private HttpURLConnection setConnection() {
       conn.setDoInput(true);
 
       conn.setConnectTimeout(CONNECT_TIMEOUT);
-      conn.setReadTimeout(READ_TIMEOUT);
+      conn.setReadTimeout(readTimeout);
 
       if (conn instanceof HttpsURLConnection) {
         if (hostnameVerifier != null)
@@ -654,6 +656,25 @@ public void importPrivKey(String bitcoinPrivKey, String label, boolean rescan) t
     query("importprivkey", bitcoinPrivKey, label, rescan);
   }
 
+  /**
+   * Rescan the local blockchain for wallet related transactions. This method
+   * without argument rescan all the blocks.
+   * The read timeout is set to half a day. because this method take a while. It
+   * depends on hardware and blockchain size. Original timeout is restore after
+   * the query.
+   *
+   * @see <a href="https://bitcoincore.org/en/doc/0.20.0/rpc/wallet/rescanblockchain/">rescanblockchain</a>
+   * */
+  @Override
+  public void rescanBlockchain() throws GenericRpcException {
+    int savedReadTimeout = this.readTimeout;
+    // Change the read timeout to restore it after
+    this.readTimeout = (int) TimeUnit.MINUTES.toMillis(720);
+    query("rescanblockchain");
+    // Restore the previous timeout
+    this.readTimeout = savedReadTimeout;
+  }
+
   @Override
   public Object importAddress(String address, String label, boolean rescan) throws GenericRpcException {
     query("importaddress", address, label, rescan);
@@ -2373,7 +2394,12 @@ public String type() {
         @Override
         @SuppressWarnings("unchecked")
         public List<String> addresses() {
-          return (List<String>) m.get("addresses");
+          List<String> addresses = ((List<String>) m.get("addresses"));
+          if (addresses == null) {
+            final String address = mapStr("address");
+            return address == null? Collections.emptyList() : Collections.singletonList(address);
+          }
+          return addresses;
         }
 
       }

src/main/java/wf/bitcoin/javabitcoindrpcclient/BitcoindRpcClient.java

@@ -853,6 +853,14 @@ public interface BitcoindRpcClient {
    */
   void importPrivKey(String bitcoinPrivKey, String account, boolean rescan) throws GenericRpcException;
 
+  /**
+   * Rescan the local blockchain for wallet related transactions. This method
+   * without argument rescan all the blocks.
+   *
+   * @see <a href="https://bitcoincore.org/en/doc/0.20.0/rpc/wallet/rescanblockchain/">rescanblockchain</a>
+   */
+  void rescanBlockchain() throws GenericRpcException;
+
   /**
    * The importwallet RPC imports private keys from a file in wallet dump file format (see the dumpwallet RPC). 
    * These keys will be added to the keys currently in the wallet.