diff --git a/apidoc/allclasses-index.html b/apidoc/allclasses-index.html
index 023520fdd..ffd7e3b17 100644
--- a/apidoc/allclasses-index.html
+++ b/apidoc/allclasses-index.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>All Classes and Interfaces (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>All Classes and Interfaces (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="class index">
 <meta name="generator" content="javadoc/AllClassesIndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="all-classes-index-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "./";
+<script type="text/javascript">var pathtoroot = "./";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="index.html">Overview</a></li>
@@ -41,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -55,7 +51,7 @@
 <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces</h1>
 </div>
 <div id="all-classes-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="all-classes-table-tab0" role="tab" aria-selected="true" aria-controls="all-classes-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="all-classes-table-tab1" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab1', 2)" class="table-tab">Interfaces</button><button id="all-classes-table-tab2" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab2', 2)" class="table-tab">Classes</button><button id="all-classes-table-tab3" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab3', 2)" class="table-tab">Enum Classes</button><button id="all-classes-table-tab4" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab4', 2)" class="table-tab">Record Classes</button><button id="all-classes-table-tab5" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab5', 2)" class="table-tab">Exceptions</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="all-classes-table-tab0" role="tab" aria-selected="true" aria-controls="all-classes-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="all-classes-table-tab1" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab1', 2)" class="table-tab">Interfaces</button><button id="all-classes-table-tab2" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab2', 2)" class="table-tab">Classes</button><button id="all-classes-table-tab3" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab3', 2)" class="table-tab">Enum Classes</button><button id="all-classes-table-tab4" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab4', 2)" class="table-tab">Record Classes</button><button id="all-classes-table-tab5" role="tab" aria-selected="false" aria-controls="all-classes-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('all-classes-table', 'all-classes-table-tab5', 2)" class="table-tab">Exception Classes</button></div>
 <div id="all-classes-table.tabpanel" role="tabpanel">
 <div class="summary-table two-column-summary" aria-labelledby="all-classes-table-tab0">
 <div class="table-header col-first">Class</div>
@@ -65,55 +61,55 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 <div class="block">GraalVM-compatible implementation of <a href="org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html" title="interface in org.consensusj.jsonrpc.introspection"><code>JsonRpcServiceWrapper</code></a> that takes a map of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link"><code>Method</code></a>s in the constructor
  so that introspection can be done at static initialization time (which means during native image generation).</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressBalanceInfo</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
-<div class="block">Abstract Base class for a strongly-typed, Jackson-based JSON-RPC client.</div>
-</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressBalanceInfo</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Result of OmniCore/BitCore <code>getaddressbalance</code> method.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/AddressDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">AddressDeserializer</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/AddressDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">AddressDeserializer</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Deserialize bitcoinj (family) addresses</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html" title="class in org.consensusj.bitcoin.json.pojo">AddressGroupingItem</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html" title="class in org.consensusj.bitcoin.json.pojo">AddressGroupingItem</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">For <code>listaddressgroupings</code> response
  Note: In the JSON response this is actually an array</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/AddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">AddressInfo</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">AddressKeyDeserializer</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/AddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">AddressInfo</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">AddressKeyDeserializer</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Key Deserializer to support using Address as the key in a Map.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressRequest</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressRequest</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Address Request for BitCore <code>getaddressbalance</code> and others.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/AddressSerializer.html" title="class in org.consensusj.bitcoin.json.conversion">AddressSerializer</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/AddressSerializer.html" title="class in org.consensusj.bitcoin.json.conversion">AddressSerializer</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">UTXO Info object from Bitcore/Omni <code>getaddressutxos</code>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoResult.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoResult</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoResult.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoResult</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Result from Bitcore/Omni <code>getaddressutxos</code>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/daemon/micronaut/Application.html" title="class in org.consensusj.daemon.micronaut">Application</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/daemon/Application.html" title="class in org.consensusj.jsonrpc.daemon">Application</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/daemon/micronaut/Application.html" title="class in org.consensusj.daemon.micronaut">Application</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/daemon/Application.html" title="class in org.consensusj.jsonrpc.daemon">Application</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Helper methods for creating asynchronous calls using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture</code></a>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier&lt;T&gt;</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Subinterface of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link"><code>Supplier</code></a> for Lambdas which throw <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a>.</div>
 </div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="block">Error filter for resilient polling.</div>
+</div>
 <div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">An abstract base class for JsonRpcClientTool that uses Apache Commons CLI</div>
@@ -195,7 +191,7 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">(Mostly) Immutable representation of BitcoinTransaction info JSON</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html" title="class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage</a>&lt;<a href="org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html" title="type parameter in BitcoinZmqMessage">T</a>&gt;</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html" title="class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage&lt;T&gt;</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Use record-style naming, rather than JavaBean naming, just for fun.</div>
 </div>
@@ -240,61 +236,83 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">BTCR DID</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Interface for a Bitcoin JSON-RPC client that implements <code>getchaintips</code>.</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BTCTestSupport</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="block">Test support functions intended to be mixed-in to Spock test specs</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="block">Interface for a Bitcoin JSON-RPC client that implements <code>getchaintips</code>.</div>
+</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoin/rx/ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="block">Marker type for <code>Publisher&lt;ChainTip&gt;</code>.</div>
+</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html" title="class in org.consensusj.bitcoin.rx">ChainTipPublisher.Wrapper</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
 <div class="block">A publisher of <a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a></div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/cli/test/CLICommandResult.html" title="class in org.consensusj.jsonrpc.cli.test">CLICommandResult</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/cli/test/CLICommandResult.html" title="class in org.consensusj.jsonrpc.cli.test">CLICommandResult</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Holds all the results (status code, stdout, stderr) of a CLI command run by a test</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/cli/CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/cli/CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
 <div class="block">JSON-RPC method parameter, parsed from the command-line.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="org/consensusj/jsonrpc/cli/CliParameter.Invalid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Invalid</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="org/consensusj/jsonrpc/cli/CliParameter.Invalid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Invalid</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Implementation for Invalid source strings</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/cli/CliParameter.Parser.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter.Parser</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/cli/CliParameter.Parser.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter.Parser</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Functional interface for parsing a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link"><code>String</code></a> to an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link"><code>Object</code></a> possibly
  throwing an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link"><code>Exception</code></a>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab4"><a href="org/consensusj/jsonrpc/cli/CliParameter.Valid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab4">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab4"><a href="org/consensusj/jsonrpc/cli/CliParameter.Valid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab4">
 <div class="block">Implementation for Valid objects</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/cli/CliParameterParser.html" title="class in org.consensusj.jsonrpc.cli">CliParameterParser</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/cli/CliParameterParser.html" title="class in org.consensusj.jsonrpc.cli">CliParameterParser</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Parser for command-line JSON-RPC method and parameters</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/cli/test/CLITestSupport.html" title="interface in org.consensusj.jsonrpc.cli.test">CLITestSupport</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/cli/test/CLITestSupport.html" title="interface in org.consensusj.jsonrpc.cli.test">CLITestSupport</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Support functions for testing command-line tools</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/CoinDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">CoinDeserializer</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/CoinDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">CoinDeserializer</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Deserialize a numeric value to a bitcoinj <code>Coin</code> type.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/CoinSerializer.html" title="class in org.consensusj.bitcoin.json.conversion">CoinSerializer</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/CoinSerializer.html" title="class in org.consensusj.bitcoin.json.conversion">CoinSerializer</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Serialize a bitcoinj <code>Coin</code> type.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/CompositeTrustManager.html" title="class in org.consensusj.jsonrpc">CompositeTrustManager</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/CompositeTrustManager.html" title="class in org.consensusj.jsonrpc">CompositeTrustManager</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">A Trust Manager that adds a second trust store (key store) to the default trust store.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/exchange/CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/exchange/CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Currency Pair using JavaMoney CurrencyUnit type</div>
 </div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="block">A strongly-typed, Jackson-based JSON-RPC client.</div>
+</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper&lt;T&gt;</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="block">Functional interface for ignoring what are considered "transient" errors.</div>
+</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="block">Functional interface for creating JsonRpcTransport instances.</div>
+</div>
 <div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/DefaultSigningRequest.html" title="class in org.consensusj.bitcoinj.signing">DefaultSigningRequest</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Simple implementation of SigningRequest</div>
@@ -384,111 +402,111 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Hex string to hex conversion utility class.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Interface with default methods for a strongly-typed JSON-RPC client that uses Jackson to map from JSON to Java Objects.</div>
-</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/cli/JavaLoggingSupport.html" title="class in org.consensusj.jsonrpc.cli">JavaLoggingSupport</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/cli/JavaLoggingSupport.html" title="class in org.consensusj.jsonrpc.cli">JavaLoggingSupport</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">GraalVM-compatible support for using Java Logging.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient&lt;T&gt;</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
 <div class="block">JSON-RPC client interface.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">JSON-RPC Client using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/HttpURLConnection.html" title="class or interface in java.net" class="external-link"><code>HttpURLConnection</code></a> formerly named<code>RpcClient</code>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Incubating JSON-RPC client using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.net.http/java/net/http/HttpClient.html" title="class or interface in java.net.http" class="external-link"><code>HttpClient</code></a></div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html" title="interface in org.consensusj.jsonrpc">JsonRpcClientJavaNet.MappingFunction</a>&lt;<a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html" title="type parameter in JsonRpcClientJavaNet.MappingFunction">R</a>&gt;</div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html" title="interface in org.consensusj.jsonrpc">JsonRpcClientJavaNet.MappingFunction&lt;R&gt;</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Map a response string to a Java object.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/daemon/micronaut/JsonRpcController.html" title="class in org.consensusj.daemon.micronaut">JsonRpcController</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/daemon/micronaut/JsonRpcController.html" title="class in org.consensusj.daemon.micronaut">JsonRpcController</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Create a REST endpoint from a JsonRpcService
  Here we're using Micronaut annotations to wrap the JsonRpcService
  in an HTTP environment and to serialize JSON to and from Java POJOs.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/daemon/JsonRpcController.html" title="class in org.consensusj.jsonrpc.daemon">JsonRpcController</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/daemon/JsonRpcController.html" title="class in org.consensusj.jsonrpc.daemon">JsonRpcController</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Create a REST endpoint from a JsonRpcService
  Here we're using Micronaut annotations to wrap the JsonRpcService
  in an HTTP environment and to serialize JSON to and from Java POJOs.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcError.html" title="class in org.consensusj.jsonrpc">JsonRpcError</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcError.html" title="class in org.consensusj.jsonrpc">JsonRpcError</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">JSON-RPC Error Object POJO</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab3"><a href="org/consensusj/jsonrpc/JsonRpcError.Error.html" title="enum class in org.consensusj.jsonrpc">JsonRpcError.Error</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab5"><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab5">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab3"><a href="org/consensusj/jsonrpc/JsonRpcError.Error.html" title="enum class in org.consensusj.jsonrpc">JsonRpcError.Error</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab3">&nbsp;</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab5"><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab5">
 <div class="block">Exception wrapper for JsonRpcError
   Useful in server implementations, throwing an error that will be transmitted
   to the client.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab5"><a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab5">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab5"><a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab5">
 <div class="block">JSON RPC Exception</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcMessage.html" title="class in org.consensusj.jsonrpc">JsonRpcMessage</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcMessage.html" title="class in org.consensusj.jsonrpc">JsonRpcMessage</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">In the future this may be a superclass for <a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> and <a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab3"><a href="org/consensusj/jsonrpc/JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab3"><a href="org/consensusj/jsonrpc/JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab3">&nbsp;</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">JSON-RPC Request POJO</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="type parameter in JsonRpcResponse">RSLT</a>&gt;</div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse&lt;RSLT&gt;</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">JSON-RPC Response POJO
 
  Note that <code>result</code> is a parameterized type and can be used to directly map JSON-RPC results
  to the correct type for each method.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/JsonRpcService.html" title="interface in org.consensusj.jsonrpc">JsonRpcService</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/JsonRpcService.html" title="interface in org.consensusj.jsonrpc">JsonRpcService</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Interface for an Asynchronous JSON-RPC Server/Service.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html" title="interface in org.consensusj.jsonrpc.introspection">JsonRpcServiceWrapper</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html" title="interface in org.consensusj.jsonrpc.introspection">JsonRpcServiceWrapper</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Interface and default methods for wrapping a Java class with JSON-RPC support.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab5"><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab5">
-<div class="block">JSON-RPC returned HTTP status other than 200
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab5"><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab5">
+<div class="block">JSON-RPC returned HTTP status other than 200 (and unfortunately also sometimes when their is response.error)
  Additional information is usually in JSON-RPC response
  TODO: See TODO in parent class <a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcException</code></a></div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html" title="class in org.consensusj.jsonrpc.cli">JsonRpcToolOptions</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html" title="class in org.consensusj.jsonrpc.cli">JsonRpcToolOptions</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Command-line options for JSON-RPC tool</div>
 </div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport&lt;T&gt;</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="block">Defines the interface for a network-layer implementation of a JSON-RPC client.</div>
+</div>
 <div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
 <div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider.MonitoredCurrency</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/analytics/util/collector/LargestSliceAccumulator.html" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator</a>&lt;<a href="org/consensusj/analytics/util/collector/LargestSliceAccumulator.html" title="type parameter in LargestSliceAccumulator">E</a>,<wbr><a href="org/consensusj/analytics/util/collector/LargestSliceAccumulator.html" title="type parameter in LargestSliceAccumulator">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/util/collector/LargestSliceAccumulator.html" title="type parameter in LargestSliceAccumulator">N</a>&gt;&gt;</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/analytics/util/collector/LargestSliceAccumulator.html" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator&lt;E,<wbr>N&gt;</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Accumulates the <code>n</code> largest slices of a stream of objects of type <code>&lt;E&gt;</code>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" title="class in org.consensusj.analytics.util.collector">LargestSliceCollector</a>&lt;<a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;&gt;</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" title="class in org.consensusj.analytics.util.collector">LargestSliceCollector&lt;E,<wbr>N&gt;</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Collector that collects the <code>n</code> objects containing the "largest slices" of an input stream of
  type <code>&lt;E&gt;</code>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/analytics/util/collector/LargestSliceList.html" title="interface in org.consensusj.analytics.util.collector">LargestSliceList</a>&lt;<a href="org/consensusj/analytics/util/collector/LargestSliceList.html" title="type parameter in LargestSliceList">E</a>,<wbr><a href="org/consensusj/analytics/util/collector/LargestSliceList.html" title="type parameter in LargestSliceList">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/util/collector/LargestSliceList.html" title="type parameter in LargestSliceList">N</a>&gt;&gt;</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/analytics/util/collector/LargestSliceList.html" title="interface in org.consensusj.analytics.util.collector">LargestSliceList&lt;E,<wbr>N&gt;</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Represents a filtered subset of a collection or stream of objects.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/analytics/util/collector/LargestSliceListImpl.html" title="class in org.consensusj.analytics.util.collector">LargestSliceListImpl</a>&lt;<a href="org/consensusj/analytics/util/collector/LargestSliceListImpl.html" title="type parameter in LargestSliceListImpl">E</a>,<wbr><a href="org/consensusj/analytics/util/collector/LargestSliceListImpl.html" title="type parameter in LargestSliceListImpl">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/util/collector/LargestSliceListImpl.html" title="type parameter in LargestSliceListImpl">N</a>&gt;&gt;</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/analytics/util/collector/LargestSliceListImpl.html" title="class in org.consensusj.analytics.util.collector">LargestSliceListImpl&lt;E,<wbr>N&gt;</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">An immutable implementation of <a href="org/consensusj/analytics/util/collector/LargestSliceList.html" title="interface in org.consensusj.analytics.util.collector"><code>LargestSliceList</code></a>.</div>
 </div>
@@ -564,12 +582,12 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 <div class="block">Implements ObservablePair using an exchange rate polling function and an interval</div>
 </div>
 <div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
-<div class="block">Interface with <a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#pollForDistinctChainTip()"><code>PollingChainTipService.pollForDistinctChainTip()</code></a> method.</div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">Deprecated.
+<div class="deprecation-comment">Use the <a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc"><code>PollingChainTipServiceImpl</code></a> implementation</div>
 </div>
 <div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
-<div class="block">Implementation of <a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc"><code>PollingChainTipService</code></a> using a <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> and a polling interval.</div>
+<div class="block">Provides <a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx"><code>ChainTipService</code></a> a using a <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> and a polling interval.</div>
 </div>
 <div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html" title="class in org.consensusj.bitcoin.json.pojo">PrevTxOutInfo</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
@@ -608,7 +626,7 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 <div class="block">FundingSource using RegTest mining, BitcoinExtendedClient (with getRegTestMiningAddress),
  and the server's default wallet for accumulating coins.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/analytics/service/RichListService.html" title="interface in org.consensusj.analytics.service">RichListService</a>&lt;<a href="org/consensusj/analytics/service/RichListService.html" title="type parameter in RichListService">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/service/RichListService.html" title="type parameter in RichListService">N</a>&gt;,<wbr><a href="org/consensusj/analytics/service/RichListService.html" title="type parameter in RichListService">ID</a>&gt;</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/analytics/service/RichListService.html" title="interface in org.consensusj.analytics.service">RichListService&lt;N,<wbr>ID&gt;</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Interface for reactive rich list service</div>
 </div>
@@ -654,9 +672,7 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 <div class="block">Reactive Streams interface for subscribing to reactive blockchain data.</div>
 </div>
 <div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
-<div class="block">A JSON-RPC client interface that provides ChainTipService</div>
-</div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">Deprecated.</div>
 <div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">RxJava support for calling JSON-RPC clients.</div>
@@ -667,7 +683,7 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 </div>
 <div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/rx/zeromq/RxZmqContext.html" title="class in org.consensusj.rx.zeromq">RxZmqContext</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab2">
-<div class="block">ZMQ Context with a single socket and one <code>FlowableProcessor&lt;ZMsg&gt;</code> per topic.</div>
+<div class="block">ZMQ Context with a single socket and one <code>Processor&lt;ZMsg&gt;</code> per topic.</div>
 </div>
 <div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html" title="class in org.consensusj.bitcoin.rx.zeromq">SampleBitcoinZmqClient</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
@@ -709,143 +725,147 @@ <h1 title="All Classes and Interfaces" class="title">All Classes and Interfaces<
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
 <div class="block">A wallet-level service that can complete and sign transactions.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html" title="class in org.consensusj.bitcoinj.signing">TestnetFeeCalculator</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html" title="class in org.consensusj.bitcoin.rx.jsonrpc.test">TestChainTipPublishers</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab2">
-<div class="block">Stupid simple fee calculator for testnet</div>
+<div class="block">Useful for testing.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/jsonrpc/test/TestServers.html" title="class in org.consensusj.bitcoin.jsonrpc.test">TestServers</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html" title="class in org.consensusj.bitcoinj.signing">TestnetFeeCalculator</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
-<div class="block">Credentials to server under test.</div>
+<div class="block">Stupid simple fee calculator for testnet</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/analytics/service/TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="org/consensusj/analytics/service/TokenRichList.html" title="type parameter in TokenRichList">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/service/TokenRichList.html" title="type parameter in TokenRichList">N</a>&gt;,<wbr><a href="org/consensusj/analytics/service/TokenRichList.html" title="type parameter in TokenRichList">ID</a>&gt;</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/jsonrpc/test/TestServers.html" title="class in org.consensusj.bitcoin.jsonrpc.test">TestServers</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="block">Credentials to server under test.</div>
+</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/analytics/service/TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList&lt;N,<wbr>ID&gt;</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Response format for Omni rich list queries.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html" title="class in org.consensusj.analytics.service">TokenRichList.TokenBalancePair</a>&lt;<a href="org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html" title="type parameter in TokenRichList.TokenBalancePair">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html" title="type parameter in TokenRichList.TokenBalancePair">N</a>&gt;&gt;</div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/TransactionHexSerializer.html" title="class in org.consensusj.bitcoin.json.conversion">TransactionHexSerializer</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html" title="class in org.consensusj.analytics.service">TokenRichList.TokenBalancePair&lt;N&gt;</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/TransactionHexSerializer.html" title="class in org.consensusj.bitcoin.json.conversion">TransactionHexSerializer</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Serialize a transaction as a hex-encoded binary string.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/jsonrpc/test/TransactionIngredients.html" title="class in org.consensusj.bitcoin.jsonrpc.test">TransactionIngredients</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/jsonrpc/test/TransactionIngredients.html" title="class in org.consensusj.bitcoin.jsonrpc.test">TransactionIngredients</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Everything needed to build your own custom transaction
  TODO: Make this an immutable bean</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoinj/signing/TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoinj/signing/TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Immutable data for a transaction input.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html" title="class in org.consensusj.bitcoinj.signing">TransactionInputDataUtxo</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html" title="class in org.consensusj.bitcoinj.signing">TransactionInputDataUtxo</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Immutable aggregate of data for TransactionInput.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TransactionOutputAddress.html" title="class in org.consensusj.bitcoinj.signing">TransactionOutputAddress</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TransactionOutputAddress.html" title="class in org.consensusj.bitcoinj.signing">TransactionOutputAddress</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Raw, immutable data for a pay-to-address transaction output</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoinj/signing/TransactionOutputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionOutputData</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoinj/signing/TransactionOutputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionOutputData</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Raw, immutable data for a transaction output</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TransactionOutputDataScript.html" title="class in org.consensusj.bitcoinj.signing">TransactionOutputDataScript</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TransactionOutputOpReturn.html" title="class in org.consensusj.bitcoinj.signing">TransactionOutputOpReturn</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TransactionOutputDataScript.html" title="class in org.consensusj.bitcoinj.signing">TransactionOutputDataScript</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TransactionOutputOpReturn.html" title="class in org.consensusj.bitcoinj.signing">TransactionOutputOpReturn</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Raw, immutable data for an OP_RETURN transaction output</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/TransactionSerializer.html" title="class in org.consensusj.bitcoin.json.conversion">TransactionSerializer</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/conversion/TransactionSerializer.html" title="class in org.consensusj.bitcoin.json.conversion">TransactionSerializer</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Custom Serialization of Transaction Peer class</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoinj/signing/TransactionSigner.html" title="interface in org.consensusj.bitcoinj.signing">TransactionSigner</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoinj/signing/TransactionSigner.html" title="interface in org.consensusj.bitcoinj.signing">TransactionSigner</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">A low-level transaction signing interface that can sign a <a href="org/consensusj/bitcoinj/signing/SigningRequest.html" title="interface in org.consensusj.bitcoinj.signing"><code>SigningRequest</code></a> that is a complete
  transaction that only needs signatures.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TransactionVerification.html" title="class in org.consensusj.bitcoinj.signing">TransactionVerification</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/TransactionVerification.html" title="class in org.consensusj.bitcoinj.signing">TransactionVerification</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Utility for transaction validation</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/TxOutInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutInfo</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/TxOutInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutInfo</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Result of `gettxout`</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutSetInfo</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutSetInfo</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Result of `gettxoutsetinfo`</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html" title="class in org.consensusj.bitcoin.rx.jsonrpc.service">TxOutSetService</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html" title="class in org.consensusj.bitcoin.rx.jsonrpc.service">TxOutSetService</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Service to return a stream of TxOutSetInfos for a given blockchain/client.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">TxOutSetWatcherSample</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">TxOutSetWatcherSample</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Sample command-line tool that subscribes to ChainTip and TxOutSetInfo</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/UnloadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">UnloadWalletResult</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/UnloadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">UnloadWalletResult</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Response object for <code>createwallet</code> and <code>loadwallet</code></div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Data class for UnspentOutput as returned by listUnspent RPC
  Because the class is immutable we have to give Jackson some hints via annotations.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoinj/signing/Utxo.html" title="interface in org.consensusj.bitcoinj.signing">Utxo</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoinj/signing/Utxo.html" title="interface in org.consensusj.bitcoinj.signing">Utxo</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">UTXO info for transaction signing.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/Utxo.Basic.html" title="class in org.consensusj.bitcoinj.signing">Utxo.Basic</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/Utxo.Basic.html" title="class in org.consensusj.bitcoinj.signing">Utxo.Basic</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Bare minimum UTXO info: txId and index</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/Utxo.Complete.html" title="class in org.consensusj.bitcoinj.signing">Utxo.Complete</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/Utxo.Complete.html" title="class in org.consensusj.bitcoinj.signing">Utxo.Complete</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">UTXO with <code>amount</code> and <code>scriptPubKey</code>.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/Utxo.Signable.html" title="class in org.consensusj.bitcoinj.signing">Utxo.Signable</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoinj/signing/Utxo.Signable.html" title="class in org.consensusj.bitcoinj.signing">Utxo.Signable</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">UTXO with "amount" which is necessary for signing a segwit transaction.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoin/json/pojo/UtxoInfo.html" title="interface in org.consensusj.bitcoin.json.pojo">UtxoInfo</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab1">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab1"><a href="org/consensusj/bitcoin/json/pojo/UtxoInfo.html" title="interface in org.consensusj.bitcoin.json.pojo">UtxoInfo</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab1">
 <div class="block">Interface for commonly-used UTXO information, for example the <code>prevtxs</code> parameter of
  the <code>signrawtransactionwithwallet</code> JSON-RPC request.</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/daemon/micronaut/WalletAppKitJsonRpcService.html" title="class in org.consensusj.daemon.micronaut">WalletAppKitJsonRpcService</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/daemon/micronaut/WalletAppKitJsonRpcService.html" title="class in org.consensusj.daemon.micronaut">WalletAppKitJsonRpcService</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">JSON-RPC wrapper for WalletAppKitService</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/services/WalletAppKitService.html" title="class in org.consensusj.bitcoin.services">WalletAppKitService</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/services/WalletAppKitService.html" title="class in org.consensusj.bitcoin.services">WalletAppKitService</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Implement a subset of Bitcoin JSON RPC using a WalletAppKit</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/services/WalletSigningService.html" title="class in org.consensusj.bitcoin.services">WalletSigningService</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/services/WalletSigningService.html" title="class in org.consensusj.bitcoin.services">WalletSigningService</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Transaction completion and signing service that uses a bitcoinj <code>Wallet</code>.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/jsonrpc/test/WalletTestUtil.html" title="class in org.consensusj.bitcoin.jsonrpc.test">WalletTestUtil</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/jsonrpc/test/WalletTestUtil.html" title="class in org.consensusj.bitcoin.jsonrpc.test">WalletTestUtil</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Utilities for integration testing server-side wallets</div>
 </div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Detailed information about an in-wallet transaction (from gettransaction RPC)</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.DetailList.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.DetailList</a></div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a></div>
 <div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.WalletConflictList.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.WalletConflictList</a></div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.DetailList.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.DetailList</a></div>
 <div class="col-last odd-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
-<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/ZmqNotification.html" title="class in org.consensusj.bitcoin.json.pojo">ZmqNotification</a></div>
-<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.WalletConflictList.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.WalletConflictList</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">&nbsp;</div>
+<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/bitcoin/json/pojo/ZmqNotification.html" title="class in org.consensusj.bitcoin.json.pojo">ZmqNotification</a></div>
+<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
 <div class="block">Information about an active ZeroMQ notification.</div>
 </div>
-<div class="col-first odd-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/rx/zeromq/ZMsgSocketFlowable.html" title="class in org.consensusj.rx.zeromq">ZMsgSocketFlowable</a></div>
-<div class="col-last odd-row-color all-classes-table all-classes-table-tab2">
-<div class="block">Factory class for creating <code>Flowable&lt;ZMsg&gt;</code> from a <code>ZMQ.Socket</code>.</div>
+<div class="col-first even-row-color all-classes-table all-classes-table-tab2"><a href="org/consensusj/rx/zeromq/ZMsgSocketFlowable.html" title="class in org.consensusj.rx.zeromq">ZMsgSocketFlowable</a></div>
+<div class="col-last even-row-color all-classes-table all-classes-table-tab2">
+<div class="block">Factory class for creating <code>Publisher&lt;ZMsg&gt;</code> from a <code>ZMQ.Socket</code>.</div>
 </div>
 </div>
 </div>
diff --git a/apidoc/allpackages-index.html b/apidoc/allpackages-index.html
index 051e71647..ccaa85eee 100644
--- a/apidoc/allpackages-index.html
+++ b/apidoc/allpackages-index.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>All Packages (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>All Packages (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="package index">
 <meta name="generator" content="javadoc/AllPackagesIndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -98,92 +98,93 @@ <h1 title="All&amp;nbsp;Packages" class="title">All&nbsp;Packages</h1>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><a href="org/consensusj/bitcoin/rx/jsonrpc/service/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.service</a></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/bitcoin/rx/peergroup/package-summary.html">org.consensusj.bitcoin.rx.peergroup</a></div>
+<div class="col-first even-row-color"><a href="org/consensusj/bitcoin/rx/jsonrpc/test/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.test</a></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><a href="org/consensusj/bitcoin/rx/zeromq/package-summary.html">org.consensusj.bitcoin.rx.zeromq</a></div>
+<div class="col-first odd-row-color"><a href="org/consensusj/bitcoin/rx/peergroup/package-summary.html">org.consensusj.bitcoin.rx.peergroup</a></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/bitcoin/services/package-summary.html">org.consensusj.bitcoin.services</a></div>
-<div class="col-last even-row-color">
+<div class="col-first even-row-color"><a href="org/consensusj/bitcoin/rx/zeromq/package-summary.html">org.consensusj.bitcoin.rx.zeromq</a></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><a href="org/consensusj/bitcoin/services/package-summary.html">org.consensusj.bitcoin.services</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Reusable Dependency-injected services for Bitcoin server applications and microservices.</div>
 </div>
-<div class="col-first odd-row-color"><a href="org/consensusj/bitcoinj/dsl/js/package-summary.html">org.consensusj.bitcoinj.dsl.js</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="org/consensusj/bitcoinj/dsl/js/package-summary.html">org.consensusj.bitcoinj.dsl.js</a></div>
+<div class="col-last even-row-color">
 <div class="block">Prototype JavaScript scripting support via (Standalone) <b>Nashorn</b> and ScriptEngineFactory (JSR 223)</div>
 </div>
-<div class="col-first even-row-color"><a href="org/consensusj/bitcoinj/service/package-summary.html">org.consensusj.bitcoinj.service</a></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><a href="org/consensusj/bitcoinj/signing/package-summary.html">org.consensusj.bitcoinj.signing</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first odd-row-color"><a href="org/consensusj/bitcoinj/service/package-summary.html">org.consensusj.bitcoinj.service</a></div>
+<div class="col-last odd-row-color">&nbsp;</div>
+<div class="col-first even-row-color"><a href="org/consensusj/bitcoinj/signing/package-summary.html">org.consensusj.bitcoinj.signing</a></div>
+<div class="col-last even-row-color">
 <div class="block"><i>Incubating</i> support for <q>signing wallets</q> using immutable, record-like classes.</div>
 </div>
-<div class="col-first even-row-color"><a href="org/consensusj/bitcoinj/util/package-summary.html">org.consensusj.bitcoinj.util</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="org/consensusj/bitcoinj/util/package-summary.html">org.consensusj.bitcoinj.util</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Miscellaneous utility classes for <b>bitcoinj</b></div>
 </div>
-<div class="col-first odd-row-color"><a href="org/consensusj/bitcoinj/wallet/package-summary.html">org.consensusj.bitcoinj.wallet</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="org/consensusj/bitcoinj/wallet/package-summary.html">org.consensusj.bitcoinj.wallet</a></div>
+<div class="col-last even-row-color">
 <div class="block">Support for BIP-44 family HD Keychains, as a temporary solution until <b>bitcoinj</b> 0.17 is released.</div>
 </div>
-<div class="col-first even-row-color"><a href="org/consensusj/currency/package-summary.html">org.consensusj.currency</a></div>
-<div class="col-last even-row-color">
+<div class="col-first odd-row-color"><a href="org/consensusj/currency/package-summary.html">org.consensusj.currency</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Bitcoin currency provider for JavaMoney (JSR-354)</div>
 </div>
-<div class="col-first odd-row-color"><a href="org/consensusj/daemon/micronaut/package-summary.html">org.consensusj.daemon.micronaut</a></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/decentralizedid/package-summary.html">org.consensusj.decentralizedid</a></div>
+<div class="col-first even-row-color"><a href="org/consensusj/daemon/micronaut/package-summary.html">org.consensusj.daemon.micronaut</a></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><a href="org/consensusj/decentralizedid/btcr/package-summary.html">org.consensusj.decentralizedid.btcr</a></div>
+<div class="col-first odd-row-color"><a href="org/consensusj/decentralizedid/package-summary.html">org.consensusj.decentralizedid</a></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/ethereum/jsonrpc/package-summary.html">org.consensusj.ethereum.jsonrpc</a></div>
-<div class="col-last even-row-color">
+<div class="col-first even-row-color"><a href="org/consensusj/decentralizedid/btcr/package-summary.html">org.consensusj.decentralizedid.btcr</a></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><a href="org/consensusj/ethereum/jsonrpc/package-summary.html">org.consensusj.ethereum.jsonrpc</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Ethereum JSON-RPC client (partial implementation)</div>
 </div>
-<div class="col-first odd-row-color"><a href="org/consensusj/exchange/package-summary.html">org.consensusj.exchange</a></div>
-<div class="col-last odd-row-color">
+<div class="col-first even-row-color"><a href="org/consensusj/exchange/package-summary.html">org.consensusj.exchange</a></div>
+<div class="col-last even-row-color">
 <div class="block">JavaMoney (JSR-354) support for Cryptocurrency exchanges</div>
 </div>
-<div class="col-first even-row-color"><a href="org/consensusj/exchange/knowm/package-summary.html">org.consensusj.exchange.knowm</a></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><a href="org/consensusj/exchange/rx/package-summary.html">org.consensusj.exchange.rx</a></div>
+<div class="col-first odd-row-color"><a href="org/consensusj/exchange/knowm/package-summary.html">org.consensusj.exchange.knowm</a></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></div>
-<div class="col-last even-row-color">
+<div class="col-first even-row-color"><a href="org/consensusj/exchange/rx/package-summary.html">org.consensusj.exchange.rx</a></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Basic JSON-RPC Java client and supporting classes.</div>
 </div>
-<div class="col-first odd-row-color"><a href="org/consensusj/jsonrpc/cli/package-summary.html">org.consensusj.jsonrpc.cli</a></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/jsonrpc/cli/test/package-summary.html">org.consensusj.jsonrpc.cli.test</a></div>
+<div class="col-first even-row-color"><a href="org/consensusj/jsonrpc/cli/package-summary.html">org.consensusj.jsonrpc.cli</a></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><a href="org/consensusj/jsonrpc/daemon/package-summary.html">org.consensusj.jsonrpc.daemon</a></div>
+<div class="col-first odd-row-color"><a href="org/consensusj/jsonrpc/cli/test/package-summary.html">org.consensusj.jsonrpc.cli.test</a></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/jsonrpc/groovy/package-summary.html">org.consensusj.jsonrpc.groovy</a></div>
-<div class="col-last even-row-color">
+<div class="col-first even-row-color"><a href="org/consensusj/jsonrpc/daemon/package-summary.html">org.consensusj.jsonrpc.daemon</a></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><a href="org/consensusj/jsonrpc/groovy/package-summary.html">org.consensusj.jsonrpc.groovy</a></div>
+<div class="col-last odd-row-color">
 <div class="block">JSON-RPC Groovy dynamic client and supporting classes.</div>
 </div>
-<div class="col-first odd-row-color"><a href="org/consensusj/jsonrpc/internal/package-summary.html">org.consensusj.jsonrpc.internal</a></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/jsonrpc/introspection/package-summary.html">org.consensusj.jsonrpc.introspection</a></div>
+<div class="col-first even-row-color"><a href="org/consensusj/jsonrpc/internal/package-summary.html">org.consensusj.jsonrpc.internal</a></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><a href="org/consensusj/jsonrpc/introspection/sample/package-summary.html">org.consensusj.jsonrpc.introspection.sample</a></div>
+<div class="col-first odd-row-color"><a href="org/consensusj/jsonrpc/introspection/package-summary.html">org.consensusj.jsonrpc.introspection</a></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/namecoin/jsonrpc/package-summary.html">org.consensusj.namecoin.jsonrpc</a></div>
-<div class="col-last even-row-color">
+<div class="col-first even-row-color"><a href="org/consensusj/jsonrpc/introspection/sample/package-summary.html">org.consensusj.jsonrpc.introspection.sample</a></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><a href="org/consensusj/namecoin/jsonrpc/package-summary.html">org.consensusj.namecoin.jsonrpc</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Namecoin JSON-RPC Client</div>
 </div>
-<div class="col-first odd-row-color"><a href="org/consensusj/namecoin/jsonrpc/cli/package-summary.html">org.consensusj.namecoin.jsonrpc.cli</a></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/namecoin/jsonrpc/core/package-summary.html">org.consensusj.namecoin.jsonrpc.core</a></div>
+<div class="col-first even-row-color"><a href="org/consensusj/namecoin/jsonrpc/cli/package-summary.html">org.consensusj.namecoin.jsonrpc.cli</a></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><a href="org/consensusj/namecoin/jsonrpc/pojo/package-summary.html">org.consensusj.namecoin.jsonrpc.pojo</a></div>
+<div class="col-first odd-row-color"><a href="org/consensusj/namecoin/jsonrpc/core/package-summary.html">org.consensusj.namecoin.jsonrpc.core</a></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="org/consensusj/rx/jsonrpc/package-summary.html">org.consensusj.rx.jsonrpc</a></div>
-<div class="col-last even-row-color">
+<div class="col-first even-row-color"><a href="org/consensusj/namecoin/jsonrpc/pojo/package-summary.html">org.consensusj.namecoin.jsonrpc.pojo</a></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><a href="org/consensusj/rx/jsonrpc/package-summary.html">org.consensusj.rx.jsonrpc</a></div>
+<div class="col-last odd-row-color">
 <div class="block">Reactive enhancements for JSON-RPC clients using <a href="https://github.com/ReactiveX/RxJava">RxJava 3</a>.</div>
 </div>
-<div class="col-first odd-row-color"><a href="org/consensusj/rx/zeromq/package-summary.html">org.consensusj.rx.zeromq</a></div>
-<div class="col-last odd-row-color">
-<div class="block">Reactive interface to <a href="https://zeromq.org">ZeroMQ</a> using <a href="https://github.com/zeromq/jeromq">JeroMQ</a> library
- and <a href="https://github.com/ReactiveX/RxJava">RxJava 3</a>.</div>
+<div class="col-first even-row-color"><a href="org/consensusj/rx/zeromq/package-summary.html">org.consensusj.rx.zeromq</a></div>
+<div class="col-last even-row-color">
+<div class="block">Reactive interface to <a href="https://zeromq.org">ZeroMQ</a> using <a href="https://github.com/zeromq/jeromq">JeroMQ</a> library.</div>
 </div>
 </div>
 </main>
diff --git a/apidoc/constant-values.html b/apidoc/constant-values.html
index b7bac4400..a299d33bd 100644
--- a/apidoc/constant-values.html
+++ b/apidoc/constant-values.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Constant Field Values (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Constant Field Values (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="summary of constants">
 <meta name="generator" content="javadoc/ConstantsSummaryWriterImpl">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,15 +49,15 @@
 <main role="main">
 <div class="header">
 <h1 title="Constant Field Values" class="title">Constant Field Values</h1>
+</div>
 <section class="packages">
 <h2 title="Contents">Contents</h2>
-<ul>
+<ul class="contents-list">
 <li><a href="#org.consensusj">org.consensusj.*</a></li>
 </ul>
 </section>
-</div>
-<section class="constants-summary" id="org.consensusj.bitcoin.cli">
-<h2 title="org.consensusj">org.consensusj.*</h2>
+<section class="constants-summary" id="org.consensusj">
+<h2 title="org.consensusj.*">org.consensusj.*</h2>
 <ul class="block-list">
 <li>
 <div class="caption"><span>org.consensusj.bitcoin.cli.<a href="org/consensusj/bitcoin/cli/BitcoinCLITool.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool</a></span></div>
diff --git a/apidoc/copy.svg b/apidoc/copy.svg
new file mode 100644
index 000000000..7c46ab15f
--- /dev/null
+++ b/apidoc/copy.svg
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 380 460" fill="#505050">
+  <path
+     d="M 346,8 H 108 C 90,8 75,23 75,41 v 316 c 0,18 15,33 33,33 h 238 c 18,0 33,-15 33,-33 V 41 C 379,23 364,8 346,8 Z m -8,344 H 116 c -2,0 -3,-1 -3,-3 V 49 c 0,-2 1,-3 3,-3 h 222 c 2,0 3,1 3,3 v 300 h 10e-4 c 0,2 -1,3 -3,3 z"/>
+  <path
+     d="m 290,389 v 26 h 10e-4 c 0,2 -1,3 -3,3 H 49 c -2,0 -3,-1 -3,-3 V 99 c 0,-2 1,-3 3,-3 h 27 v 0 l -5e-4,-38 H 41 C 23,58 8,73 8,91 v 332 c 10e-4,18 15,33 33,33 h 254 c 18,0 33,-15 33,-33 v -34"/>
+</svg>
diff --git a/apidoc/deprecated-list.html b/apidoc/deprecated-list.html
index 494ad1d17..9ca6d163d 100644
--- a/apidoc/deprecated-list.html
+++ b/apidoc/deprecated-list.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Deprecated List (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Deprecated List (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="deprecated elements">
 <meta name="generator" content="javadoc/DeprecatedListWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,14 +49,13 @@
 <main role="main">
 <div class="header">
 <h1 title="Deprecated API" class="title">Deprecated API</h1>
+</div>
 <h2 title="Contents">Contents</h2>
-<ul>
-<li><a href="#interface">Interfaces</a></li>
-<li><a href="#class">Classes</a></li>
-<li><a href="#method">Methods</a></li>
-<li><a href="#constructor">Constructors</a></li>
+<ul class="contents-list">
+<li id="contents-interface"><a href="#interface">Interfaces</a></li>
+<li id="contents-class"><a href="#class">Classes</a></li>
+<li id="contents-method"><a href="#method">Methods</a></li>
 </ul>
-</div>
 <ul class="block-list">
 <li>
 <div id="interface">
@@ -64,9 +63,15 @@ <h2 title="Contents">Contents</h2>
 <div class="summary-table two-column-summary">
 <div class="table-header col-first">Interface</div>
 <div class="table-header col-last">Description</div>
+<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">org.consensusj.bitcoin.rx.jsonrpc.PollingChainTipService</a></div>
+<div class="col-last even-row-color">
+<div class="block">Use the <a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc"><code>PollingChainTipServiceImpl</code></a> implementation</div>
+</div>
+<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">org.consensusj.bitcoin.rx.jsonrpc.RxJsonChainTipClient</a></div>
+<div class="col-last odd-row-color"></div>
 <div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html" title="interface in org.consensusj.bitcoinj.wallet">org.consensusj.bitcoinj.wallet.BipStandardKeyChainGroupStructure</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Use <code>KeyChainGroupStructure.BIP43</code> and constants in <code>DeterministicKeyChain</code></div>
+<div class="block">Use <code>KeyChainGroupStructure.BIP43</code> and constants in <code>DeterministicKeyChain</code></div>
 </div>
 <div class="col-summary-item-name odd-row-color"><a href="org/consensusj/exchange/ExchangeRateObserver.html" title="interface in org.consensusj.exchange">org.consensusj.exchange.ExchangeRateObserver</a></div>
 <div class="col-last odd-row-color"></div>
@@ -85,7 +90,7 @@ <h2 title="Contents">Contents</h2>
 <div class="table-header col-last">Description</div>
 <div class="col-summary-item-name even-row-color"><a href="org/consensusj/exchange/BaseXChangeExchangeRateProvider.html" title="class in org.consensusj.exchange">org.consensusj.exchange.BaseXChangeExchangeRateProvider</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Will be removed in the next release.</div>
+<div class="block">Will be removed in the next release.</div>
 </div>
 <div class="col-summary-item-name odd-row-color"><a href="org/consensusj/exchange/ExchangeRateChange.html" title="class in org.consensusj.exchange">org.consensusj.exchange.ExchangeRateChange</a></div>
 <div class="col-last odd-row-color"></div>
@@ -102,7 +107,7 @@ <h2 title="Contents">Contents</h2>
 <div class="table-header col-last">Description</div>
 <div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html#getLocktime()">org.consensusj.bitcoin.json.pojo.RawTransactionInfo.getLocktime()</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html#getLockTime()"><code>RawTransactionInfo.getLockTime()</code></a></div>
+<div class="block">Use <a href="org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html#getLockTime()"><code>RawTransactionInfo.getLockTime()</code></a></div>
 </div>
 <div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/json/pojo/ZmqNotification.html#getAddress()">org.consensusj.bitcoin.json.pojo.ZmqNotification.getAddress()</a></div>
 <div class="col-last odd-row-color"></div>
@@ -110,75 +115,50 @@ <h2 title="Contents">Contents</h2>
 <div class="col-last even-row-color"></div>
 <div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/json/pojo/ZmqNotification.html#getType()">org.consensusj.bitcoin.json.pojo.ZmqNotification.getType()</a></div>
 <div class="col-last odd-row-color"></div>
-<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getNetParams()">org.consensusj.bitcoin.jsonrpc.BitcoinClient.getNetParams()</a></div>
+<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getChainTips()">org.consensusj.bitcoin.jsonrpc.BitcoinClient.getChainTips()</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getNetwork()"><code>BitcoinClient.getNetwork()</code></a></div>
+<div class="block">Use <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getChainTipsAsync()"><code>BitcoinClient.getChainTipsAsync()</code></a></div>
 </div>
-<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html#getNetParams()">org.consensusj.bitcoin.jsonrpc.RpcConfig.getNetParams()</a></div>
+<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#waitForServer(int)">org.consensusj.bitcoin.jsonrpc.BitcoinClient.waitForServer<wbr>(int)</a></div>
 <div class="col-last odd-row-color">
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html#network()"><code>RpcConfig.network()</code></a></div>
+<div class="block">Use <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#waitForServer(java.time.Duration)"><code>BitcoinClient.waitForServer(Duration)</code></a></div>
 </div>
-<div class="col-summary-item-name even-row-color"><a href="org/consensusj/jsonrpc/CompositeTrustManager.html#getAlternateSSLSocketFactory(java.io.InputStream)">org.consensusj.jsonrpc.CompositeTrustManager.getAlternateSSLSocketFactory<wbr>(InputStream)</a></div>
+<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html#getChainTips()">org.consensusj.bitcoin.jsonrpc.ChainTipClient.getChainTips()</a></div>
 <div class="col-last even-row-color"></div>
-<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/jsonrpc/CompositeTrustManager.html#getAlternateSSLSocketFactory(java.nio.file.Path)">org.consensusj.jsonrpc.CompositeTrustManager.getAlternateSSLSocketFactory<wbr>(Path)</a></div>
+<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#getChainTips()">org.consensusj.bitcoin.rx.jsonrpc.PollingChainTipServiceImpl.getChainTips()</a></div>
 <div class="col-last odd-row-color"></div>
-<div class="col-summary-item-name even-row-color"><a href="org/consensusj/jsonrpc/CompositeTrustManager.html#getCompositeSSLSocketFactory(java.io.InputStream)">org.consensusj.jsonrpc.CompositeTrustManager.getCompositeSSLSocketFactory<wbr>(InputStream)</a></div>
+<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html#pollOnNewBlock(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">org.consensusj.bitcoin.rx.jsonrpc.RxJsonChainTipClient.pollOnNewBlock<wbr>(AsyncSupport.ThrowingSupplier&lt;RSLT&gt;)</a></div>
 <div class="col-last even-row-color"></div>
-<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/jsonrpc/CompositeTrustManager.html#getCompositeSSLSocketFactory(java.nio.file.Path)">org.consensusj.jsonrpc.CompositeTrustManager.getCompositeSSLSocketFactory<wbr>(Path)</a></div>
+<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">org.consensusj.rx.jsonrpc.RxJsonRpcClient.call<wbr>(AsyncSupport.ThrowingSupplier&lt;RSLT&gt;)</a></div>
 <div class="col-last odd-row-color"></div>
-</div>
-</div>
-</li>
-</ul>
-<ul class="block-list">
-<li>
-<div id="constructor">
-<div class="caption"><span>Deprecated Constructors</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Constructor</div>
-<div class="table-header col-last">Description</div>
-<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)">org.consensusj.bitcoin.json.conversion.AddressDeserializer<wbr>(NetworkParameters)</a></div>
-<div class="col-last even-row-color">
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#%3Cinit%3E(org.bitcoinj.base.Network)"><code>AddressDeserializer(Network)</code></a></div>
-</div>
-<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)">org.consensusj.bitcoin.json.conversion.AddressKeyDeserializer<wbr>(NetworkParameters)</a></div>
-<div class="col-last odd-row-color">
-<div class="deprecation-comment">use <a href="org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#%3Cinit%3E(org.bitcoinj.base.Network)"><code>AddressKeyDeserializer(Network)</code></a></div>
-</div>
-<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#%3Cinit%3E(org.bitcoinj.base.Network)">org.consensusj.bitcoin.json.conversion.BlockHexDeserializer<wbr>(Network)</a></div>
+<div class="col-summary-item-name even-row-color"><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#callAsync(java.util.function.Supplier)">org.consensusj.rx.jsonrpc.RxJsonRpcClient.callAsync<wbr>(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt;)</a></div>
 <div class="col-last even-row-color"></div>
-<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)">org.consensusj.bitcoin.json.conversion.BlockHexDeserializer<wbr>(NetworkParameters)</a></div>
+<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#defer(java.util.function.Supplier)">org.consensusj.rx.jsonrpc.RxJsonRpcClient.defer<wbr>(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt;)</a></div>
 <div class="col-last odd-row-color"></div>
-<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/json/conversion/RpcServerModule.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)">org.consensusj.bitcoin.json.conversion.RpcServerModule<wbr>(NetworkParameters)</a></div>
-<div class="col-last even-row-color"></div>
-<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">org.consensusj.bitcoin.jsonrpc.BitcoinClient<wbr>(SSLSocketFactory, Network, URI, String, String)</a></div>
-<div class="col-last odd-row-color">
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"><code>BitcoinClient(SSLContext, Network, URI, String, String)</code></a></div>
-</div>
-<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)">org.consensusj.bitcoin.jsonrpc.BitcoinClient<wbr>(SSLSocketFactory, NetworkParameters, URI, String, String)</a></div>
+<div class="col-summary-item-name even-row-color"><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">org.consensusj.rx.jsonrpc.RxJsonRpcClient.pollOnce<wbr>(AsyncSupport.ThrowingSupplier&lt;RSLT&gt;)</a></div>
 <div class="col-last even-row-color">
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"><code>BitcoinClient(SSLContext, Network, URI, String, String)</code></a></div>
+<div class="block">Use <a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)"><code>RxJsonRpcClient.pollOnceAsPublisher(Supplier, TransientErrorFilter)</code></a> (Supplier)}</div>
 </div>
-<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)">org.consensusj.bitcoin.jsonrpc.BitcoinClient<wbr>(NetworkParameters, URI, String, String)</a></div>
+<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsync(java.util.function.Supplier)">org.consensusj.rx.jsonrpc.RxJsonRpcClient.pollOnceAsync<wbr>(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt;)</a></div>
 <div class="col-last odd-row-color"></div>
-<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient<wbr>(SSLSocketFactory, Network, URI, String, String)</a></div>
-<div class="col-last even-row-color"></div>
-<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)">org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient<wbr>(SSLSocketFactory, NetworkParameters, URI, String, String)</a></div>
-<div class="col-last odd-row-color"></div>
-<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)">org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient<wbr>(NetworkParameters, URI, String, String)</a></div>
-<div class="col-last even-row-color"></div>
-<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)">org.consensusj.bitcoin.jsonrpc.RpcConfig<wbr>(NetworkParameters, URI, String, String)</a></div>
-<div class="col-last odd-row-color"></div>
-<div class="col-summary-item-name even-row-color"><a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)">org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient<wbr>(SSLSocketFactory, Network, URI, String, String, boolean)</a></div>
-<div class="col-last even-row-color"></div>
-<div class="col-summary-item-name odd-row-color"><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)">org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection<wbr>(SSLSocketFactory, JsonRpcMessage.Version, URI, String, String)</a></div>
-<div class="col-last odd-row-color">
-<div class="deprecation-comment">Use <a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"><code>JsonRpcClientHttpUrlConnection(SSLContext, JsonRpcMessage.Version, URI, String, String)</code></a></div>
-</div>
 </div>
 </div>
 </li>
 </ul>
+<script type="text/javascript">document.addEventListener("DOMContentLoaded", function(e) {
+    document.querySelectorAll('input[type="checkbox"]').forEach(
+        function(c) {
+            c.disabled = false;
+            c.onclick();
+        });
+    });
+window.addEventListener("load", function(e) {
+    document.querySelectorAll('input[type="checkbox"]').forEach(
+        function(c) {
+            c.onclick();
+        });
+    });
+</script>
 </main>
 </div>
 </div>
diff --git a/apidoc/element-list b/apidoc/element-list
index 5377ab40e..b5da399d6 100644
--- a/apidoc/element-list
+++ b/apidoc/element-list
@@ -12,6 +12,7 @@ org.consensusj.bitcoin.jsonrpc.test
 org.consensusj.bitcoin.rx
 org.consensusj.bitcoin.rx.jsonrpc
 org.consensusj.bitcoin.rx.jsonrpc.service
+org.consensusj.bitcoin.rx.jsonrpc.test
 org.consensusj.bitcoin.rx.peergroup
 org.consensusj.bitcoin.rx.zeromq
 org.consensusj.bitcoin.services
diff --git a/apidoc/help-doc.html b/apidoc/help-doc.html
index 3f0521366..12a26efe9 100644
--- a/apidoc/help-doc.html
+++ b/apidoc/help-doc.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>API Help (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>API Help (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="help">
 <meta name="generator" content="javadoc/HelpWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="index.html">Overview</a></li>
@@ -35,18 +34,27 @@
 <li><a href="index-all.html">Index</a></li>
 <li class="nav-bar-cell1-rev">Help</li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Help:</p>
+<ul>
+<li><a href="#help-navigation">Navigation</a></li>
+<li><a href="#help-pages">Pages</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Help:&nbsp;</li>
 <li><a href="#help-navigation">Navigation</a>&nbsp;|&nbsp;</li>
 <li><a href="#help-pages">Pages</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -58,7 +66,7 @@ <h1 class="title">JavaDoc Help</h1>
 <ul class="help-toc">
 <li><a href="#help-navigation">Navigation</a>: 
 <ul class="help-subtoc">
-<li><a href="#help-search">Search</a></li>
+<li><a href="#search">Search</a></li>
 </ul>
 </li>
 <li><a href="#help-pages">Kinds of Pages</a>: 
@@ -81,15 +89,15 @@ <h1 class="title">JavaDoc Help</h1>
 <div class="sub-title">
 <h2 id="help-navigation">Navigation</h2>
 Starting from the <a href="index.html">Overview</a> page, you can browse the documentation using the links in each page, and in the navigation bar at the top of each page. The <a href="index-all.html">Index</a> and Search box allow you to navigate to specific declarations and summary pages, including: <a href="allpackages-index.html">All Packages</a>, <a href="allclasses-index.html">All Classes and Interfaces</a>
-<section class="help-section" id="help-search">
+<section class="help-section" id="search">
 <h3>Search</h3>
-<p>You can search for definitions of modules, packages, types, fields, methods, system properties and other terms defined in the API, using some or all of the name, optionally using "camelCase" abbreviations. For example:</p>
+<p>You can search for definitions of modules, packages, types, fields, methods, system properties and other terms defined in the API. These items can be searched using part or all of the name, optionally using "camelCase" abbreviations, or multiple search terms separated by whitespace. Some examples:</p>
 <ul class="help-section-list">
-<li><code>j.l.obj</code> will match "java.lang.Object"</li>
-<li><code>InpStr</code> will match "java.io.InputStream"</li>
-<li><code>HM.cK</code> will match "java.util.HashMap.containsKey(Object)"</li>
+<li><code>"j.l.obj"</code> matches "java.lang.Object"</li>
+<li><code>"InpStr"</code> matches "java.io.InputStream"</li>
+<li><code>"math exact long"</code> matches "java.lang.Math.absExact(long)"</li>
 </ul>
-<p>Refer to the <a href="https://docs.oracle.com/en/java/javase/17/docs/specs/javadoc/javadoc-search-spec.html">Javadoc Search Specification</a> for a full description of search features.</p>
+<p>Refer to the <a href="https://docs.oracle.com/en/java/javase/21/docs/specs/javadoc/javadoc-search-spec.html">Javadoc Search Specification</a> for a full description of search features.</p>
 </section>
 </div>
 <hr>
@@ -107,8 +115,7 @@ <h3>Package</h3>
 <li>Interfaces</li>
 <li>Classes</li>
 <li>Enum Classes</li>
-<li>Exceptions</li>
-<li>Errors</li>
+<li>Exception Classes</li>
 <li>Annotation Interfaces</li>
 </ul>
 </section>
diff --git a/apidoc/index-all.html b/apidoc/index-all.html
index b27170f2e..ef298b9f0 100644
--- a/apidoc/index-all.html
+++ b/apidoc/index-all.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Index (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Index (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="index">
 <meta name="generator" content="javadoc/IndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -60,12 +60,6 @@ <h2 class="title" id="I:A">A</h2>
 </dd>
 <dt><a href="org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html#%3Cinit%3E(java.util.Map)" class="member-name-link">AbstractJsonRpcService(Map&lt;String, Method&gt;)</a> - Constructor for class org.consensusj.jsonrpc.introspection.<a href="org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html" title="class in org.consensusj.jsonrpc.introspection">AbstractJsonRpcService</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/AbstractRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a> - Class in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
-<dd>
-<div class="block">Abstract Base class for a strongly-typed, Jackson-based JSON-RPC client.</div>
-</dd>
-<dt><a href="org/consensusj/jsonrpc/AbstractRpcClient.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version)" class="member-name-link">AbstractRpcClient(JsonRpcMessage.Version)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#account(int)" class="member-name-link">account(int)</a> - Static method in interface org.consensusj.bitcoinj.wallet.<a href="org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html" title="interface in org.consensusj.bitcoinj.wallet">BipStandardKeyChainGroupStructure</a></dt>
 <dd>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
@@ -73,10 +67,6 @@ <h2 class="title" id="I:A">A</h2>
 </dd>
 <dt><a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html#accumulator()" class="member-name-link">accumulator()</a> - Method in class org.consensusj.analytics.util.collector.<a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" title="class in org.consensusj.analytics.util.collector">LargestSliceCollector</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#activeChainTipFromBestBlock(org.bitcoinj.core.Block)" class="member-name-link">activeChainTipFromBestBlock(Block)</a> - Method in class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></dt>
-<dd>
-<div class="block">Convert best <code>Block</code> to active <a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a>.</div>
-</dd>
 <dt><a href="org/consensusj/jsonrpc/introspection/sample/MathService.html#add(java.lang.Integer,java.lang.Integer)" class="member-name-link">add(Integer, Integer)</a> - Method in class org.consensusj.jsonrpc.introspection.sample.<a href="org/consensusj/jsonrpc/introspection/sample/MathService.html" title="class in org.consensusj.jsonrpc.introspection.sample">MathService</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoinj/signing/SigningUtils.html#addChange(org.consensusj.bitcoinj.signing.SigningRequest,org.bitcoinj.base.Address,org.consensusj.bitcoinj.signing.FeeCalculator)" class="member-name-link">addChange(SigningRequest, Address, FeeCalculator)</a> - Static method in interface org.consensusj.bitcoinj.signing.<a href="org/consensusj/bitcoinj/signing/SigningUtils.html" title="interface in org.consensusj.bitcoinj.signing">SigningUtils</a></dt>
@@ -119,12 +109,6 @@ <h2 class="title" id="I:A">A</h2>
 <dd>
 <div class="block">Construct an address deserializer that validates addresses for the specified <code>Network</code>.</div>
 </dd>
-<dt><a href="org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)" class="member-name-link">AddressDeserializer(NetworkParameters)</a> - Constructor for class org.consensusj.bitcoin.json.conversion.<a href="org/consensusj/bitcoin/json/conversion/AddressDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">AddressDeserializer</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#%3Cinit%3E(org.bitcoinj.base.Network)"><code>AddressDeserializer(Network)</code></a></div>
-</div>
-</dd>
 <dt><a href="org/consensusj/bitcoinj/wallet/BipStandardDeterministicKeyChain.html#addressFromKey(org.bitcoinj.crypto.ECKey)" class="member-name-link">addressFromKey(ECKey)</a> - Method in class org.consensusj.bitcoinj.wallet.<a href="org/consensusj/bitcoinj/wallet/BipStandardDeterministicKeyChain.html" title="class in org.consensusj.bitcoinj.wallet">BipStandardDeterministicKeyChain</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">AddressGroupingItem</a> - Class in <a href="org/consensusj/bitcoin/json/pojo/package-summary.html">org.consensusj.bitcoin.json.pojo</a></dt>
@@ -156,12 +140,6 @@ <h2 class="title" id="I:A">A</h2>
 <dd>
 <div class="block">Construct an address KeyDeserializer that validates addresses for the specified <code>Network</code>.</div>
 </dd>
-<dt><a href="org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)" class="member-name-link">AddressKeyDeserializer(NetworkParameters)</a> - Constructor for class org.consensusj.bitcoin.json.conversion.<a href="org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">AddressKeyDeserializer</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">use <a href="org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#%3Cinit%3E(org.bitcoinj.base.Network)"><code>AddressKeyDeserializer(Network)</code></a></div>
-</div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressRequest</a> - Class in <a href="org/consensusj/bitcoin/json/pojo/bitcore/package-summary.html">org.consensusj.bitcoin.json.pojo.bitcore</a></dt>
 <dd>
 <div class="block">Address Request for BitCore <code>getaddressbalance</code> and others.</div>
@@ -226,14 +204,18 @@ <h2 class="title" id="I:A">A</h2>
 <dd>
 <div class="block">Helper methods for creating asynchronous calls using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture</code></a>.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt; - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dt><a href="org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier&lt;T&gt;</a> - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
 <dd>
 <div class="block">Subinterface of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link"><code>Supplier</code></a> for Lambdas which throw <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a>.</div>
 </dd>
+<dt><a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a> - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dd>
+<div class="block">Error filter for resilient polling.</div>
+</dd>
 </dl>
 <h2 class="title" id="I:B">B</h2>
 <dl class="index">
-<dt><a href="org/consensusj/jsonrpc/AbstractRpcClient.html#base64Encode(java.lang.String)" class="member-name-link">base64Encode(String)</a> - Static method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcTransport.html#base64Encode(java.lang.String)" class="member-name-link">base64Encode(String)</a> - Static method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></dt>
 <dd>
 <div class="block">Encode username password as Base64 for basic authentication</div>
 </dd>
@@ -339,26 +321,10 @@ <h2 class="title" id="I:B">B</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinClient(SSLContext, Network, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinClient(SSLSocketFactory, Network, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"><code>BitcoinClient(SSLContext, Network, URI, String, String)</code></a></div>
-</div>
-</dd>
-<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinClient(SSLSocketFactory, NetworkParameters, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"><code>BitcoinClient(SSLContext, Network, URI, String, String)</code></a></div>
-</div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinClient(Network, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
 <dd>
 <div class="block">Construct a BitcoinClient from Network, URI, user name, and password.</div>
 </dd>
-<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinClient(NetworkParameters, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)" class="member-name-link">BitcoinClient(RpcConfig)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
 <dd>
 <div class="block">Construct a BitcoinClient from an RPCConfig data object.</div>
@@ -426,20 +392,8 @@ <h2 class="title" id="I:B">B</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinExtendedClient(SSLContext, Network, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinExtendedClient(SSLSocketFactory, Network, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
-<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinExtendedClient(SSLSocketFactory, NetworkParameters, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinExtendedClient(Network, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinExtendedClient(NetworkParameters, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)" class="member-name-link">BitcoinExtendedClient(RpcConfig)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/daemon/micronaut/BitcoinFactory.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">BitcoinFactory</a> - Class in <a href="org/consensusj/daemon/micronaut/package-summary.html">org.consensusj.daemon.micronaut</a></dt>
@@ -470,7 +424,7 @@ <h2 class="title" id="I:B">B</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html#%3Cinit%3E(boolean,org.bitcoinj.base.Address,java.lang.String,org.bitcoinj.base.Coin,java.lang.String,int,org.bitcoinj.base.Coin,int,boolean,boolean,org.bitcoinj.base.Sha256Hash,int,int,long,org.bitcoinj.base.Sha256Hash,java.util.List,long,long,java.lang.String,java.lang.String,boolean)" class="member-name-link">BitcoinTransactionInfo(boolean, Address, String, Coin, String, int, Coin, int, boolean, boolean, Sha256Hash, int, int, long, Sha256Hash, List&lt;Sha256Hash&gt;, long, long, String, String, boolean)</a> - Constructor for class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage</a>&lt;<a href="org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html" title="type parameter in BitcoinZmqMessage">T</a>&gt; - Class in <a href="org/consensusj/bitcoin/rx/zeromq/package-summary.html">org.consensusj.bitcoin.rx.zeromq</a></dt>
+<dt><a href="org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage&lt;T&gt;</a> - Class in <a href="org/consensusj/bitcoin/rx/zeromq/package-summary.html">org.consensusj.bitcoin.rx.zeromq</a></dt>
 <dd>
 <div class="block">Use record-style naming, rather than JavaBean naming, just for fun.</div>
 </dd>
@@ -542,14 +496,6 @@ <h2 class="title" id="I:B">B</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#%3Cinit%3E()" class="member-name-link">BlockHexDeserializer()</a> - Constructor for class org.consensusj.bitcoin.json.conversion.<a href="org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">BlockHexDeserializer</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#%3Cinit%3E(org.bitcoinj.base.Network)" class="member-name-link">BlockHexDeserializer(Network)</a> - Constructor for class org.consensusj.bitcoin.json.conversion.<a href="org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">BlockHexDeserializer</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
-<dt><a href="org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)" class="member-name-link">BlockHexDeserializer(NetworkParameters)</a> - Constructor for class org.consensusj.bitcoin.json.conversion.<a href="org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html" title="class in org.consensusj.bitcoin.json.conversion">BlockHexDeserializer</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a> - Class in <a href="org/consensusj/bitcoin/json/pojo/package-summary.html">org.consensusj.bitcoin.json.pojo</a></dt>
 <dd>
 <div class="block">BlockInfo POJO returned by GetBlockInfo</div>
@@ -586,6 +532,10 @@ <h2 class="title" id="I:B">B</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/decentralizedid/btcr/BtcrDid.html#%3Cinit%3E(java.net.URI)" class="member-name-link">BtcrDid(URI)</a> - Constructor for class org.consensusj.decentralizedid.btcr.<a href="org/consensusj/decentralizedid/btcr/BtcrDid.html" title="class in org.consensusj.decentralizedid.btcr">BtcrDid</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BTCTestSupport</a> - Interface in <a href="org/consensusj/bitcoin/jsonrpc/test/package-summary.html">org.consensusj.bitcoin.jsonrpc.test</a></dt>
+<dd>
+<div class="block">Test support functions intended to be mixed-in to Spock test specs</div>
+</dd>
 <dt><a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html#buildExchangeRateChange(org.consensusj.exchange.CurrencyUnitPair,org.knowm.xchange.dto.marketdata.Ticker)" class="member-name-link">buildExchangeRateChange(CurrencyUnitPair, Ticker)</a> - Method in class org.consensusj.exchange.knowm.<a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)" class="member-name-link">buildJsonRequest(String, Object...)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
@@ -607,7 +557,7 @@ <h2 class="title" id="I:C">C</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)" class="member-name-link">call(AsyncSupport.ThrowingSupplier&lt;RSLT&gt;)</a> - Method in interface org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></dt>
 <dd>
-<div class="block">Return a <i>cold</i> <code>Single</code> for calling a provided <b>synchronous</b> JSON-RPC method.</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </dd>
 <dt><a href="org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html#call(org.consensusj.jsonrpc.JsonRpcRequest)" class="member-name-link">call(JsonRpcRequest)</a> - Method in interface org.consensusj.jsonrpc.introspection.<a href="org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html" title="interface in org.consensusj.jsonrpc.introspection">JsonRpcServiceWrapper</a></dt>
 <dd>
@@ -617,6 +567,10 @@ <h2 class="title" id="I:C">C</h2>
 <dd>
 <div class="block">Handle a JSON-RPC <a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> and return a <a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> POJO</div>
 </dd>
+<dt><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#callAsync(java.util.function.Supplier)" class="member-name-link">callAsync(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt;)</a> - Method in interface org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></dt>
+<dd>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</dd>
 <dt><a href="org/consensusj/daemon/micronaut/BitcoinRestController.html#chaininfo()" class="member-name-link">chaininfo()</a> - Method in class org.consensusj.daemon.micronaut.<a href="org/consensusj/daemon/micronaut/BitcoinRestController.html" title="class in org.consensusj.daemon.micronaut">BitcoinRestController</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a> - Class in <a href="org/consensusj/bitcoin/json/pojo/package-summary.html">org.consensusj.bitcoin.json.pojo</a></dt>
@@ -634,17 +588,29 @@ <h2 class="title" id="I:C">C</h2>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#chainTipPublisher()" class="member-name-link">chainTipPublisher()</a> - Method in class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#chainTipPublisher()" class="member-name-link">chainTipPublisher()</a> - Method in class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">The BitcoinClient must have "connected once" before this is called.</div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/rx/peergroup/RxPeerGroup.html#chainTipPublisher()" class="member-name-link">chainTipPublisher()</a> - Method in class org.consensusj.bitcoin.rx.peergroup.<a href="org/consensusj/bitcoin/rx/peergroup/RxPeerGroup.html" title="class in org.consensusj.bitcoin.rx.peergroup">RxPeerGroup</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/RxBlockchainService.html#chainTipPublisher()" class="member-name-link">chainTipPublisher()</a> - Method in interface org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/RxBlockchainService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainService</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#chainTipPublisher()" class="member-name-link">chainTipPublisher()</a> - Method in class org.consensusj.bitcoin.rx.zeromq.<a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html" title="class in org.consensusj.bitcoin.rx.zeromq">RxBitcoinZmqService</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/rx/ChainTipPublisher.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a> - Interface in <a href="org/consensusj/bitcoin/rx/package-summary.html">org.consensusj.bitcoin.rx</a></dt>
+<dd>
+<div class="block">Marker type for <code>Publisher&lt;ChainTip&gt;</code>.</div>
+</dd>
+<dt><a href="org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx">ChainTipPublisher.Wrapper</a> - Class in <a href="org/consensusj/bitcoin/rx/package-summary.html">org.consensusj.bitcoin.rx</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/ChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a> - Interface in <a href="org/consensusj/bitcoin/rx/package-summary.html">org.consensusj.bitcoin.rx</a></dt>
 <dd>
 <div class="block">A publisher of <a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a></div>
 </dd>
+<dt><a href="org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#chainToNetwork(org.consensusj.bitcoin.json.pojo.BlockChainInfo)" class="member-name-link">chainToNetwork(BlockChainInfo)</a> - Static method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a></dt>
+<dd>
+<div class="block">Map a BlockChainInfo chain string to a Network.</div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html#chainwork" class="member-name-link">chainwork</a> - Variable in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#CHANGE_CHANGE" class="member-name-link">CHANGE_CHANGE</a> - Static variable in interface org.consensusj.bitcoinj.wallet.<a href="org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html" title="interface in org.consensusj.bitcoinj.wallet">BipStandardKeyChainGroupStructure</a></dt>
@@ -739,7 +705,7 @@ <h2 class="title" id="I:C">C</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#close()" class="member-name-link">close()</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
 <dd>
-<div class="block">Default no-op implementation of close.</div>
+<div class="block">Default no-op implementation of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link"><code>AutoCloseable.close()</code></a>.</div>
 </dd>
 <dt><a href="org/consensusj/rx/zeromq/RxZmqContext.html#close()" class="member-name-link">close()</a> - Method in class org.consensusj.rx.zeromq.<a href="org/consensusj/rx/zeromq/RxZmqContext.html" title="class in org.consensusj.rx.zeromq">RxZmqContext</a></dt>
 <dd>&nbsp;</dd>
@@ -768,6 +734,14 @@ <h2 class="title" id="I:C">C</h2>
 <dd>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 &nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">collectionTypeForClasses(Class&lt;? extends Collection&gt;, JavaType)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,java.lang.Class)" class="member-name-link">collectionTypeForClasses(Class&lt;? extends Collection&gt;, Class&lt;?&gt;)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#collectionTypeForClasses(java.lang.Class,java.lang.Class)" class="member-name-link">collectionTypeForClasses(Class&lt;? extends Collection&gt;, Class&lt;?&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#collectionTypeForClasses(java.lang.Class,T)" class="member-name-link">collectionTypeForClasses(Class&lt;? extends Collection&gt;, T)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html#combiner()" class="member-name-link">combiner()</a> - Method in class org.consensusj.analytics.util.collector.<a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" title="class in org.consensusj.analytics.util.collector">LargestSliceCollector</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#commandExists(java.lang.String)" class="member-name-link">commandExists(String)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
@@ -800,6 +774,10 @@ <h2 class="title" id="I:C">C</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html#confirmations" class="member-name-link">confirmations</a> - Variable in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">ReceivedByAddressInfo</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#connectToServer(java.time.Duration)" class="member-name-link">connectToServer(Duration)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>
+<div class="block">Actively connect to server (one time) waiting for it to start if necessary</div>
+</dd>
 <dt><a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html#convertSymbol(javax.money.CurrencyUnit)" class="member-name-link">convertSymbol(CurrencyUnit)</a> - Method in class org.consensusj.exchange.knowm.<a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider</a></dt>
 <dd>
 <div class="block">Convert a JavaMoney CurrencyUnit to an XChange currency code string
@@ -818,6 +796,8 @@ <h2 class="title" id="I:C">C</h2>
 <dd>
 <div class="block">Verify that a transaction correctly spends the input specified by index.</div>
 </dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html#create(com.fasterxml.jackson.databind.ObjectMapper)" class="member-name-link">create(ObjectMapper)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/decentralizedid/btcr/BtcrDid.html#create(java.lang.String)" class="member-name-link">create(String)</a> - Static method in class org.consensusj.decentralizedid.btcr.<a href="org/consensusj/decentralizedid/btcr/BtcrDid.html" title="class in org.consensusj.decentralizedid.btcr">BtcrDid</a></dt>
 <dd>
 <div class="block">Create a DID from a known good string
@@ -836,8 +816,12 @@ <h2 class="title" id="I:C">C</h2>
 <dd>
 <div class="block">Create a signing request, given a list of inputs, a list of outputs and a change address.</div>
 </dd>
+<dt><a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#createCall(java.io.PrintStream,java.io.PrintStream,java.lang.String...)" class="member-name-link">createCall(PrintStream, PrintStream, String...)</a> - Method in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/cli/BitcoinCLITool.html#createCall(java.io.PrintStream,java.io.PrintStream,java.lang.String...)" class="member-name-link">createCall(PrintStream, PrintStream, String...)</a> - Method in class org.consensusj.bitcoin.cli.<a href="org/consensusj/bitcoin/cli/BitcoinCLITool.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html#createCall(java.io.PrintStream,java.io.PrintStream,java.lang.String...)" class="member-name-link">createCall(PrintStream, PrintStream, String...)</a> - Method in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">GenericJsonRpcTool</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/cli/BitcoinCLITool.html#createCall(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)" class="member-name-link">createCall(PrintWriter, PrintWriter, String...)</a> - Method in class org.consensusj.bitcoin.cli.<a href="org/consensusj/bitcoin/cli/BitcoinCLITool.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#createCall(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)" class="member-name-link">createCall(PrintWriter, PrintWriter, String...)</a> - Method in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></dt>
@@ -908,10 +892,6 @@ <h2 class="title" id="I:C">C</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/exchange/CurrencyUnitPair.html#%3Cinit%3E(javax.money.CurrencyUnit,javax.money.CurrencyUnit)" class="member-name-link">CurrencyUnitPair(CurrencyUnit, CurrencyUnit)</a> - Constructor for class org.consensusj.exchange.<a href="org/consensusj/exchange/CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html#currentChainTipMaybe()" class="member-name-link">currentChainTipMaybe()</a> - Method in interface org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></dt>
-<dd>
-<div class="block">Get the active chain tip if there is one (useful for polling clients)</div>
-</dd>
 <dt><a href="org/consensusj/exchange/rx/ExchangeRateUpdate.html#currentFactor" class="member-name-link">currentFactor</a> - Variable in class org.consensusj.exchange.rx.<a href="org/consensusj/exchange/rx/ExchangeRateUpdate.html" title="class in org.consensusj.exchange.rx">ExchangeRateUpdate</a></dt>
 <dd>&nbsp;</dd>
 </dl>
@@ -941,6 +921,26 @@ <h2 class="title" id="I:D">D</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html#defaultRegTestURI" class="member-name-link">defaultRegTestURI</a> - Static variable in interface org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html" title="interface in org.consensusj.bitcoin.jsonrpc">RpcURI</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a> - Class in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dd>
+<div class="block">A strongly-typed, Jackson-based JSON-RPC client.</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">DefaultRpcClient(URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">DefaultRpcClient(SSLContext, JsonRpcMessage.Version, URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#%3Cinit%3E(org.consensusj.jsonrpc.DefaultRpcClient.TransportFactory,org.consensusj.jsonrpc.JsonRpcMessage.Version)" class="member-name-link">DefaultRpcClient(DefaultRpcClient.TransportFactory, JsonRpcMessage.Version)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">DefaultRpcClient(JsonRpcMessage.Version, URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper&lt;T&gt;</a> - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dd>
+<div class="block">Functional interface for ignoring what are considered "transient" errors.</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a> - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dd>
+<div class="block">Functional interface for creating JsonRpcTransport instances.</div>
+</dd>
 <dt><a href="org/consensusj/bitcoinj/signing/DefaultSigningRequest.html" class="type-name-link" title="class in org.consensusj.bitcoinj.signing">DefaultSigningRequest</a> - Class in <a href="org/consensusj/bitcoinj/signing/package-summary.html">org.consensusj.bitcoinj.signing</a></dt>
 <dd>
 <div class="block">Simple implementation of SigningRequest</div>
@@ -949,11 +949,15 @@ <h2 class="title" id="I:D">D</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html#defaultTestNetURI" class="member-name-link">defaultTestNetURI</a> - Static variable in interface org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html" title="interface in org.consensusj.bitcoin.jsonrpc">RpcURI</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#defaultType()" class="member-name-link">defaultType()</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#defaultType()" class="member-name-link">defaultType()</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#defaultUri" class="member-name-link">defaultUri</a> - Static variable in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#defer(java.util.function.Supplier)" class="member-name-link">defer(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt;)</a> - Method in interface org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></dt>
+<dt><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#defer(java.util.function.Supplier)" class="member-name-link">defer(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt;)</a> - Static method in interface org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></dt>
 <dd>
-<div class="block">Return a <i>cold</i> <code>Single</code> for calling a provided <b>asynchronous</b> JSON-RPC method.</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </dd>
 <dt><a href="org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html" class="type-name-link" title="class in org.consensusj.jsonrpc.introspection">DelegatingJsonRpcService</a> - Class in <a href="org/consensusj/jsonrpc/introspection/package-summary.html">org.consensusj.jsonrpc.introspection</a></dt>
 <dd>
@@ -1146,7 +1150,9 @@ <h2 class="title" id="I:F">F</h2>
 <div class="block">Interface for transaction fee calculation.</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/ChainTip.html#findActiveChainTip(java.util.List)" class="member-name-link">findActiveChainTip(List&lt;ChainTip&gt;)</a> - Static method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Find the active chain tip if there is one</div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/ChainTip.html#findActiveChainTipOrElseThrow(java.util.List)" class="member-name-link">findActiveChainTipOrElseThrow(List&lt;ChainTip&gt;)</a> - Static method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html#findPort(org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic)" class="member-name-link">findPort(BitcoinZmqMessage.Topic)</a> - Method in class org.consensusj.bitcoin.rx.zeromq.<a href="org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html" title="class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqPortFinder</a></dt>
@@ -1290,14 +1296,6 @@ <h2 class="title" id="I:G">G</h2>
 <dd>
 <div class="block">Create an SSLContext using an alternative Trust Store</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/CompositeTrustManager.html#getAlternateSSLSocketFactory(java.io.InputStream)" class="member-name-link">getAlternateSSLSocketFactory(InputStream)</a> - Static method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/CompositeTrustManager.html" title="class in org.consensusj.jsonrpc">CompositeTrustManager</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
-<dt><a href="org/consensusj/jsonrpc/CompositeTrustManager.html#getAlternateSSLSocketFactory(java.nio.file.Path)" class="member-name-link">getAlternateSSLSocketFactory(Path)</a> - Static method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/CompositeTrustManager.html" title="class in org.consensusj.jsonrpc">CompositeTrustManager</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html#getAmount()" class="member-name-link">getAmount()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html#getAmount()" class="member-name-link">getAmount()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html" title="class in org.consensusj.bitcoin.json.pojo">PrevTxOutInfo</a></dt>
@@ -1346,16 +1344,16 @@ <h2 class="title" id="I:G">G</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html#getBestBlock()" class="member-name-link">getBestBlock()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutSetInfo</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getBestBlock()" class="member-name-link">getBestBlock()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>
+<div class="block">Composite query that first calls ChainTips, then gets best block for the active tip</div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html#getbestblockhash()" class="member-name-link">getbestblockhash()</a> - Method in interface org.consensusj.bitcoin.json.rpc.<a href="org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/services/WalletAppKitService.html#getbestblockhash()" class="member-name-link">getbestblockhash()</a> - Method in class org.consensusj.bitcoin.services.<a href="org/consensusj/bitcoin/services/WalletAppKitService.html" title="class in org.consensusj.bitcoin.services">WalletAppKitService</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#getBestBlockHash()" class="member-name-link">getBestBlockHash()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#getBestBlockViaRpc()" class="member-name-link">getBestBlockViaRpc()</a> - Method in class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></dt>
-<dd>
-<div class="block">Get the latest (aka "best") <code>Block</code> via JSON-RPC.</div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#getBitcoinBalance(org.bitcoinj.base.Address)" class="member-name-link">getBitcoinBalance(Address)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></dt>
 <dd>
 <div class="block">Returns the Bitcoin balance of an address (in the server-side wallet.)</div>
@@ -1392,6 +1390,8 @@ <h2 class="title" id="I:G">G</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/services/WalletAppKitService.html#getblock2(org.bitcoinj.base.Sha256Hash,java.lang.Integer)" class="member-name-link">getblock2(Sha256Hash, Integer)</a> - Method in class org.consensusj.bitcoin.services.<a href="org/consensusj/bitcoin/services/WalletAppKitService.html" title="class in org.consensusj.bitcoin.services">WalletAppKitService</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getBlockAsync(org.bitcoinj.base.Sha256Hash)" class="member-name-link">getBlockAsync(Sha256Hash)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html#getblockchaininfo()" class="member-name-link">getblockchaininfo()</a> - Method in interface org.consensusj.bitcoin.json.rpc.<a href="org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/services/WalletAppKitService.html#getblockchaininfo()" class="member-name-link">getblockchaininfo()</a> - Method in class org.consensusj.bitcoin.services.<a href="org/consensusj/bitcoin/services/WalletAppKitService.html" title="class in org.consensusj.bitcoin.services">WalletAppKitService</a></dt>
@@ -1400,6 +1400,8 @@ <h2 class="title" id="I:G">G</h2>
 <dd>
 <div class="block">The getblockchaininfo RPC provides information about the current state of the block chain.</div>
 </dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getBlockChainInfoAsync()" class="member-name-link">getBlockChainInfoAsync()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html#getblockcount()" class="member-name-link">getblockcount()</a> - Method in interface org.consensusj.bitcoin.json.rpc.<a href="org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/services/WalletAppKitService.html#getblockcount()" class="member-name-link">getblockcount()</a> - Method in class org.consensusj.bitcoin.services.<a href="org/consensusj/bitcoin/services/WalletAppKitService.html" title="class in org.consensusj.bitcoin.services">WalletAppKitService</a></dt>
@@ -1472,11 +1474,23 @@ <h2 class="title" id="I:G">G</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getChainTips()" class="member-name-link">getChainTips()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
 <dd>
-<div class="block">Return information about all known tips in the block tree, including the main chain as well as orphaned branches.</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getChainTipsAsync()"><code>BitcoinClient.getChainTipsAsync()</code></a></div>
+</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html#getChainTips()" class="member-name-link">getChainTips()</a> - Method in interface org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#getChainTips()" class="member-name-link">getChainTips()</a> - Method in class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></dt>
+<dd>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getChainTipsAsync()" class="member-name-link">getChainTipsAsync()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html#getChainTipsAsync()" class="member-name-link">getChainTipsAsync()</a> - Method in interface org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#getChainTipsAsync()" class="member-name-link">getChainTipsAsync()</a> - Method in class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html#getChainwork()" class="member-name-link">getChainwork()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dt>
 <dd>&nbsp;</dd>
@@ -1506,14 +1520,6 @@ <h2 class="title" id="I:G">G</h2>
 <div class="block">Used to create an SSLContext using <a href="org/consensusj/jsonrpc/CompositeTrustManager.html" title="class in org.consensusj.jsonrpc"><code>CompositeTrustManager</code></a>
  See: https://stackoverflow.com/questions/859111/how-can-i-use-different-certificates-on-specific-connections</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/CompositeTrustManager.html#getCompositeSSLSocketFactory(java.io.InputStream)" class="member-name-link">getCompositeSSLSocketFactory(InputStream)</a> - Static method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/CompositeTrustManager.html" title="class in org.consensusj.jsonrpc">CompositeTrustManager</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
-<dt><a href="org/consensusj/jsonrpc/CompositeTrustManager.html#getCompositeSSLSocketFactory(java.nio.file.Path)" class="member-name-link">getCompositeSSLSocketFactory(Path)</a> - Static method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/CompositeTrustManager.html" title="class in org.consensusj.jsonrpc">CompositeTrustManager</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html#getConfirmations()" class="member-name-link">getConfirmations()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html#getConfirmations()" class="member-name-link">getConfirmations()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dt>
@@ -1567,16 +1573,12 @@ <h2 class="title" id="I:G">G</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html#getDefaultRegTestWalletURI()" class="member-name-link">getDefaultRegTestWalletURI()</a> - Static method in interface org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html" title="interface in org.consensusj.bitcoin.jsonrpc">RpcURI</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/AbstractRpcClient.html#getDefaultSSLContext()" class="member-name-link">getDefaultSSLContext()</a> - Static method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcTransport.html#getDefaultSSLContext()" class="member-name-link">getDefaultSSLContext()</a> - Static method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></dt>
 <dd>
 <div class="block">Return the default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link"><code>SSLContext</code></a> without declaring a checked exception</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html#getDefaultTestNetURI()" class="member-name-link">getDefaultTestNetURI()</a> - Static method in interface org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html" title="interface in org.consensusj.bitcoin.jsonrpc">RpcURI</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/AbstractRpcClient.html#getDefaultType()" class="member-name-link">getDefaultType()</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#getDefaultType()" class="member-name-link">getDefaultType()</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/AddressInfo.html#getDesc()" class="member-name-link">getDesc()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/AddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">AddressInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/UnspentOutput.html#getDesc()" class="member-name-link">getDesc()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a></dt>
@@ -1591,7 +1593,7 @@ <h2 class="title" id="I:G">G</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html#getDiskSize()" class="member-name-link">getDiskSize()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutSetInfo</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html#getError()" class="member-name-link">getError()</a> - Method in exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html#getError()" class="member-name-link">getError()</a> - Method in exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></dt>
 <dd>
 <div class="block">Get the JSON RPC Error POJO</div>
 </dd>
@@ -1679,7 +1681,7 @@ <h2 class="title" id="I:G">G</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcResponse.html#getJsonrpc()" class="member-name-link">getJsonrpc()</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/AbstractRpcClient.html#getJsonRpcVersion()" class="member-name-link">getJsonRpcVersion()</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#getJsonRpcVersion()" class="member-name-link">getJsonRpcVersion()</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#getJsonRpcVersion()" class="member-name-link">getJsonRpcVersion()</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
 <dd>
@@ -1709,9 +1711,7 @@ <h2 class="title" id="I:G">G</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html#getLockTime()" class="member-name-link">getLockTime()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/AbstractRpcClient.html#getMapper()" class="member-name-link">getMapper()</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#getMapper()" class="member-name-link">getMapper()</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#getMapper()" class="member-name-link">getMapper()</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html#getMerkleroot()" class="member-name-link">getMerkleroot()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dt>
 <dd>&nbsp;</dd>
@@ -1747,18 +1747,6 @@ <h2 class="title" id="I:G">G</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html#getNetIdString()" class="member-name-link">getNetIdString()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getNetParams()" class="member-name-link">getNetParams()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getNetwork()"><code>BitcoinClient.getNetwork()</code></a></div>
-</div>
-</dd>
-<dt><a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html#getNetParams()" class="member-name-link">getNetParams()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html#network()"><code>RpcConfig.network()</code></a></div>
-</div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/NetworkInfo.html#getNetwork()" class="member-name-link">getNetwork()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/NetworkInfo.html" title="class in org.consensusj.bitcoin.json.pojo">NetworkInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getNetwork()" class="member-name-link">getNetwork()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
@@ -1815,10 +1803,13 @@ <h2 class="title" id="I:G">G</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#getPollingInterval()" class="member-name-link">getPollingInterval()</a> - Method in interface org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></dt>
 <dd>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Implement this method to provide a polling interval</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#getPollingInterval()" class="member-name-link">getPollingInterval()</a> - Method in class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="block">Provide a polling interval</div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html#getPreviousblockhash()" class="member-name-link">getPreviousblockhash()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/ServerInfo.html#getProtocolversion()" class="member-name-link">getProtocolversion()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ServerInfo.html" title="class in org.consensusj.bitcoin.json.pojo">ServerInfo</a></dt>
@@ -1900,10 +1891,8 @@ <h2 class="title" id="I:G">G</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vin.html#getSequence()" class="member-name-link">getSequence()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#getServerURI()" class="member-name-link">getServerURI()</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
-<dd>
-<div class="block">Get the URI of the remote server</div>
-</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#getServerURI()" class="member-name-link">getServerURI()</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#getServerURI()" class="member-name-link">getServerURI()</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></dt>
 <dd>
 <div class="block">Get the URI of the server this client connects to</div>
@@ -1912,6 +1901,10 @@ <h2 class="title" id="I:G">G</h2>
 <dd>
 <div class="block">Get the URI of the remote server</div>
 </dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcTransport.html#getServerURI()" class="member-name-link">getServerURI()</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></dt>
+<dd>
+<div class="block">Get the URI of the remote server</div>
+</dd>
 <dt><a href="org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html#getServiceObject()" class="member-name-link">getServiceObject()</a> - Method in class org.consensusj.jsonrpc.introspection.<a href="org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html" title="class in org.consensusj.jsonrpc.introspection">AbstractJsonRpcService</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html#getServiceObject()" class="member-name-link">getServiceObject()</a> - Method in class org.consensusj.jsonrpc.introspection.<a href="org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html" title="class in org.consensusj.jsonrpc.introspection">DelegatingJsonRpcService</a></dt>
@@ -2094,12 +2087,18 @@ <h2 class="title" id="I:G">G</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getZmqNotifications()" class="member-name-link">getZmqNotifications()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
 <dd>
-<div class="block">The getzmqnotifications RPC returns information about which configured ZMQ notifications are enabled
+<div class="block">The <code>getzmqnotifications</code> RPC returns information about which configured ZMQ notifications are enabled
  and on which ports.</div>
 </dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#getZmqNotificationsAsync()" class="member-name-link">getZmqNotificationsAsync()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <h2 class="title" id="I:H">H</h2>
 <dl class="index">
+<dt><a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html#handle(T,java.lang.Throwable)" class="member-name-link">handle(T, Throwable)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></dt>
+<dd>
+<div class="block">Handler to transpose to a "future maybe".</div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html#hash" class="member-name-link">hash</a> - Variable in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.Topic.html#hashblock" class="member-name-link">hashblock</a> - Enum constant in enum class org.consensusj.bitcoin.rx.zeromq.<a href="org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.Topic.html" title="enum class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage.Topic</a></dt>
@@ -2169,9 +2168,9 @@ <h2 class="title" id="I:H">H</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/conversion/HexUtil.html#%3Cinit%3E()" class="member-name-link">HexUtil()</a> - Constructor for class org.consensusj.bitcoin.json.conversion.<a href="org/consensusj/bitcoin/json/conversion/HexUtil.html" title="class in org.consensusj.bitcoin.json.conversion">HexUtil</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#httpCode" class="member-name-link">httpCode</a> - Variable in exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#httpCode" class="member-name-link">httpCode</a> - Variable in exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#httpMessage" class="member-name-link">httpMessage</a> - Variable in exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#httpMessage" class="member-name-link">httpMessage</a> - Variable in exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/ZmqNotification.html#hwm()" class="member-name-link">hwm()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ZmqNotification.html" title="class in org.consensusj.bitcoin.json.pojo">ZmqNotification</a></dt>
 <dd>&nbsp;</dd>
@@ -2180,7 +2179,7 @@ <h2 class="title" id="I:I">I</h2>
 <dl class="index">
 <dt><a href="org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#id()" class="member-name-link">id()</a> - Method in enum class org.consensusj.namecoin.jsonrpc.core.<a href="org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></dt>
 <dd>
-<div class="block">Return the network ID string (previously specified in <code>NetworkParameters</code>)</div>
+<div class="block">Return the network ID string (specified by a <code>Network</code>)</div>
 </dd>
 <dt><a href="org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#ID_MAINNET" class="member-name-link">ID_MAINNET</a> - Static variable in enum class org.consensusj.namecoin.jsonrpc.core.<a href="org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></dt>
 <dd>
@@ -2202,6 +2201,10 @@ <h2 class="title" id="I:I">I</h2>
 <dd>
 <div class="block">The ID string for the Unit test network -- there is no corresponding <code>enum</code>.</div>
 </dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#identityTransientErrorMapper(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)" class="member-name-link">identityTransientErrorMapper(JsonRpcRequest, JsonRpcResponse&lt;T&gt;, Throwable)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>
+<div class="block">Transient error mapper that is a no-op, i.e.</div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.IncludeTxFlag.html#IDONLY" class="member-name-link">IDONLY</a> - Enum constant in enum class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.IncludeTxFlag.html" title="enum class in org.consensusj.bitcoin.json.pojo">BlockInfo.IncludeTxFlag</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)" class="member-name-link">importPrivKey(ECKey, String, boolean)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
@@ -2280,6 +2283,8 @@ <h2 class="title" id="I:I">I</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html#isTickerAvailable()" class="member-name-link">isTickerAvailable()</a> - Method in class org.consensusj.exchange.knowm.<a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider.MonitoredCurrency</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html#isTransient(java.lang.Throwable)" class="member-name-link">isTransient(Throwable)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html#isTrusted()" class="member-name-link">isTrusted()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a></dt>
 <dd>&nbsp;</dd>
 </dl>
@@ -2287,10 +2292,6 @@ <h2 class="title" id="I:J">J</h2>
 <dl class="index">
 <dt><a href="org/consensusj/daemon/micronaut/BitcoinFactory.html#jacksonModule()" class="member-name-link">jacksonModule()</a> - Method in class org.consensusj.daemon.micronaut.<a href="org/consensusj/daemon/micronaut/BitcoinFactory.html" title="class in org.consensusj.daemon.micronaut">BitcoinFactory</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a> - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
-<dd>
-<div class="block">Interface with default methods for a strongly-typed JSON-RPC client that uses Jackson to map from JSON to Java Objects.</div>
-</dd>
 <dt><a href="org/consensusj/jsonrpc/cli/JavaLoggingSupport.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">JavaLoggingSupport</a> - Class in <a href="org/consensusj/jsonrpc/cli/package-summary.html">org.consensusj.jsonrpc.cli</a></dt>
 <dd>
 <div class="block">GraalVM-compatible support for using Java Logging.</div>
@@ -2301,7 +2302,7 @@ <h2 class="title" id="I:J">J</h2>
 <dd>
 <div class="block">Get the value for the message field.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a> - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClient&lt;T&gt;</a> - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
 <dd>
 <div class="block">JSON-RPC client interface.</div>
 </dd>
@@ -2309,33 +2310,21 @@ <h2 class="title" id="I:J">J</h2>
 <dd>
 <div class="block">JSON-RPC Client using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/HttpURLConnection.html" title="class or interface in java.net" class="external-link"><code>HttpURLConnection</code></a> formerly named<code>RpcClient</code>.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientHttpUrlConnection(SSLContext, JsonRpcMessage.Version, URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper,javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientHttpUrlConnection(ObjectMapper, SSLContext, URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientHttpUrlConnection(SSLSocketFactory, JsonRpcMessage.Version, URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"><code>JsonRpcClientHttpUrlConnection(SSLContext, JsonRpcMessage.Version, URI, String, String)</code></a></div>
-</div>
-</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientHttpUrlConnection(JsonRpcMessage.Version, URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></dt>
-<dd>
-<div class="block">Construct a JSON-RPC client from URI, username, and password</div>
-</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a> - Class in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
 <dd>
 <div class="block">Incubating JSON-RPC client using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.net.http/java/net/http/HttpClient.html" title="class or interface in java.net.http" class="external-link"><code>HttpClient</code></a></div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientJavaNet(URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></dt>
-<dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientJavaNet(SSLContext, JsonRpcMessage.Version, URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientJavaNet(ObjectMapper, URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientJavaNet(JsonRpcMessage.Version, URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper,javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientJavaNet(ObjectMapper, SSLContext, URI, String, String)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClientJavaNet.MappingFunction</a>&lt;<a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html" title="type parameter in JsonRpcClientJavaNet.MappingFunction">R</a>&gt; - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClientJavaNet.MappingFunction&lt;R&gt;</a> - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
 <dd>
 <div class="block">Map a response string to a Java object.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#jsonRpcCode" class="member-name-link">jsonRpcCode</a> - Variable in exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#jsonRpcCode" class="member-name-link">jsonRpcCode</a> - Variable in exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/daemon/micronaut/JsonRpcController.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">JsonRpcController</a> - Class in <a href="org/consensusj/daemon/micronaut/package-summary.html">org.consensusj.daemon.micronaut</a></dt>
 <dd>
@@ -2361,25 +2350,25 @@ <h2 class="title" id="I:J">J</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcError.Error.html" class="type-name-link" title="enum class in org.consensusj.jsonrpc">JsonRpcError.Error</a> - Enum Class in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a> - Exception in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a> - Exception Class in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
 <dd>
 <div class="block">Exception wrapper for JsonRpcError
   Useful in server implementations, throwing an error that will be transmitted
   to the client.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError)" class="member-name-link">JsonRpcErrorException(JsonRpcError)</a> - Constructor for exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError)" class="member-name-link">JsonRpcErrorException(JsonRpcError)</a> - Constructor for exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError.Error,java.lang.Throwable)" class="member-name-link">JsonRpcErrorException(JsonRpcError.Error, Throwable)</a> - Constructor for exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError.Error,java.lang.Throwable)" class="member-name-link">JsonRpcErrorException(JsonRpcError.Error, Throwable)</a> - Constructor for exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError,java.lang.Throwable)" class="member-name-link">JsonRpcErrorException(JsonRpcError, Throwable)</a> - Constructor for exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError,java.lang.Throwable)" class="member-name-link">JsonRpcErrorException(JsonRpcError, Throwable)</a> - Constructor for exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcException.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcException</a> - Exception in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcException.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcException</a> - Exception Class in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
 <dd>
 <div class="block">JSON RPC Exception</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcException.html#%3Cinit%3E(java.lang.String)" class="member-name-link">JsonRpcException(String)</a> - Constructor for exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcException.html#%3Cinit%3E(java.lang.String)" class="member-name-link">JsonRpcException(String)</a> - Constructor for exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)" class="member-name-link">JsonRpcException(String, Throwable)</a> - Constructor for exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcException.html#%3Cinit%3E(java.lang.String,java.lang.Throwable)" class="member-name-link">JsonRpcException(String, Throwable)</a> - Constructor for exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcMessage.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcMessage</a> - Class in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
 <dd>
@@ -2401,7 +2390,7 @@ <h2 class="title" id="I:J">J</h2>
 <dd>
 <div class="block">Constructor for use by Jackson deserialization.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcRequest.html#%3Cinit%3E(java.lang.String,java.util.List)" class="member-name-link">JsonRpcRequest(String, List&lt;Object&gt;)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcRequest.html#%3Cinit%3E(java.lang.String,java.util.List)" class="member-name-link">JsonRpcRequest(String, List&lt;?&gt;)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></dt>
 <dd>
 <div class="block">Create a JSON RPC request (for serialization.) To create a request on the client side, it
  is generally recommended to use the methods in <a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc"><code>JsonRpcClient</code></a>.</div>
@@ -2411,12 +2400,12 @@ <h2 class="title" id="I:J">J</h2>
 <div class="block">This constructor is slightly more strict than the deserialization constructor and should be used
  where possible.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcRequest.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.lang.String,java.util.List)" class="member-name-link">JsonRpcRequest(JsonRpcMessage.Version, String, List&lt;Object&gt;)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcRequest.html#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.lang.String,java.util.List)" class="member-name-link">JsonRpcRequest(JsonRpcMessage.Version, String, List&lt;?&gt;)</a> - Constructor for class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></dt>
 <dd>
 <div class="block">Create a JSON RPC request (for serialization.)
  Can be used to override default JSON RPC version.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcResponse.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="type parameter in JsonRpcResponse">RSLT</a>&gt; - Class in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcResponse.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcResponse&lt;RSLT&gt;</a> - Class in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
 <dd>
 <div class="block">JSON-RPC Response POJO
 
@@ -2437,15 +2426,27 @@ <h2 class="title" id="I:J">J</h2>
 <dd>
 <div class="block">Interface and default methods for wrapping a Java class with JSON-RPC support.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a> - Exception in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a> - Exception Class in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
 <dd>
-<div class="block">JSON-RPC returned HTTP status other than 200
+<div class="block">JSON-RPC returned HTTP status other than 200 (and unfortunately also sometimes when their is response.error)
  Additional information is usually in JSON-RPC response
  TODO: See TODO in parent class <a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcException</code></a></div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#%3Cinit%3E(java.lang.String,int,java.lang.String,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)" class="member-name-link">JsonRpcStatusException(String, int, String, int, String, JsonRpcResponse&lt;?&gt;)</a> - Constructor for exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#%3Cinit%3E(int,java.lang.String)" class="member-name-link">JsonRpcStatusException(int, String)</a> - Constructor for exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
 <dd>
-<div class="block">Default Constructor</div>
+<div class="block">Constructor for when we were unable to deserialize a JSON response</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#%3Cinit%3E(int,org.consensusj.jsonrpc.JsonRpcResponse)" class="member-name-link">JsonRpcStatusException(int, JsonRpcResponse&lt;?&gt;)</a> - Constructor for exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dd>
+<div class="block">Constructor for when we were able to deserialize a JSON response</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#%3Cinit%3E(java.lang.String,int,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)" class="member-name-link">JsonRpcStatusException(String, int, int, String, JsonRpcResponse&lt;?&gt;)</a> - Constructor for exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dd>
+<div class="block">Same as canonical, but without the <code>httpCode</code> parameter.</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#%3Cinit%3E(java.lang.String,int,java.lang.String,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)" class="member-name-link">JsonRpcStatusException(String, int, String, int, String, JsonRpcResponse&lt;?&gt;)</a> - Constructor for exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dd>
+<div class="block">Canonical Constructor</div>
 </dd>
 <dt><a href="org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">JsonRpcToolOptions</a> - Class in <a href="org/consensusj/jsonrpc/cli/package-summary.html">org.consensusj.jsonrpc.cli</a></dt>
 <dd>
@@ -2453,10 +2454,14 @@ <h2 class="title" id="I:J">J</h2>
 </dd>
 <dt><a href="org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html#%3Cinit%3E()" class="member-name-link">JsonRpcToolOptions()</a> - Constructor for class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html" title="class in org.consensusj.jsonrpc.cli">JsonRpcToolOptions</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/AbstractRpcClient.html#jsonRpcVersion" class="member-name-link">jsonRpcVersion</a> - Variable in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></dt>
-<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcTransport.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcTransport&lt;T&gt;</a> - Interface in <a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></dt>
+<dd>
+<div class="block">Defines the interface for a network-layer implementation of a JSON-RPC client.</div>
+</dd>
 <dt><a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#jsonRpcVersion" class="member-name-link">jsonRpcVersion</a> - Variable in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#jsonRpcVersion" class="member-name-link">jsonRpcVersion</a> - Variable in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <h2 class="title" id="I:K">K</h2>
 <dl class="index">
@@ -2493,7 +2498,7 @@ <h2 class="title" id="I:L">L</h2>
 <dl class="index">
 <dt><a href="org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html#label" class="member-name-link">label</a> - Variable in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">ReceivedByAddressInfo</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/analytics/util/collector/LargestSliceAccumulator.html" class="type-name-link" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator</a>&lt;<a href="org/consensusj/analytics/util/collector/LargestSliceAccumulator.html" title="type parameter in LargestSliceAccumulator">E</a>,<wbr><a href="org/consensusj/analytics/util/collector/LargestSliceAccumulator.html" title="type parameter in LargestSliceAccumulator">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/util/collector/LargestSliceAccumulator.html" title="type parameter in LargestSliceAccumulator">N</a>&gt;&gt; - Class in <a href="org/consensusj/analytics/util/collector/package-summary.html">org.consensusj.analytics.util.collector</a></dt>
+<dt><a href="org/consensusj/analytics/util/collector/LargestSliceAccumulator.html" class="type-name-link" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator&lt;E,<wbr>N&gt;</a> - Class in <a href="org/consensusj/analytics/util/collector/package-summary.html">org.consensusj.analytics.util.collector</a></dt>
 <dd>
 <div class="block">Accumulates the <code>n</code> largest slices of a stream of objects of type <code>&lt;E&gt;</code>.</div>
 </dd>
@@ -2501,7 +2506,7 @@ <h2 class="title" id="I:L">L</h2>
 <dd>
 <div class="block">Construct</div>
 </dd>
-<dt><a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" class="type-name-link" title="class in org.consensusj.analytics.util.collector">LargestSliceCollector</a>&lt;<a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;&gt; - Class in <a href="org/consensusj/analytics/util/collector/package-summary.html">org.consensusj.analytics.util.collector</a></dt>
+<dt><a href="org/consensusj/analytics/util/collector/LargestSliceCollector.html" class="type-name-link" title="class in org.consensusj.analytics.util.collector">LargestSliceCollector&lt;E,<wbr>N&gt;</a> - Class in <a href="org/consensusj/analytics/util/collector/package-summary.html">org.consensusj.analytics.util.collector</a></dt>
 <dd>
 <div class="block">Collector that collects the <code>n</code> objects containing the "largest slices" of an input stream of
  type <code>&lt;E&gt;</code>.</div>
@@ -2510,11 +2515,11 @@ <h2 class="title" id="I:L">L</h2>
 <dd>
 <div class="block">Construct a <code>LargestSliceCollector</code> to collect <code>n</code> objects of type <code>&lt;E&gt;</code>.</div>
 </dd>
-<dt><a href="org/consensusj/analytics/util/collector/LargestSliceList.html" class="type-name-link" title="interface in org.consensusj.analytics.util.collector">LargestSliceList</a>&lt;<a href="org/consensusj/analytics/util/collector/LargestSliceList.html" title="type parameter in LargestSliceList">E</a>,<wbr><a href="org/consensusj/analytics/util/collector/LargestSliceList.html" title="type parameter in LargestSliceList">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/util/collector/LargestSliceList.html" title="type parameter in LargestSliceList">N</a>&gt;&gt; - Interface in <a href="org/consensusj/analytics/util/collector/package-summary.html">org.consensusj.analytics.util.collector</a></dt>
+<dt><a href="org/consensusj/analytics/util/collector/LargestSliceList.html" class="type-name-link" title="interface in org.consensusj.analytics.util.collector">LargestSliceList&lt;E,<wbr>N&gt;</a> - Interface in <a href="org/consensusj/analytics/util/collector/package-summary.html">org.consensusj.analytics.util.collector</a></dt>
 <dd>
 <div class="block">Represents a filtered subset of a collection or stream of objects.</div>
 </dd>
-<dt><a href="org/consensusj/analytics/util/collector/LargestSliceListImpl.html" class="type-name-link" title="class in org.consensusj.analytics.util.collector">LargestSliceListImpl</a>&lt;<a href="org/consensusj/analytics/util/collector/LargestSliceListImpl.html" title="type parameter in LargestSliceListImpl">E</a>,<wbr><a href="org/consensusj/analytics/util/collector/LargestSliceListImpl.html" title="type parameter in LargestSliceListImpl">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/util/collector/LargestSliceListImpl.html" title="type parameter in LargestSliceListImpl">N</a>&gt;&gt; - Class in <a href="org/consensusj/analytics/util/collector/package-summary.html">org.consensusj.analytics.util.collector</a></dt>
+<dt><a href="org/consensusj/analytics/util/collector/LargestSliceListImpl.html" class="type-name-link" title="class in org.consensusj.analytics.util.collector">LargestSliceListImpl&lt;E,<wbr>N&gt;</a> - Class in <a href="org/consensusj/analytics/util/collector/package-summary.html">org.consensusj.analytics.util.collector</a></dt>
 <dd>
 <div class="block">An immutable implementation of <a href="org/consensusj/analytics/util/collector/LargestSliceList.html" title="interface in org.consensusj.analytics.util.collector"><code>LargestSliceList</code></a>.</div>
 </dd>
@@ -2590,13 +2595,17 @@ <h2 class="title" id="I:L">L</h2>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html#log" class="member-name-link">log</a> - Static variable in interface org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BlockchainSyncing</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#log" class="member-name-link">log</a> - Static variable in interface org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></dt>
-<dd>&nbsp;</dd>
+<dd>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoinj/signing/BaseTransactionSigner.html#log" class="member-name-link">log</a> - Static variable in interface org.consensusj.bitcoinj.signing.<a href="org/consensusj/bitcoinj/signing/BaseTransactionSigner.html" title="interface in org.consensusj.bitcoinj.signing">BaseTransactionSigner</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html#log" class="member-name-link">log</a> - Static variable in interface org.consensusj.jsonrpc.introspection.<a href="org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html" title="interface in org.consensusj.jsonrpc.introspection">JsonRpcServiceWrapper</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#log" class="member-name-link">log</a> - Static variable in interface org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html#log(java.lang.Throwable)" class="member-name-link">log(Throwable)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <h2 class="title" id="I:M">M</h2>
 <dl class="index">
@@ -2624,9 +2633,15 @@ <h2 class="title" id="I:M">M</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#MAINNET" class="member-name-link">MAINNET</a> - Enum constant in enum class org.consensusj.namecoin.jsonrpc.core.<a href="org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html#map(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)" class="member-name-link">map(JsonRpcRequest, JsonRpcResponse&lt;T&gt;, Throwable)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#mapBitcoinTransientErrors(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)" class="member-name-link">mapBitcoinTransientErrors(JsonRpcRequest, JsonRpcResponse&lt;T&gt;, Throwable)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>
+<div class="block">TransientErrorMapper suitable for waiting for a temporarily down or restarting Bitcoin JSON-RPC server.</div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/services/WalletAppKitService.html#mapper" class="member-name-link">mapper</a> - Variable in class org.consensusj.bitcoin.services.<a href="org/consensusj/bitcoin/services/WalletAppKitService.html" title="class in org.consensusj.bitcoin.services">WalletAppKitService</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/AbstractRpcClient.html#mapper" class="member-name-link">mapper</a> - Variable in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#mapper" class="member-name-link">mapper</a> - Variable in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html#marketDataService" class="member-name-link">marketDataService</a> - Variable in class org.consensusj.exchange.knowm.<a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider</a></dt>
 <dd>&nbsp;</dd>
@@ -2749,6 +2764,12 @@ <h2 class="title" id="I:N">N</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/NetworkInfo.html#%3Cinit%3E(int,java.lang.String,int,int,int,java.lang.String,int,byte%5B%5D,java.lang.Object%5B%5D,java.lang.Object%5B%5D)" class="member-name-link">NetworkInfo(int, String, int, int, int, String, int, byte[], Object[], Object[])</a> - Constructor for class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/NetworkInfo.html" title="class in org.consensusj.bitcoin.json.pojo">NetworkInfo</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#networkToChainName(org.bitcoinj.base.BitcoinNetwork)" class="member-name-link">networkToChainName(BitcoinNetwork)</a> - Static method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a></dt>
+<dd>
+<div class="block">Map <code>BitcoinNetwork</code> to a chain-id string.</div>
+</dd>
+<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html#never()" class="member-name-link">never()</a> - Static method in class org.consensusj.bitcoin.rx.jsonrpc.test.<a href="org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html" title="class in org.consensusj.bitcoin.rx.jsonrpc.test">TestChainTipPublishers</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/internal/BitcoinClientThreadFactory.html#newThread(java.lang.Runnable)" class="member-name-link">newThread(Runnable)</a> - Method in class org.consensusj.bitcoin.jsonrpc.internal.<a href="org/consensusj/bitcoin/jsonrpc/internal/BitcoinClientThreadFactory.html" title="class in org.consensusj.bitcoin.jsonrpc.internal">BitcoinClientThreadFactory</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html#nextblockhash" class="member-name-link">nextblockhash</a> - Variable in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dt>
@@ -2769,6 +2790,8 @@ <h2 class="title" id="I:N">N</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html#nonce" class="member-name-link">nonce</a> - Variable in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html#none()" class="member-name-link">none()</a> - Static method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/internal/NumberStringSerializer.html" class="type-name-link" title="class in org.consensusj.jsonrpc.internal">NumberStringSerializer</a> - Class in <a href="org/consensusj/jsonrpc/internal/package-summary.html">org.consensusj.jsonrpc.internal</a></dt>
 <dd>
 <div class="block">If string is an integer (valid long) serialize as Number, else serialize as String</div>
@@ -2804,6 +2827,8 @@ <h2 class="title" id="I:O">O</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/decentralizedid/Did.html#of(java.net.URI)" class="member-name-link">of(URI)</a> - Static method in class org.consensusj.decentralizedid.<a href="org/consensusj/decentralizedid/Did.html" title="class in org.consensusj.decentralizedid">Did</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html#of(java.util.function.Predicate,java.util.function.Consumer)" class="member-name-link">of(Predicate&lt;Throwable&gt;, Consumer&lt;Throwable&gt;)</a> - Static method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html#of(java.util.List,java.util.List)" class="member-name-link">of(List&lt;RawTransactionSigningRequest.RawInput&gt;, List&lt;TransactionOutputData&gt;)</a> - Static method in class org.consensusj.bitcoinj.signing.<a href="org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html" title="class in org.consensusj.bitcoinj.signing">RawTransactionSigningRequest</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoinj/signing/SigningRequest.html#of(java.util.List,java.util.List)" class="member-name-link">of(List&lt;TransactionInputData&gt;, List&lt;TransactionOutputData&gt;)</a> - Static method in interface org.consensusj.bitcoinj.signing.<a href="org/consensusj/bitcoinj/signing/SigningRequest.html" title="interface in org.consensusj.bitcoinj.signing">SigningRequest</a></dt>
@@ -2832,10 +2857,14 @@ <h2 class="title" id="I:O">O</h2>
 </dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcError.html#of(org.consensusj.jsonrpc.JsonRpcError.Error)" class="member-name-link">of(JsonRpcError.Error)</a> - Static method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcError.html" title="class in org.consensusj.jsonrpc">JsonRpcError</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html#of(org.consensusj.jsonrpc.JsonRpcError.Error)" class="member-name-link">of(JsonRpcError.Error)</a> - Static method in exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcErrorException.html#of(org.consensusj.jsonrpc.JsonRpcError.Error)" class="member-name-link">of(JsonRpcError.Error)</a> - Static method in exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">JsonRpcErrorException</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcError.html#of(org.consensusj.jsonrpc.JsonRpcError.Error,java.lang.Throwable)" class="member-name-link">of(JsonRpcError.Error, Throwable)</a> - Static method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcError.html" title="class in org.consensusj.jsonrpc">JsonRpcError</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/rx/ChainTipPublisher.html#of(org.reactivestreams.Publisher)" class="member-name-link">of(Publisher&lt;ChainTip&gt;)</a> - Static method in interface org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></dt>
+<dd>
+<div class="block">Adapt a <code>Publisher&lt;ChainTip</code></div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/ChainTip.html#ofActive(int,org.bitcoinj.base.Sha256Hash)" class="member-name-link">ofActive(int, Sha256Hash)</a> - Static method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></dt>
 <dd>
 <div class="block">Construct an "active" <a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a></div>
@@ -2906,6 +2935,8 @@ <h2 class="title" id="I:O">O</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/service/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.service</a> - package org.consensusj.bitcoin.rx.jsonrpc.service</dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/test/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.test</a> - package org.consensusj.bitcoin.rx.jsonrpc.test</dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/peergroup/package-summary.html">org.consensusj.bitcoin.rx.peergroup</a> - package org.consensusj.bitcoin.rx.peergroup</dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/zeromq/package-summary.html">org.consensusj.bitcoin.rx.zeromq</a> - package org.consensusj.bitcoin.rx.zeromq</dt>
@@ -2990,8 +3021,7 @@ <h2 class="title" id="I:O">O</h2>
 </dd>
 <dt><a href="org/consensusj/rx/zeromq/package-summary.html">org.consensusj.rx.zeromq</a> - package org.consensusj.rx.zeromq</dt>
 <dd>
-<div class="block">Reactive interface to <a href="https://zeromq.org">ZeroMQ</a> using <a href="https://github.com/zeromq/jeromq">JeroMQ</a> library
- and <a href="https://github.com/ReactiveX/RxJava">RxJava 3</a>.</div>
+<div class="block">Reactive interface to <a href="https://zeromq.org">ZeroMQ</a> using <a href="https://github.com/zeromq/jeromq">JeroMQ</a> library.</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/Outpoint.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">Outpoint</a> - Class in <a href="org/consensusj/bitcoin/json/pojo/package-summary.html">org.consensusj.bitcoin.json.pojo</a></dt>
 <dd>
@@ -3041,22 +3071,12 @@ <h2 class="title" id="I:P">P</h2>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Map desired output script type and account index to an account path</div>
 </dd>
-<dt><a href="org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#pathFor(org.bitcoinj.base.ScriptType,org.bitcoinj.core.NetworkParameters)" class="member-name-link">pathFor(ScriptType, NetworkParameters)</a> - Static method in interface org.consensusj.bitcoinj.wallet.<a href="org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html" title="interface in org.consensusj.bitcoinj.wallet">BipStandardKeyChainGroupStructure</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-<div class="block">Map desired output script type and account index to an account path</div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/json/conversion/PeerSerializer.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.conversion">PeerSerializer</a> - Class in <a href="org/consensusj/bitcoin/json/conversion/package-summary.html">org.consensusj.bitcoin.json.conversion</a></dt>
 <dd>
 <div class="block">Custom Serialization of bitcoinj Peer class</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/conversion/PeerSerializer.html#%3Cinit%3E()" class="member-name-link">PeerSerializer()</a> - Constructor for class org.consensusj.bitcoin.json.conversion.<a href="org/consensusj/bitcoin/json/conversion/PeerSerializer.html" title="class in org.consensusj.bitcoin.json.conversion">PeerSerializer</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/exchange/BaseXChangeExchangeRateProvider.html#poll()" class="member-name-link">poll()</a> - Method in class org.consensusj.exchange.<a href="org/consensusj/exchange/BaseXChangeExchangeRateProvider.html" title="class in org.consensusj.exchange">BaseXChangeExchangeRateProvider</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-<div class="block">Poll the exchange for updated Tickers</div>
-</dd>
 <dt><a href="org/consensusj/exchange/rx/PolledObservablePair.html" class="type-name-link" title="class in org.consensusj.exchange.rx">PolledObservablePair</a> - Class in <a href="org/consensusj/exchange/rx/package-summary.html">org.consensusj.exchange.rx</a></dt>
 <dd>
 <div class="block">Implements ObservablePair using an exchange rate polling function and an interval</div>
@@ -3065,6 +3085,7 @@ <h2 class="title" id="I:P">P</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#pollForDistinctChainTip()" class="member-name-link">pollForDistinctChainTip()</a> - Method in interface org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></dt>
 <dd>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Using a polling interval provided by <a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#getPollingInterval()"><code>PollingChainTipService.getPollingInterval()</code></a> provide a
  stream of distinct <a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a>s.</div>
 </dd>
@@ -3072,11 +3093,13 @@ <h2 class="title" id="I:P">P</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a> - Interface in <a href="org/consensusj/bitcoin/rx/jsonrpc/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc</a></dt>
 <dd>
-<div class="block">Interface with <a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#pollForDistinctChainTip()"><code>PollingChainTipService.pollForDistinctChainTip()</code></a> method.</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use the <a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc"><code>PollingChainTipServiceImpl</code></a> implementation</div>
+</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a> - Class in <a href="org/consensusj/bitcoin/rx/jsonrpc/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc</a></dt>
 <dd>
-<div class="block">Implementation of <a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc"><code>PollingChainTipService</code></a> using a <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> and a polling interval.</div>
+<div class="block">Provides <a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx"><code>ChainTipService</code></a> a using a <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> and a polling interval.</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)" class="member-name-link">PollingChainTipServiceImpl(BitcoinClient)</a> - Constructor for class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></dt>
 <dd>&nbsp;</dd>
@@ -3088,11 +3111,34 @@ <h2 class="title" id="I:P">P</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)" class="member-name-link">pollOnce(AsyncSupport.ThrowingSupplier&lt;RSLT&gt;)</a> - Method in interface org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></dt>
 <dd>
-<div class="block">Poll a method, ignoring <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOError.html" title="class or interface in java.io" class="external-link"><code>IOError</code></a>.</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use <a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)"><code>RxJsonRpcClient.pollOnceAsPublisher(Supplier, TransientErrorFilter)</code></a> (Supplier)}</div>
+</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#pollOnce(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)" class="member-name-link">pollOnce(JsonRpcRequest, JavaType, DefaultRpcClient.TransientErrorMapper&lt;T&gt;)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier)" class="member-name-link">pollOnceAsPublisher(Supplier&lt;CompletionStage&lt;T&gt;&gt;)</a> - Method in interface org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)" class="member-name-link">pollOnceAsPublisher(Supplier&lt;CompletionStage&lt;T&gt;&gt;, AsyncSupport.TransientErrorFilter)</a> - Method in interface org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></dt>
+<dd>
+<div class="block">Takes a supplier of computable futures and returns a publisher that when subscribed to returns 0 or 1 items.</div>
+</dd>
+<dt><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsync(java.util.function.Supplier)" class="member-name-link">pollOnceAsync(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt;)</a> - Method in interface org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></dt>
+<dd>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html#pollOnNewBlock(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)" class="member-name-link">pollOnNewBlock(AsyncSupport.ThrowingSupplier&lt;RSLT&gt;)</a> - Method in interface org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></dt>
 <dd>
-<div class="block">Repeatedly once-per-new-block poll a method</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</dd>
+<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#pollOnNewBlockAsync(java.util.function.Supplier)" class="member-name-link">pollOnNewBlockAsync(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt;)</a> - Method in class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></dt>
+<dd>
+<div class="block">Repeatedly once-per-new-block poll an async method</div>
+</dd>
+<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html#pollOnNewBlockAsync(java.util.function.Supplier)" class="member-name-link">pollOnNewBlockAsync(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt;)</a> - Method in interface org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></dt>
+<dd>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+<div class="block">Repeatedly once-per-new-block poll an async method</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html#previousblockhash" class="member-name-link">previousblockhash</a> - Variable in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dt>
 <dd>&nbsp;</dd>
@@ -3256,13 +3302,21 @@ <h2 class="title" id="I:R">R</h2>
 <dd>
 <div class="block">Generate blocks (if necessary) and fund an address with requested amount of BTC.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#response" class="member-name-link">response</a> - Variable in exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#response" class="member-name-link">response</a> - Variable in exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dd>
+<div class="block">Http response body as a string.</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#responseJson" class="member-name-link">responseJson</a> - Variable in exception class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dd>
+<div class="block">Deserialized response message, if available.</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)" class="member-name-link">responseTypeFor(JavaType)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcStatusException.html#responseJson" class="member-name-link">responseJson</a> - Variable in exception org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></dt>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#responseTypeFor(java.lang.Class)" class="member-name-link">responseTypeFor(Class&lt;?&gt;)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)" class="member-name-link">responseTypeFor(JavaType)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#responseTypeFor(java.lang.Class)" class="member-name-link">responseTypeFor(Class&lt;?&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#responseTypeFor(java.lang.Class)" class="member-name-link">responseTypeFor(Class&lt;?&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#responseTypeFor(T)" class="member-name-link">responseTypeFor(T)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html#result(RSLT)" class="member-name-link">result(RSLT)</a> - Method in class org.consensusj.jsonrpc.introspection.<a href="org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html" title="class in org.consensusj.jsonrpc.introspection">AbstractJsonRpcService</a></dt>
 <dd>&nbsp;</dd>
@@ -3272,7 +3326,7 @@ <h2 class="title" id="I:R">R</h2>
 <dd>
 <div class="block">Return a single rich list</div>
 </dd>
-<dt><a href="org/consensusj/analytics/service/RichListService.html" class="type-name-link" title="interface in org.consensusj.analytics.service">RichListService</a>&lt;<a href="org/consensusj/analytics/service/RichListService.html" title="type parameter in RichListService">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/service/RichListService.html" title="type parameter in RichListService">N</a>&gt;,<wbr><a href="org/consensusj/analytics/service/RichListService.html" title="type parameter in RichListService">ID</a>&gt; - Interface in <a href="org/consensusj/analytics/service/package-summary.html">org.consensusj.analytics.service</a></dt>
+<dt><a href="org/consensusj/analytics/service/RichListService.html" class="type-name-link" title="interface in org.consensusj.analytics.service">RichListService&lt;N,<wbr>ID&gt;</a> - Interface in <a href="org/consensusj/analytics/service/package-summary.html">org.consensusj.analytics.service</a></dt>
 <dd>
 <div class="block">Interface for reactive rich list service</div>
 </dd>
@@ -3312,10 +3366,6 @@ <h2 class="title" id="I:R">R</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">RpcConfig(Network, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">RpcConfig(NetworkParameters, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html#rpcconnect" class="member-name-link">rpcconnect</a> - Variable in class org.consensusj.bitcoin.jsonrpc.bitcoind.<a href="org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html" title="class in org.consensusj.bitcoin.jsonrpc.bitcoind">BitcoinConf</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html#RPCCONNECT_DEFAULT" class="member-name-link">RPCCONNECT_DEFAULT</a> - Variable in class org.consensusj.bitcoin.jsonrpc.bitcoind.<a href="org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html" title="class in org.consensusj.bitcoin.jsonrpc.bitcoind">BitcoinConf</a></dt>
@@ -3342,10 +3392,6 @@ <h2 class="title" id="I:R">R</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/conversion/RpcServerModule.html#%3Cinit%3E()" class="member-name-link">RpcServerModule()</a> - Constructor for class org.consensusj.bitcoin.json.conversion.<a href="org/consensusj/bitcoin/json/conversion/RpcServerModule.html" title="class in org.consensusj.bitcoin.json.conversion">RpcServerModule</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/json/conversion/RpcServerModule.html#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)" class="member-name-link">RpcServerModule(NetworkParameters)</a> - Constructor for class org.consensusj.bitcoin.json.conversion.<a href="org/consensusj/bitcoin/json/conversion/RpcServerModule.html" title="class in org.consensusj.bitcoin.json.conversion">RpcServerModule</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html#rpcssl" class="member-name-link">rpcssl</a> - Static variable in interface org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html" title="interface in org.consensusj.bitcoin.jsonrpc">RpcURI</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#rpcTool" class="member-name-link">rpcTool</a> - Variable in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool.CommonsCLICall</a></dt>
@@ -3358,8 +3404,12 @@ <h2 class="title" id="I:R">R</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html#rpcWalletURI(java.lang.String,int,java.lang.String)" class="member-name-link">rpcWalletURI(String, int, String)</a> - Static method in interface org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html" title="interface in org.consensusj.bitcoin.jsonrpc">RpcURI</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#run(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)" class="member-name-link">run(PrintWriter, PrintWriter, String...)</a> - Method in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/cli/BitcoinCLITool.html#run(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)" class="member-name-link">run(PrintWriter, PrintWriter, String...)</a> - Method in class org.consensusj.bitcoin.cli.<a href="org/consensusj/bitcoin/cli/BitcoinCLITool.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html#run(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)" class="member-name-link">run(PrintWriter, PrintWriter, String...)</a> - Method in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">GenericJsonRpcTool</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#run(org.consensusj.jsonrpc.cli.BaseJsonRpcTool.CommonsCLICall)" class="member-name-link">run(BaseJsonRpcTool.CommonsCLICall)</a> - Method in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#run(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call)" class="member-name-link">run(JsonRpcClientTool.Call)</a> - Method in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></dt>
@@ -3374,10 +3424,6 @@ <h2 class="title" id="I:R">R</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)" class="member-name-link">RxBitcoinClient(SSLContext, Network, URI, String, String, boolean)</a> - Constructor for class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)" class="member-name-link">RxBitcoinClient(SSLSocketFactory, Network, URI, String, String, boolean)</a> - Constructor for class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></dt>
-<dd>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">RxBitcoinClient(Network, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)" class="member-name-link">RxBitcoinClient(Network, URI, String, String, boolean)</a> - Constructor for class org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></dt>
@@ -3394,7 +3440,7 @@ <h2 class="title" id="I:R">R</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">RxBitcoinZmqBinaryService(Network, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.rx.zeromq.<a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html" title="class in org.consensusj.bitcoin.rx.zeromq">RxBitcoinZmqBinaryService</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)" class="member-name-link">RxBitcoinZmqBinaryService(RxBitcoinClient)</a> - Constructor for class org.consensusj.bitcoin.rx.zeromq.<a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html" title="class in org.consensusj.bitcoin.rx.zeromq">RxBitcoinZmqBinaryService</a></dt>
+<dt><a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)" class="member-name-link">RxBitcoinZmqBinaryService(BitcoinClient)</a> - Constructor for class org.consensusj.bitcoin.rx.zeromq.<a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html" title="class in org.consensusj.bitcoin.rx.zeromq">RxBitcoinZmqBinaryService</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.zeromq">RxBitcoinZmqService</a> - Class in <a href="org/consensusj/bitcoin/rx/zeromq/package-summary.html">org.consensusj.bitcoin.rx.zeromq</a></dt>
 <dd>
@@ -3402,7 +3448,7 @@ <h2 class="title" id="I:R">R</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">RxBitcoinZmqService(Network, URI, String, String)</a> - Constructor for class org.consensusj.bitcoin.rx.zeromq.<a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html" title="class in org.consensusj.bitcoin.rx.zeromq">RxBitcoinZmqService</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)" class="member-name-link">RxBitcoinZmqService(RxBitcoinClient)</a> - Constructor for class org.consensusj.bitcoin.rx.zeromq.<a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html" title="class in org.consensusj.bitcoin.rx.zeromq">RxBitcoinZmqService</a></dt>
+<dt><a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)" class="member-name-link">RxBitcoinZmqService(BitcoinClient)</a> - Constructor for class org.consensusj.bitcoin.rx.zeromq.<a href="org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html" title="class in org.consensusj.bitcoin.rx.zeromq">RxBitcoinZmqService</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/RxBlockchainBinaryService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a> - Interface in <a href="org/consensusj/bitcoin/rx/package-summary.html">org.consensusj.bitcoin.rx</a></dt>
 <dd>
@@ -3415,7 +3461,7 @@ <h2 class="title" id="I:R">R</h2>
 </dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> - Interface in <a href="org/consensusj/bitcoin/rx/jsonrpc/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc</a></dt>
 <dd>
-<div class="block">A JSON-RPC client interface that provides ChainTipService</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </dd>
 <dt><a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a> - Interface in <a href="org/consensusj/rx/jsonrpc/package-summary.html">org.consensusj.rx.jsonrpc</a></dt>
 <dd>
@@ -3429,7 +3475,7 @@ <h2 class="title" id="I:R">R</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/rx/zeromq/RxZmqContext.html" class="type-name-link" title="class in org.consensusj.rx.zeromq">RxZmqContext</a> - Class in <a href="org/consensusj/rx/zeromq/package-summary.html">org.consensusj.rx.zeromq</a></dt>
 <dd>
-<div class="block">ZMQ Context with a single socket and one <code>FlowableProcessor&lt;ZMsg&gt;</code> per topic.</div>
+<div class="block">ZMQ Context with a single socket and one <code>Processor&lt;ZMsg&gt;</code> per topic.</div>
 </dd>
 <dt><a href="org/consensusj/rx/zeromq/RxZmqContext.html#%3Cinit%3E(java.net.URI,java.util.List)" class="member-name-link">RxZmqContext(URI, List&lt;String&gt;)</a> - Constructor for class org.consensusj.rx.zeromq.<a href="org/consensusj/rx/zeromq/RxZmqContext.html" title="class in org.consensusj.rx.zeromq">RxZmqContext</a></dt>
 <dd>&nbsp;</dd>
@@ -3489,34 +3535,38 @@ <h2 class="title" id="I:S">S</h2>
 <div class="block">Return the standard Bech32 <code>SegwitAddress.SegwitHrp</code> (as a <code>String</code>) for
  this network.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)" class="member-name-link">send(String, JavaType, Object...)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
-<dd>
-<div class="block">Varargs version</div>
-</dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)" class="member-name-link">send(String, JavaType, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
-<dd>
-<div class="block">JSON-RPC remote method call that returns 'response.result`</div>
-</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)" class="member-name-link">send(String, Class&lt;R&gt;, Object...)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)" class="member-name-link">send(String, Class&lt;R&gt;, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)" class="member-name-link">send(String, Class&lt;R&gt;, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
 <dd>
 <div class="block">JSON-RPC remote method call that returns 'response.result`</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)" class="member-name-link">send(String, Class&lt;R&gt;, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
-<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)" class="member-name-link">send(String, Object...)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
 <dd>
 <div class="block">Call an RPC method and return default object type.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.util.List)" class="member-name-link">send(String, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#send(java.lang.String,java.util.List)" class="member-name-link">send(String, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
 <dd>
 <div class="block">Call an RPC method and return default object type.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#send(java.lang.String,java.util.List)" class="member-name-link">send(String, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.lang.Object...)" class="member-name-link">send(String, T, Object...)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
+<dd>
+<div class="block">Varargs version</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.util.List)" class="member-name-link">send(String, T, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
 <dd>
-<div class="block">Call an RPC method and return "default" object type.</div>
+<div class="block">JSON-RPC remote method call that returns <code>response.result</code></div>
 </dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.lang.Object...)" class="member-name-link">sendAsync(String, Class&lt;R&gt;, Object...)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.util.List)" class="member-name-link">sendAsync(String, Class&lt;R&gt;, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.util.List)" class="member-name-link">sendAsync(String, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.lang.Object...)" class="member-name-link">sendAsync(String, T, Object...)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.util.List)" class="member-name-link">sendAsync(String, T, List&lt;Object&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#sendBitcoin(org.bitcoinj.base.Address,java.util.Map)" class="member-name-link">sendBitcoin(Address, Map&lt;Address, Coin&gt;)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></dt>
 <dd>
 <div class="block">Sends BTC from an address to the destinations, whereby no new change address is created, and any leftover is
@@ -3559,28 +3609,30 @@ <h2 class="title" id="I:S">S</h2>
 <dd>
 <div class="block">Broadcast a signed transaction on the P2P network</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)" class="member-name-link">sendRequestForResponse(JsonRpcRequest)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponse(JsonRpcRequest, JavaType)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></dt>
 <dd>
-<div class="block">Convenience method for requesting a response with a <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link"><code>JsonNode</code></a> for the result.</div>
+<div class="block">Send a JSON-RPC request to the server and return a JSON-RPC response.</div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponse(JsonRpcRequest, JavaType)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcTransport.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)" class="member-name-link">sendRequestForResponse(JsonRpcRequest, T)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></dt>
 <dd>
 <div class="block">Send a <a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a></div>
 </dd>
-<dt><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponse(JsonRpcRequest, JavaType)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></dt>
-<dd>
-<div class="block">Send a JSON-RPC request to the server and return a JSON-RPC response.</div>
-</dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponseAsync(JsonRpcRequest, JavaType)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest)" class="member-name-link">sendRequestForResponseAsync(JsonRpcRequest)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
 <dd>
-<div class="block">Send a <a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
+<div class="block">Convenience method for requesting an asynchronous response with a <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link"><code>JsonNode</code></a> for the result.</div>
 </dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponseAsync(JsonRpcRequest, JavaType)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponseAsync(JsonRpcRequest, JavaType)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponseAsync(JsonRpcRequest, JavaType)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></dt>
 <dd>
 <div class="block">Send a <a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
 </dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcTransport.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)" class="member-name-link">sendRequestForResponseAsync(JsonRpcRequest, T)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></dt>
+<dd>
+<div class="block">Send a <a href="org/consensusj/jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
+</dd>
 <dt><a href="org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html#sendtoaddress(java.lang.String,java.lang.Double)" class="member-name-link">sendtoaddress(String, Double)</a> - Method in interface org.consensusj.bitcoin.json.rpc.<a href="org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/services/WalletAppKitService.html#sendtoaddress(java.lang.String,java.lang.Double)" class="member-name-link">sendtoaddress(String, Double)</a> - Method in class org.consensusj.bitcoin.services.<a href="org/consensusj/bitcoin/services/WalletAppKitService.html" title="class in org.consensusj.bitcoin.services">WalletAppKitService</a></dt>
@@ -3633,8 +3685,16 @@ <h2 class="title" id="I:S">S</h2>
 <dd>
 <div class="block">Returns the value of the <a href="./org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html#param-serverPort"><code>serverPort</code></a> record component.</div>
 </dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html#serverReady(org.bitcoinj.base.Network)" class="member-name-link">serverReady(Network)</a> - Method in interface org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BTCTestSupport</a></dt>
+<dd>
+<div class="block">Wait for the server to become ready and validate the Bitcoin network it is running on</div>
+</dd>
 <dt><a href="org/consensusj/exchange/rx/ExchangeRateUpdate.html#serverTimeStamp" class="member-name-link">serverTimeStamp</a> - Variable in class org.consensusj.exchange.rx.<a href="org/consensusj/exchange/rx/ExchangeRateUpdate.html" title="class in org.consensusj.exchange.rx">ExchangeRateUpdate</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/cli/JavaLoggingSupport.html#setLogLevel(java.util.logging.Level)" class="member-name-link">setLogLevel(Level)</a> - Static method in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/JavaLoggingSupport.html" title="class in org.consensusj.jsonrpc.cli">JavaLoggingSupport</a></dt>
+<dd>
+<div class="block">Change log level (eg.</div>
+</dd>
 <dt><a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html#setTicker(org.knowm.xchange.dto.marketdata.Ticker)" class="member-name-link">setTicker(Ticker)</a> - Method in class org.consensusj.exchange.knowm.<a href="org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider.MonitoredCurrency</a></dt>
 <dd>
 <div class="block">Set the ticker object, called from polling method</div>
@@ -3742,6 +3802,8 @@ <h2 class="title" id="I:S">S</h2>
 &nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/cli/test/CLICommandResult.html#status" class="member-name-link">status</a> - Variable in class org.consensusj.jsonrpc.cli.test.<a href="org/consensusj/jsonrpc/cli/test/CLICommandResult.html" title="class in org.consensusj.jsonrpc.cli.test">CLICommandResult</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#statusFromErrorResponse(org.consensusj.jsonrpc.JsonRpcResponse)" class="member-name-link">statusFromErrorResponse(JsonRpcResponse&lt;?&gt;)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#stdRelayTxFee" class="member-name-link">stdRelayTxFee</a> - Variable in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#stdTxFee" class="member-name-link">stdTxFee</a> - Variable in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></dt>
@@ -3781,6 +3843,8 @@ <h2 class="title" id="I:S">S</h2>
 </dd>
 <dt><a href="org/consensusj/jsonrpc/cli/CliParameter.Valid.html#stream()" class="member-name-link">stream()</a> - Method in record class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.Valid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html#subscribe(org.reactivestreams.Subscriber)" class="member-name-link">subscribe(Subscriber&lt;? super ChainTip&gt;)</a> - Method in class org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html" title="class in org.consensusj.bitcoin.rx">ChainTipPublisher.Wrapper</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/exchange/rx/PolledObservablePair.html#subscribeActual(io.reactivex.rxjava3.core.Observer)" class="member-name-link">subscribeActual(Observer&lt;? super ExchangeRateUpdate&gt;)</a> - Method in class org.consensusj.exchange.rx.<a href="org/consensusj/exchange/rx/PolledObservablePair.html" title="class in org.consensusj.exchange.rx">PolledObservablePair</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/jsonrpc/introspection/sample/MathService.html#subtract(java.lang.Integer,java.lang.Integer)" class="member-name-link">subtract(Integer, Integer)</a> - Method in class org.consensusj.jsonrpc.introspection.sample.<a href="org/consensusj/jsonrpc/introspection/sample/MathService.html" title="class in org.consensusj.jsonrpc.introspection.sample">MathService</a></dt>
@@ -3807,9 +3871,22 @@ <h2 class="title" id="I:S">S</h2>
 <dd>
 <div class="block">Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</div>
 </dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcTransport.html#syncGet(java.util.concurrent.CompletableFuture)" class="member-name-link">syncGet(CompletableFuture&lt;R&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></dt>
+<dd>
+<div class="block">Synchronously complete a JSON-RPC request by calling <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html#get()" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture.get()</code></a>, unwrapping nested
+ <a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcException</code></a> or <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> from <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ExecutionException.html" title="class or interface in java.util.concurrent" class="external-link"><code>ExecutionException</code></a>.</div>
+</dd>
 </dl>
 <h2 class="title" id="I:T">T</h2>
 <dl class="index">
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#temporarilyUnavailableResponse(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.Throwable)" class="member-name-link">temporarilyUnavailableResponse(JsonRpcRequest, Throwable)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc.test">TestChainTipPublishers</a> - Class in <a href="org/consensusj/bitcoin/rx/jsonrpc/test/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.test</a></dt>
+<dd>
+<div class="block">Useful for testing.</div>
+</dd>
+<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html#%3Cinit%3E()" class="member-name-link">TestChainTipPublishers()</a> - Constructor for class org.consensusj.bitcoin.rx.jsonrpc.test.<a href="org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html" title="class in org.consensusj.bitcoin.rx.jsonrpc.test">TestChainTipPublishers</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#TESTNET" class="member-name-link">TESTNET</a> - Enum constant in enum class org.consensusj.namecoin.jsonrpc.core.<a href="org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html" class="type-name-link" title="class in org.consensusj.bitcoinj.signing">TestnetFeeCalculator</a> - Class in <a href="org/consensusj/bitcoinj/signing/package-summary.html">org.consensusj.bitcoinj.signing</a></dt>
@@ -3838,13 +3915,13 @@ <h2 class="title" id="I:T">T</h2>
 &nbsp;</dd>
 <dt><a href="org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html#%3Cinit%3E(org.bitcoinj.base.Address,N)" class="member-name-link">TokenBalancePair(Address, N)</a> - Constructor for class org.consensusj.analytics.service.<a href="org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html" title="class in org.consensusj.analytics.service">TokenRichList.TokenBalancePair</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/analytics/service/TokenRichList.html" class="type-name-link" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="org/consensusj/analytics/service/TokenRichList.html" title="type parameter in TokenRichList">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/service/TokenRichList.html" title="type parameter in TokenRichList">N</a>&gt;,<wbr><a href="org/consensusj/analytics/service/TokenRichList.html" title="type parameter in TokenRichList">ID</a>&gt; - Class in <a href="org/consensusj/analytics/service/package-summary.html">org.consensusj.analytics.service</a></dt>
+<dt><a href="org/consensusj/analytics/service/TokenRichList.html" class="type-name-link" title="class in org.consensusj.analytics.service">TokenRichList&lt;N,<wbr>ID&gt;</a> - Class in <a href="org/consensusj/analytics/service/package-summary.html">org.consensusj.analytics.service</a></dt>
 <dd>
 <div class="block">Response format for Omni rich list queries.</div>
 </dd>
 <dt><a href="org/consensusj/analytics/service/TokenRichList.html#%3Cinit%3E(int,org.bitcoinj.base.Sha256Hash,long,ID,java.util.List,N)" class="member-name-link">TokenRichList(int, Sha256Hash, long, ID, List&lt;TokenRichList.TokenBalancePair&lt;N&gt;&gt;, N)</a> - Constructor for class org.consensusj.analytics.service.<a href="org/consensusj/analytics/service/TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html" class="type-name-link" title="class in org.consensusj.analytics.service">TokenRichList.TokenBalancePair</a>&lt;<a href="org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html" title="type parameter in TokenRichList.TokenBalancePair">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html" title="type parameter in TokenRichList.TokenBalancePair">N</a>&gt;&gt; - Class in <a href="org/consensusj/analytics/service/package-summary.html">org.consensusj.analytics.service</a></dt>
+<dt><a href="org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html" class="type-name-link" title="class in org.consensusj.analytics.service">TokenRichList.TokenBalancePair&lt;N&gt;</a> - Class in <a href="org/consensusj/analytics/service/package-summary.html">org.consensusj.analytics.service</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html#toMutableInput()" class="member-name-link">toMutableInput()</a> - Method in class org.consensusj.bitcoinj.signing.<a href="org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html" title="class in org.consensusj.bitcoinj.signing">TransactionInputDataUtxo</a></dt>
 <dd>&nbsp;</dd>
@@ -3860,7 +3937,7 @@ <h2 class="title" id="I:T">T</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/rx/zeromq/RxZmqContext.html#topicPublisher(java.lang.String)" class="member-name-link">topicPublisher(String)</a> - Method in class org.consensusj.rx.zeromq.<a href="org/consensusj/rx/zeromq/RxZmqContext.html" title="class in org.consensusj.rx.zeromq">RxZmqContext</a></dt>
 <dd>
-<div class="block">Get a Publisher (Flowable) for a given topic</div>
+<div class="block">Get a Publisher (internally is an RxJava3 Flowable) for a given topic</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/Outpoint.html#toString()" class="member-name-link">toString()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/Outpoint.html" title="class in org.consensusj.bitcoin.json.pojo">Outpoint</a></dt>
 <dd>&nbsp;</dd>
@@ -4028,7 +4105,7 @@ <h2 class="title" id="I:T">T</h2>
 <dd>
 <div class="block">Service to return a stream of TxOutSetInfos for a given blockchain/client.</div>
 </dd>
-<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html#%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)" class="member-name-link">TxOutSetService(RxBitcoinClient)</a> - Constructor for class org.consensusj.bitcoin.rx.jsonrpc.service.<a href="org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html" title="class in org.consensusj.bitcoin.rx.jsonrpc.service">TxOutSetService</a></dt>
+<dt><a href="org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html#%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient,org.consensusj.bitcoin.rx.ChainTipPublisher)" class="member-name-link">TxOutSetService(RxBitcoinClient, ChainTipPublisher)</a> - Constructor for class org.consensusj.bitcoin.rx.jsonrpc.service.<a href="org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html" title="class in org.consensusj.bitcoin.rx.jsonrpc.service">TxOutSetService</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">TxOutSetWatcherSample</a> - Class in <a href="org/consensusj/bitcoin/rx/jsonrpc/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc</a></dt>
 <dd>
@@ -4038,7 +4115,9 @@ <h2 class="title" id="I:T">T</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/json/pojo/ZmqNotification.html#type()" class="member-name-link">type()</a> - Method in class org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ZmqNotification.html" title="class in org.consensusj.bitcoin.json.pojo">ZmqNotification</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="org/consensusj/jsonrpc/JacksonRpcClient.html#typeForClass(java.lang.Class)" class="member-name-link">typeForClass(Class&lt;?&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></dt>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#typeForClass(java.lang.Class)" class="member-name-link">typeForClass(Class&lt;?&gt;)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/JsonRpcClient.html#typeForClass(java.lang.Class)" class="member-name-link">typeForClass(Class&lt;?&gt;)</a> - Method in interface org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></dt>
 <dd>&nbsp;</dd>
 </dl>
 <h2 class="title" id="I:U">U</h2>
@@ -4190,15 +4269,41 @@ <h2 class="title" id="I:W">W</h2>
 <dd>
 <div class="block">Wait for RPC server to reach specified block height.</div>
 </dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#waitForBlockchainInfoAsync(java.time.Duration,java.time.Duration)" class="member-name-link">waitForBlockchainInfoAsync(Duration, Duration)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html#waitForBlocks(int)" class="member-name-link">waitForBlocks(int)</a> - Method in interface org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BlockChainEnvironment</a></dt>
 <dd>
 <div class="block">Wait for (and possible *hasten*) the creation of blocks</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html#waitForBlocks(int)" class="member-name-link">waitForBlocks(int)</a> - Method in class org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html" title="class in org.consensusj.bitcoin.jsonrpc.test">RegTestEnvironment</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#waitForConnected()" class="member-name-link">waitForConnected()</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>
+<div class="block">This is like waitForServer but does not initiate a connection.</div>
+</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#waitForConnected(java.time.Duration)" class="member-name-link">waitForConnected(Duration)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#waitForServer(int)" class="member-name-link">waitForServer(int)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
 <dd>
-<div class="block">Wait until the server is available.</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use <a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#waitForServer(java.time.Duration)"><code>BitcoinClient.waitForServer(Duration)</code></a></div>
+</div>
+</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#waitForServer(java.time.Duration)" class="member-name-link">waitForServer(Duration)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>
+<div class="block">Poll the server regularly until it responds.</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)" class="member-name-link">waitForServer(Duration, Duration, Supplier&lt;JsonRpcRequest&gt;, JavaType, DefaultRpcClient.TransientErrorMapper&lt;T&gt;)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>
+<div class="block">A wait-for-server routine that is agnostic about which RPC methods the server supports.</div>
+</dd>
+<dt><a href="org/consensusj/jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)" class="member-name-link">waitForServer(Duration, Duration, Supplier&lt;JsonRpcRequest&gt;, DefaultRpcClient.TransientErrorMapper&lt;T&gt;)</a> - Method in class org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></dt>
+<dd>
+<div class="block">A wait-for-server routine that is agnostic about which RPC methods the server supports.</div>
+</dd>
+<dt><a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#waitForServerAsync(java.time.Duration,java.time.Duration)" class="member-name-link">waitForServerAsync(Duration, Duration)</a> - Method in class org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></dt>
+<dd>
+<div class="block">Wait for a connection to the server.</div>
 </dd>
 <dt><a href="org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html#waitForSync(org.consensusj.bitcoin.jsonrpc.BitcoinClient)" class="member-name-link">waitForSync(BitcoinClient)</a> - Method in interface org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BlockchainSyncing</a></dt>
 <dd>
@@ -4258,8 +4363,12 @@ <h2 class="title" id="I:W">W</h2>
 <dd>
 <div class="block">Incubating: clone the client with a new base URI for a named wallet.</div>
 </dd>
+<dt><a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#writerFromStream(java.io.PrintStream)" class="member-name-link">writerFromStream(PrintStream)</a> - Method in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></dt>
+<dd>&nbsp;</dd>
 <dt><a href="org/consensusj/bitcoin/cli/BitcoinCLITool.html#writerFromStream(java.io.PrintStream)" class="member-name-link">writerFromStream(PrintStream)</a> - Method in class org.consensusj.bitcoin.cli.<a href="org/consensusj/bitcoin/cli/BitcoinCLITool.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool</a></dt>
 <dd>&nbsp;</dd>
+<dt><a href="org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html#writerFromStream(java.io.PrintStream)" class="member-name-link">writerFromStream(PrintStream)</a> - Method in class org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">GenericJsonRpcTool</a></dt>
+<dd>&nbsp;</dd>
 </dl>
 <h2 class="title" id="I:X">X</h2>
 <dl class="index">
@@ -4289,7 +4398,7 @@ <h2 class="title" id="I:Z">Z</h2>
 <dd>&nbsp;</dd>
 <dt><a href="org/consensusj/rx/zeromq/ZMsgSocketFlowable.html" class="type-name-link" title="class in org.consensusj.rx.zeromq">ZMsgSocketFlowable</a> - Class in <a href="org/consensusj/rx/zeromq/package-summary.html">org.consensusj.rx.zeromq</a></dt>
 <dd>
-<div class="block">Factory class for creating <code>Flowable&lt;ZMsg&gt;</code> from a <code>ZMQ.Socket</code>.</div>
+<div class="block">Factory class for creating <code>Publisher&lt;ZMsg&gt;</code> from a <code>ZMQ.Socket</code>.</div>
 </dd>
 <dt><a href="org/consensusj/rx/zeromq/ZMsgSocketFlowable.html#%3Cinit%3E()" class="member-name-link">ZMsgSocketFlowable()</a> - Constructor for class org.consensusj.rx.zeromq.<a href="org/consensusj/rx/zeromq/ZMsgSocketFlowable.html" title="class in org.consensusj.rx.zeromq">ZMsgSocketFlowable</a></dt>
 <dd>&nbsp;</dd>
diff --git a/apidoc/index.html b/apidoc/index.html
index 9fe2f99f5..903503ba4 100644
--- a/apidoc/index.html
+++ b/apidoc/index.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Overview (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Overview (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="package index">
 <meta name="generator" content="javadoc/PackageIndexWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li class="nav-bar-cell1-rev">Overview</li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -48,7 +48,7 @@
 <div class="flex-content">
 <main role="main">
 <div class="header">
-<h1 class="title">consensusj 0.7.0-alpha2 API</h1>
+<h1 class="title">consensusj 0.7.0-alpha3 API</h1>
 </div>
 <div id="all-packages-table">
 <div class="caption"><span>Packages</span></div>
@@ -99,92 +99,93 @@ <h1 class="title">consensusj 0.7.0-alpha2 API</h1>
 <div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
 <div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoin/rx/jsonrpc/service/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.service</a></div>
 <div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoin/rx/peergroup/package-summary.html">org.consensusj.bitcoin.rx.peergroup</a></div>
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoin/rx/jsonrpc/test/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.test</a></div>
 <div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoin/rx/zeromq/package-summary.html">org.consensusj.bitcoin.rx.zeromq</a></div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoin/rx/peergroup/package-summary.html">org.consensusj.bitcoin.rx.peergroup</a></div>
 <div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoin/services/package-summary.html">org.consensusj.bitcoin.services</a></div>
-<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoin/rx/zeromq/package-summary.html">org.consensusj.bitcoin.rx.zeromq</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoin/services/package-summary.html">org.consensusj.bitcoin.services</a></div>
+<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
 <div class="block">Reusable Dependency-injected services for Bitcoin server applications and microservices.</div>
 </div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoinj/dsl/js/package-summary.html">org.consensusj.bitcoinj.dsl.js</a></div>
-<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoinj/dsl/js/package-summary.html">org.consensusj.bitcoinj.dsl.js</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
 <div class="block">Prototype JavaScript scripting support via (Standalone) <b>Nashorn</b> and ScriptEngineFactory (JSR 223)</div>
 </div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoinj/service/package-summary.html">org.consensusj.bitcoinj.service</a></div>
-<div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoinj/signing/package-summary.html">org.consensusj.bitcoinj.signing</a></div>
-<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoinj/service/package-summary.html">org.consensusj.bitcoinj.service</a></div>
+<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoinj/signing/package-summary.html">org.consensusj.bitcoinj.signing</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
 <div class="block"><i>Incubating</i> support for <q>signing wallets</q> using immutable, record-like classes.</div>
 </div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoinj/util/package-summary.html">org.consensusj.bitcoinj.util</a></div>
-<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoinj/util/package-summary.html">org.consensusj.bitcoinj.util</a></div>
+<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
 <div class="block">Miscellaneous utility classes for <b>bitcoinj</b></div>
 </div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoinj/wallet/package-summary.html">org.consensusj.bitcoinj.wallet</a></div>
-<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/bitcoinj/wallet/package-summary.html">org.consensusj.bitcoinj.wallet</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
 <div class="block">Support for BIP-44 family HD Keychains, as a temporary solution until <b>bitcoinj</b> 0.17 is released.</div>
 </div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/currency/package-summary.html">org.consensusj.currency</a></div>
-<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/currency/package-summary.html">org.consensusj.currency</a></div>
+<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
 <div class="block">Bitcoin currency provider for JavaMoney (JSR-354)</div>
 </div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/daemon/micronaut/package-summary.html">org.consensusj.daemon.micronaut</a></div>
-<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/decentralizedid/package-summary.html">org.consensusj.decentralizedid</a></div>
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/daemon/micronaut/package-summary.html">org.consensusj.daemon.micronaut</a></div>
 <div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/decentralizedid/btcr/package-summary.html">org.consensusj.decentralizedid.btcr</a></div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/decentralizedid/package-summary.html">org.consensusj.decentralizedid</a></div>
 <div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/ethereum/jsonrpc/package-summary.html">org.consensusj.ethereum.jsonrpc</a></div>
-<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/decentralizedid/btcr/package-summary.html">org.consensusj.decentralizedid.btcr</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/ethereum/jsonrpc/package-summary.html">org.consensusj.ethereum.jsonrpc</a></div>
+<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
 <div class="block">Ethereum JSON-RPC client (partial implementation)</div>
 </div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/exchange/package-summary.html">org.consensusj.exchange</a></div>
-<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/exchange/package-summary.html">org.consensusj.exchange</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
 <div class="block">JavaMoney (JSR-354) support for Cryptocurrency exchanges</div>
 </div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/exchange/knowm/package-summary.html">org.consensusj.exchange.knowm</a></div>
-<div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/exchange/rx/package-summary.html">org.consensusj.exchange.rx</a></div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/exchange/knowm/package-summary.html">org.consensusj.exchange.knowm</a></div>
 <div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></div>
-<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/exchange/rx/package-summary.html">org.consensusj.exchange.rx</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/package-summary.html">org.consensusj.jsonrpc</a></div>
+<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
 <div class="block">Basic JSON-RPC Java client and supporting classes.</div>
 </div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/cli/package-summary.html">org.consensusj.jsonrpc.cli</a></div>
-<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/cli/test/package-summary.html">org.consensusj.jsonrpc.cli.test</a></div>
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/cli/package-summary.html">org.consensusj.jsonrpc.cli</a></div>
 <div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/daemon/package-summary.html">org.consensusj.jsonrpc.daemon</a></div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/cli/test/package-summary.html">org.consensusj.jsonrpc.cli.test</a></div>
 <div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/groovy/package-summary.html">org.consensusj.jsonrpc.groovy</a></div>
-<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/daemon/package-summary.html">org.consensusj.jsonrpc.daemon</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/groovy/package-summary.html">org.consensusj.jsonrpc.groovy</a></div>
+<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
 <div class="block">JSON-RPC Groovy dynamic client and supporting classes.</div>
 </div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/internal/package-summary.html">org.consensusj.jsonrpc.internal</a></div>
-<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/introspection/package-summary.html">org.consensusj.jsonrpc.introspection</a></div>
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/internal/package-summary.html">org.consensusj.jsonrpc.internal</a></div>
 <div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/introspection/sample/package-summary.html">org.consensusj.jsonrpc.introspection.sample</a></div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/introspection/package-summary.html">org.consensusj.jsonrpc.introspection</a></div>
 <div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/namecoin/jsonrpc/package-summary.html">org.consensusj.namecoin.jsonrpc</a></div>
-<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/jsonrpc/introspection/sample/package-summary.html">org.consensusj.jsonrpc.introspection.sample</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/namecoin/jsonrpc/package-summary.html">org.consensusj.namecoin.jsonrpc</a></div>
+<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
 <div class="block">Namecoin JSON-RPC Client</div>
 </div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/namecoin/jsonrpc/cli/package-summary.html">org.consensusj.namecoin.jsonrpc.cli</a></div>
-<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/namecoin/jsonrpc/core/package-summary.html">org.consensusj.namecoin.jsonrpc.core</a></div>
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/namecoin/jsonrpc/cli/package-summary.html">org.consensusj.namecoin.jsonrpc.cli</a></div>
 <div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/namecoin/jsonrpc/pojo/package-summary.html">org.consensusj.namecoin.jsonrpc.pojo</a></div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/namecoin/jsonrpc/core/package-summary.html">org.consensusj.namecoin.jsonrpc.core</a></div>
 <div class="col-last odd-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
-<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/rx/jsonrpc/package-summary.html">org.consensusj.rx.jsonrpc</a></div>
-<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/namecoin/jsonrpc/pojo/package-summary.html">org.consensusj.namecoin.jsonrpc.pojo</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">&nbsp;</div>
+<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/rx/jsonrpc/package-summary.html">org.consensusj.rx.jsonrpc</a></div>
+<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
 <div class="block">Reactive enhancements for JSON-RPC clients using <a href="https://github.com/ReactiveX/RxJava">RxJava 3</a>.</div>
 </div>
-<div class="col-first odd-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/rx/zeromq/package-summary.html">org.consensusj.rx.zeromq</a></div>
-<div class="col-last odd-row-color all-packages-table all-packages-table-tab1">
-<div class="block">Reactive interface to <a href="https://zeromq.org">ZeroMQ</a> using <a href="https://github.com/zeromq/jeromq">JeroMQ</a> library
- and <a href="https://github.com/ReactiveX/RxJava">RxJava 3</a>.</div>
+<div class="col-first even-row-color all-packages-table all-packages-table-tab1"><a href="org/consensusj/rx/zeromq/package-summary.html">org.consensusj.rx.zeromq</a></div>
+<div class="col-last even-row-color all-packages-table all-packages-table-tab1">
+<div class="block">Reactive interface to <a href="https://zeromq.org">ZeroMQ</a> using <a href="https://github.com/zeromq/jeromq">JeroMQ</a> library.</div>
 </div>
 </div>
 </div>
diff --git a/apidoc/jquery-ui.overrides.css b/apidoc/jquery-ui.overrides.css
deleted file mode 100644
index facf852c2..000000000
--- a/apidoc/jquery-ui.overrides.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2020, 2022, Oracle and/or its affiliates. All rights reserved.
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * This code is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 only, as
- * published by the Free Software Foundation.  Oracle designates this
- * particular file as subject to the "Classpath" exception as provided
- * by Oracle in the LICENSE file that accompanied this code.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- */
-
-.ui-state-active,
-.ui-widget-content .ui-state-active,
-.ui-widget-header .ui-state-active,
-a.ui-button:active,
-.ui-button:active,
-.ui-button.ui-state-active:hover {
-    /* Overrides the color of selection used in jQuery UI */
-    background: #F8981D;
-    border: 1px solid #F8981D;
-}
diff --git a/apidoc/legal/ASSEMBLY_EXCEPTION b/apidoc/legal/ASSEMBLY_EXCEPTION
index 065b8d902..429666664 100644
--- a/apidoc/legal/ASSEMBLY_EXCEPTION
+++ b/apidoc/legal/ASSEMBLY_EXCEPTION
@@ -2,8 +2,8 @@
 OPENJDK ASSEMBLY EXCEPTION
 
 The OpenJDK source code made available by Oracle America, Inc. (Oracle) at
-openjdk.java.net ("OpenJDK Code") is distributed under the terms of the GNU
-General Public License <http://www.gnu.org/copyleft/gpl.html> version 2
+openjdk.org ("OpenJDK Code") is distributed under the terms of the GNU
+General Public License <https://www.gnu.org/copyleft/gpl.html> version 2
 only ("GPL2"), with the following clarification and special exception.
 
     Linking this OpenJDK Code statically or dynamically with other code
@@ -12,7 +12,7 @@ only ("GPL2"), with the following clarification and special exception.
 
     As a special exception, Oracle gives you permission to link this
     OpenJDK Code with certain code licensed by Oracle as indicated at
-    http://openjdk.java.net/legal/exception-modules-2007-05-08.html
+    https://openjdk.org/legal/exception-modules-2007-05-08.html
     ("Designated Exception Modules") to produce an executable,
     regardless of the license terms of the Designated Exception Modules,
     and to copy and distribute the resulting executable under GPL2,
diff --git a/apidoc/legal/jqueryUI.md b/apidoc/legal/jqueryUI.md
index 8031bdb56..8bda9d7a8 100644
--- a/apidoc/legal/jqueryUI.md
+++ b/apidoc/legal/jqueryUI.md
@@ -1,4 +1,4 @@
-## jQuery UI v1.12.1
+## jQuery UI v1.13.2
 
 ### jQuery UI License
 ```
diff --git a/apidoc/link.svg b/apidoc/link.svg
new file mode 100644
index 000000000..7ccc5ed08
--- /dev/null
+++ b/apidoc/link.svg
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ Copyright (c) 2023, Oracle and/or its affiliates. All rights reserved.
+ DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+
+ This code is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 2 only, as
+ published by the Free Software Foundation.  Oracle designates this
+ particular file as subject to the "Classpath" exception as provided
+ by Oracle in the LICENSE file that accompanied this code.
+
+ This code is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ version 2 for more details (a copy is included in the LICENSE file that
+ accompanied this code).
+
+ You should have received a copy of the GNU General Public License version
+ 2 along with this work; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+
+ Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ or visit www.oracle.com if you need additional information or have any
+ questions.
+-->
+
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="#505050">
+    <path d="M32 239.3c18.2 16.7 57.1 15.4 74.5-1.7l30.9-32c8.3-8.8 4.8-15.1.7-19.9-4.7-3-12-8.1-20.4.5l-29.4 29.6a29.4 29.4 0 0 1-39.4.9l-8-7c-8.8-9.4-11-28.3-.8-38.8l49.8-51.3c7.2-6.6 21.3-10 36.1-2.4 6.9 5.4 15.6 15.7 26 6.2 9.9-11.2 2.9-20.4-10-29.3-18.7-12.6-52-14.8-70.4 3.8L17 154.2c-20 20.2-11.3 58 1.7 71.5a69 69 0 0 0 13.2 13.6z"/>
+    <path d="M223.2 17.5c-18.4-16.6-57.3-15.3-74.6 2l-30.8 31.9c-8.3 9-4.8 15.2-.7 20 4.8 3 12.1 8 20.5-.6 4.8-5 29.3-29.6 29.3-29.6a29.4 29.4 0 0 1 39.4-1l8 6.8c8.8 9.5 11 28.3.9 38.9l-49.6 51.4c-7.2 6.7-21.3 10.1-36.1 2.6-7-5.4-15.7-15.7-26.1-6.2-9.8 11.2-2.8 20.4 10.2 29.3 18.7 12.5 52 14.7 70.3-4l54.4-56.5c20-20.3 11.2-58-1.9-71.5a69 69 0 0 0-13.2-13.5Z"/>
+</svg>
diff --git a/apidoc/member-search-index.js b/apidoc/member-search-index.js
index 2d0a37b7b..4aea2be09 100644
--- a/apidoc/member-search-index.js
+++ b/apidoc/member-search-index.js
@@ -1 +1 @@
-memberSearchIndex = [{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"AbstractJsonRpcService(Map<String, Method>)","u":"%3Cinit%3E(java.util.Map)"},{"p":"org.consensusj.jsonrpc","c":"AbstractRpcClient","l":"AbstractRpcClient(JsonRpcMessage.Version)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"account(int)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"accumulator()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"activeChainTipFromBestBlock(Block)","u":"activeChainTipFromBestBlock(org.bitcoinj.core.Block)"},{"p":"org.consensusj.jsonrpc.introspection.sample","c":"MathService","l":"add(Integer, Integer)","u":"add(java.lang.Integer,java.lang.Integer)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"addChange(SigningRequest, Address, FeeCalculator)","u":"addChange(org.consensusj.bitcoinj.signing.SigningRequest,org.bitcoinj.base.Address,org.consensusj.bitcoinj.signing.FeeCalculator)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"addNode(String, String)","u":"addNode(java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"addOtherInfo(String, Object)","u":"addOtherInfo(java.lang.String,java.lang.Object)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"address"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TransactionIngredients","l":"address"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"address()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"address()"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"address(HDPath)","u":"address(org.bitcoinj.crypto.HDPath)"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressBalanceInfo","l":"AddressBalanceInfo(long, long, long)","u":"%3Cinit%3E(long,long,long)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressDeserializer","l":"AddressDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressDeserializer","l":"AddressDeserializer(AddressParser)","u":"%3Cinit%3E(org.bitcoinj.base.AddressParser)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressDeserializer","l":"AddressDeserializer(Network)","u":"%3Cinit%3E(org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressDeserializer","l":"AddressDeserializer(NetworkParameters)","u":"%3Cinit%3E(org.bitcoinj.core.NetworkParameters)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"addressFromKey(ECKey)","u":"addressFromKey(org.bitcoinj.crypto.ECKey)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressGroupingItem","l":"AddressGroupingItem(Address, Coin, String)","u":"%3Cinit%3E(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressGroupingItem","l":"AddressGroupingItem(List<Object>)","u":"%3Cinit%3E(java.util.List)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"AddressInfo(Address, String, boolean, boolean, String, boolean, boolean, boolean, String, boolean, String, boolean, Long, List<Object>)","u":"%3Cinit%3E(org.bitcoinj.base.Address,java.lang.String,boolean,boolean,java.lang.String,boolean,boolean,boolean,java.lang.String,boolean,java.lang.String,boolean,java.lang.Long,java.util.List)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressKeyDeserializer","l":"AddressKeyDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressKeyDeserializer","l":"AddressKeyDeserializer(AddressParser)","u":"%3Cinit%3E(org.bitcoinj.base.AddressParser)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressKeyDeserializer","l":"AddressKeyDeserializer(Network)","u":"%3Cinit%3E(org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressKeyDeserializer","l":"AddressKeyDeserializer(NetworkParameters)","u":"%3Cinit%3E(org.bitcoinj.core.NetworkParameters)"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressRequest","l":"AddressRequest(List<Address>)","u":"%3Cinit%3E(java.util.List)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressSerializer","l":"AddressSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"AddressUtxoInfo(Address, Sha256Hash, int, String, long, int, boolean)","u":"%3Cinit%3E(org.bitcoinj.base.Address,org.bitcoinj.base.Sha256Hash,int,java.lang.String,long,int,boolean)"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoResult","l":"AddressUtxoResult(Sha256Hash, int, List<AddressUtxoInfo>)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,java.util.List)"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"addSignedInput(Transaction, TransactionInputData, Supplier<? extends RuntimeException>)","u":"addSignedInput(org.bitcoinj.core.Transaction,org.consensusj.bitcoinj.signing.TransactionInputData,java.util.function.Supplier)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"amount"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputData","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputDataScript","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputOpReturn","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Complete","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Signable","l":"amount()"},{"p":"org.consensusj.daemon.micronaut","c":"Application","l":"Application()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc.daemon","c":"Application","l":"Application()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Parser","l":"apply(String)","u":"apply(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet.MappingFunction","l":"apply(String)","u":"apply(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet.MappingFunction","l":"applyThrows(String)","u":"applyThrows(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"AbstractRpcClient","l":"base64Encode(String)","u":"base64Encode(java.lang.String)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"BaseJsonRpcTool()","u":"%3Cinit%3E()"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(Class<? extends Exchange>, CurrencyUnitPair...)","u":"%3Cinit%3E(java.lang.Class,org.consensusj.exchange.CurrencyUnitPair...)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(Class<? extends Exchange>, ScheduledExecutorService, CurrencyUnitPair...)","u":"%3Cinit%3E(java.lang.Class,java.util.concurrent.ScheduledExecutorService,org.consensusj.exchange.CurrencyUnitPair...)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(Class<? extends Exchange>, ScheduledExecutorService, String...)","u":"%3Cinit%3E(java.lang.Class,java.util.concurrent.ScheduledExecutorService,java.lang.String...)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(Class<? extends Exchange>, String...)","u":"%3Cinit%3E(java.lang.Class,java.lang.String...)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(String, ScheduledExecutorService, Map<CurrencyUnit, String>, Collection<CurrencyUnitPair>)","u":"%3Cinit%3E(java.lang.String,java.util.concurrent.ScheduledExecutorService,java.util.Map,java.util.Collection)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(String, ScheduledExecutorService, Map<CurrencyUnit, String>, CurrencyUnitPair...)","u":"%3Cinit%3E(java.lang.String,java.util.concurrent.ScheduledExecutorService,java.util.Map,org.consensusj.exchange.CurrencyUnitPair...)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(String, ScheduledExecutorService, String[])","u":"%3Cinit%3E(java.lang.String,java.util.concurrent.ScheduledExecutorService,java.lang.String[])"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Basic","l":"Basic(Sha256Hash, int)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"BIP44_PARENT"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"BIP84_PARENT"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"BipStandardDeterministicKeyChain(DeterministicKeyChain, Network)","u":"%3Cinit%3E(org.bitcoinj.wallet.DeterministicKeyChain,org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"BipStandardDeterministicKeyChain(DeterministicSeed, ScriptType, Network)","u":"%3Cinit%3E(org.bitcoinj.wallet.DeterministicSeed,org.bitcoinj.base.ScriptType,org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BITCOIN_CORE_VERSION_DESC_DEFAULT"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BITCOIN_CORE_VERSION_MIN"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"BITCOIN_SCHEME"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool.BitcoinCLICall","l":"BitcoinCLICall(BitcoinCLITool, PrintWriter, PrintWriter, String[])","u":"%3Cinit%3E(org.consensusj.bitcoin.cli.BitcoinCLITool,java.io.PrintWriter,java.io.PrintWriter,java.lang.String[])"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(NetworkParameters, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(RpcConfig)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(SSLContext, Network, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(SSLContext, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(SSLSocketFactory, Network, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(SSLSocketFactory, NetworkParameters, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(URI, String, String)","u":"%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.internal","c":"BitcoinClientThreadFactory","l":"BitcoinClientThreadFactory(Context, String)","u":"%3Cinit%3E(org.bitcoinj.core.Context,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.internal","c":"BitcoinClientThreadFactory","l":"BitcoinClientThreadFactory(Context, String, int)","u":"%3Cinit%3E(org.bitcoinj.core.Context,java.lang.String,int)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"BitcoinCLITool()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"BitcoinConf()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConfFile","l":"BitcoinConfFile()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConfFile","l":"BitcoinConfFile(File)","u":"%3Cinit%3E(java.io.File)"},{"p":"org.consensusj.currency","c":"BitcoinCurrencyProvider","l":"BitcoinCurrencyProvider()","u":"%3Cinit%3E()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"BitcoinDaemonConfig(String, int, Path, String)","u":"%3Cinit%3E(java.lang.String,int,java.nio.file.Path,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(NetworkParameters, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(RpcConfig)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(SSLContext, Network, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(SSLSocketFactory, Network, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(SSLSocketFactory, NetworkParameters, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(URI, String, String)","u":"%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinFactory","l":"BitcoinFactory()","u":"%3Cinit%3E()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinRestController","l":"BitcoinRestController(WalletAppKitService)","u":"%3Cinit%3E(org.consensusj.bitcoin.services.WalletAppKitService)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinRpcCliOptions","l":"BitcoinRpcCliOptions()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"BitcoinTransactionInfo(boolean, Address, String, Coin, String, int, Coin, int, boolean, boolean, Sha256Hash, int, int, long, Sha256Hash, List<Sha256Hash>, long, long, String, String, boolean)","u":"%3Cinit%3E(boolean,org.bitcoinj.base.Address,java.lang.String,org.bitcoinj.base.Coin,java.lang.String,int,org.bitcoinj.base.Coin,int,boolean,boolean,org.bitcoinj.base.Sha256Hash,int,int,long,org.bitcoinj.base.Sha256Hash,java.util.List,long,long,java.lang.String,java.lang.String,boolean)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage","l":"BitcoinZmqMessage(BitcoinZmqMessage.Topic, T, long)","u":"%3Cinit%3E(org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic,T,long)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqPortFinder","l":"BitcoinZmqPortFinder(BitcoinClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"bits"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinRestController","l":"block(String)","u":"block(java.lang.String)"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainBinaryService","l":"blockBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"blockBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"blockBinaryPublisher()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"BlockChainInfo(String, int, int, Sha256Hash, BigDecimal, BigDecimal, byte[])","u":"%3Cinit%3E(java.lang.String,int,int,org.bitcoinj.base.Sha256Hash,java.math.BigDecimal,java.math.BigDecimal,byte[])"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainBinaryService","l":"blockHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"blockHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"blockHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"blockHashPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"blockHashPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"blockHashPublisher()"},{"p":"org.consensusj.bitcoinj.util","c":"BlockUtil","l":"blockHeightFromCoinbase(Block)","u":"blockHeightFromCoinbase(org.bitcoinj.core.Block)"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"blockHeightPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"blockHeightPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"blockHeightPublisher()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"BlockHexDeserializer","l":"BlockHexDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"BlockHexDeserializer","l":"BlockHexDeserializer(Network)","u":"%3Cinit%3E(org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"BlockHexDeserializer","l":"BlockHexDeserializer(NetworkParameters)","u":"%3Cinit%3E(org.bitcoinj.core.NetworkParameters)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"BlockInfo(Sha256Hash, int, int, int, int, Sha256Hash, int, BlockInfo.Sha256HashList, long, long, String, BigDecimal, String, Sha256Hash, Sha256Hash)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,int,int,int,org.bitcoinj.base.Sha256Hash,int,org.consensusj.bitcoin.json.pojo.BlockInfo.Sha256HashList,long,long,java.lang.String,java.math.BigDecimal,java.lang.String,org.bitcoinj.base.Sha256Hash,org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinRestController","l":"blockNoTxDetails(String)","u":"blockNoTxDetails(java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"blockPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"blockPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"blockPublisher()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"blocktime"},{"p":"org.consensusj.bitcoinj.util","c":"BlockUtil","l":"BlockUtil()","u":"%3Cinit%3E()"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"BtcrDid(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"BtcrDid(URI)","u":"%3Cinit%3E(java.net.URI)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"buildExchangeRateChange(CurrencyUnitPair, Ticker)","u":"buildExchangeRateChange(org.consensusj.exchange.CurrencyUnitPair,org.knowm.xchange.dto.marketdata.Ticker)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"buildJsonRequest(String, List<Object>)","u":"buildJsonRequest(java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"buildJsonRequest(String, Object...)","u":"buildJsonRequest(java.lang.String,java.lang.Object...)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"HexUtil","l":"bytesToHexString(byte[])"},{"p":"org.consensusj.bitcoinj.signing","c":"FeeCalculator","l":"calculateFee(SigningRequest)","u":"calculateFee(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.bitcoinj.signing","c":"TestnetFeeCalculator","l":"calculateFee(SigningRequest)","u":"calculateFee(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"call(AsyncSupport.ThrowingSupplier<RSLT>)","u":"call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)"},{"p":"org.consensusj.jsonrpc.introspection","c":"JsonRpcServiceWrapper","l":"call(JsonRpcRequest)","u":"call(org.consensusj.jsonrpc.JsonRpcRequest)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcService","l":"call(JsonRpcRequest)","u":"call(org.consensusj.jsonrpc.JsonRpcRequest)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinRestController","l":"chaininfo()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"ChainTip(int, Sha256Hash, int, String)","u":"%3Cinit%3E(int,org.bitcoinj.base.Sha256Hash,int,java.lang.String)"},{"p":"org.consensusj.bitcoin.rx","c":"ChainTipService","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"chainwork"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"CHANGE_CHANGE"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"CHANGE_RECEIVING"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"changeAddr(int)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"changeKey(int)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"characteristics()"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"checkClientTrusted(X509Certificate[], String)","u":"checkClientTrusted(java.security.cert.X509Certificate[],java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"checkServerTrusted(X509Certificate[], String)","u":"checkServerTrusted(java.security.cert.X509Certificate[],java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"clearMemPool()"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLICommandResult","l":"CLICommandResult(int, ByteArrayOutputStream, ByteArrayOutputStream)","u":"%3Cinit%3E(int,java.io.ByteArrayOutputStream,java.io.ByteArrayOutputStream)"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLICommandResult","l":"CLICommandResult(int, String, String)","u":"%3Cinit%3E(int,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"client"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"client"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BitcoinClientAccessor","l":"client()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameterParser","l":"CliParameterParser(JsonRpcMessage.Version, ObjectMapper)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,com.fasterxml.jackson.databind.ObjectMapper)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameterParser","l":"CliParameterParser(ObjectMapper)","u":"%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"close()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"close()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.service","c":"TxOutSetService","l":"close()"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"close()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"close()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"close()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"close()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"close()"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"close()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"close()"},{"p":"org.consensusj.rx.zeromq","c":"RxZmqContext","l":"close()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"CoinDeserializer","l":"CoinDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"CoinSerializer","l":"CoinSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"COINTYPE_BTC"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"COINTYPE_TBTC"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"coinType(String)","u":"coinType(java.lang.String)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"combiner()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"commandExists(String)","u":"commandExists(java.lang.String)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"commandName"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"commandName"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"CommonsCLICall(BaseJsonRpcTool, PrintWriter, PrintWriter, String[])","u":"%3Cinit%3E(org.consensusj.jsonrpc.cli.BaseJsonRpcTool,java.io.PrintWriter,java.io.PrintWriter,java.lang.String[])"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"compareTo(CurrencyUnitPair)","u":"compareTo(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Complete","l":"Complete(Sha256Hash, int, Coin, Script)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin,org.bitcoinj.script.Script)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"CompositeTrustManager(InputStream)","u":"%3Cinit%3E(java.io.InputStream)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"CompositeTrustManager(Path)","u":"%3Cinit%3E(java.nio.file.Path)"},{"p":"org.consensusj.jsonrpc.cli","c":"JavaLoggingSupport","l":"configure(String)","u":"configure(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"confirmations"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"confirmations"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"convertSymbol(CurrencyUnit)","u":"convertSymbol(javax.money.CurrencyUnit)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"convertSymbol(CurrencyUnit)","u":"convertSymbol(javax.money.CurrencyUnit)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionVerification","l":"correctlySpendsInput(Transaction, int, Address)","u":"correctlySpendsInput(org.bitcoinj.core.Transaction,int,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionVerification","l":"correctlySpendsInput(Transaction, int, Script)","u":"correctlySpendsInput(org.bitcoinj.core.Transaction,int,org.bitcoinj.script.Script)"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"create(String)","u":"create(java.lang.String)"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"create(String)","u":"create(java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"createBitcoinSigningRequest(List<TransactionInputData>, List<TransactionOutputData>, Address)","u":"createBitcoinSigningRequest(java.util.List,java.util.List,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoinj.service","c":"SignTransactionService","l":"createBitcoinSigningRequest(List<TransactionInputData>, List<TransactionOutputData>, Address)","u":"createBitcoinSigningRequest(java.util.List,java.util.List,org.bitcoinj.base.Address)"},{"p":"org.consensusj.jsonrpc.cli","c":"BitcoinCLITool","l":"createCall(PrintStream, PrintStream, String...)","u":"createCall(java.io.PrintStream,java.io.PrintStream,java.lang.String...)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"createCall(PrintWriter, PrintWriter, String...)","u":"createCall(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"createCall(PrintWriter, PrintWriter, String...)","u":"createCall(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool.BitcoinCLICall","l":"createClient(SSLContext, RpcConfig)","u":"createClient(javax.net.ssl.SSLContext,org.consensusj.bitcoin.jsonrpc.RpcConfig)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"createDustOutput(Address)","u":"createDustOutput(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"FundingSource","l":"createFundedAddress(Coin)","u":"createFundedAddress(org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"createFundedAddress(Coin)","u":"createFundedAddress(org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"createIngredients(Coin)","u":"createIngredients(org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"createRawTransaction(Address, Address, Coin)","u":"createRawTransaction(org.bitcoinj.base.Address,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"createRawTransaction(Address, Map<Address, Coin>)","u":"createRawTransaction(org.bitcoinj.base.Address,java.util.Map)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"createrawtransaction(List<Map<String, Object>>, List<Map<String, String>>)","u":"createrawtransaction(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"createrawtransaction(List<Map<String, Object>>, List<Map<String, String>>)","u":"createrawtransaction(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"createRawTransaction(List<Outpoint>, Map<Address, Coin>)","u":"createRawTransaction(java.util.List,java.util.Map)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"createSignedTransaction(ECKey, Address, Coin)","u":"createSignedTransaction(org.bitcoinj.crypto.ECKey,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"createSignedTransaction(ECKey, List<TransactionOutput>)","u":"createSignedTransaction(org.bitcoinj.crypto.ECKey,java.util.List)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"createTemporary(BitcoinNetwork, ScriptType, String)","u":"createTemporary(org.bitcoinj.base.BitcoinNetwork,org.bitcoinj.base.ScriptType,java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"createTemporaryWallet(BitcoinNetwork, ScriptType, String)","u":"createTemporaryWallet(org.bitcoinj.base.BitcoinNetwork,org.bitcoinj.base.ScriptType,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"createWallet(String, Boolean, Boolean)","u":"createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"createWallet(String, Boolean, Boolean, String, Boolean)","u":"createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"createWallet(String, Boolean, Boolean, String, Boolean, Boolean, Boolean, Boolean)","u":"createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"CurrencyUnitPair(CurrencyUnit, CurrencyUnit)","u":"%3Cinit%3E(javax.money.CurrencyUnit,javax.money.CurrencyUnit)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"CurrencyUnitPair(ExchangeRate)","u":"%3Cinit%3E(javax.money.convert.ExchangeRate)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"CurrencyUnitPair(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"CurrencyUnitPair(String, String)","u":"%3Cinit%3E(java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxJsonChainTipClient","l":"currentChainTipMaybe()"},{"p":"org.consensusj.exchange.rx","c":"ExchangeRateUpdate","l":"currentFactor"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"dataDir()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"DEFAULT_LOCALHOST"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"DEFAULT_MAINNET_URI"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"DEFAULT_MAX_CONF"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"DEFAULT_MIN_CONF"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"DEFAULT_REGTEST_MINING_ADDRESS"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"DEFAULT_REGTEST_URI"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"DEFAULT_TESTNET_URI"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"defaultMainNetURI"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"defaultMaxConf"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"defaultRegTestURI"},{"p":"org.consensusj.bitcoinj.signing","c":"DefaultSigningRequest","l":"DefaultSigningRequest(List<TransactionInputData>, List<TransactionOutputData>)","u":"%3Cinit%3E(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"defaultTestNetURI"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"defaultUri"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"defer(Supplier<CompletionStage<RSLT>>)","u":"defer(java.util.function.Supplier)"},{"p":"org.consensusj.jsonrpc.introspection","c":"DelegatingJsonRpcService","l":"DelegatingJsonRpcService(Map<String, Method>, Object)","u":"%3Cinit%3E(java.util.Map,java.lang.Object)"},{"p":"org.consensusj.jsonrpc.introspection","c":"DelegatingJsonRpcService","l":"DelegatingJsonRpcService(Object)","u":"%3Cinit%3E(java.lang.Object)"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"Demo","l":"Demo()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressDeserializer","l":"deserialize(JsonParser, DeserializationContext)","u":"deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"BlockHexDeserializer","l":"deserialize(JsonParser, DeserializationContext)","u":"deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"CoinDeserializer","l":"deserialize(JsonParser, DeserializationContext)","u":"deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ECKeyDeserializer","l":"deserialize(JsonParser, DeserializationContext)","u":"deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"Sha256HashDeserializer","l":"deserialize(JsonParser, DeserializationContext)","u":"deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressKeyDeserializer","l":"deserializeKey(String, DeserializationContext)","u":"deserializeKey(java.lang.String,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"Detail(String, Address, String, Coin, String, int, Coin)","u":"%3Cinit%3E(java.lang.String,org.bitcoinj.base.Address,java.lang.String,org.bitcoinj.base.Coin,java.lang.String,int,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.DetailList","l":"DetailList()","u":"%3Cinit%3E()"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"DID_SCHEME"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"Did(URI)","u":"%3Cinit%3E(java.net.URI)"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"didUri"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"difficulty"},{"p":"org.consensusj.jsonrpc.groovy","c":"Dummy","l":"Dummy()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"dumpPrivKey(Address)","u":"dumpPrivKey(org.bitcoinj.base.Address)"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"echo(String)","u":"echo(java.lang.String)"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"EchoJsonRpcService()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ECKeyDeserializer","l":"ECKeyDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ECKeySerializer","l":"ECKeySerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.signing","c":"ECKeySigner","l":"ECKeySigner(ECKey)","u":"%3Cinit%3E(org.bitcoinj.crypto.ECKey)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLICommandResult","l":"error"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"error()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"ethBlockNumber()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"ethCall(EthTxCallObject, String)","u":"ethCall(org.consensusj.ethereum.jsonrpc.EthTxCallObject,java.lang.String)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"EthereumClient()","u":"%3Cinit%3E()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"EthereumClient(URI, String, String)","u":"%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"ethGetBalance(String, String)","u":"ethGetBalance(java.lang.String,java.lang.String)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"ethProtocolVersion()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"EthTxCallObject(String, String, String, String, String, String)","u":"%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"ScriptRunner","l":"evalFile(File)","u":"evalFile(java.io.File)"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"ScriptRunner","l":"evalResource(String)","u":"evalResource(java.lang.String)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"exceedsMaxMoney(Monetary)","u":"exceedsMaxMoney(org.bitcoinj.base.Monetary)"},{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"exception(Throwable)","u":"exception(java.lang.Throwable)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"exchange"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"exchange"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"exchangeClassName"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"exchangeClassName"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"exchangePair"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"exchangePair"},{"p":"org.consensusj.exchange","c":"ExchangeRateChange","l":"ExchangeRateChange(ExchangeRate, long)","u":"%3Cinit%3E(javax.money.convert.ExchangeRate,long)"},{"p":"org.consensusj.exchange.rx","c":"ExchangeRateUpdate","l":"ExchangeRateUpdate(CurrencyUnitPair, NumberValue, long)","u":"%3Cinit%3E(org.consensusj.exchange.CurrencyUnitPair,javax.money.NumberValue,long)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"exchangeSpecification"},{"p":"org.consensusj.decentralizedid.btcr","c":"ExtendedTxRef","l":"ExtendedTxRef(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"findActiveChainTip(List<ChainTip>)","u":"findActiveChainTip(java.util.List)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"findActiveChainTipOrElseThrow(List<ChainTip>)","u":"findActiveChainTipOrElseThrow(java.util.List)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqPortFinder","l":"findPort(BitcoinZmqMessage.Topic)","u":"findPort(org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"findUnspentOutput(Sha256Hash, int)","u":"findUnspentOutput(org.bitcoinj.base.Sha256Hash,int)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"findUtxo(Utxo)","u":"findUtxo(org.consensusj.bitcoinj.signing.Utxo)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"finisher()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"formatter"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"fromIdString(String)","u":"fromIdString(java.lang.String)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"fromString(String)","u":"fromString(java.lang.String)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"fromTxInput(TransactionInput)","u":"fromTxInput(org.bitcoinj.core.TransactionInput)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"fromTxOut(TransactionOutput)","u":"fromTxOut(org.bitcoinj.core.TransactionOutput)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputData","l":"fromTxOutput(TransactionOutput)","u":"fromTxOutput(org.bitcoinj.core.TransactionOutput)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"FundingSourceAccessor","l":"fundingSource()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"FundingSource","l":"fundingSourceMaintenance()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"fundingSourceMaintenance()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"generateBlocks(int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"generateToAddress(int, Address)","u":"generateToAddress(int,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"generateToAddress(int, Address, Integer)","u":"generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"GenericJsonRpcTool()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport.ThrowingSupplier","l":"get()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NMCMainNetParams","l":"get()"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getAcceptedIssuers()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressGroupingItem","l":"getAccount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getAccount()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddedNodeInfo(boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddedNodeInfo(boolean, String)","u":"getAddedNodeInfo(boolean,java.lang.String)"},{"p":"org.consensusj.analytics.service","c":"TokenRichList.TokenBalancePair","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressGroupingItem","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"getAddress()"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"getAddress()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddressBalance(Address)","u":"getAddressBalance(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddressBalance(List<Address>)","u":"getAddressBalance(java.util.List)"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressRequest","l":"getAddresses()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"getAddresses()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddressInfo(Address)","u":"getAddressInfo(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddressUtxos(Address)","u":"getAddressUtxos(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddressUtxos(List<Address>)","u":"getAddressUtxos(java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getAlternateSSLContext(InputStream)","u":"getAlternateSSLContext(java.io.InputStream)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getAlternateSSLContext(Path)","u":"getAlternateSSLContext(java.nio.file.Path)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getAlternateSSLSocketFactory(InputStream)","u":"getAlternateSSLSocketFactory(java.io.InputStream)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getAlternateSSLSocketFactory(Path)","u":"getAlternateSSLSocketFactory(java.nio.file.Path)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"getAsm()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getbalance()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getbalance()"},{"p":"org.consensusj.analytics.service","c":"TokenRichList.TokenBalancePair","l":"getBalance()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressGroupingItem","l":"getBalance()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressBalanceInfo","l":"getBalance()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getBalance()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBalance()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBalance(String)","u":"getBalance(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBalance(String, Integer)","u":"getBalance(java.lang.String,java.lang.Integer)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"getBase()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"getBestblock()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getBestBlock()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getbestblockhash()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getbestblockhash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getBestBlockHash()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"getBestBlockViaRpc()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getBitcoinBalance(Address)","u":"getBitcoinBalance(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getBitcoinBalance(Address, Integer)","u":"getBitcoinBalance(org.bitcoinj.base.Address,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getBitcoinBalance(Address, Integer, Integer)","u":"getBitcoinBalance(org.bitcoinj.base.Address,java.lang.Integer,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getBits()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getBlock(int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlock(Sha256Hash)","u":"getBlock(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getblock(String, Integer)","u":"getblock(java.lang.String,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblock(String, Integer)","u":"getblock(java.lang.String,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblock2(Sha256Hash, Integer)","u":"getblock2(org.bitcoinj.base.Sha256Hash,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getblockchaininfo()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblockchaininfo()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlockChainInfo()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getblockcount()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblockcount()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlockCount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getBlockhash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getBlockhash()"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getBlockHash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getBlockHash()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getblockhash(Integer)","u":"getblockhash(java.lang.Integer)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblockhash(Integer)","u":"getblockhash(java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlockHash(Integer)","u":"getBlockHash(java.lang.Integer)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getblockheader(String, Boolean)","u":"getblockheader(java.lang.String,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblockheader(String, Boolean)","u":"getblockheader(java.lang.String,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblockheader2(Sha256Hash, Boolean)","u":"getblockheader2(org.bitcoinj.base.Sha256Hash,java.lang.Boolean)"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getBlockHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getBlockHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getBlockindex()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getBlockIndex()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlockInfo(Sha256Hash)","u":"getBlockInfo(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getBlockInfo(Sha256Hash, BlockInfo.IncludeTxFlag)","u":"getBlockInfo(org.bitcoinj.base.Sha256Hash,org.consensusj.bitcoin.json.pojo.BlockInfo.IncludeTxFlag)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getBlocks()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getBlocks()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getBlockSubsidy(int)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getBlocktime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getBlocktime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getBlockTime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getBogoSize()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"getBranchlen()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getCategory()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getCategory()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getChain()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getChainTips()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"ChainTipClient","l":"getChainTips()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"getChainTips()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getChainwork()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getChainWork()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BitcoinClientAccessor","l":"getClient()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"getCode()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"getCode()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getCommands()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getComment()"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getCompositeSSLContext(InputStream)","u":"getCompositeSSLContext(java.io.InputStream)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getCompositeSSLContext(Path)","u":"getCompositeSSLContext(java.nio.file.Path)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getCompositeSSLSocketFactory(InputStream)","u":"getCompositeSSLSocketFactory(java.io.InputStream)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getCompositeSSLSocketFactory(Path)","u":"getCompositeSSLSocketFactory(java.nio.file.Path)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getconnectioncount()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getconnectioncount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getConnections()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getConnections()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"getContext()"},{"p":"org.consensusj.currency","c":"BitcoinCurrencyProvider","l":"getCurrencies(CurrencyQuery)","u":"getCurrencies(javax.money.CurrencyQuery)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"getCurrencyConversion(ConversionQuery)","u":"getCurrencyConversion(javax.money.convert.ConversionQuery)"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getCurrencyID()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getData()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"getData()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getDecoded()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getDefaultAsyncExecutor()"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport","l":"getDefaultAsyncExecutor()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"getDefaultMainNetURI()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getDefaultMaxConf()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"getDefaultRegTestURI()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"getDefaultRegTestWalletURI()"},{"p":"org.consensusj.jsonrpc","c":"AbstractRpcClient","l":"getDefaultSSLContext()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"getDefaultTestNetURI()"},{"p":"org.consensusj.jsonrpc","c":"AbstractRpcClient","l":"getDefaultType()"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"getDefaultType()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getDesc()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getDesc()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getDetails()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getDifficulty()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getDifficulty()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getDifficulty()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getDiskSize()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcErrorException","l":"getError()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"getError()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getErrors()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"getExchangeRate(ConversionQuery)","u":"getExchangeRate(javax.money.convert.ConversionQuery)"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"getExpires_in()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getFee()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getFee()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getFee()"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"getFee(Collection<TransactionInputData>, Collection<TransactionOutputData>)","u":"getFee(java.util.Collection,java.util.Collection)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"getFee(SigningRequest)","u":"getFee(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getFrom()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"FundingSourceAccessor","l":"getFundingSource()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getGas()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getGasPrice()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoResult","l":"getHash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getHash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"getHash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getHashSerialized2()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getHeaders()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getHeight()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoResult","l":"getHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"getHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getHex()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"getHex()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"SignedRawTransaction","l":"getHex()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getHex()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"getHwm()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"getId()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"getId()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressBalanceInfo","l":"getImmature()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TestServers","l":"getInstance()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIschange()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIscompressed()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIsmine()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIsscript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIswatchonly()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIswitness()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"getJsonrpc()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"getJsonrpc()"},{"p":"org.consensusj.jsonrpc","c":"AbstractRpcClient","l":"getJsonRpcVersion()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"getJsonRpcVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getKeypoololdest()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getKeypoolsize()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinFactory","l":"getKit(BitcoinDaemonConfig)","u":"getKit(org.consensusj.daemon.micronaut.BitcoinDaemonConfig)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getLabel()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getLabel()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getLabel()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getLabels()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getLocalServices()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getLocktime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getLockTime()"},{"p":"org.consensusj.jsonrpc","c":"AbstractRpcClient","l":"getMapper()"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"getMapper()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getMerkleroot()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"getMessage()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"getMessage()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"getMethod()"},{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"getMethod(String)","u":"getMethod(java.lang.String)"},{"p":"org.consensusj.jsonrpc.introspection","c":"DelegatingJsonRpcService","l":"getMethod(String)","u":"getMethod(java.lang.String)"},{"p":"org.consensusj.jsonrpc.introspection","c":"JsonRpcServiceWrapper","l":"getMethod(String)","u":"getMethod(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"MethodHelpEntry","l":"getMethodName()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"MethodHelpEntry","l":"getMethodParametersHelp()"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"getMinNonDustValue(TransactionOutputData)","u":"getMinNonDustValue(org.consensusj.bitcoinj.signing.TransactionOutputData)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"getN()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"LoadWalletResult","l":"getName()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"getName()"},{"p":"org.consensusj.exchange.rx","c":"ReactiveExchange","l":"getName()"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"getName()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"getNetIdString()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getNetParams()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"getNetParams()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getNetwork()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getNetwork()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getnetworkinfo()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getnetworkinfo()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getNetworkInfo()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getnewaddress()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getnewaddress()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getNewAddress()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getNewAddress(String)","u":"getNewAddress(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getNextblockhash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getNonce()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getNTx()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"getObservablePair(CurrencyUnitPair)","u":"getObservablePair(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.exchange.rx","c":"ReactiveExchange","l":"getObservablePair(CurrencyUnitPair)","u":"getObservablePair(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getOtherBalanceTotal()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getOtherInfo()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getOutputIndex()"},{"p":"org.consensusj.exchange.rx","c":"ObservablePair","l":"getPair()"},{"p":"org.consensusj.exchange.rx","c":"PolledObservablePair","l":"getPair()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"getParams()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"getPassword()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getPaytxfee()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getPeerGroup()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipService","l":"getPollingInterval()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"getPollingInterval()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getPreviousblockhash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getProtocolversion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getProtocolVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getProxy()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getProxy()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getPubkey()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getRawTransaction(Sha256Hash)","u":"getRawTransaction(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getRawTransactionInfo(Sha256Hash)","u":"getRawTransactionInfo(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressBalanceInfo","l":"getReceived()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getReceivedByAddress(Address)","u":"getReceivedByAddress(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getReceivedByAddress(Address, Integer)","u":"getReceivedByAddress(org.bitcoinj.base.Address,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getRedeemScript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getRedeemScript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getRedeemScript()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BlockchainSyncing","l":"getReferenceBlockHeight()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getRegTestMiningAddress()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"getRegTestWalletURI(String)","u":"getRegTestWalletURI(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getRelayfee()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getRelayFee()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"getReqSigs()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"getResult()"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getRichList()"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool.BitcoinCLICall","l":"getRPCConfig()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"getRPCConfig()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TestServers","l":"getRpcTestPassword()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TestServers","l":"getRpcTestUser()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getSatoshis()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getScript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"getScriptSig()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"getSequence()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"getServerURI()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientHttpUrlConnection","l":"getServerURI()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet","l":"getServerURI()"},{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"getServiceObject()"},{"p":"org.consensusj.jsonrpc.introspection","c":"DelegatingJsonRpcService","l":"getServiceObject()"},{"p":"org.consensusj.jsonrpc.introspection","c":"JsonRpcServiceWrapper","l":"getServiceObject()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getSize()"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceList","l":"getSliceList()"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceListImpl","l":"getSliceList()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getSolvable()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"getStatus()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getStdRelayTxFee()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getStdTxFee()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getSubVersion()"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"getTarget()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getTestnet()"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport.ThrowingSupplier","l":"getThrows()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"getTicker()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getTime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getTime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getTime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getTime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getTimeoffset()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getTimeOffset()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getTimereceived()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getTimeReceived()"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getTimestamp()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getTimestamp()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getTo()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getTotalAmount()"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceList","l":"getTotalOther()"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceListImpl","l":"getTotalOther()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getTransaction(Sha256Hash)","u":"getTransaction(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getTransaction(Sha256Hash, Boolean, Boolean)","u":"getTransaction(org.bitcoinj.base.Sha256Hash,java.lang.Boolean,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getTransactions()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getTx()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"Outpoint","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getTxid()"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getTxId()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"getTxids()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getTxOut(Sha256Hash, Integer)","u":"getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getTxOut(Sha256Hash, Integer, Boolean)","u":"getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getTxOuts()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getTxOutSetInfo()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.service","c":"TxOutSetService","l":"getTxOutSetPublisher()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"getType()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"getType()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"getUpdate(CurrencyUnitPair)","u":"getUpdate(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"getURI()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"getUsername()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoResult","l":"getUtxos()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"getValue()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"getValue()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getValue()"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"getValue()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getVerificationProgress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"getVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getVin()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"Outpoint","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getWalletconflicts()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getWalletConflicts()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getWalletversion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"LoadWalletResult","l":"getWarning()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnloadWalletResult","l":"getWarning()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getWitnessScript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getWitnessScript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getWitnessScript()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getZmqNotifications()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"hash"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"hashblock"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"hashCode()"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"hashCode()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"hashCode()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"hashCode()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"hashtx"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"hasMaxMoney()"},{"p":"org.consensusj.bitcoinj.signing","c":"HDKeychainSigner","l":"HDKeychainSigner(DeterministicKeyChain)","u":"%3Cinit%3E(org.bitcoinj.wallet.DeterministicKeyChain)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"height"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"help()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"help()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"help()"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"help()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"help(String)","u":"help(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"helpAsLines()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"helpAsMethodEntries()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"helpAsStream()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"hexFormat"},{"p":"org.consensusj.bitcoin.json.conversion","c":"HexUtil","l":"hexStringToByteArray(String)","u":"hexStringToByteArray(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"HexUtil","l":"HexUtil()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"httpCode"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"httpMessage"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"hwm()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"ID_MAINNET"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"ID_REGTEST"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"ID_SIGNET"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"ID_TESTNET"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"ID_UNITTESTNET"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"id()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.IncludeTxFlag","l":"IDONLY"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"importPrivKey(ECKey, String, boolean)","u":"importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest.RawInput","l":"index()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"index()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Basic","l":"index()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Complete","l":"index()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"index()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Signable","l":"index()"},{"p":"org.consensusj.daemon.micronaut","c":"JsonRpcController","l":"index(JsonRpcRequest)","u":"index(org.consensusj.jsonrpc.JsonRpcRequest)"},{"p":"org.consensusj.jsonrpc.daemon","c":"JsonRpcController","l":"index(JsonRpcRequest)","u":"index(org.consensusj.jsonrpc.JsonRpcRequest)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"initialize()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"initRegTestWallet()"},{"p":"org.consensusj.bitcoinj.signing","c":"DefaultSigningRequest","l":"inputs()"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest","l":"inputs()"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningRequest","l":"inputs()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"interval"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"invalid()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"invalid(String, Exception)","u":"invalid(java.lang.String,java.lang.Exception)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"Invalid(String, Exception)","u":"%3Cinit%3E(java.lang.String,java.lang.Exception)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"invalidateBlock(Sha256Hash)","u":"invalidateBlock(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"isAbandoned()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"isAddressIndexEnabled()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"isAvailable(ConversionQuery)","u":"isAvailable(javax.money.convert.ConversionQuery)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"isBip125Replaceable()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"isCoinbase()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"isCoinbase()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"SignedRawTransaction","l":"isComplete()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"isGenerated()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"isInvolvesWatchOnly()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"isSafe()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"isSolvable()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"isSpendable()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"isTickerAvailable()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"isTrusted()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinFactory","l":"jacksonModule()"},{"p":"org.consensusj.jsonrpc.cli","c":"JavaLoggingSupport","l":"JavaLoggingSupport()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"jsonrpc()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientHttpUrlConnection","l":"JsonRpcClientHttpUrlConnection(JsonRpcMessage.Version, URI, String, String)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientHttpUrlConnection","l":"JsonRpcClientHttpUrlConnection(SSLContext, JsonRpcMessage.Version, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientHttpUrlConnection","l":"JsonRpcClientHttpUrlConnection(SSLSocketFactory, JsonRpcMessage.Version, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet","l":"JsonRpcClientJavaNet(JsonRpcMessage.Version, URI, String, String)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet","l":"JsonRpcClientJavaNet(SSLContext, JsonRpcMessage.Version, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet","l":"JsonRpcClientJavaNet(URI, String, String)","u":"%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"jsonRpcCode"},{"p":"org.consensusj.jsonrpc.daemon","c":"JsonRpcController","l":"JsonRpcController(JsonRpcService)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcService)"},{"p":"org.consensusj.daemon.micronaut","c":"JsonRpcController","l":"JsonRpcController(WalletAppKitJsonRpcService)","u":"%3Cinit%3E(org.consensusj.daemon.micronaut.WalletAppKitJsonRpcService)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"JsonRpcError(int, String, Object)","u":"%3Cinit%3E(int,java.lang.String,java.lang.Object)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcErrorException","l":"JsonRpcErrorException(JsonRpcError)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcErrorException","l":"JsonRpcErrorException(JsonRpcError, Throwable)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError,java.lang.Throwable)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcErrorException","l":"JsonRpcErrorException(JsonRpcError.Error, Throwable)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError.Error,java.lang.Throwable)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcException","l":"JsonRpcException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcException","l":"JsonRpcException(String, Throwable)","u":"%3Cinit%3E(java.lang.String,java.lang.Throwable)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage","l":"JsonRpcMessage()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"JsonRpcRequest(JsonRpcMessage.Version, long, String, List<Object>)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,long,java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"JsonRpcRequest(JsonRpcMessage.Version, String, List<Object>)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"JsonRpcRequest(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"JsonRpcRequest(String, List<Object>)","u":"%3Cinit%3E(java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"JsonRpcRequest(String, String, String, List<Object>)","u":"%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"JsonRpcResponse(JsonRpcRequest, JsonRpcError)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcError)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"JsonRpcResponse(JsonRpcRequest, RSLT)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcRequest,RSLT)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"JsonRpcResponse(String, String, RSLT, JsonRpcError)","u":"%3Cinit%3E(java.lang.String,java.lang.String,RSLT,org.consensusj.jsonrpc.JsonRpcError)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"JsonRpcStatusException(String, int, String, int, String, JsonRpcResponse<?>)","u":"%3Cinit%3E(java.lang.String,int,java.lang.String,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)"},{"p":"org.consensusj.jsonrpc.cli","c":"JsonRpcToolOptions","l":"JsonRpcToolOptions()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc","c":"AbstractRpcClient","l":"jsonRpcVersion"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"jsonRpcVersion"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"key(HDPath)","u":"key(org.bitcoinj.crypto.HDPath)"},{"p":"org.consensusj.bitcoinj.signing","c":"HDKeychainSigner","l":"keyForHash(byte[])"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"keyForInput(TransactionInputData)","u":"keyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)"},{"p":"org.consensusj.bitcoinj.signing","c":"ECKeySigner","l":"keyForInput(TransactionInputData)","u":"keyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)"},{"p":"org.consensusj.bitcoinj.signing","c":"HDKeychainSigner","l":"keyForInput(TransactionInputData)","u":"keyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"kit"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"KnowmExchangeRateProvider(String, Map<CurrencyUnit, String>, Collection<CurrencyUnitPair>)","u":"%3Cinit%3E(java.lang.String,java.util.Map,java.util.Collection)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"label"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceAccumulator","l":"LargestSliceAccumulator(int, Function<E, N>, N, BinaryOperator<N>)","u":"%3Cinit%3E(int,java.util.function.Function,N,java.util.function.BinaryOperator)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"LargestSliceCollector(int, Function<E, N>, N, BinaryOperator<N>)","u":"%3Cinit%3E(int,java.util.function.Function,N,java.util.function.BinaryOperator)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceListImpl","l":"LargestSliceListImpl(List<E>, N)","u":"%3Cinit%3E(java.util.List,N)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"legacyAddressHeader()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"legacyP2SHHeader()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"line"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listAddressGroupings()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listReceivedByAddress(Integer, Boolean)","u":"listReceivedByAddress(java.lang.Integer,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listTransactions()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listTransactions(String, Integer)","u":"listTransactions(java.lang.String,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listTransactions(String, Integer, Integer, Boolean)","u":"listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listUnspent()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listUnspent(Integer, Integer)","u":"listUnspent(java.lang.Integer,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listUnspent(Integer, Integer, Address)","u":"listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listUnspent(Integer, Integer, List<Address>)","u":"listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listUnspent(Integer, Integer, List<Address>, Boolean)","u":"listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"listunspent(Integer, Integer, List<String>, Boolean)","u":"listunspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"listunspent(Integer, Integer, List<String>, Boolean)","u":"listunspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"listUnspentJ(Address)","u":"listUnspentJ(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"listUnspentOutPoints(Address)","u":"listUnspentOutPoints(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listWallets()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"LoadWalletResult","l":"LoadWalletResult(String, String)","u":"%3Cinit%3E(java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BlockchainSyncing","l":"log"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipService","l":"log"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"log"},{"p":"org.consensusj.jsonrpc.introspection","c":"JsonRpcServiceWrapper","l":"log"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"log"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"TxOutSetWatcherSample","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"SampleBitcoinZmqClient","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"Demo","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.daemon.micronaut","c":"Application","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.jsonrpc.daemon","c":"Application","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.jsonrpc.introspection.sample","c":"MathService","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.namecoin.jsonrpc.cli","c":"NmcLookup","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"MAINNET"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"mapper"},{"p":"org.consensusj.jsonrpc","c":"AbstractRpcClient","l":"mapper"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"marketDataService"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"marketDataService"},{"p":"org.consensusj.jsonrpc.introspection.sample","c":"MathService","l":"MathService()","u":"%3Cinit%3E()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"MAX_MONEY"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"maxMoney()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"merkleroot"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"METHOD"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"METHOD_NOT_FOUND"},{"p":"org.consensusj.bitcoin.json.pojo","c":"MethodHelpEntry","l":"MethodHelpEntry(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"MethodHelpEntry","l":"MethodHelpEntry(String, String)","u":"%3Cinit%3E(java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"MethodHelpEntry","l":"MethodHelpEntry(String[])","u":"%3Cinit%3E(java.lang.String[])"},{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"methods"},{"p":"org.consensusj.daemon.micronaut","c":"MicronautWalletAppKitService","l":"MicronautWalletAppKitService(WalletAppKit)","u":"%3Cinit%3E(org.bitcoinj.kits.WalletAppKit)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"MIN_NONDUST_OUTPUT"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"minerStart(int)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"minerStop()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"monitoredCurrencies"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"n"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"name"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"name"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"name()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"name()"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"name()"},{"p":"org.consensusj.namecoin.jsonrpc","c":"NamecoinClient","l":"NamecoinClient(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.namecoin.jsonrpc","c":"NamecoinClient","l":"NamecoinClient(RpcConfig)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"NameData(String, String, Sha256Hash, Address, int)","u":"%3Cinit%3E(java.lang.String,java.lang.String,org.bitcoinj.base.Sha256Hash,org.bitcoinj.base.Address,int)"},{"p":"org.consensusj.namecoin.jsonrpc","c":"NamecoinClient","l":"nameShow(String)","u":"nameShow(java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"network"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"network()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"network()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"network()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"networkId()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"NetworkInfo(int, String, int, int, int, String, int, byte[], Object[], Object[])","u":"%3Cinit%3E(int,java.lang.String,int,int,int,java.lang.String,int,byte[],java.lang.Object[],java.lang.Object[])"},{"p":"org.consensusj.bitcoin.jsonrpc.internal","c":"BitcoinClientThreadFactory","l":"newThread(Runnable)","u":"newThread(java.lang.Runnable)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"nextblockhash"},{"p":"org.consensusj.namecoin.jsonrpc.cli","c":"NmcLookup","l":"NmcLookup()","u":"%3Cinit%3E()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NMCMainNetParams","l":"NMCMainNetParams()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.IncludeTxFlag","l":"NO"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"nonce"},{"p":"org.consensusj.jsonrpc.internal","c":"NumberStringSerializer","l":"NumberStringSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"object()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"observable"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"observablePairs"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"observerList"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputData","l":"of(Address, Coin)","u":"of(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"of(JsonRpcError.Error)","u":"of(org.consensusj.jsonrpc.JsonRpcError.Error)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcErrorException","l":"of(JsonRpcError.Error)","u":"of(org.consensusj.jsonrpc.JsonRpcError.Error)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"of(JsonRpcError.Error, Throwable)","u":"of(org.consensusj.jsonrpc.JsonRpcError.Error,java.lang.Throwable)"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest","l":"of(List<RawTransactionSigningRequest.RawInput>, List<TransactionOutputData>)","u":"of(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningRequest","l":"of(List<TransactionInputData>, List<TransactionOutputData>)","u":"of(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningRequest","l":"of(List<TransactionInputData>, Map<Address, Coin>)","u":"of(java.util.List,java.util.Map)"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"of(Sha256Hash, int)","u":"of(org.bitcoinj.base.Sha256Hash,int)"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"of(Sha256Hash, int, Coin)","u":"of(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"of(Sha256Hash, int, Coin, Script)","u":"of(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin,org.bitcoinj.script.Script)"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"of(String)","u":"of(java.lang.String)"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"of(String)","u":"of(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"SignedRawTransaction","l":"of(Transaction)","u":"of(org.bitcoinj.core.Transaction)"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"of(TransactionOutPoint)","u":"of(org.bitcoinj.core.TransactionOutPoint)"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"of(URI)","u":"of(java.net.URI)"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"of(URI)","u":"of(java.net.URI)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"of(Utxo.Complete)","u":"of(org.consensusj.bitcoinj.signing.Utxo.Complete)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"of(Utxo.Signable, Address)","u":"of(org.consensusj.bitcoinj.signing.Utxo.Signable,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"ofActive(int, Sha256Hash)","u":"ofActive(int,org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest","l":"ofTransaction(Transaction)","u":"ofTransaction(org.bitcoinj.core.Transaction)"},{"p":"org.consensusj.exchange","c":"ExchangeRateObserver","l":"onExchangeRateChange(ExchangeRateChange)","u":"onExchangeRateChange(org.consensusj.exchange.ExchangeRateChange)"},{"p":"org.consensusj.daemon.micronaut","c":"MicronautWalletAppKitService","l":"onShutdown(ServerShutdownEvent)","u":"onShutdown(io.micronaut.runtime.server.event.ServerShutdownEvent)"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"onShutdown(ServerShutdownEvent)","u":"onShutdown(io.micronaut.runtime.server.event.ServerShutdownEvent)"},{"p":"org.consensusj.daemon.micronaut","c":"MicronautWalletAppKitService","l":"onStartup(ServerStartupEvent)","u":"onStartup(io.micronaut.runtime.server.event.ServerStartupEvent)"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"onStartup(ServerStartupEvent)","u":"onStartup(io.micronaut.runtime.server.event.ServerStartupEvent)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputOpReturn","l":"opReturnData()"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"options()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"options()"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"options()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"Outpoint","l":"Outpoint(Sha256Hash, int)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TransactionIngredients","l":"outPoints"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLICommandResult","l":"output"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"outputObject"},{"p":"org.consensusj.bitcoinj.signing","c":"DefaultSigningRequest","l":"outputs()"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest","l":"outputs()"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningRequest","l":"outputs()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"outputStyle"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"pair"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"pair"},{"p":"org.consensusj.exchange.rx","c":"ExchangeRateUpdate","l":"pair"},{"p":"org.consensusj.exchange","c":"ExchangeUtils","l":"pairsConvert(List<String>)","u":"pairsConvert(java.util.List)"},{"p":"org.consensusj.exchange","c":"ExchangeUtils","l":"pairsConvert(String[])","u":"pairsConvert(java.lang.String[])"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameterParser","l":"parse(List<String>)","u":"parse(java.util.List)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"parse(String, CliParameter.Parser)","u":"parse(java.lang.String,org.consensusj.jsonrpc.cli.CliParameter.Parser)"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLITestSupport","l":"parseCommandLine(String)","u":"parseCommandLine(java.lang.String)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"pathFor(ScriptType, NetworkParameters)","u":"pathFor(org.bitcoinj.base.ScriptType,org.bitcoinj.core.NetworkParameters)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"pathFor(ScriptType, String)","u":"pathFor(org.bitcoinj.base.ScriptType,java.lang.String)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"PeerSerializer","l":"PeerSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"poll()"},{"p":"org.consensusj.exchange.rx","c":"PolledObservablePair","l":"PolledObservablePair(CurrencyUnitPair, Supplier<ExchangeRateUpdate>, Observable<Long>)","u":"%3Cinit%3E(org.consensusj.exchange.CurrencyUnitPair,java.util.function.Supplier,io.reactivex.rxjava3.core.Observable)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipService","l":"pollForDistinctChainTip()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"pollForTicker()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"PollingChainTipServiceImpl(BitcoinClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"PollingChainTipServiceImpl(BitcoinClient, Observable<Long>)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient,io.reactivex.rxjava3.core.Observable)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"pollingFunction()"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"pollOnce(AsyncSupport.ThrowingSupplier<RSLT>)","u":"pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxJsonChainTipClient","l":"pollOnNewBlock(AsyncSupport.ThrowingSupplier<RSLT>)","u":"pollOnNewBlock(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"previousblockhash"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"PrevTxOutInfo(Sha256Hash, int, String, String, String, Coin)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,java.lang.String,java.lang.String,java.lang.String,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"printError(JsonRpcClientTool.Call, String)","u":"printError(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call,java.lang.String)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"printHelp(JsonRpcClientTool.Call, String)","u":"printHelp(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TransactionIngredients","l":"privateKey"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"providerContext"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"providerContext"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"pubKeyForInput(TransactionInputData)","u":"pubKeyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)"},{"p":"org.consensusj.bitcoinj.signing","c":"HDKeychainSigner","l":"pubKeyFromPubKeyHash(byte[])"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"PURPOSE_BIP44"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"PURPOSE_BIP49"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"PURPOSE_BIP84"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"purpose(ScriptType)","u":"purpose(org.bitcoinj.base.ScriptType)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"WalletTestUtil","l":"randomWalletName()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"WalletTestUtil","l":"randomWalletName(String, int)","u":"randomWalletName(java.lang.String,int)"},{"p":"org.consensusj.exchange","c":"ExchangeRateChange","l":"rate"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"rawblock"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest.RawInput","l":"RawInput(Sha256Hash, int, Script)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.script.Script)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"RawTransactionInfo(String, Sha256Hash, long, long, RawTransactionInfo.VinList, RawTransactionInfo.VoutList, Sha256Hash, int, long, long)","u":"%3Cinit%3E(java.lang.String,org.bitcoinj.base.Sha256Hash,long,long,org.consensusj.bitcoin.json.pojo.RawTransactionInfo.VinList,org.consensusj.bitcoin.json.pojo.RawTransactionInfo.VoutList,org.bitcoinj.base.Sha256Hash,int,long,long)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"RawTransactionInfo(Transaction)","u":"%3Cinit%3E(org.bitcoinj.core.Transaction)"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest","l":"RawTransactionSigningRequest(List<RawTransactionSigningRequest.RawInput>, List<TransactionOutputData>)","u":"%3Cinit%3E(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"rawtx"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"ReactiveKnowmExchangeProvider(ExchangeSpecification, Map<CurrencyUnit, String>, Collection<CurrencyUnitPair>, Observable<Long>)","u":"%3Cinit%3E(org.knowm.xchange.ExchangeSpecification,java.util.Map,java.util.Collection,io.reactivex.rxjava3.core.Observable)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"ReactiveKnowmExchangeProvider(ExchangeSpecification, String, Map<CurrencyUnit, String>, Collection<CurrencyUnitPair>, Observable<Long>)","u":"%3Cinit%3E(org.knowm.xchange.ExchangeSpecification,java.lang.String,java.util.Map,java.util.Collection,io.reactivex.rxjava3.core.Observable)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"ReactiveKnowmExchangeProvider(String, Map<CurrencyUnit, String>, Collection<CurrencyUnitPair>, Observable<Long>)","u":"%3Cinit%3E(java.lang.String,java.util.Map,java.util.Collection,io.reactivex.rxjava3.core.Observable)"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConfFile","l":"read()"},{"p":"org.consensusj.namecoin.jsonrpc","c":"NamecoinClient","l":"readConfig()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConfFile","l":"readDefaultConfig()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConfFile","l":"readWithFallback()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"ReceivedByAddressInfo(Address, Coin, int, List<Sha256Hash>, String)","u":"%3Cinit%3E(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,int,java.util.List,java.lang.String)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"receivingAddr(int)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"receivingKey(int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"reconsiderBlock(Sha256Hash)","u":"reconsiderBlock(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.jsonrpc.introspection","c":"JsonRpcServiceWrapper","l":"reflect(Class<?>)","u":"reflect(java.lang.Class)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"registerExchangeRateObserver(CurrencyUnitPair, ExchangeRateObserver)","u":"registerExchangeRateObserver(org.consensusj.exchange.CurrencyUnitPair,org.consensusj.exchange.ExchangeRateObserver)"},{"p":"org.consensusj.exchange","c":"ObservableExchangeRateProvider","l":"registerExchangeRateObserver(CurrencyUnitPair, ExchangeRateObserver)","u":"registerExchangeRateObserver(org.consensusj.exchange.CurrencyUnitPair,org.consensusj.exchange.ExchangeRateObserver)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"REGTEST"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"REGTEST_WALLET_NAME"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestEnvironment","l":"RegTestEnvironment(BitcoinExtendedClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"RegTestFundingSource(BitcoinExtendedClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"FundingSource","l":"requestBitcoin(Address, Coin)","u":"requestBitcoin(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"requestBitcoin(Address, Coin)","u":"requestBitcoin(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"response"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"responseJson"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"responseTypeFor(Class<?>)","u":"responseTypeFor(java.lang.Class)"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"responseTypeFor(JavaType)","u":"responseTypeFor(com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"result(RSLT)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"result(T)"},{"p":"org.consensusj.analytics.service","c":"RichListService","l":"richList(ID, int)","u":"richList(ID,int)"},{"p":"org.consensusj.analytics.service","c":"RichListService","l":"richListUpdates(ID, int)","u":"richListUpdates(ID,int)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool.BitcoinCLICall","l":"rpcClient()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"rpcClient()"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool.BitcoinCLICall","l":"rpcClient(SSLContext)","u":"rpcClient(javax.net.ssl.SSLContext)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"rpcClient(SSLContext)","u":"rpcClient(javax.net.ssl.SSLContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"RpcClientModule","l":"RpcClientModule()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"RpcClientModule","l":"RpcClientModule(Network)","u":"%3Cinit%3E(org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"RpcClientModule","l":"RpcClientModule(Network, boolean)","u":"%3Cinit%3E(org.bitcoinj.base.Network,boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"RpcConfig(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"RpcConfig(NetworkParameters, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"RpcConfig(String, String, String, String)","u":"%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"RpcConfig(String, URI, String, String)","u":"%3Cinit%3E(java.lang.String,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"rpcconnect"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"RPCCONNECT_DEFAULT"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpcfile"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpchost"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"rpcport"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"RPCPORT_DEFAULT"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"RPCPORT_MAINNET"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"RPCPORT_REGTEST"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"RPCPORT_TESTNET"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpcproto"},{"p":"org.consensusj.bitcoin.json.conversion","c":"RpcServerModule","l":"RpcServerModule()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"RpcServerModule","l":"RpcServerModule(NetworkParameters)","u":"%3Cinit%3E(org.bitcoinj.core.NetworkParameters)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpcssl"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"rpcTool"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpcURI(String, int)","u":"rpcURI(java.lang.String,int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpcWalletURI(String, int, String)","u":"rpcWalletURI(java.lang.String,int,java.lang.String)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"run(BaseJsonRpcTool.CommonsCLICall)","u":"run(org.consensusj.jsonrpc.cli.BaseJsonRpcTool.CommonsCLICall)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"run(JsonRpcClientTool.Call)","u":"run(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call)"},{"p":"org.consensusj.jsonrpc.cli","c":"BitcoinCLITool","l":"run(PrintWriter, PrintWriter, String...)","u":"run(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLITestSupport","l":"runTool(BaseJsonRpcTool, String...)","u":"runTool(org.consensusj.jsonrpc.cli.BaseJsonRpcTool,java.lang.String...)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"RxBitcoinClient(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"RxBitcoinClient(Network, URI, String, String, boolean)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"RxBitcoinClient(SSLContext, Network, URI, String, String, boolean)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"RxBitcoinClient(SSLSocketFactory, Network, URI, String, String, boolean)","u":"%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"RxBitcoinSinglePortZmqService(URI, ThreadFactory, BitcoinZmqMessage.Topic...)","u":"%3Cinit%3E(java.net.URI,java.util.concurrent.ThreadFactory,org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic...)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"RxBitcoinZmqBinaryService(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"RxBitcoinZmqBinaryService(RxBitcoinClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"RxBitcoinZmqService(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"RxBitcoinZmqService(RxBitcoinClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"RxPeerGroup(PeerGroup)","u":"%3Cinit%3E(org.bitcoinj.core.PeerGroup)"},{"p":"org.consensusj.rx.zeromq","c":"RxZmqContext","l":"RxZmqContext(URI, List<String>)","u":"%3Cinit%3E(java.net.URI,java.util.List)"},{"p":"org.consensusj.rx.zeromq","c":"RxZmqContext","l":"RxZmqContext(URI, List<String>, ThreadFactory)","u":"%3Cinit%3E(java.net.URI,java.util.List,java.util.concurrent.ThreadFactory)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"SampleBitcoinZmqClient","l":"SampleBitcoinZmqClient()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"script()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"script()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"scriptPubKey"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"scriptPubKey()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputData","l":"scriptPubKey()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputDataScript","l":"scriptPubKey()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputOpReturn","l":"scriptPubKey()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Complete","l":"scriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"ScriptPubKeyInfo(Script)","u":"%3Cinit%3E(org.bitcoinj.script.Script)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"ScriptPubKeyInfo(String, String, int, String, List<Address>)","u":"%3Cinit%3E(java.lang.String,java.lang.String,int,java.lang.String,java.util.List)"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"ScriptRunner","l":"ScriptRunner()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"ScriptRunner","l":"ScriptRunner(RpcConfig)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ScriptSerializer","l":"ScriptSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"scriptSig"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest.RawInput","l":"scriptSig()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"segwitAddressHrp()"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"send(String, Class<R>, List<Object>)","u":"send(java.lang.String,java.lang.Class,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"send(String, Class<R>, List<Object>)","u":"send(java.lang.String,java.lang.Class,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"send(String, Class<R>, Object...)","u":"send(java.lang.String,java.lang.Class,java.lang.Object...)"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"send(String, JavaType, List<Object>)","u":"send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"send(String, JavaType, Object...)","u":"send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"send(String, List<Object>)","u":"send(java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"send(String, List<Object>)","u":"send(java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"send(String, Object...)","u":"send(java.lang.String,java.lang.Object...)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"sendBitcoin(Address, Address, Coin)","u":"sendBitcoin(org.bitcoinj.base.Address,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"sendBitcoin(Address, Map<Address, Coin>)","u":"sendBitcoin(org.bitcoinj.base.Address,java.util.Map)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendFrom(String, Address, Coin)","u":"sendFrom(java.lang.String,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendMany(String, Map<Address, Coin>)","u":"sendMany(java.lang.String,java.util.Map)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"sendrawtransaction(String)","u":"sendrawtransaction(java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"sendrawtransaction(String)","u":"sendrawtransaction(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendRawTransaction(String)","u":"sendRawTransaction(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendRawTransaction(String, Coin)","u":"sendRawTransaction(java.lang.String,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendRawTransaction(Transaction)","u":"sendRawTransaction(org.bitcoinj.core.Transaction)"},{"p":"org.consensusj.bitcoinj.service","c":"SendTransactionService","l":"sendRawTransaction(Transaction)","u":"sendRawTransaction(org.bitcoinj.core.Transaction)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendRawTransaction(Transaction, Coin)","u":"sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoinj.service","c":"SendTransactionService","l":"sendRawTransaction(Transaction, Coin)","u":"sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"sendRequestForResponse(JsonRpcRequest)","u":"sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"sendRequestForResponse(JsonRpcRequest, JavaType)","u":"sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientHttpUrlConnection","l":"sendRequestForResponse(JsonRpcRequest, JavaType)","u":"sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"sendRequestForResponseAsync(JsonRpcRequest, JavaType)","u":"sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientHttpUrlConnection","l":"sendRequestForResponseAsync(JsonRpcRequest, JavaType)","u":"sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet","l":"sendRequestForResponseAsync(JsonRpcRequest, JavaType)","u":"sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendToAddress(Address, Coin)","u":"sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendToAddress(Address, Coin, String, String)","u":"sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"sendtoaddress(String, Double)","u":"sendtoaddress(java.lang.String,java.lang.Double)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"sendtoaddress(String, Double)","u":"sendtoaddress(java.lang.String,java.lang.Double)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"sequence"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"sequence"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage","l":"sequenceNumber()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressSerializer","l":"serialize(Address, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.base.Address,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"CoinSerializer","l":"serialize(Coin, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.base.Coin,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ECKeySerializer","l":"serialize(ECKey, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.crypto.ECKey,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"PeerSerializer","l":"serialize(Peer, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.core.Peer,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ScriptSerializer","l":"serialize(Script, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.script.Script,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"Sha256HashSerializer","l":"serialize(Sha256Hash, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.base.Sha256Hash,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.jsonrpc.internal","c":"NumberStringSerializer","l":"serialize(String, JsonGenerator, SerializerProvider)","u":"serialize(java.lang.String,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"TransactionHexSerializer","l":"serialize(Transaction, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.core.Transaction,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"TransactionSerializer","l":"serialize(Transaction, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.core.Transaction,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"SERVER_ERROR"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"SERVER_EXCEPTION"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"ServerInfo(int, int, int, Coin, int, int, int, String, BigDecimal, Boolean, int, int, Coin, Coin, String)","u":"%3Cinit%3E(int,int,int,org.bitcoinj.base.Coin,int,int,int,java.lang.String,java.math.BigDecimal,java.lang.Boolean,int,int,org.bitcoinj.base.Coin,org.bitcoinj.base.Coin,java.lang.String)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"serverPort()"},{"p":"org.consensusj.exchange.rx","c":"ExchangeRateUpdate","l":"serverTimeStamp"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"setTicker(Ticker)","u":"setTicker(org.knowm.xchange.dto.marketdata.Ticker)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"setTxFee(Coin)","u":"setTxFee(org.bitcoinj.base.Coin)"},{"p":"org.consensusj.jsonrpc.cli","c":"JavaLoggingSupport","l":"setVerbose()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"Sha256HashDeserializer","l":"Sha256HashDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.Sha256HashList","l":"Sha256HashList(List<Sha256Hash>)","u":"%3Cinit%3E(java.util.List)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"Sha256HashSerializer","l":"Sha256HashSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Signable","l":"Signable(Sha256Hash, int, Coin)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"SignedRawTransaction","l":"SignedRawTransaction(String, boolean)","u":"%3Cinit%3E(java.lang.String,boolean)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"SIGNET"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"signrawtransactionwithwallet(String)","u":"signrawtransactionwithwallet(java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"signrawtransactionwithwallet(String)","u":"signrawtransactionwithwallet(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"signRawTransactionWithWallet(String)","u":"signRawTransactionWithWallet(java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"signSendToAddress(Address, Coin)","u":"signSendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoinj.service","c":"SignTransactionService","l":"signSendToAddress(Address, Coin)","u":"signSendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"signTransaction(RawTransactionSigningRequest)","u":"signTransaction(org.consensusj.bitcoinj.signing.RawTransactionSigningRequest)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"signTransaction(SigningRequest)","u":"signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"signTransaction(SigningRequest)","u":"signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionSigner","l":"signTransaction(SigningRequest)","u":"signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"size"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"source()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"source()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"source()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"start()"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"start()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"start()"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"start()"},{"p":"org.consensusj.exchange","c":"ObservableExchangeRateProvider","l":"start()"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLICommandResult","l":"status"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"stdRelayTxFee"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"stdTxFee"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"stdTxFeeSatoshis"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"stop()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"stop()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"stop()"},{"p":"org.consensusj.daemon.micronaut","c":"MicronautWalletAppKitService","l":"stop()"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"stop()"},{"p":"org.consensusj.exchange","c":"ObservableExchangeRateProvider","l":"stop()"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"stop()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"stream()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"stream()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"stream()"},{"p":"org.consensusj.exchange.rx","c":"PolledObservablePair","l":"subscribeActual(Observer<? super ExchangeRateUpdate>)","u":"subscribeActual(io.reactivex.rxjava3.core.Observer)"},{"p":"org.consensusj.jsonrpc.introspection.sample","c":"MathService","l":"subtract(Integer, Integer)","u":"subtract(java.lang.Integer,java.lang.Integer)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"sumInputs(Collection<TransactionInputData>)","u":"sumInputs(java.util.Collection)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"sumInputSats(Collection<TransactionInputData>)","u":"sumInputSats(java.util.Collection)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"sumOutputs(Collection<TransactionOutputData>)","u":"sumOutputs(java.util.Collection)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"sumOutputSats(Collection<TransactionOutputData>)","u":"sumOutputSats(java.util.Collection)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"supplier()"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport","l":"supplyAsync(AsyncSupport.ThrowingSupplier<T>)","u":"supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport","l":"supplyAsync(AsyncSupport.ThrowingSupplier<T>, Executor)","u":"supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"TESTNET"},{"p":"org.consensusj.bitcoinj.signing","c":"TestnetFeeCalculator","l":"TestnetFeeCalculator()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TestServers","l":"TestServers()","u":"%3Cinit%3E()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"tickerMapper(Ticker)","u":"tickerMapper(org.knowm.xchange.dto.marketdata.Ticker)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"tickerSymbolConversions"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"tickerSymbolConversions"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"time"},{"p":"org.consensusj.exchange","c":"ExchangeRateChange","l":"timestamp"},{"p":"org.consensusj.analytics.service","c":"TokenRichList.TokenBalancePair","l":"TokenBalancePair(Address, N)","u":"%3Cinit%3E(org.bitcoinj.base.Address,N)"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"TokenRichList(int, Sha256Hash, long, ID, List<TokenRichList.TokenBalancePair<N>>, N)","u":"%3Cinit%3E(int,org.bitcoinj.base.Sha256Hash,long,ID,java.util.List,N)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"toMutableInput()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputData","l":"toMutableOutput()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"toOutPoint()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"toOutPoint()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage","l":"topic()"},{"p":"org.consensusj.rx.zeromq","c":"RxZmqContext","l":"topicPublisher(String)","u":"topicPublisher(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"Outpoint","l":"toString()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"toString()"},{"p":"org.consensusj.decentralizedid.btcr","c":"ExtendedTxRef","l":"toString()"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"toString()"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"toString()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"toString()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"toString()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"toString()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"toString()"},{"p":"org.consensusj.bitcoinj.signing","c":"DefaultSigningRequest","l":"toUnsignedTransaction()"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningRequest","l":"toUnsignedTransaction()"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"toURI()"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest.RawInput","l":"toUtxo()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"toUtxo()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"toUtxo()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainBinaryService","l":"transactionBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"transactionBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"transactionBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainBinaryService","l":"transactionHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"transactionHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"transactionHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"transactionHashPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"transactionHashPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"transactionHashPublisher()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"TransactionHexSerializer","l":"TransactionHexSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TransactionIngredients","l":"TransactionIngredients()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"TransactionInputDataUtxo(Sha256Hash, int, Coin, Script)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin,org.bitcoinj.script.Script)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"TransactionOutputAddress(Coin, Address)","u":"%3Cinit%3E(org.bitcoinj.base.Coin,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"TransactionOutputAddress(long, Address)","u":"%3Cinit%3E(long,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"TransactionOutputAddress(long, String)","u":"%3Cinit%3E(long,java.lang.String)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputDataScript","l":"TransactionOutputDataScript(Coin, Script)","u":"%3Cinit%3E(org.bitcoinj.base.Coin,org.bitcoinj.script.Script)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputOpReturn","l":"TransactionOutputOpReturn(byte[])","u":"%3Cinit%3E(byte[])"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"transactionPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"transactionPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"transactionPublisher()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"TransactionSerializer","l":"TransactionSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionVerification","l":"TransactionVerification()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"tx"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"txid"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest.RawInput","l":"txId()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"txId()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Basic","l":"txId()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Complete","l":"txId()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Signable","l":"txId()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"txId()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"txids"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"TxOutInfo(Sha256Hash, int, Coin, Map, int, boolean)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin,java.util.Map,int,boolean)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"TxOutSetInfo(int, Sha256Hash, long, long, long, Sha256Hash, long, Coin)","u":"%3Cinit%3E(int,org.bitcoinj.base.Sha256Hash,long,long,long,org.bitcoinj.base.Sha256Hash,long,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.service","c":"TxOutSetService","l":"TxOutSetService(RxBitcoinClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"TxOutSetWatcherSample","l":"TxOutSetWatcherSample()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"type()"},{"p":"org.consensusj.jsonrpc","c":"JacksonRpcClient","l":"typeForClass(Class<?>)","u":"typeForClass(java.lang.Class)"},{"p":"org.consensusj.exchange.rx","c":"ExchangeRateUpdate","l":"unknown(CurrencyUnitPair)","u":"unknown(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"unloadWallet()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"unloadWallet(String, Boolean)","u":"unloadWallet(java.lang.String,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnloadWalletResult","l":"UnloadWalletResult(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"UnspentOutput(Sha256Hash, int, Address, String, String, Coin, int, String, String, boolean, boolean, String, boolean)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Address,java.lang.String,java.lang.String,org.bitcoinj.base.Coin,int,java.lang.String,java.lang.String,boolean,boolean,java.lang.String,boolean)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"uriScheme()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"usage"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"usage()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"V1"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"V2"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"valid()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"valid(String, Object)","u":"valid(java.lang.String,java.lang.Object)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"Valid(String, Object)","u":"%3Cinit%3E(java.lang.String,java.lang.Object)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"value"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage","l":"value()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.IncludeTxFlag","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.IncludeTxFlag","l":"values()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"values()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"values()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"values()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"values()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"verbose"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"verify(Transaction, List<TransactionInputData>)","u":"verify(org.bitcoinj.core.Transaction,java.util.List)"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"verifyInput(Transaction, int, TransactionInputData)","u":"verifyInput(org.bitcoinj.core.Transaction,int,org.consensusj.bitcoinj.signing.TransactionInputData)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"version"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"Vin(Sha256Hash, long, Object, long)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,long,java.lang.Object,long)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.VinList","l":"VinList()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"vout"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"Vout(Coin, int, RawTransactionInfo.ScriptPubKeyInfo)","u":"%3Cinit%3E(org.bitcoinj.base.Coin,int,org.consensusj.bitcoin.json.pojo.RawTransactionInfo.ScriptPubKeyInfo)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.VoutList","l":"VoutList()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BlockChainEnvironment","l":"waitForBlock()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestEnvironment","l":"waitForBlock()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"waitForBlock(int, int)","u":"waitForBlock(int,int)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BlockChainEnvironment","l":"waitForBlocks(int)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestEnvironment","l":"waitForBlocks(int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"waitForServer(int)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BlockchainSyncing","l":"waitForSync(BitcoinClient)","u":"waitForSync(org.consensusj.bitcoin.jsonrpc.BitcoinClient)"},{"p":"org.consensusj.daemon.micronaut","c":"WalletAppKitJsonRpcService","l":"WalletAppKitJsonRpcService(WalletAppKitService)","u":"%3Cinit%3E(org.consensusj.bitcoin.services.WalletAppKitService)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"WalletAppKitService(WalletAppKit)","u":"%3Cinit%3E(org.bitcoinj.kits.WalletAppKit)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"walletBaseName()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.WalletConflictList","l":"WalletConflictList()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"WalletSigningService(Wallet)","u":"%3Cinit%3E(org.bitcoinj.wallet.Wallet)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"WalletTestUtil","l":"WalletTestUtil()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"WalletTransactionInfo(Coin, Coin, int, Sha256Hash, int, long, Sha256Hash, WalletTransactionInfo.WalletConflictList, long, long, String, WalletTransactionInfo.DetailList, String, RawTransactionInfo)","u":"%3Cinit%3E(org.bitcoinj.base.Coin,org.bitcoinj.base.Coin,int,org.bitcoinj.base.Sha256Hash,int,long,org.bitcoinj.base.Sha256Hash,org.consensusj.bitcoin.json.pojo.WalletTransactionInfo.WalletConflictList,long,long,java.lang.String,org.consensusj.bitcoin.json.pojo.WalletTransactionInfo.DetailList,java.lang.String,org.consensusj.bitcoin.json.pojo.RawTransactionInfo)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"web3ClientVersion()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"web3Sha3(String)","u":"web3Sha3(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"withWallet(String, String, String)","u":"withWallet(java.lang.String,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc.cli","c":"BitcoinCLITool","l":"writerFromStream(PrintStream)","u":"writerFromStream(java.io.PrintStream)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"xchangePair(CurrencyUnitPair)","u":"xchangePair(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"xchangePair(CurrencyUnitPair)","u":"xchangePair(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.IncludeTxFlag","l":"YES"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"ZmqNotification(String, String, int)","u":"%3Cinit%3E(java.lang.String,java.lang.String,int)"},{"p":"org.consensusj.rx.zeromq","c":"ZMsgSocketFlowable","l":"ZMsgSocketFlowable()","u":"%3Cinit%3E()"}];updateSearchResults();
\ No newline at end of file
+memberSearchIndex = [{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"AbstractJsonRpcService(Map<String, Method>)","u":"%3Cinit%3E(java.util.Map)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"account(int)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"accumulator()"},{"p":"org.consensusj.jsonrpc.introspection.sample","c":"MathService","l":"add(Integer, Integer)","u":"add(java.lang.Integer,java.lang.Integer)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"addChange(SigningRequest, Address, FeeCalculator)","u":"addChange(org.consensusj.bitcoinj.signing.SigningRequest,org.bitcoinj.base.Address,org.consensusj.bitcoinj.signing.FeeCalculator)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"addNode(String, String)","u":"addNode(java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"addOtherInfo(String, Object)","u":"addOtherInfo(java.lang.String,java.lang.Object)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"address"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TransactionIngredients","l":"address"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"address()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"address()"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"address(HDPath)","u":"address(org.bitcoinj.crypto.HDPath)"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressBalanceInfo","l":"AddressBalanceInfo(long, long, long)","u":"%3Cinit%3E(long,long,long)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressDeserializer","l":"AddressDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressDeserializer","l":"AddressDeserializer(AddressParser)","u":"%3Cinit%3E(org.bitcoinj.base.AddressParser)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressDeserializer","l":"AddressDeserializer(Network)","u":"%3Cinit%3E(org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"addressFromKey(ECKey)","u":"addressFromKey(org.bitcoinj.crypto.ECKey)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressGroupingItem","l":"AddressGroupingItem(Address, Coin, String)","u":"%3Cinit%3E(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressGroupingItem","l":"AddressGroupingItem(List<Object>)","u":"%3Cinit%3E(java.util.List)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"AddressInfo(Address, String, boolean, boolean, String, boolean, boolean, boolean, String, boolean, String, boolean, Long, List<Object>)","u":"%3Cinit%3E(org.bitcoinj.base.Address,java.lang.String,boolean,boolean,java.lang.String,boolean,boolean,boolean,java.lang.String,boolean,java.lang.String,boolean,java.lang.Long,java.util.List)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressKeyDeserializer","l":"AddressKeyDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressKeyDeserializer","l":"AddressKeyDeserializer(AddressParser)","u":"%3Cinit%3E(org.bitcoinj.base.AddressParser)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressKeyDeserializer","l":"AddressKeyDeserializer(Network)","u":"%3Cinit%3E(org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressRequest","l":"AddressRequest(List<Address>)","u":"%3Cinit%3E(java.util.List)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressSerializer","l":"AddressSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"AddressUtxoInfo(Address, Sha256Hash, int, String, long, int, boolean)","u":"%3Cinit%3E(org.bitcoinj.base.Address,org.bitcoinj.base.Sha256Hash,int,java.lang.String,long,int,boolean)"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoResult","l":"AddressUtxoResult(Sha256Hash, int, List<AddressUtxoInfo>)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,java.util.List)"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"addSignedInput(Transaction, TransactionInputData, Supplier<? extends RuntimeException>)","u":"addSignedInput(org.bitcoinj.core.Transaction,org.consensusj.bitcoinj.signing.TransactionInputData,java.util.function.Supplier)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"amount"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputData","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputDataScript","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputOpReturn","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Complete","l":"amount()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Signable","l":"amount()"},{"p":"org.consensusj.daemon.micronaut","c":"Application","l":"Application()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc.daemon","c":"Application","l":"Application()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Parser","l":"apply(String)","u":"apply(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet.MappingFunction","l":"apply(String)","u":"apply(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet.MappingFunction","l":"applyThrows(String)","u":"applyThrows(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcTransport","l":"base64Encode(String)","u":"base64Encode(java.lang.String)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"BaseJsonRpcTool()","u":"%3Cinit%3E()"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(Class<? extends Exchange>, CurrencyUnitPair...)","u":"%3Cinit%3E(java.lang.Class,org.consensusj.exchange.CurrencyUnitPair...)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(Class<? extends Exchange>, ScheduledExecutorService, CurrencyUnitPair...)","u":"%3Cinit%3E(java.lang.Class,java.util.concurrent.ScheduledExecutorService,org.consensusj.exchange.CurrencyUnitPair...)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(Class<? extends Exchange>, ScheduledExecutorService, String...)","u":"%3Cinit%3E(java.lang.Class,java.util.concurrent.ScheduledExecutorService,java.lang.String...)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(Class<? extends Exchange>, String...)","u":"%3Cinit%3E(java.lang.Class,java.lang.String...)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(String, ScheduledExecutorService, Map<CurrencyUnit, String>, Collection<CurrencyUnitPair>)","u":"%3Cinit%3E(java.lang.String,java.util.concurrent.ScheduledExecutorService,java.util.Map,java.util.Collection)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(String, ScheduledExecutorService, Map<CurrencyUnit, String>, CurrencyUnitPair...)","u":"%3Cinit%3E(java.lang.String,java.util.concurrent.ScheduledExecutorService,java.util.Map,org.consensusj.exchange.CurrencyUnitPair...)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"BaseXChangeExchangeRateProvider(String, ScheduledExecutorService, String[])","u":"%3Cinit%3E(java.lang.String,java.util.concurrent.ScheduledExecutorService,java.lang.String[])"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Basic","l":"Basic(Sha256Hash, int)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"BIP44_PARENT"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"BIP84_PARENT"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"BipStandardDeterministicKeyChain(DeterministicKeyChain, Network)","u":"%3Cinit%3E(org.bitcoinj.wallet.DeterministicKeyChain,org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"BipStandardDeterministicKeyChain(DeterministicSeed, ScriptType, Network)","u":"%3Cinit%3E(org.bitcoinj.wallet.DeterministicSeed,org.bitcoinj.base.ScriptType,org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BITCOIN_CORE_VERSION_DESC_DEFAULT"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BITCOIN_CORE_VERSION_MIN"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"BITCOIN_SCHEME"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool.BitcoinCLICall","l":"BitcoinCLICall(BitcoinCLITool, PrintWriter, PrintWriter, String[])","u":"%3Cinit%3E(org.consensusj.bitcoin.cli.BitcoinCLITool,java.io.PrintWriter,java.io.PrintWriter,java.lang.String[])"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(RpcConfig)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(SSLContext, Network, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(SSLContext, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"BitcoinClient(URI, String, String)","u":"%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.internal","c":"BitcoinClientThreadFactory","l":"BitcoinClientThreadFactory(Context, String)","u":"%3Cinit%3E(org.bitcoinj.core.Context,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.internal","c":"BitcoinClientThreadFactory","l":"BitcoinClientThreadFactory(Context, String, int)","u":"%3Cinit%3E(org.bitcoinj.core.Context,java.lang.String,int)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"BitcoinCLITool()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"BitcoinConf()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConfFile","l":"BitcoinConfFile()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConfFile","l":"BitcoinConfFile(File)","u":"%3Cinit%3E(java.io.File)"},{"p":"org.consensusj.currency","c":"BitcoinCurrencyProvider","l":"BitcoinCurrencyProvider()","u":"%3Cinit%3E()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"BitcoinDaemonConfig(String, int, Path, String)","u":"%3Cinit%3E(java.lang.String,int,java.nio.file.Path,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(RpcConfig)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(SSLContext, Network, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"BitcoinExtendedClient(URI, String, String)","u":"%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinFactory","l":"BitcoinFactory()","u":"%3Cinit%3E()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinRestController","l":"BitcoinRestController(WalletAppKitService)","u":"%3Cinit%3E(org.consensusj.bitcoin.services.WalletAppKitService)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinRpcCliOptions","l":"BitcoinRpcCliOptions()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"BitcoinTransactionInfo(boolean, Address, String, Coin, String, int, Coin, int, boolean, boolean, Sha256Hash, int, int, long, Sha256Hash, List<Sha256Hash>, long, long, String, String, boolean)","u":"%3Cinit%3E(boolean,org.bitcoinj.base.Address,java.lang.String,org.bitcoinj.base.Coin,java.lang.String,int,org.bitcoinj.base.Coin,int,boolean,boolean,org.bitcoinj.base.Sha256Hash,int,int,long,org.bitcoinj.base.Sha256Hash,java.util.List,long,long,java.lang.String,java.lang.String,boolean)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage","l":"BitcoinZmqMessage(BitcoinZmqMessage.Topic, T, long)","u":"%3Cinit%3E(org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic,T,long)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqPortFinder","l":"BitcoinZmqPortFinder(BitcoinClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"bits"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinRestController","l":"block(String)","u":"block(java.lang.String)"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainBinaryService","l":"blockBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"blockBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"blockBinaryPublisher()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"BlockChainInfo(String, int, int, Sha256Hash, BigDecimal, BigDecimal, byte[])","u":"%3Cinit%3E(java.lang.String,int,int,org.bitcoinj.base.Sha256Hash,java.math.BigDecimal,java.math.BigDecimal,byte[])"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainBinaryService","l":"blockHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"blockHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"blockHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"blockHashPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"blockHashPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"blockHashPublisher()"},{"p":"org.consensusj.bitcoinj.util","c":"BlockUtil","l":"blockHeightFromCoinbase(Block)","u":"blockHeightFromCoinbase(org.bitcoinj.core.Block)"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"blockHeightPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"blockHeightPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"blockHeightPublisher()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"BlockHexDeserializer","l":"BlockHexDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"BlockInfo(Sha256Hash, int, int, int, int, Sha256Hash, int, BlockInfo.Sha256HashList, long, long, String, BigDecimal, String, Sha256Hash, Sha256Hash)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,int,int,int,org.bitcoinj.base.Sha256Hash,int,org.consensusj.bitcoin.json.pojo.BlockInfo.Sha256HashList,long,long,java.lang.String,java.math.BigDecimal,java.lang.String,org.bitcoinj.base.Sha256Hash,org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinRestController","l":"blockNoTxDetails(String)","u":"blockNoTxDetails(java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"blockPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"blockPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"blockPublisher()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"blocktime"},{"p":"org.consensusj.bitcoinj.util","c":"BlockUtil","l":"BlockUtil()","u":"%3Cinit%3E()"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"BtcrDid(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"BtcrDid(URI)","u":"%3Cinit%3E(java.net.URI)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"buildExchangeRateChange(CurrencyUnitPair, Ticker)","u":"buildExchangeRateChange(org.consensusj.exchange.CurrencyUnitPair,org.knowm.xchange.dto.marketdata.Ticker)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"buildJsonRequest(String, List<Object>)","u":"buildJsonRequest(java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"buildJsonRequest(String, Object...)","u":"buildJsonRequest(java.lang.String,java.lang.Object...)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"HexUtil","l":"bytesToHexString(byte[])"},{"p":"org.consensusj.bitcoinj.signing","c":"FeeCalculator","l":"calculateFee(SigningRequest)","u":"calculateFee(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.bitcoinj.signing","c":"TestnetFeeCalculator","l":"calculateFee(SigningRequest)","u":"calculateFee(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"call(AsyncSupport.ThrowingSupplier<RSLT>)","u":"call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)"},{"p":"org.consensusj.jsonrpc.introspection","c":"JsonRpcServiceWrapper","l":"call(JsonRpcRequest)","u":"call(org.consensusj.jsonrpc.JsonRpcRequest)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcService","l":"call(JsonRpcRequest)","u":"call(org.consensusj.jsonrpc.JsonRpcRequest)"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"callAsync(Supplier<CompletionStage<RSLT>>)","u":"callAsync(java.util.function.Supplier)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinRestController","l":"chaininfo()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"ChainTip(int, Sha256Hash, int, String)","u":"%3Cinit%3E(int,org.bitcoinj.base.Sha256Hash,int,java.lang.String)"},{"p":"org.consensusj.bitcoin.rx","c":"ChainTipService","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"chainTipPublisher()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"chainToNetwork(BlockChainInfo)","u":"chainToNetwork(org.consensusj.bitcoin.json.pojo.BlockChainInfo)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"chainwork"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"CHANGE_CHANGE"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"CHANGE_RECEIVING"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"changeAddr(int)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"changeKey(int)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"characteristics()"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"checkClientTrusted(X509Certificate[], String)","u":"checkClientTrusted(java.security.cert.X509Certificate[],java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"checkServerTrusted(X509Certificate[], String)","u":"checkServerTrusted(java.security.cert.X509Certificate[],java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"clearMemPool()"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLICommandResult","l":"CLICommandResult(int, ByteArrayOutputStream, ByteArrayOutputStream)","u":"%3Cinit%3E(int,java.io.ByteArrayOutputStream,java.io.ByteArrayOutputStream)"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLICommandResult","l":"CLICommandResult(int, String, String)","u":"%3Cinit%3E(int,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"client"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"client"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BitcoinClientAccessor","l":"client()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameterParser","l":"CliParameterParser(JsonRpcMessage.Version, ObjectMapper)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,com.fasterxml.jackson.databind.ObjectMapper)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameterParser","l":"CliParameterParser(ObjectMapper)","u":"%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"close()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"close()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.service","c":"TxOutSetService","l":"close()"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"close()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"close()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"close()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"close()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"close()"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"close()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"close()"},{"p":"org.consensusj.rx.zeromq","c":"RxZmqContext","l":"close()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"CoinDeserializer","l":"CoinDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"CoinSerializer","l":"CoinSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"COINTYPE_BTC"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"COINTYPE_TBTC"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"coinType(String)","u":"coinType(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"collectionTypeForClasses(Class<? extends Collection>, Class<?>)","u":"collectionTypeForClasses(java.lang.Class,java.lang.Class)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"collectionTypeForClasses(Class<? extends Collection>, Class<?>)","u":"collectionTypeForClasses(java.lang.Class,java.lang.Class)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"collectionTypeForClasses(Class<? extends Collection>, JavaType)","u":"collectionTypeForClasses(java.lang.Class,com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"collectionTypeForClasses(Class<? extends Collection>, T)","u":"collectionTypeForClasses(java.lang.Class,T)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"combiner()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"commandExists(String)","u":"commandExists(java.lang.String)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"commandName"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"commandName"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"CommonsCLICall(BaseJsonRpcTool, PrintWriter, PrintWriter, String[])","u":"%3Cinit%3E(org.consensusj.jsonrpc.cli.BaseJsonRpcTool,java.io.PrintWriter,java.io.PrintWriter,java.lang.String[])"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"compareTo(CurrencyUnitPair)","u":"compareTo(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Complete","l":"Complete(Sha256Hash, int, Coin, Script)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin,org.bitcoinj.script.Script)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"CompositeTrustManager(InputStream)","u":"%3Cinit%3E(java.io.InputStream)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"CompositeTrustManager(Path)","u":"%3Cinit%3E(java.nio.file.Path)"},{"p":"org.consensusj.jsonrpc.cli","c":"JavaLoggingSupport","l":"configure(String)","u":"configure(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"confirmations"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"confirmations"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"connectToServer(Duration)","u":"connectToServer(java.time.Duration)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"convertSymbol(CurrencyUnit)","u":"convertSymbol(javax.money.CurrencyUnit)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"convertSymbol(CurrencyUnit)","u":"convertSymbol(javax.money.CurrencyUnit)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionVerification","l":"correctlySpendsInput(Transaction, int, Address)","u":"correctlySpendsInput(org.bitcoinj.core.Transaction,int,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionVerification","l":"correctlySpendsInput(Transaction, int, Script)","u":"correctlySpendsInput(org.bitcoinj.core.Transaction,int,org.bitcoinj.script.Script)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient.TransportFactory","l":"create(ObjectMapper)","u":"create(com.fasterxml.jackson.databind.ObjectMapper)"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"create(String)","u":"create(java.lang.String)"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"create(String)","u":"create(java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"createBitcoinSigningRequest(List<TransactionInputData>, List<TransactionOutputData>, Address)","u":"createBitcoinSigningRequest(java.util.List,java.util.List,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoinj.service","c":"SignTransactionService","l":"createBitcoinSigningRequest(List<TransactionInputData>, List<TransactionOutputData>, Address)","u":"createBitcoinSigningRequest(java.util.List,java.util.List,org.bitcoinj.base.Address)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"createCall(PrintStream, PrintStream, String...)","u":"createCall(java.io.PrintStream,java.io.PrintStream,java.lang.String...)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"createCall(PrintStream, PrintStream, String...)","u":"createCall(java.io.PrintStream,java.io.PrintStream,java.lang.String...)"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"createCall(PrintStream, PrintStream, String...)","u":"createCall(java.io.PrintStream,java.io.PrintStream,java.lang.String...)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"createCall(PrintWriter, PrintWriter, String...)","u":"createCall(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"createCall(PrintWriter, PrintWriter, String...)","u":"createCall(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool.BitcoinCLICall","l":"createClient(SSLContext, RpcConfig)","u":"createClient(javax.net.ssl.SSLContext,org.consensusj.bitcoin.jsonrpc.RpcConfig)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"createDustOutput(Address)","u":"createDustOutput(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"FundingSource","l":"createFundedAddress(Coin)","u":"createFundedAddress(org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"createFundedAddress(Coin)","u":"createFundedAddress(org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"createIngredients(Coin)","u":"createIngredients(org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"createRawTransaction(Address, Address, Coin)","u":"createRawTransaction(org.bitcoinj.base.Address,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"createRawTransaction(Address, Map<Address, Coin>)","u":"createRawTransaction(org.bitcoinj.base.Address,java.util.Map)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"createrawtransaction(List<Map<String, Object>>, List<Map<String, String>>)","u":"createrawtransaction(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"createrawtransaction(List<Map<String, Object>>, List<Map<String, String>>)","u":"createrawtransaction(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"createRawTransaction(List<Outpoint>, Map<Address, Coin>)","u":"createRawTransaction(java.util.List,java.util.Map)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"createSignedTransaction(ECKey, Address, Coin)","u":"createSignedTransaction(org.bitcoinj.crypto.ECKey,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"createSignedTransaction(ECKey, List<TransactionOutput>)","u":"createSignedTransaction(org.bitcoinj.crypto.ECKey,java.util.List)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"createTemporary(BitcoinNetwork, ScriptType, String)","u":"createTemporary(org.bitcoinj.base.BitcoinNetwork,org.bitcoinj.base.ScriptType,java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"createTemporaryWallet(BitcoinNetwork, ScriptType, String)","u":"createTemporaryWallet(org.bitcoinj.base.BitcoinNetwork,org.bitcoinj.base.ScriptType,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"createWallet(String, Boolean, Boolean)","u":"createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"createWallet(String, Boolean, Boolean, String, Boolean)","u":"createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"createWallet(String, Boolean, Boolean, String, Boolean, Boolean, Boolean, Boolean)","u":"createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"CurrencyUnitPair(CurrencyUnit, CurrencyUnit)","u":"%3Cinit%3E(javax.money.CurrencyUnit,javax.money.CurrencyUnit)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"CurrencyUnitPair(ExchangeRate)","u":"%3Cinit%3E(javax.money.convert.ExchangeRate)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"CurrencyUnitPair(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"CurrencyUnitPair(String, String)","u":"%3Cinit%3E(java.lang.String,java.lang.String)"},{"p":"org.consensusj.exchange.rx","c":"ExchangeRateUpdate","l":"currentFactor"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"dataDir()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"DEFAULT_LOCALHOST"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"DEFAULT_MAINNET_URI"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"DEFAULT_MAX_CONF"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"DEFAULT_MIN_CONF"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"DEFAULT_REGTEST_MINING_ADDRESS"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"DEFAULT_REGTEST_URI"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"DEFAULT_TESTNET_URI"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"defaultMainNetURI"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"defaultMaxConf"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"defaultRegTestURI"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"DefaultRpcClient(DefaultRpcClient.TransportFactory, JsonRpcMessage.Version)","u":"%3Cinit%3E(org.consensusj.jsonrpc.DefaultRpcClient.TransportFactory,org.consensusj.jsonrpc.JsonRpcMessage.Version)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"DefaultRpcClient(JsonRpcMessage.Version, URI, String, String)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"DefaultRpcClient(SSLContext, JsonRpcMessage.Version, URI, String, String)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"DefaultRpcClient(URI, String, String)","u":"%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoinj.signing","c":"DefaultSigningRequest","l":"DefaultSigningRequest(List<TransactionInputData>, List<TransactionOutputData>)","u":"%3Cinit%3E(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"defaultTestNetURI"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"defaultType()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"defaultType()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"defaultUri"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"defer(Supplier<CompletionStage<RSLT>>)","u":"defer(java.util.function.Supplier)"},{"p":"org.consensusj.jsonrpc.introspection","c":"DelegatingJsonRpcService","l":"DelegatingJsonRpcService(Map<String, Method>, Object)","u":"%3Cinit%3E(java.util.Map,java.lang.Object)"},{"p":"org.consensusj.jsonrpc.introspection","c":"DelegatingJsonRpcService","l":"DelegatingJsonRpcService(Object)","u":"%3Cinit%3E(java.lang.Object)"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"Demo","l":"Demo()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressDeserializer","l":"deserialize(JsonParser, DeserializationContext)","u":"deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"BlockHexDeserializer","l":"deserialize(JsonParser, DeserializationContext)","u":"deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"CoinDeserializer","l":"deserialize(JsonParser, DeserializationContext)","u":"deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ECKeyDeserializer","l":"deserialize(JsonParser, DeserializationContext)","u":"deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"Sha256HashDeserializer","l":"deserialize(JsonParser, DeserializationContext)","u":"deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressKeyDeserializer","l":"deserializeKey(String, DeserializationContext)","u":"deserializeKey(java.lang.String,com.fasterxml.jackson.databind.DeserializationContext)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"Detail(String, Address, String, Coin, String, int, Coin)","u":"%3Cinit%3E(java.lang.String,org.bitcoinj.base.Address,java.lang.String,org.bitcoinj.base.Coin,java.lang.String,int,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.DetailList","l":"DetailList()","u":"%3Cinit%3E()"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"DID_SCHEME"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"Did(URI)","u":"%3Cinit%3E(java.net.URI)"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"didUri"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"difficulty"},{"p":"org.consensusj.jsonrpc.groovy","c":"Dummy","l":"Dummy()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"dumpPrivKey(Address)","u":"dumpPrivKey(org.bitcoinj.base.Address)"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"echo(String)","u":"echo(java.lang.String)"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"EchoJsonRpcService()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ECKeyDeserializer","l":"ECKeyDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ECKeySerializer","l":"ECKeySerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.signing","c":"ECKeySigner","l":"ECKeySigner(ECKey)","u":"%3Cinit%3E(org.bitcoinj.crypto.ECKey)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"equals(Object)","u":"equals(java.lang.Object)"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLICommandResult","l":"error"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"error()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"ethBlockNumber()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"ethCall(EthTxCallObject, String)","u":"ethCall(org.consensusj.ethereum.jsonrpc.EthTxCallObject,java.lang.String)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"EthereumClient()","u":"%3Cinit%3E()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"EthereumClient(URI, String, String)","u":"%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"ethGetBalance(String, String)","u":"ethGetBalance(java.lang.String,java.lang.String)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"ethProtocolVersion()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"EthTxCallObject(String, String, String, String, String, String)","u":"%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"ScriptRunner","l":"evalFile(File)","u":"evalFile(java.io.File)"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"ScriptRunner","l":"evalResource(String)","u":"evalResource(java.lang.String)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"exceedsMaxMoney(Monetary)","u":"exceedsMaxMoney(org.bitcoinj.base.Monetary)"},{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"exception(Throwable)","u":"exception(java.lang.Throwable)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"exchange"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"exchange"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"exchangeClassName"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"exchangeClassName"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"exchangePair"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"exchangePair"},{"p":"org.consensusj.exchange","c":"ExchangeRateChange","l":"ExchangeRateChange(ExchangeRate, long)","u":"%3Cinit%3E(javax.money.convert.ExchangeRate,long)"},{"p":"org.consensusj.exchange.rx","c":"ExchangeRateUpdate","l":"ExchangeRateUpdate(CurrencyUnitPair, NumberValue, long)","u":"%3Cinit%3E(org.consensusj.exchange.CurrencyUnitPair,javax.money.NumberValue,long)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"exchangeSpecification"},{"p":"org.consensusj.decentralizedid.btcr","c":"ExtendedTxRef","l":"ExtendedTxRef(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"findActiveChainTip(List<ChainTip>)","u":"findActiveChainTip(java.util.List)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"findActiveChainTipOrElseThrow(List<ChainTip>)","u":"findActiveChainTipOrElseThrow(java.util.List)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqPortFinder","l":"findPort(BitcoinZmqMessage.Topic)","u":"findPort(org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"findUnspentOutput(Sha256Hash, int)","u":"findUnspentOutput(org.bitcoinj.base.Sha256Hash,int)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"findUtxo(Utxo)","u":"findUtxo(org.consensusj.bitcoinj.signing.Utxo)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"finisher()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"formatter"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"fromIdString(String)","u":"fromIdString(java.lang.String)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"fromString(String)","u":"fromString(java.lang.String)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"fromTxInput(TransactionInput)","u":"fromTxInput(org.bitcoinj.core.TransactionInput)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"fromTxOut(TransactionOutput)","u":"fromTxOut(org.bitcoinj.core.TransactionOutput)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputData","l":"fromTxOutput(TransactionOutput)","u":"fromTxOutput(org.bitcoinj.core.TransactionOutput)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"FundingSourceAccessor","l":"fundingSource()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"FundingSource","l":"fundingSourceMaintenance()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"fundingSourceMaintenance()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"generateBlocks(int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"generateToAddress(int, Address)","u":"generateToAddress(int,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"generateToAddress(int, Address, Integer)","u":"generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"GenericJsonRpcTool()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport.ThrowingSupplier","l":"get()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NMCMainNetParams","l":"get()"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getAcceptedIssuers()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressGroupingItem","l":"getAccount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getAccount()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddedNodeInfo(boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddedNodeInfo(boolean, String)","u":"getAddedNodeInfo(boolean,java.lang.String)"},{"p":"org.consensusj.analytics.service","c":"TokenRichList.TokenBalancePair","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressGroupingItem","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getAddress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"getAddress()"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"getAddress()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddressBalance(Address)","u":"getAddressBalance(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddressBalance(List<Address>)","u":"getAddressBalance(java.util.List)"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressRequest","l":"getAddresses()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"getAddresses()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddressInfo(Address)","u":"getAddressInfo(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddressUtxos(Address)","u":"getAddressUtxos(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getAddressUtxos(List<Address>)","u":"getAddressUtxos(java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getAlternateSSLContext(InputStream)","u":"getAlternateSSLContext(java.io.InputStream)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getAlternateSSLContext(Path)","u":"getAlternateSSLContext(java.nio.file.Path)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getAmount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"getAsm()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getbalance()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getbalance()"},{"p":"org.consensusj.analytics.service","c":"TokenRichList.TokenBalancePair","l":"getBalance()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressGroupingItem","l":"getBalance()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressBalanceInfo","l":"getBalance()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getBalance()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBalance()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBalance(String)","u":"getBalance(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBalance(String, Integer)","u":"getBalance(java.lang.String,java.lang.Integer)"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"getBase()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"getBestblock()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getBestBlock()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBestBlock()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getbestblockhash()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getbestblockhash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getBestBlockHash()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getBitcoinBalance(Address)","u":"getBitcoinBalance(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getBitcoinBalance(Address, Integer)","u":"getBitcoinBalance(org.bitcoinj.base.Address,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getBitcoinBalance(Address, Integer, Integer)","u":"getBitcoinBalance(org.bitcoinj.base.Address,java.lang.Integer,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getBits()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getBlock(int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlock(Sha256Hash)","u":"getBlock(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getblock(String, Integer)","u":"getblock(java.lang.String,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblock(String, Integer)","u":"getblock(java.lang.String,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblock2(Sha256Hash, Integer)","u":"getblock2(org.bitcoinj.base.Sha256Hash,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlockAsync(Sha256Hash)","u":"getBlockAsync(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getblockchaininfo()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblockchaininfo()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlockChainInfo()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlockChainInfoAsync()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getblockcount()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblockcount()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlockCount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getBlockhash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getBlockhash()"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getBlockHash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getBlockHash()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getblockhash(Integer)","u":"getblockhash(java.lang.Integer)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblockhash(Integer)","u":"getblockhash(java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlockHash(Integer)","u":"getBlockHash(java.lang.Integer)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getblockheader(String, Boolean)","u":"getblockheader(java.lang.String,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblockheader(String, Boolean)","u":"getblockheader(java.lang.String,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getblockheader2(Sha256Hash, Boolean)","u":"getblockheader2(org.bitcoinj.base.Sha256Hash,java.lang.Boolean)"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getBlockHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getBlockHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getBlockindex()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getBlockIndex()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getBlockInfo(Sha256Hash)","u":"getBlockInfo(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getBlockInfo(Sha256Hash, BlockInfo.IncludeTxFlag)","u":"getBlockInfo(org.bitcoinj.base.Sha256Hash,org.consensusj.bitcoin.json.pojo.BlockInfo.IncludeTxFlag)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getBlocks()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getBlocks()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getBlockSubsidy(int)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getBlocktime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getBlocktime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getBlockTime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getBogoSize()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"getBranchlen()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getCategory()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getCategory()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getChain()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getChainTips()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"ChainTipClient","l":"getChainTips()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"getChainTips()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getChainTipsAsync()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"ChainTipClient","l":"getChainTipsAsync()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"getChainTipsAsync()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getChainwork()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getChainWork()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BitcoinClientAccessor","l":"getClient()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"getCode()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"getCode()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getCommands()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getComment()"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getCompositeSSLContext(InputStream)","u":"getCompositeSSLContext(java.io.InputStream)"},{"p":"org.consensusj.jsonrpc","c":"CompositeTrustManager","l":"getCompositeSSLContext(Path)","u":"getCompositeSSLContext(java.nio.file.Path)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getConfirmations()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getconnectioncount()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getconnectioncount()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getConnections()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getConnections()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"getContext()"},{"p":"org.consensusj.currency","c":"BitcoinCurrencyProvider","l":"getCurrencies(CurrencyQuery)","u":"getCurrencies(javax.money.CurrencyQuery)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"getCurrencyConversion(ConversionQuery)","u":"getCurrencyConversion(javax.money.convert.ConversionQuery)"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getCurrencyID()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getData()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"getData()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getDecoded()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getDefaultAsyncExecutor()"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport","l":"getDefaultAsyncExecutor()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"getDefaultMainNetURI()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getDefaultMaxConf()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"getDefaultRegTestURI()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"getDefaultRegTestWalletURI()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcTransport","l":"getDefaultSSLContext()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"getDefaultTestNetURI()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getDesc()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getDesc()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getDetails()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getDifficulty()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getDifficulty()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getDifficulty()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getDiskSize()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcErrorException","l":"getError()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"getError()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getErrors()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"getExchangeRate(ConversionQuery)","u":"getExchangeRate(javax.money.convert.ConversionQuery)"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"getExpires_in()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getFee()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getFee()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getFee()"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"getFee(Collection<TransactionInputData>, Collection<TransactionOutputData>)","u":"getFee(java.util.Collection,java.util.Collection)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"getFee(SigningRequest)","u":"getFee(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getFrom()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"FundingSourceAccessor","l":"getFundingSource()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getGas()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getGasPrice()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoResult","l":"getHash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getHash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"getHash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getHashSerialized2()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getHeaders()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getHeight()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoResult","l":"getHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"getHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getHeight()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getHex()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"getHex()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"SignedRawTransaction","l":"getHex()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getHex()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"getHwm()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"getId()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"getId()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressBalanceInfo","l":"getImmature()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TestServers","l":"getInstance()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIschange()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIscompressed()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIsmine()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIsscript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIswatchonly()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getIswitness()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"getJsonrpc()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"getJsonrpc()"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"getJsonRpcVersion()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"getJsonRpcVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getKeypoololdest()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getKeypoolsize()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinFactory","l":"getKit(BitcoinDaemonConfig)","u":"getKit(org.consensusj.daemon.micronaut.BitcoinDaemonConfig)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getLabel()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getLabel()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getLabel()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getLabels()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getLocalServices()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getLocktime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getLockTime()"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"getMapper()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getMerkleroot()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"getMessage()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"getMessage()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"getMethod()"},{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"getMethod(String)","u":"getMethod(java.lang.String)"},{"p":"org.consensusj.jsonrpc.introspection","c":"DelegatingJsonRpcService","l":"getMethod(String)","u":"getMethod(java.lang.String)"},{"p":"org.consensusj.jsonrpc.introspection","c":"JsonRpcServiceWrapper","l":"getMethod(String)","u":"getMethod(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"MethodHelpEntry","l":"getMethodName()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"MethodHelpEntry","l":"getMethodParametersHelp()"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"getMinNonDustValue(TransactionOutputData)","u":"getMinNonDustValue(org.consensusj.bitcoinj.signing.TransactionOutputData)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"getN()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"LoadWalletResult","l":"getName()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"getName()"},{"p":"org.consensusj.exchange.rx","c":"ReactiveExchange","l":"getName()"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"getName()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"getNetIdString()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getNetwork()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getNetwork()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getnetworkinfo()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getnetworkinfo()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getNetworkInfo()"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"getnewaddress()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getnewaddress()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getNewAddress()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getNewAddress(String)","u":"getNewAddress(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getNextblockhash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getNonce()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getNTx()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"getObservablePair(CurrencyUnitPair)","u":"getObservablePair(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.exchange.rx","c":"ReactiveExchange","l":"getObservablePair(CurrencyUnitPair)","u":"getObservablePair(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getOtherBalanceTotal()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getOtherInfo()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getOutputIndex()"},{"p":"org.consensusj.exchange.rx","c":"ObservablePair","l":"getPair()"},{"p":"org.consensusj.exchange.rx","c":"PolledObservablePair","l":"getPair()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"getParams()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"getPassword()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getPaytxfee()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"getPeerGroup()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipService","l":"getPollingInterval()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"getPollingInterval()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getPreviousblockhash()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getProtocolversion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getProtocolVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getProxy()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getProxy()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getPubkey()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getRawTransaction(Sha256Hash)","u":"getRawTransaction(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getRawTransactionInfo(Sha256Hash)","u":"getRawTransactionInfo(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressBalanceInfo","l":"getReceived()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getReceivedByAddress(Address)","u":"getReceivedByAddress(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getReceivedByAddress(Address, Integer)","u":"getReceivedByAddress(org.bitcoinj.base.Address,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getRedeemScript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getRedeemScript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getRedeemScript()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BlockchainSyncing","l":"getReferenceBlockHeight()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getRegTestMiningAddress()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"getRegTestWalletURI(String)","u":"getRegTestWalletURI(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getRelayfee()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getRelayFee()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"getReqSigs()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"getResult()"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getRichList()"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool.BitcoinCLICall","l":"getRPCConfig()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"getRPCConfig()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TestServers","l":"getRpcTestPassword()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TestServers","l":"getRpcTestUser()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getSatoshis()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getScript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getScriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"getScriptSig()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"getSequence()"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"getServerURI()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientHttpUrlConnection","l":"getServerURI()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet","l":"getServerURI()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcTransport","l":"getServerURI()"},{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"getServiceObject()"},{"p":"org.consensusj.jsonrpc.introspection","c":"DelegatingJsonRpcService","l":"getServiceObject()"},{"p":"org.consensusj.jsonrpc.introspection","c":"JsonRpcServiceWrapper","l":"getServiceObject()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getSize()"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceList","l":"getSliceList()"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceListImpl","l":"getSliceList()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getSolvable()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"getStatus()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getStdRelayTxFee()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"getStdTxFee()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getSubVersion()"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"getTarget()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getTestnet()"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport.ThrowingSupplier","l":"getThrows()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"getTicker()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getTime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getTime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getTime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getTime()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getTimeoffset()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getTimeOffset()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getTimereceived()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getTimeReceived()"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"getTimestamp()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"AddressInfo","l":"getTimestamp()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getTo()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getTotalAmount()"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceList","l":"getTotalOther()"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceListImpl","l":"getTotalOther()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getTransaction(Sha256Hash)","u":"getTransaction(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getTransaction(Sha256Hash, Boolean, Boolean)","u":"getTransaction(org.bitcoinj.base.Sha256Hash,java.lang.Boolean,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getTransactions()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getTx()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"Outpoint","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getTxid()"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"getTxid()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getTxId()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"getTxids()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getTxOut(Sha256Hash, Integer)","u":"getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getTxOut(Sha256Hash, Integer, Boolean)","u":"getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"getTxOuts()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getTxOutSetInfo()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.service","c":"TxOutSetService","l":"getTxOutSetPublisher()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"getType()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"getType()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"getUpdate(CurrencyUnitPair)","u":"getUpdate(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"getURI()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"getUsername()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoResult","l":"getUtxos()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"getValue()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"getValue()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthTxCallObject","l":"getValue()"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"getValue()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"getVerificationProgress()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"getVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"getVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"getVersion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getVin()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"Outpoint","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.Detail","l":"getVout()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"getWalletconflicts()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"getWalletConflicts()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"getWalletversion()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"LoadWalletResult","l":"getWarning()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnloadWalletResult","l":"getWarning()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"getWitnessScript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"getWitnessScript()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UtxoInfo","l":"getWitnessScript()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getZmqNotifications()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"getZmqNotificationsAsync()"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport.TransientErrorFilter","l":"handle(T, Throwable)","u":"handle(T,java.lang.Throwable)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"hash"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"hashblock"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"hashCode()"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"hashCode()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"hashCode()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"hashCode()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"hashtx"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"hasMaxMoney()"},{"p":"org.consensusj.bitcoinj.signing","c":"HDKeychainSigner","l":"HDKeychainSigner(DeterministicKeyChain)","u":"%3Cinit%3E(org.bitcoinj.wallet.DeterministicKeyChain)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"height"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"help()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"help()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"help()"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"help()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"help(String)","u":"help(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"helpAsLines()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"helpAsMethodEntries()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"helpAsStream()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"hexFormat"},{"p":"org.consensusj.bitcoin.json.conversion","c":"HexUtil","l":"hexStringToByteArray(String)","u":"hexStringToByteArray(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"HexUtil","l":"HexUtil()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"httpCode"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"httpMessage"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"hwm()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"ID_MAINNET"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"ID_REGTEST"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"ID_SIGNET"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"ID_TESTNET"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"ID_UNITTESTNET"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"id()"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"identityTransientErrorMapper(JsonRpcRequest, JsonRpcResponse<T>, Throwable)","u":"identityTransientErrorMapper(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.IncludeTxFlag","l":"IDONLY"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"importPrivKey(ECKey, String, boolean)","u":"importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest.RawInput","l":"index()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"index()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Basic","l":"index()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Complete","l":"index()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"index()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Signable","l":"index()"},{"p":"org.consensusj.daemon.micronaut","c":"JsonRpcController","l":"index(JsonRpcRequest)","u":"index(org.consensusj.jsonrpc.JsonRpcRequest)"},{"p":"org.consensusj.jsonrpc.daemon","c":"JsonRpcController","l":"index(JsonRpcRequest)","u":"index(org.consensusj.jsonrpc.JsonRpcRequest)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"initialize()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"initRegTestWallet()"},{"p":"org.consensusj.bitcoinj.signing","c":"DefaultSigningRequest","l":"inputs()"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest","l":"inputs()"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningRequest","l":"inputs()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"interval"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"invalid()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"invalid(String, Exception)","u":"invalid(java.lang.String,java.lang.Exception)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"Invalid(String, Exception)","u":"%3Cinit%3E(java.lang.String,java.lang.Exception)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"invalidateBlock(Sha256Hash)","u":"invalidateBlock(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"isAbandoned()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"isAddressIndexEnabled()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"isAvailable(ConversionQuery)","u":"isAvailable(javax.money.convert.ConversionQuery)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"isBip125Replaceable()"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","c":"AddressUtxoInfo","l":"isCoinbase()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"isCoinbase()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"SignedRawTransaction","l":"isComplete()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"isGenerated()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"isInvolvesWatchOnly()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"isSafe()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"isSolvable()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"isSpendable()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"isTickerAvailable()"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport.TransientErrorFilter","l":"isTransient(Throwable)","u":"isTransient(java.lang.Throwable)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BitcoinTransactionInfo","l":"isTrusted()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinFactory","l":"jacksonModule()"},{"p":"org.consensusj.jsonrpc.cli","c":"JavaLoggingSupport","l":"JavaLoggingSupport()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"jsonrpc()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientHttpUrlConnection","l":"JsonRpcClientHttpUrlConnection(ObjectMapper, SSLContext, URI, String, String)","u":"%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper,javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet","l":"JsonRpcClientJavaNet(ObjectMapper, SSLContext, URI, String, String)","u":"%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper,javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet","l":"JsonRpcClientJavaNet(ObjectMapper, URI, String, String)","u":"%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"jsonRpcCode"},{"p":"org.consensusj.jsonrpc.daemon","c":"JsonRpcController","l":"JsonRpcController(JsonRpcService)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcService)"},{"p":"org.consensusj.daemon.micronaut","c":"JsonRpcController","l":"JsonRpcController(WalletAppKitJsonRpcService)","u":"%3Cinit%3E(org.consensusj.daemon.micronaut.WalletAppKitJsonRpcService)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"JsonRpcError(int, String, Object)","u":"%3Cinit%3E(int,java.lang.String,java.lang.Object)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcErrorException","l":"JsonRpcErrorException(JsonRpcError)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcErrorException","l":"JsonRpcErrorException(JsonRpcError, Throwable)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError,java.lang.Throwable)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcErrorException","l":"JsonRpcErrorException(JsonRpcError.Error, Throwable)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcError.Error,java.lang.Throwable)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcException","l":"JsonRpcException(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcException","l":"JsonRpcException(String, Throwable)","u":"%3Cinit%3E(java.lang.String,java.lang.Throwable)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage","l":"JsonRpcMessage()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"JsonRpcRequest(JsonRpcMessage.Version, long, String, List<Object>)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,long,java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"JsonRpcRequest(JsonRpcMessage.Version, String, List<?>)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"JsonRpcRequest(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"JsonRpcRequest(String, List<?>)","u":"%3Cinit%3E(java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcRequest","l":"JsonRpcRequest(String, String, String, List<Object>)","u":"%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"JsonRpcResponse(JsonRpcRequest, JsonRpcError)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcError)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"JsonRpcResponse(JsonRpcRequest, RSLT)","u":"%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcRequest,RSLT)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcResponse","l":"JsonRpcResponse(String, String, RSLT, JsonRpcError)","u":"%3Cinit%3E(java.lang.String,java.lang.String,RSLT,org.consensusj.jsonrpc.JsonRpcError)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"JsonRpcStatusException(int, JsonRpcResponse<?>)","u":"%3Cinit%3E(int,org.consensusj.jsonrpc.JsonRpcResponse)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"JsonRpcStatusException(int, String)","u":"%3Cinit%3E(int,java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"JsonRpcStatusException(String, int, int, String, JsonRpcResponse<?>)","u":"%3Cinit%3E(java.lang.String,int,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"JsonRpcStatusException(String, int, String, int, String, JsonRpcResponse<?>)","u":"%3Cinit%3E(java.lang.String,int,java.lang.String,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)"},{"p":"org.consensusj.jsonrpc.cli","c":"JsonRpcToolOptions","l":"JsonRpcToolOptions()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"jsonRpcVersion"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"jsonRpcVersion"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"key(HDPath)","u":"key(org.bitcoinj.crypto.HDPath)"},{"p":"org.consensusj.bitcoinj.signing","c":"HDKeychainSigner","l":"keyForHash(byte[])"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"keyForInput(TransactionInputData)","u":"keyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)"},{"p":"org.consensusj.bitcoinj.signing","c":"ECKeySigner","l":"keyForInput(TransactionInputData)","u":"keyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)"},{"p":"org.consensusj.bitcoinj.signing","c":"HDKeychainSigner","l":"keyForInput(TransactionInputData)","u":"keyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"kit"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"KnowmExchangeRateProvider(String, Map<CurrencyUnit, String>, Collection<CurrencyUnitPair>)","u":"%3Cinit%3E(java.lang.String,java.util.Map,java.util.Collection)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"label"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceAccumulator","l":"LargestSliceAccumulator(int, Function<E, N>, N, BinaryOperator<N>)","u":"%3Cinit%3E(int,java.util.function.Function,N,java.util.function.BinaryOperator)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"LargestSliceCollector(int, Function<E, N>, N, BinaryOperator<N>)","u":"%3Cinit%3E(int,java.util.function.Function,N,java.util.function.BinaryOperator)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceListImpl","l":"LargestSliceListImpl(List<E>, N)","u":"%3Cinit%3E(java.util.List,N)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"legacyAddressHeader()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"legacyP2SHHeader()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"line"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listAddressGroupings()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listReceivedByAddress(Integer, Boolean)","u":"listReceivedByAddress(java.lang.Integer,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listTransactions()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listTransactions(String, Integer)","u":"listTransactions(java.lang.String,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listTransactions(String, Integer, Integer, Boolean)","u":"listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listUnspent()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listUnspent(Integer, Integer)","u":"listUnspent(java.lang.Integer,java.lang.Integer)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listUnspent(Integer, Integer, Address)","u":"listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listUnspent(Integer, Integer, List<Address>)","u":"listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listUnspent(Integer, Integer, List<Address>, Boolean)","u":"listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"listunspent(Integer, Integer, List<String>, Boolean)","u":"listunspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"listunspent(Integer, Integer, List<String>, Boolean)","u":"listunspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"listUnspentJ(Address)","u":"listUnspentJ(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"listUnspentOutPoints(Address)","u":"listUnspentOutPoints(org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"listWallets()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"LoadWalletResult","l":"LoadWalletResult(String, String)","u":"%3Cinit%3E(java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BlockchainSyncing","l":"log"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipService","l":"log"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"log"},{"p":"org.consensusj.jsonrpc.introspection","c":"JsonRpcServiceWrapper","l":"log"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"log"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport.TransientErrorFilter","l":"log(Throwable)","u":"log(java.lang.Throwable)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"TxOutSetWatcherSample","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"SampleBitcoinZmqClient","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"Demo","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.daemon.micronaut","c":"Application","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.jsonrpc.daemon","c":"Application","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.jsonrpc.introspection.sample","c":"MathService","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.namecoin.jsonrpc.cli","c":"NmcLookup","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"MAINNET"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient.TransientErrorMapper","l":"map(JsonRpcRequest, JsonRpcResponse<T>, Throwable)","u":"map(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"mapBitcoinTransientErrors(JsonRpcRequest, JsonRpcResponse<T>, Throwable)","u":"mapBitcoinTransientErrors(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"mapper"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"mapper"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"marketDataService"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"marketDataService"},{"p":"org.consensusj.jsonrpc.introspection.sample","c":"MathService","l":"MathService()","u":"%3Cinit%3E()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"MAX_MONEY"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"maxMoney()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"merkleroot"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"METHOD"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"METHOD_NOT_FOUND"},{"p":"org.consensusj.bitcoin.json.pojo","c":"MethodHelpEntry","l":"MethodHelpEntry(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"MethodHelpEntry","l":"MethodHelpEntry(String, String)","u":"%3Cinit%3E(java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"MethodHelpEntry","l":"MethodHelpEntry(String[])","u":"%3Cinit%3E(java.lang.String[])"},{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"methods"},{"p":"org.consensusj.daemon.micronaut","c":"MicronautWalletAppKitService","l":"MicronautWalletAppKitService(WalletAppKit)","u":"%3Cinit%3E(org.bitcoinj.kits.WalletAppKit)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"MIN_NONDUST_OUTPUT"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"minerStart(int)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"minerStop()"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"monitoredCurrencies"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"n"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"name"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"name"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"name()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"name()"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"name()"},{"p":"org.consensusj.namecoin.jsonrpc","c":"NamecoinClient","l":"NamecoinClient(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.namecoin.jsonrpc","c":"NamecoinClient","l":"NamecoinClient(RpcConfig)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","c":"NameData","l":"NameData(String, String, Sha256Hash, Address, int)","u":"%3Cinit%3E(java.lang.String,java.lang.String,org.bitcoinj.base.Sha256Hash,org.bitcoinj.base.Address,int)"},{"p":"org.consensusj.namecoin.jsonrpc","c":"NamecoinClient","l":"nameShow(String)","u":"nameShow(java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"network"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"network()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"network()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"network()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"networkId()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"NetworkInfo","l":"NetworkInfo(int, String, int, int, int, String, int, byte[], Object[], Object[])","u":"%3Cinit%3E(int,java.lang.String,int,int,int,java.lang.String,int,byte[],java.lang.Object[],java.lang.Object[])"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockChainInfo","l":"networkToChainName(BitcoinNetwork)","u":"networkToChainName(org.bitcoinj.base.BitcoinNetwork)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.test","c":"TestChainTipPublishers","l":"never()"},{"p":"org.consensusj.bitcoin.jsonrpc.internal","c":"BitcoinClientThreadFactory","l":"newThread(Runnable)","u":"newThread(java.lang.Runnable)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"nextblockhash"},{"p":"org.consensusj.namecoin.jsonrpc.cli","c":"NmcLookup","l":"NmcLookup()","u":"%3Cinit%3E()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NMCMainNetParams","l":"NMCMainNetParams()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.IncludeTxFlag","l":"NO"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"nonce"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport.TransientErrorFilter","l":"none()"},{"p":"org.consensusj.jsonrpc.internal","c":"NumberStringSerializer","l":"NumberStringSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"object()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"observable"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"observablePairs"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"observerList"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputData","l":"of(Address, Coin)","u":"of(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"of(JsonRpcError.Error)","u":"of(org.consensusj.jsonrpc.JsonRpcError.Error)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcErrorException","l":"of(JsonRpcError.Error)","u":"of(org.consensusj.jsonrpc.JsonRpcError.Error)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError","l":"of(JsonRpcError.Error, Throwable)","u":"of(org.consensusj.jsonrpc.JsonRpcError.Error,java.lang.Throwable)"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest","l":"of(List<RawTransactionSigningRequest.RawInput>, List<TransactionOutputData>)","u":"of(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningRequest","l":"of(List<TransactionInputData>, List<TransactionOutputData>)","u":"of(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningRequest","l":"of(List<TransactionInputData>, Map<Address, Coin>)","u":"of(java.util.List,java.util.Map)"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport.TransientErrorFilter","l":"of(Predicate<Throwable>, Consumer<Throwable>)","u":"of(java.util.function.Predicate,java.util.function.Consumer)"},{"p":"org.consensusj.bitcoin.rx","c":"ChainTipPublisher","l":"of(Publisher<ChainTip>)","u":"of(org.reactivestreams.Publisher)"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"of(Sha256Hash, int)","u":"of(org.bitcoinj.base.Sha256Hash,int)"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"of(Sha256Hash, int, Coin)","u":"of(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"of(Sha256Hash, int, Coin, Script)","u":"of(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin,org.bitcoinj.script.Script)"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"of(String)","u":"of(java.lang.String)"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"of(String)","u":"of(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"SignedRawTransaction","l":"of(Transaction)","u":"of(org.bitcoinj.core.Transaction)"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"of(TransactionOutPoint)","u":"of(org.bitcoinj.core.TransactionOutPoint)"},{"p":"org.consensusj.decentralizedid.btcr","c":"BtcrDid","l":"of(URI)","u":"of(java.net.URI)"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"of(URI)","u":"of(java.net.URI)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"of(Utxo.Complete)","u":"of(org.consensusj.bitcoinj.signing.Utxo.Complete)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"of(Utxo.Signable, Address)","u":"of(org.consensusj.bitcoinj.signing.Utxo.Signable,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ChainTip","l":"ofActive(int, Sha256Hash)","u":"ofActive(int,org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest","l":"ofTransaction(Transaction)","u":"ofTransaction(org.bitcoinj.core.Transaction)"},{"p":"org.consensusj.exchange","c":"ExchangeRateObserver","l":"onExchangeRateChange(ExchangeRateChange)","u":"onExchangeRateChange(org.consensusj.exchange.ExchangeRateChange)"},{"p":"org.consensusj.daemon.micronaut","c":"MicronautWalletAppKitService","l":"onShutdown(ServerShutdownEvent)","u":"onShutdown(io.micronaut.runtime.server.event.ServerShutdownEvent)"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"onShutdown(ServerShutdownEvent)","u":"onShutdown(io.micronaut.runtime.server.event.ServerShutdownEvent)"},{"p":"org.consensusj.daemon.micronaut","c":"MicronautWalletAppKitService","l":"onStartup(ServerStartupEvent)","u":"onStartup(io.micronaut.runtime.server.event.ServerStartupEvent)"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"onStartup(ServerStartupEvent)","u":"onStartup(io.micronaut.runtime.server.event.ServerStartupEvent)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputOpReturn","l":"opReturnData()"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"options()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"options()"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"options()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"Outpoint","l":"Outpoint(Sha256Hash, int)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TransactionIngredients","l":"outPoints"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLICommandResult","l":"output"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"outputObject"},{"p":"org.consensusj.bitcoinj.signing","c":"DefaultSigningRequest","l":"outputs()"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest","l":"outputs()"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningRequest","l":"outputs()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"outputStyle"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"pair"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"pair"},{"p":"org.consensusj.exchange.rx","c":"ExchangeRateUpdate","l":"pair"},{"p":"org.consensusj.exchange","c":"ExchangeUtils","l":"pairsConvert(List<String>)","u":"pairsConvert(java.util.List)"},{"p":"org.consensusj.exchange","c":"ExchangeUtils","l":"pairsConvert(String[])","u":"pairsConvert(java.lang.String[])"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameterParser","l":"parse(List<String>)","u":"parse(java.util.List)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"parse(String, CliParameter.Parser)","u":"parse(java.lang.String,org.consensusj.jsonrpc.cli.CliParameter.Parser)"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLITestSupport","l":"parseCommandLine(String)","u":"parseCommandLine(java.lang.String)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"pathFor(ScriptType, String)","u":"pathFor(org.bitcoinj.base.ScriptType,java.lang.String)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"PeerSerializer","l":"PeerSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.exchange.rx","c":"PolledObservablePair","l":"PolledObservablePair(CurrencyUnitPair, Supplier<ExchangeRateUpdate>, Observable<Long>)","u":"%3Cinit%3E(org.consensusj.exchange.CurrencyUnitPair,java.util.function.Supplier,io.reactivex.rxjava3.core.Observable)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipService","l":"pollForDistinctChainTip()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"pollForTicker()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"PollingChainTipServiceImpl(BitcoinClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"PollingChainTipServiceImpl(BitcoinClient, Observable<Long>)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient,io.reactivex.rxjava3.core.Observable)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"pollingFunction()"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"pollOnce(AsyncSupport.ThrowingSupplier<RSLT>)","u":"pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"pollOnce(JsonRpcRequest, JavaType, DefaultRpcClient.TransientErrorMapper<T>)","u":"pollOnce(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"pollOnceAsPublisher(Supplier<CompletionStage<T>>)","u":"pollOnceAsPublisher(java.util.function.Supplier)"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"pollOnceAsPublisher(Supplier<CompletionStage<T>>, AsyncSupport.TransientErrorFilter)","u":"pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)"},{"p":"org.consensusj.rx.jsonrpc","c":"RxJsonRpcClient","l":"pollOnceAsync(Supplier<CompletionStage<RSLT>>)","u":"pollOnceAsync(java.util.function.Supplier)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxJsonChainTipClient","l":"pollOnNewBlock(AsyncSupport.ThrowingSupplier<RSLT>)","u":"pollOnNewBlock(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"pollOnNewBlockAsync(Supplier<CompletionStage<RSLT>>)","u":"pollOnNewBlockAsync(java.util.function.Supplier)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxJsonChainTipClient","l":"pollOnNewBlockAsync(Supplier<CompletionStage<RSLT>>)","u":"pollOnNewBlockAsync(java.util.function.Supplier)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"previousblockhash"},{"p":"org.consensusj.bitcoin.json.pojo","c":"PrevTxOutInfo","l":"PrevTxOutInfo(Sha256Hash, int, String, String, String, Coin)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,java.lang.String,java.lang.String,java.lang.String,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"printError(JsonRpcClientTool.Call, String)","u":"printError(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call,java.lang.String)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"printHelp(JsonRpcClientTool.Call, String)","u":"printHelp(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TransactionIngredients","l":"privateKey"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"providerContext"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"providerContext"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"pubKeyForInput(TransactionInputData)","u":"pubKeyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)"},{"p":"org.consensusj.bitcoinj.signing","c":"HDKeychainSigner","l":"pubKeyFromPubKeyHash(byte[])"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"PURPOSE_BIP44"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"PURPOSE_BIP49"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"PURPOSE_BIP84"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardKeyChainGroupStructure","l":"purpose(ScriptType)","u":"purpose(org.bitcoinj.base.ScriptType)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"WalletTestUtil","l":"randomWalletName()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"WalletTestUtil","l":"randomWalletName(String, int)","u":"randomWalletName(java.lang.String,int)"},{"p":"org.consensusj.exchange","c":"ExchangeRateChange","l":"rate"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"rawblock"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest.RawInput","l":"RawInput(Sha256Hash, int, Script)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.script.Script)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"RawTransactionInfo(String, Sha256Hash, long, long, RawTransactionInfo.VinList, RawTransactionInfo.VoutList, Sha256Hash, int, long, long)","u":"%3Cinit%3E(java.lang.String,org.bitcoinj.base.Sha256Hash,long,long,org.consensusj.bitcoin.json.pojo.RawTransactionInfo.VinList,org.consensusj.bitcoin.json.pojo.RawTransactionInfo.VoutList,org.bitcoinj.base.Sha256Hash,int,long,long)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo","l":"RawTransactionInfo(Transaction)","u":"%3Cinit%3E(org.bitcoinj.core.Transaction)"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest","l":"RawTransactionSigningRequest(List<RawTransactionSigningRequest.RawInput>, List<TransactionOutputData>)","u":"%3Cinit%3E(java.util.List,java.util.List)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"rawtx"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"ReactiveKnowmExchangeProvider(ExchangeSpecification, Map<CurrencyUnit, String>, Collection<CurrencyUnitPair>, Observable<Long>)","u":"%3Cinit%3E(org.knowm.xchange.ExchangeSpecification,java.util.Map,java.util.Collection,io.reactivex.rxjava3.core.Observable)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"ReactiveKnowmExchangeProvider(ExchangeSpecification, String, Map<CurrencyUnit, String>, Collection<CurrencyUnitPair>, Observable<Long>)","u":"%3Cinit%3E(org.knowm.xchange.ExchangeSpecification,java.lang.String,java.util.Map,java.util.Collection,io.reactivex.rxjava3.core.Observable)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"ReactiveKnowmExchangeProvider(String, Map<CurrencyUnit, String>, Collection<CurrencyUnitPair>, Observable<Long>)","u":"%3Cinit%3E(java.lang.String,java.util.Map,java.util.Collection,io.reactivex.rxjava3.core.Observable)"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConfFile","l":"read()"},{"p":"org.consensusj.namecoin.jsonrpc","c":"NamecoinClient","l":"readConfig()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConfFile","l":"readDefaultConfig()"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConfFile","l":"readWithFallback()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"ReceivedByAddressInfo(Address, Coin, int, List<Sha256Hash>, String)","u":"%3Cinit%3E(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,int,java.util.List,java.lang.String)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"receivingAddr(int)"},{"p":"org.consensusj.bitcoinj.wallet","c":"BipStandardDeterministicKeyChain","l":"receivingKey(int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"reconsiderBlock(Sha256Hash)","u":"reconsiderBlock(org.bitcoinj.base.Sha256Hash)"},{"p":"org.consensusj.jsonrpc.introspection","c":"JsonRpcServiceWrapper","l":"reflect(Class<?>)","u":"reflect(java.lang.Class)"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"registerExchangeRateObserver(CurrencyUnitPair, ExchangeRateObserver)","u":"registerExchangeRateObserver(org.consensusj.exchange.CurrencyUnitPair,org.consensusj.exchange.ExchangeRateObserver)"},{"p":"org.consensusj.exchange","c":"ObservableExchangeRateProvider","l":"registerExchangeRateObserver(CurrencyUnitPair, ExchangeRateObserver)","u":"registerExchangeRateObserver(org.consensusj.exchange.CurrencyUnitPair,org.consensusj.exchange.ExchangeRateObserver)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"REGTEST"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"REGTEST_WALLET_NAME"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestEnvironment","l":"RegTestEnvironment(BitcoinExtendedClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"RegTestFundingSource(BitcoinExtendedClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"FundingSource","l":"requestBitcoin(Address, Coin)","u":"requestBitcoin(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestFundingSource","l":"requestBitcoin(Address, Coin)","u":"requestBitcoin(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"response"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcStatusException","l":"responseJson"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"responseTypeFor(Class<?>)","u":"responseTypeFor(java.lang.Class)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"responseTypeFor(Class<?>)","u":"responseTypeFor(java.lang.Class)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"responseTypeFor(JavaType)","u":"responseTypeFor(com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"responseTypeFor(T)"},{"p":"org.consensusj.jsonrpc.introspection","c":"AbstractJsonRpcService","l":"result(RSLT)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"result(T)"},{"p":"org.consensusj.analytics.service","c":"RichListService","l":"richList(ID, int)","u":"richList(ID,int)"},{"p":"org.consensusj.analytics.service","c":"RichListService","l":"richListUpdates(ID, int)","u":"richListUpdates(ID,int)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool.BitcoinCLICall","l":"rpcClient()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"rpcClient()"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool.BitcoinCLICall","l":"rpcClient(SSLContext)","u":"rpcClient(javax.net.ssl.SSLContext)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"rpcClient(SSLContext)","u":"rpcClient(javax.net.ssl.SSLContext)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"RpcClientModule","l":"RpcClientModule()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"RpcClientModule","l":"RpcClientModule(Network)","u":"%3Cinit%3E(org.bitcoinj.base.Network)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"RpcClientModule","l":"RpcClientModule(Network, boolean)","u":"%3Cinit%3E(org.bitcoinj.base.Network,boolean)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"RpcConfig(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"RpcConfig(String, String, String, String)","u":"%3Cinit%3E(java.lang.String,java.lang.String,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcConfig","l":"RpcConfig(String, URI, String, String)","u":"%3Cinit%3E(java.lang.String,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"rpcconnect"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"RPCCONNECT_DEFAULT"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpcfile"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpchost"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"rpcport"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","c":"BitcoinConf","l":"RPCPORT_DEFAULT"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"RPCPORT_MAINNET"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"RPCPORT_REGTEST"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"RPCPORT_TESTNET"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpcproto"},{"p":"org.consensusj.bitcoin.json.conversion","c":"RpcServerModule","l":"RpcServerModule()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpcssl"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"rpcTool"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpcURI(String, int)","u":"rpcURI(java.lang.String,int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"RpcURI","l":"rpcWalletURI(String, int, String)","u":"rpcWalletURI(java.lang.String,int,java.lang.String)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"run(BaseJsonRpcTool.CommonsCLICall)","u":"run(org.consensusj.jsonrpc.cli.BaseJsonRpcTool.CommonsCLICall)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"run(JsonRpcClientTool.Call)","u":"run(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"run(PrintWriter, PrintWriter, String...)","u":"run(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"run(PrintWriter, PrintWriter, String...)","u":"run(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"run(PrintWriter, PrintWriter, String...)","u":"run(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLITestSupport","l":"runTool(BaseJsonRpcTool, String...)","u":"runTool(org.consensusj.jsonrpc.cli.BaseJsonRpcTool,java.lang.String...)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"RxBitcoinClient(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"RxBitcoinClient(Network, URI, String, String, boolean)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"RxBitcoinClient","l":"RxBitcoinClient(SSLContext, Network, URI, String, String, boolean)","u":"%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"RxBitcoinSinglePortZmqService(URI, ThreadFactory, BitcoinZmqMessage.Topic...)","u":"%3Cinit%3E(java.net.URI,java.util.concurrent.ThreadFactory,org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic...)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"RxBitcoinZmqBinaryService(BitcoinClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"RxBitcoinZmqBinaryService(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"RxBitcoinZmqService(BitcoinClient)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"RxBitcoinZmqService(Network, URI, String, String)","u":"%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"RxPeerGroup(PeerGroup)","u":"%3Cinit%3E(org.bitcoinj.core.PeerGroup)"},{"p":"org.consensusj.rx.zeromq","c":"RxZmqContext","l":"RxZmqContext(URI, List<String>)","u":"%3Cinit%3E(java.net.URI,java.util.List)"},{"p":"org.consensusj.rx.zeromq","c":"RxZmqContext","l":"RxZmqContext(URI, List<String>, ThreadFactory)","u":"%3Cinit%3E(java.net.URI,java.util.List,java.util.concurrent.ThreadFactory)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"SampleBitcoinZmqClient","l":"SampleBitcoinZmqClient()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"script()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"script()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"scriptPubKey"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"scriptPubKey()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputData","l":"scriptPubKey()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputDataScript","l":"scriptPubKey()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputOpReturn","l":"scriptPubKey()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Complete","l":"scriptPubKey()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"ScriptPubKeyInfo(Script)","u":"%3Cinit%3E(org.bitcoinj.script.Script)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.ScriptPubKeyInfo","l":"ScriptPubKeyInfo(String, String, int, String, List<Address>)","u":"%3Cinit%3E(java.lang.String,java.lang.String,int,java.lang.String,java.util.List)"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"ScriptRunner","l":"ScriptRunner()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.dsl.js","c":"ScriptRunner","l":"ScriptRunner(RpcConfig)","u":"%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ScriptSerializer","l":"ScriptSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"scriptSig"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest.RawInput","l":"scriptSig()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"segwitAddressHrp()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"send(String, Class<R>, List<Object>)","u":"send(java.lang.String,java.lang.Class,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"send(String, Class<R>, Object...)","u":"send(java.lang.String,java.lang.Class,java.lang.Object...)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"send(String, List<Object>)","u":"send(java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"send(String, Object...)","u":"send(java.lang.String,java.lang.Object...)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"send(String, T, List<Object>)","u":"send(java.lang.String,T,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"send(String, T, Object...)","u":"send(java.lang.String,T,java.lang.Object...)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"sendAsync(String, Class<R>, List<Object>)","u":"sendAsync(java.lang.String,java.lang.Class,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"sendAsync(String, Class<R>, Object...)","u":"sendAsync(java.lang.String,java.lang.Class,java.lang.Object...)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"sendAsync(String, List<Object>)","u":"sendAsync(java.lang.String,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"sendAsync(String, T, List<Object>)","u":"sendAsync(java.lang.String,T,java.util.List)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"sendAsync(String, T, Object...)","u":"sendAsync(java.lang.String,T,java.lang.Object...)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"sendBitcoin(Address, Address, Coin)","u":"sendBitcoin(org.bitcoinj.base.Address,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"sendBitcoin(Address, Map<Address, Coin>)","u":"sendBitcoin(org.bitcoinj.base.Address,java.util.Map)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendFrom(String, Address, Coin)","u":"sendFrom(java.lang.String,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendMany(String, Map<Address, Coin>)","u":"sendMany(java.lang.String,java.util.Map)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"sendrawtransaction(String)","u":"sendrawtransaction(java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"sendrawtransaction(String)","u":"sendrawtransaction(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendRawTransaction(String)","u":"sendRawTransaction(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendRawTransaction(String, Coin)","u":"sendRawTransaction(java.lang.String,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendRawTransaction(Transaction)","u":"sendRawTransaction(org.bitcoinj.core.Transaction)"},{"p":"org.consensusj.bitcoinj.service","c":"SendTransactionService","l":"sendRawTransaction(Transaction)","u":"sendRawTransaction(org.bitcoinj.core.Transaction)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendRawTransaction(Transaction, Coin)","u":"sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoinj.service","c":"SendTransactionService","l":"sendRawTransaction(Transaction, Coin)","u":"sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientHttpUrlConnection","l":"sendRequestForResponse(JsonRpcRequest, JavaType)","u":"sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcTransport","l":"sendRequestForResponse(JsonRpcRequest, T)","u":"sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"sendRequestForResponseAsync(JsonRpcRequest)","u":"sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"sendRequestForResponseAsync(JsonRpcRequest, JavaType)","u":"sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientHttpUrlConnection","l":"sendRequestForResponseAsync(JsonRpcRequest, JavaType)","u":"sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClientJavaNet","l":"sendRequestForResponseAsync(JsonRpcRequest, JavaType)","u":"sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcTransport","l":"sendRequestForResponseAsync(JsonRpcRequest, T)","u":"sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendToAddress(Address, Coin)","u":"sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"sendToAddress(Address, Coin, String, String)","u":"sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String,java.lang.String)"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"sendtoaddress(String, Double)","u":"sendtoaddress(java.lang.String,java.lang.Double)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"sendtoaddress(String, Double)","u":"sendtoaddress(java.lang.String,java.lang.Double)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"sequence"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"sequence"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage","l":"sequenceNumber()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"AddressSerializer","l":"serialize(Address, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.base.Address,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"CoinSerializer","l":"serialize(Coin, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.base.Coin,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ECKeySerializer","l":"serialize(ECKey, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.crypto.ECKey,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"PeerSerializer","l":"serialize(Peer, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.core.Peer,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"ScriptSerializer","l":"serialize(Script, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.script.Script,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"Sha256HashSerializer","l":"serialize(Sha256Hash, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.base.Sha256Hash,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.jsonrpc.internal","c":"NumberStringSerializer","l":"serialize(String, JsonGenerator, SerializerProvider)","u":"serialize(java.lang.String,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"TransactionHexSerializer","l":"serialize(Transaction, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.core.Transaction,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"TransactionSerializer","l":"serialize(Transaction, JsonGenerator, SerializerProvider)","u":"serialize(org.bitcoinj.core.Transaction,com.fasterxml.jackson.core.JsonGenerator,com.fasterxml.jackson.databind.SerializerProvider)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"SERVER_ERROR"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"SERVER_EXCEPTION"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ServerInfo","l":"ServerInfo(int, int, int, Coin, int, int, int, String, BigDecimal, Boolean, int, int, Coin, Coin, String)","u":"%3Cinit%3E(int,int,int,org.bitcoinj.base.Coin,int,int,int,java.lang.String,java.math.BigDecimal,java.lang.Boolean,int,int,org.bitcoinj.base.Coin,org.bitcoinj.base.Coin,java.lang.String)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"serverPort()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BTCTestSupport","l":"serverReady(Network)","u":"serverReady(org.bitcoinj.base.Network)"},{"p":"org.consensusj.exchange.rx","c":"ExchangeRateUpdate","l":"serverTimeStamp"},{"p":"org.consensusj.jsonrpc.cli","c":"JavaLoggingSupport","l":"setLogLevel(Level)","u":"setLogLevel(java.util.logging.Level)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider.MonitoredCurrency","l":"setTicker(Ticker)","u":"setTicker(org.knowm.xchange.dto.marketdata.Ticker)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"setTxFee(Coin)","u":"setTxFee(org.bitcoinj.base.Coin)"},{"p":"org.consensusj.jsonrpc.cli","c":"JavaLoggingSupport","l":"setVerbose()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"Sha256HashDeserializer","l":"Sha256HashDeserializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.Sha256HashList","l":"Sha256HashList(List<Sha256Hash>)","u":"%3Cinit%3E(java.util.List)"},{"p":"org.consensusj.bitcoin.json.conversion","c":"Sha256HashSerializer","l":"Sha256HashSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Signable","l":"Signable(Sha256Hash, int, Coin)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"SignedRawTransaction","l":"SignedRawTransaction(String, boolean)","u":"%3Cinit%3E(java.lang.String,boolean)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"SIGNET"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"signrawtransactionwithwallet(String)","u":"signrawtransactionwithwallet(java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"signrawtransactionwithwallet(String)","u":"signrawtransactionwithwallet(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"signRawTransactionWithWallet(String)","u":"signRawTransactionWithWallet(java.lang.String)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"signSendToAddress(Address, Coin)","u":"signSendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoinj.service","c":"SignTransactionService","l":"signSendToAddress(Address, Coin)","u":"signSendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"signTransaction(RawTransactionSigningRequest)","u":"signTransaction(org.consensusj.bitcoinj.signing.RawTransactionSigningRequest)"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"signTransaction(SigningRequest)","u":"signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"signTransaction(SigningRequest)","u":"signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionSigner","l":"signTransaction(SigningRequest)","u":"signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"size"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"source()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"source()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"source()"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"PollingChainTipServiceImpl","l":"start()"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"start()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"start()"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"start()"},{"p":"org.consensusj.exchange","c":"ObservableExchangeRateProvider","l":"start()"},{"p":"org.consensusj.jsonrpc.cli.test","c":"CLICommandResult","l":"status"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"statusFromErrorResponse(JsonRpcResponse<?>)","u":"statusFromErrorResponse(org.consensusj.jsonrpc.JsonRpcResponse)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"stdRelayTxFee"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"stdTxFee"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"stdTxFeeSatoshis"},{"p":"org.consensusj.bitcoin.json.rpc","c":"BitcoinJsonRpc","l":"stop()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"stop()"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"stop()"},{"p":"org.consensusj.daemon.micronaut","c":"MicronautWalletAppKitService","l":"stop()"},{"p":"org.consensusj.exchange","c":"BaseXChangeExchangeRateProvider","l":"stop()"},{"p":"org.consensusj.exchange","c":"ObservableExchangeRateProvider","l":"stop()"},{"p":"org.consensusj.jsonrpc.daemon","c":"EchoJsonRpcService","l":"stop()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"stream()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"stream()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"stream()"},{"p":"org.consensusj.bitcoin.rx","c":"ChainTipPublisher.Wrapper","l":"subscribe(Subscriber<? super ChainTip>)","u":"subscribe(org.reactivestreams.Subscriber)"},{"p":"org.consensusj.exchange.rx","c":"PolledObservablePair","l":"subscribeActual(Observer<? super ExchangeRateUpdate>)","u":"subscribeActual(io.reactivex.rxjava3.core.Observer)"},{"p":"org.consensusj.jsonrpc.introspection.sample","c":"MathService","l":"subtract(Integer, Integer)","u":"subtract(java.lang.Integer,java.lang.Integer)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"sumInputs(Collection<TransactionInputData>)","u":"sumInputs(java.util.Collection)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"sumInputSats(Collection<TransactionInputData>)","u":"sumInputSats(java.util.Collection)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"sumOutputs(Collection<TransactionOutputData>)","u":"sumOutputs(java.util.Collection)"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningUtils","l":"sumOutputSats(Collection<TransactionOutputData>)","u":"sumOutputSats(java.util.Collection)"},{"p":"org.consensusj.analytics.util.collector","c":"LargestSliceCollector","l":"supplier()"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport","l":"supplyAsync(AsyncSupport.ThrowingSupplier<T>)","u":"supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)"},{"p":"org.consensusj.jsonrpc","c":"AsyncSupport","l":"supplyAsync(AsyncSupport.ThrowingSupplier<T>, Executor)","u":"supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcTransport","l":"syncGet(CompletableFuture<R>)","u":"syncGet(java.util.concurrent.CompletableFuture)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"temporarilyUnavailableResponse(JsonRpcRequest, Throwable)","u":"temporarilyUnavailableResponse(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.Throwable)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.test","c":"TestChainTipPublishers","l":"TestChainTipPublishers()","u":"%3Cinit%3E()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"TESTNET"},{"p":"org.consensusj.bitcoinj.signing","c":"TestnetFeeCalculator","l":"TestnetFeeCalculator()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TestServers","l":"TestServers()","u":"%3Cinit%3E()"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider.MonitoredCurrency","l":"tickerMapper(Ticker)","u":"tickerMapper(org.knowm.xchange.dto.marketdata.Ticker)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"tickerSymbolConversions"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"tickerSymbolConversions"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"time"},{"p":"org.consensusj.exchange","c":"ExchangeRateChange","l":"timestamp"},{"p":"org.consensusj.analytics.service","c":"TokenRichList.TokenBalancePair","l":"TokenBalancePair(Address, N)","u":"%3Cinit%3E(org.bitcoinj.base.Address,N)"},{"p":"org.consensusj.analytics.service","c":"TokenRichList","l":"TokenRichList(int, Sha256Hash, long, ID, List<TokenRichList.TokenBalancePair<N>>, N)","u":"%3Cinit%3E(int,org.bitcoinj.base.Sha256Hash,long,ID,java.util.List,N)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"toMutableInput()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputData","l":"toMutableOutput()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"toOutPoint()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"toOutPoint()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage","l":"topic()"},{"p":"org.consensusj.rx.zeromq","c":"RxZmqContext","l":"topicPublisher(String)","u":"topicPublisher(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"Outpoint","l":"toString()"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"toString()"},{"p":"org.consensusj.decentralizedid.btcr","c":"ExtendedTxRef","l":"toString()"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"toString()"},{"p":"org.consensusj.exchange","c":"CurrencyUnitPair","l":"toString()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Invalid","l":"toString()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"toString()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"toString()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"toString()"},{"p":"org.consensusj.bitcoinj.signing","c":"DefaultSigningRequest","l":"toUnsignedTransaction()"},{"p":"org.consensusj.bitcoinj.signing","c":"SigningRequest","l":"toUnsignedTransaction()"},{"p":"org.consensusj.decentralizedid","c":"Did","l":"toURI()"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest.RawInput","l":"toUtxo()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputData","l":"toUtxo()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"toUtxo()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainBinaryService","l":"transactionBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"transactionBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"transactionBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainBinaryService","l":"transactionHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinSinglePortZmqService","l":"transactionHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqBinaryService","l":"transactionHashBinaryPublisher()"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"transactionHashPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"transactionHashPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"transactionHashPublisher()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"TransactionHexSerializer","l":"TransactionHexSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"TransactionIngredients","l":"TransactionIngredients()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"TransactionInputDataUtxo(Sha256Hash, int, Coin, Script)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin,org.bitcoinj.script.Script)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"TransactionOutputAddress(Coin, Address)","u":"%3Cinit%3E(org.bitcoinj.base.Coin,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"TransactionOutputAddress(long, Address)","u":"%3Cinit%3E(long,org.bitcoinj.base.Address)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputAddress","l":"TransactionOutputAddress(long, String)","u":"%3Cinit%3E(long,java.lang.String)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputDataScript","l":"TransactionOutputDataScript(Coin, Script)","u":"%3Cinit%3E(org.bitcoinj.base.Coin,org.bitcoinj.script.Script)"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionOutputOpReturn","l":"TransactionOutputOpReturn(byte[])","u":"%3Cinit%3E(byte[])"},{"p":"org.consensusj.bitcoin.rx.peergroup","c":"RxPeerGroup","l":"transactionPublisher()"},{"p":"org.consensusj.bitcoin.rx","c":"RxBlockchainService","l":"transactionPublisher()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"RxBitcoinZmqService","l":"transactionPublisher()"},{"p":"org.consensusj.bitcoin.json.conversion","c":"TransactionSerializer","l":"TransactionSerializer()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionVerification","l":"TransactionVerification()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"tx"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"txid"},{"p":"org.consensusj.bitcoinj.signing","c":"RawTransactionSigningRequest.RawInput","l":"txId()"},{"p":"org.consensusj.bitcoinj.signing","c":"TransactionInputDataUtxo","l":"txId()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Basic","l":"txId()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Complete","l":"txId()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo.Signable","l":"txId()"},{"p":"org.consensusj.bitcoinj.signing","c":"Utxo","l":"txId()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ReceivedByAddressInfo","l":"txids"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutInfo","l":"TxOutInfo(Sha256Hash, int, Coin, Map, int, boolean)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Coin,java.util.Map,int,boolean)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"TxOutSetInfo","l":"TxOutSetInfo(int, Sha256Hash, long, long, long, Sha256Hash, long, Coin)","u":"%3Cinit%3E(int,org.bitcoinj.base.Sha256Hash,long,long,long,org.bitcoinj.base.Sha256Hash,long,org.bitcoinj.base.Coin)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.service","c":"TxOutSetService","l":"TxOutSetService(RxBitcoinClient, ChainTipPublisher)","u":"%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient,org.consensusj.bitcoin.rx.ChainTipPublisher)"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","c":"TxOutSetWatcherSample","l":"TxOutSetWatcherSample()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"type()"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"typeForClass(Class<?>)","u":"typeForClass(java.lang.Class)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcClient","l":"typeForClass(Class<?>)","u":"typeForClass(java.lang.Class)"},{"p":"org.consensusj.exchange.rx","c":"ExchangeRateUpdate","l":"unknown(CurrencyUnitPair)","u":"unknown(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"unloadWallet()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"unloadWallet(String, Boolean)","u":"unloadWallet(java.lang.String,java.lang.Boolean)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnloadWalletResult","l":"UnloadWalletResult(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"UnspentOutput","l":"UnspentOutput(Sha256Hash, int, Address, String, String, Coin, int, String, String, boolean, boolean, String, boolean)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,int,org.bitcoinj.base.Address,java.lang.String,java.lang.String,org.bitcoinj.base.Coin,int,java.lang.String,java.lang.String,boolean,boolean,java.lang.String,boolean)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"uriScheme()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"usage"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"usage()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"V1"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"V2"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"valid()"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter","l":"valid(String, Object)","u":"valid(java.lang.String,java.lang.Object)"},{"p":"org.consensusj.jsonrpc.cli","c":"CliParameter.Valid","l":"Valid(String, Object)","u":"%3Cinit%3E(java.lang.String,java.lang.Object)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"value"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage","l":"value()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.IncludeTxFlag","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.IncludeTxFlag","l":"values()"},{"p":"org.consensusj.bitcoin.rx.zeromq","c":"BitcoinZmqMessage.Topic","l":"values()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcError.Error","l":"values()"},{"p":"org.consensusj.jsonrpc","c":"JsonRpcMessage.Version","l":"values()"},{"p":"org.consensusj.namecoin.jsonrpc.core","c":"NameCoinNetwork","l":"values()"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool.CommonsCLICall","l":"verbose"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"verify(Transaction, List<TransactionInputData>)","u":"verify(org.bitcoinj.core.Transaction,java.util.List)"},{"p":"org.consensusj.bitcoinj.signing","c":"BaseTransactionSigner","l":"verifyInput(Transaction, int, TransactionInputData)","u":"verifyInput(org.bitcoinj.core.Transaction,int,org.consensusj.bitcoinj.signing.TransactionInputData)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo","l":"version"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"Vin(Sha256Hash, long, Object, long)","u":"%3Cinit%3E(org.bitcoinj.base.Sha256Hash,long,java.lang.Object,long)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.VinList","l":"VinList()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vin","l":"vout"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.Vout","l":"Vout(Coin, int, RawTransactionInfo.ScriptPubKeyInfo)","u":"%3Cinit%3E(org.bitcoinj.base.Coin,int,org.consensusj.bitcoin.json.pojo.RawTransactionInfo.ScriptPubKeyInfo)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"RawTransactionInfo.VoutList","l":"VoutList()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BlockChainEnvironment","l":"waitForBlock()"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestEnvironment","l":"waitForBlock()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"waitForBlock(int, int)","u":"waitForBlock(int,int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"waitForBlockchainInfoAsync(Duration, Duration)","u":"waitForBlockchainInfoAsync(java.time.Duration,java.time.Duration)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BlockChainEnvironment","l":"waitForBlocks(int)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"RegTestEnvironment","l":"waitForBlocks(int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"waitForConnected()"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"waitForConnected(Duration)","u":"waitForConnected(java.time.Duration)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"waitForServer(Duration)","u":"waitForServer(java.time.Duration)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"waitForServer(Duration, Duration, Supplier<JsonRpcRequest>, DefaultRpcClient.TransientErrorMapper<T>)","u":"waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)"},{"p":"org.consensusj.jsonrpc","c":"DefaultRpcClient","l":"waitForServer(Duration, Duration, Supplier<JsonRpcRequest>, JavaType, DefaultRpcClient.TransientErrorMapper<T>)","u":"waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"waitForServer(int)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinClient","l":"waitForServerAsync(Duration, Duration)","u":"waitForServerAsync(java.time.Duration,java.time.Duration)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"BlockchainSyncing","l":"waitForSync(BitcoinClient)","u":"waitForSync(org.consensusj.bitcoin.jsonrpc.BitcoinClient)"},{"p":"org.consensusj.daemon.micronaut","c":"WalletAppKitJsonRpcService","l":"WalletAppKitJsonRpcService(WalletAppKitService)","u":"%3Cinit%3E(org.consensusj.bitcoin.services.WalletAppKitService)"},{"p":"org.consensusj.bitcoin.services","c":"WalletAppKitService","l":"WalletAppKitService(WalletAppKit)","u":"%3Cinit%3E(org.bitcoinj.kits.WalletAppKit)"},{"p":"org.consensusj.daemon.micronaut","c":"BitcoinDaemonConfig","l":"walletBaseName()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo.WalletConflictList","l":"WalletConflictList()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.services","c":"WalletSigningService","l":"WalletSigningService(Wallet)","u":"%3Cinit%3E(org.bitcoinj.wallet.Wallet)"},{"p":"org.consensusj.bitcoin.jsonrpc.test","c":"WalletTestUtil","l":"WalletTestUtil()","u":"%3Cinit%3E()"},{"p":"org.consensusj.bitcoin.json.pojo","c":"WalletTransactionInfo","l":"WalletTransactionInfo(Coin, Coin, int, Sha256Hash, int, long, Sha256Hash, WalletTransactionInfo.WalletConflictList, long, long, String, WalletTransactionInfo.DetailList, String, RawTransactionInfo)","u":"%3Cinit%3E(org.bitcoinj.base.Coin,org.bitcoinj.base.Coin,int,org.bitcoinj.base.Sha256Hash,int,long,org.bitcoinj.base.Sha256Hash,org.consensusj.bitcoin.json.pojo.WalletTransactionInfo.WalletConflictList,long,long,java.lang.String,org.consensusj.bitcoin.json.pojo.WalletTransactionInfo.DetailList,java.lang.String,org.consensusj.bitcoin.json.pojo.RawTransactionInfo)"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"web3ClientVersion()"},{"p":"org.consensusj.ethereum.jsonrpc","c":"EthereumClient","l":"web3Sha3(String)","u":"web3Sha3(java.lang.String)"},{"p":"org.consensusj.bitcoin.jsonrpc","c":"BitcoinExtendedClient","l":"withWallet(String, String, String)","u":"withWallet(java.lang.String,java.lang.String,java.lang.String)"},{"p":"org.consensusj.jsonrpc.cli","c":"BaseJsonRpcTool","l":"writerFromStream(PrintStream)","u":"writerFromStream(java.io.PrintStream)"},{"p":"org.consensusj.bitcoin.cli","c":"BitcoinCLITool","l":"writerFromStream(PrintStream)","u":"writerFromStream(java.io.PrintStream)"},{"p":"org.consensusj.jsonrpc.cli","c":"GenericJsonRpcTool","l":"writerFromStream(PrintStream)","u":"writerFromStream(java.io.PrintStream)"},{"p":"org.consensusj.exchange.knowm","c":"KnowmExchangeRateProvider","l":"xchangePair(CurrencyUnitPair)","u":"xchangePair(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.exchange.knowm","c":"ReactiveKnowmExchangeProvider","l":"xchangePair(CurrencyUnitPair)","u":"xchangePair(org.consensusj.exchange.CurrencyUnitPair)"},{"p":"org.consensusj.bitcoin.json.pojo","c":"BlockInfo.IncludeTxFlag","l":"YES"},{"p":"org.consensusj.bitcoin.json.pojo","c":"ZmqNotification","l":"ZmqNotification(String, String, int)","u":"%3Cinit%3E(java.lang.String,java.lang.String,int)"},{"p":"org.consensusj.rx.zeromq","c":"ZMsgSocketFlowable","l":"ZMsgSocketFlowable()","u":"%3Cinit%3E()"}];updateSearchResults();
\ No newline at end of file
diff --git a/apidoc/org/consensusj/analytics/service/RichListService.html b/apidoc/org/consensusj/analytics/service/RichListService.html
index 051f71814..24b51a2e5 100644
--- a/apidoc/org/consensusj/analytics/service/RichListService.html
+++ b/apidoc/org/consensusj/analytics/service/RichListService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RichListService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RichListService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.analytics.service, interface: RichListService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -94,13 +108,13 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>io.reactivex.rxjava3.core.Single&lt;<a href="TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="RichListService.html" title="type parameter in RichListService">N</a>,<wbr><a href="RichListService.html" title="type parameter in RichListService">ID</a>&gt;&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>io.reactivex.rxjava3.core.Single<wbr>&lt;<a href="TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="RichListService.html" title="type parameter in RichListService">N</a>,<wbr><a href="RichListService.html" title="type parameter in RichListService">ID</a>&gt;&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#richList(ID,int)" class="member-name-link">richList</a><wbr>(<a href="RichListService.html" title="type parameter in RichListService">ID</a>&nbsp;currencyID,
  int&nbsp;numEntries)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Return a single rich list</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;<a href="TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="RichListService.html" title="type parameter in RichListService">N</a>,<wbr><a href="RichListService.html" title="type parameter in RichListService">ID</a>&gt;&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;<a href="TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="RichListService.html" title="type parameter in RichListService">N</a>,<wbr><a href="RichListService.html" title="type parameter in RichListService">ID</a>&gt;&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#richListUpdates(ID,int)" class="member-name-link">richListUpdates</a><wbr>(<a href="RichListService.html" title="type parameter in RichListService">ID</a>&nbsp;currencyID,
  int&nbsp;numEntries)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
@@ -123,7 +137,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="richList(ID,int)">
 <h3 id="richList(java.lang.Object,int)">richList</h3>
-<div class="member-signature"><span class="return-type">io.reactivex.rxjava3.core.Single&lt;<a href="TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="RichListService.html" title="type parameter in RichListService">N</a>,<wbr><a href="RichListService.html" title="type parameter in RichListService">ID</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/analytics/service/RichListService.html#line-21">richList</a></span><wbr><span class="parameters">(<a href="RichListService.html" title="type parameter in RichListService">ID</a>&nbsp;currencyID,
+<div class="member-signature"><span class="return-type">io.reactivex.rxjava3.core.Single&lt;<a href="TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="RichListService.html" title="type parameter in RichListService">N</a>,<wbr><a href="RichListService.html" title="type parameter in RichListService">ID</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/analytics/service/RichListService.html#line-22">richList</a></span><wbr><span class="parameters">(<a href="RichListService.html" title="type parameter in RichListService">ID</a>&nbsp;currencyID,
  int&nbsp;numEntries)</span></div>
 <div class="block">Return a single rich list</div>
 <dl class="notes">
@@ -138,7 +152,7 @@ <h3 id="richList(java.lang.Object,int)">richList</h3>
 <li>
 <section class="detail" id="richListUpdates(ID,int)">
 <h3 id="richListUpdates(java.lang.Object,int)">richListUpdates</h3>
-<div class="member-signature"><span class="return-type">org.reactivestreams.Publisher&lt;<a href="TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="RichListService.html" title="type parameter in RichListService">N</a>,<wbr><a href="RichListService.html" title="type parameter in RichListService">ID</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/analytics/service/RichListService.html#line-30">richListUpdates</a></span><wbr><span class="parameters">(<a href="RichListService.html" title="type parameter in RichListService">ID</a>&nbsp;currencyID,
+<div class="member-signature"><span class="return-type">org.reactivestreams.Publisher&lt;<a href="TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="RichListService.html" title="type parameter in RichListService">N</a>,<wbr><a href="RichListService.html" title="type parameter in RichListService">ID</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/analytics/service/RichListService.html#line-31">richListUpdates</a></span><wbr><span class="parameters">(<a href="RichListService.html" title="type parameter in RichListService">ID</a>&nbsp;currencyID,
  int&nbsp;numEntries)</span></div>
 <div class="block">Get a continuous stream of rich list updates</div>
 <dl class="notes">
diff --git a/apidoc/org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html b/apidoc/org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html
index 0387ab0a2..337958038 100644
--- a/apidoc/org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html
+++ b/apidoc/org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TokenRichList.TokenBalancePair (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TokenRichList.TokenBalancePair (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.analytics.service, class: TokenRichList, class: TokenBalancePair">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -77,7 +91,7 @@ <h1 title="Class TokenRichList.TokenBalancePair" class="title">Class TokenRichLi
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="TokenRichList.html" title="type parameter in TokenRichList">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="TokenRichList.html" title="type parameter in TokenRichList">N</a>&gt;,<wbr><a href="TokenRichList.html" title="type parameter in TokenRichList">ID</a>&gt;</dd>
+<dd><code><a href="TokenRichList.html" title="class in org.consensusj.analytics.service">TokenRichList</a>&lt;<a href="TokenRichList.html" title="type parameter in TokenRichList">N</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super <a href="TokenRichList.html" title="type parameter in TokenRichList">N</a>&gt;,<wbr><a href="TokenRichList.html" title="type parameter in TokenRichList">ID</a>&gt;</code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/analytics/service/TokenRichList.html#line-37">TokenRichList.TokenBalancePair</a>&lt;N extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Number.html" title="class or interface in java.lang" class="external-link">Number</a> &amp; <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;? super N&gt;&gt;</span>
diff --git a/apidoc/org/consensusj/analytics/service/TokenRichList.html b/apidoc/org/consensusj/analytics/service/TokenRichList.html
index 518501424..173702a3b 100644
--- a/apidoc/org/consensusj/analytics/service/TokenRichList.html
+++ b/apidoc/org/consensusj/analytics/service/TokenRichList.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TokenRichList (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TokenRichList (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.analytics.service, class: TokenRichList">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -140,7 +154,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="TokenRichList.html" title="type parameter in TokenRichList">N</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getOtherBalanceTotal()" class="member-name-link">getOtherBalanceTotal</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="TokenRichList.TokenBalancePair.html" title="class in org.consensusj.analytics.service">TokenRichList.TokenBalancePair</a>&lt;<a href="TokenRichList.html" title="type parameter in TokenRichList">N</a>&gt;&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="TokenRichList.TokenBalancePair.html" title="class in org.consensusj.analytics.service">TokenRichList.TokenBalancePair</a>&lt;<a href="TokenRichList.html" title="type parameter in TokenRichList">N</a>&gt;&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getRichList()" class="member-name-link">getRichList</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>long</code></div>
diff --git a/apidoc/org/consensusj/analytics/service/package-summary.html b/apidoc/org/consensusj/analytics/service/package-summary.html
index 068e2b61f..0b502e501 100644
--- a/apidoc/org/consensusj/analytics/service/package-summary.html
+++ b/apidoc/org/consensusj/analytics/service/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.analytics.service (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.analytics.service (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.analytics.service">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/analytics/service/package-tree.html b/apidoc/org/consensusj/analytics/service/package-tree.html
index 41a182d6b..b33936770 100644
--- a/apidoc/org/consensusj/analytics/service/package-tree.html
+++ b/apidoc/org/consensusj/analytics/service/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.analytics.service Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.analytics.service Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.analytics.service">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.analytics.service</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/analytics/util/collector/LargestSliceAccumulator.html b/apidoc/org/consensusj/analytics/util/collector/LargestSliceAccumulator.html
index 094da2dbf..df8e94cc8 100644
--- a/apidoc/org/consensusj/analytics/util/collector/LargestSliceAccumulator.html
+++ b/apidoc/org/consensusj/analytics/util/collector/LargestSliceAccumulator.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>LargestSliceAccumulator (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>LargestSliceAccumulator (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.analytics.util.collector, class: LargestSliceAccumulator">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/analytics/util/collector/LargestSliceCollector.html b/apidoc/org/consensusj/analytics/util/collector/LargestSliceCollector.html
index 52a1532bb..f9511eaf2 100644
--- a/apidoc/org/consensusj/analytics/util/collector/LargestSliceCollector.html
+++ b/apidoc/org/consensusj/analytics/util/collector/LargestSliceCollector.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>LargestSliceCollector (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>LargestSliceCollector (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.analytics.util.collector, class: LargestSliceCollector">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -141,24 +155,24 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/BiConsumer.html" title="class or interface in java.util.function" class="external-link">BiConsumer</a>&lt;<a href="LargestSliceAccumulator.html" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator</a>&lt;<a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/BiConsumer.html" title="class or interface in java.util.function" class="external-link">BiConsumer</a><wbr>&lt;<a href="LargestSliceAccumulator.html" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator</a>&lt;<a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#accumulator()" class="member-name-link">accumulator</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Set.html" title="class or interface in java.util" class="external-link">Set</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Collector.Characteristics.html" title="class or interface in java.util.stream" class="external-link">Collector.Characteristics</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Set.html" title="class or interface in java.util" class="external-link">Set</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Collector.Characteristics.html" title="class or interface in java.util.stream" class="external-link">Collector.Characteristics</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#characteristics()" class="member-name-link">characteristics</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Note that our accumulator won't work correctly <b>or</b> efficiently if a single accumulator
  is used from multiple threads.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/BinaryOperator.html" title="class or interface in java.util.function" class="external-link">BinaryOperator</a>&lt;<a href="LargestSliceAccumulator.html" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator</a>&lt;<a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/BinaryOperator.html" title="class or interface in java.util.function" class="external-link">BinaryOperator</a><wbr>&lt;<a href="LargestSliceAccumulator.html" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator</a>&lt;<a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#combiner()" class="member-name-link">combiner</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Function.html" title="class or interface in java.util.function" class="external-link">Function</a>&lt;<a href="LargestSliceAccumulator.html" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator</a>&lt;<a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;,<wbr><a href="LargestSliceList.html" title="interface in org.consensusj.analytics.util.collector">LargestSliceList</a>&lt;<a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Function.html" title="class or interface in java.util.function" class="external-link">Function</a><wbr>&lt;<a href="LargestSliceAccumulator.html" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator</a>&lt;<a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;,<wbr><a href="LargestSliceList.html" title="interface in org.consensusj.analytics.util.collector">LargestSliceList</a>&lt;<a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#finisher()" class="member-name-link">finisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Return a finisher function.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="LargestSliceAccumulator.html" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator</a>&lt;<a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a><wbr>&lt;<a href="LargestSliceAccumulator.html" title="class in org.consensusj.analytics.util.collector">LargestSliceAccumulator</a>&lt;<a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">E</a>,<wbr><a href="LargestSliceCollector.html" title="type parameter in LargestSliceCollector">N</a>&gt;&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#supplier()" class="member-name-link">supplier</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/analytics/util/collector/LargestSliceList.html b/apidoc/org/consensusj/analytics/util/collector/LargestSliceList.html
index 24d90d4bd..45a49a6e3 100644
--- a/apidoc/org/consensusj/analytics/util/collector/LargestSliceList.html
+++ b/apidoc/org/consensusj/analytics/util/collector/LargestSliceList.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>LargestSliceList (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>LargestSliceList (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.analytics.util.collector, interface: LargestSliceList">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -82,7 +96,7 @@ <h1 title="Interface LargestSliceList" class="title">Interface LargestSliceList&
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="LargestSliceCollector.html" title="class in org.consensusj.analytics.util.collector"><code>LargestSliceCollector</code></a></li>
 </ul>
 </dd>
@@ -101,7 +115,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="LargestSliceList.html" title="type parameter in LargestSliceList">E</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="LargestSliceList.html" title="type parameter in LargestSliceList">E</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getSliceList()" class="member-name-link">getSliceList</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="LargestSliceList.html" title="type parameter in LargestSliceList">N</a></code></div>
diff --git a/apidoc/org/consensusj/analytics/util/collector/LargestSliceListImpl.html b/apidoc/org/consensusj/analytics/util/collector/LargestSliceListImpl.html
index 414ba4e92..aa148eb19 100644
--- a/apidoc/org/consensusj/analytics/util/collector/LargestSliceListImpl.html
+++ b/apidoc/org/consensusj/analytics/util/collector/LargestSliceListImpl.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>LargestSliceListImpl (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>LargestSliceListImpl (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.analytics.util.collector, class: LargestSliceListImpl">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,7 +126,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="LargestSliceListImpl.html" title="type parameter in LargestSliceListImpl">E</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="LargestSliceListImpl.html" title="type parameter in LargestSliceListImpl">E</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getSliceList()" class="member-name-link">getSliceList</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="LargestSliceListImpl.html" title="type parameter in LargestSliceListImpl">N</a></code></div>
diff --git a/apidoc/org/consensusj/analytics/util/collector/package-summary.html b/apidoc/org/consensusj/analytics/util/collector/package-summary.html
index cbf344c60..33ecae8f8 100644
--- a/apidoc/org/consensusj/analytics/util/collector/package-summary.html
+++ b/apidoc/org/consensusj/analytics/util/collector/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.analytics.util.collector (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.analytics.util.collector (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.analytics.util.collector">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/analytics/util/collector/package-tree.html b/apidoc/org/consensusj/analytics/util/collector/package-tree.html
index b08d126b8..d9395330b 100644
--- a/apidoc/org/consensusj/analytics/util/collector/package-tree.html
+++ b/apidoc/org/consensusj/analytics/util/collector/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.analytics.util.collector Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.analytics.util.collector Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.analytics.util.collector">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.analytics.util.collector</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html b/apidoc/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html
index 40e150a4f..8fe5f7b8f 100644
--- a/apidoc/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html
+++ b/apidoc/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinCLITool.BitcoinCLICall (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinCLITool.BitcoinCLICall (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.cli, class: BitcoinCLITool, class: BitcoinCLICall">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -81,10 +95,10 @@ <h1 title="Class BitcoinCLITool.BitcoinCLICall" class="title">Class BitcoinCLITo
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="BitcoinCLITool.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool</a></dd>
+<dd><code><a href="BitcoinCLITool.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-63">BitcoinCLITool.BitcoinCLICall</a></span>
+<div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-64">BitcoinCLITool.BitcoinCLICall</a></span>
 <span class="extends-implements">extends <a href="../../jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool.CommonsCLICall</a></span></div>
 </section>
 <section class="summary">
@@ -163,7 +177,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.cli.BitcoinCLITool,java.io.PrintWriter,java.io.PrintWriter,java.lang.String[])">
 <h3>BitcoinCLICall</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html#line-67">BitcoinCLICall</a></span><wbr><span class="parameters">(<a href="BitcoinCLITool.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool</a>&nbsp;tool,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html#line-68">BitcoinCLICall</a></span><wbr><span class="parameters">(<a href="BitcoinCLITool.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool</a>&nbsp;tool,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/PrintWriter.html" title="class or interface in java.io" class="external-link">PrintWriter</a>&nbsp;out,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/PrintWriter.html" title="class or interface in java.io" class="external-link">PrintWriter</a>&nbsp;err,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</span></div>
@@ -180,7 +194,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="rpcClient(javax.net.ssl.SSLContext)">
 <h3>rpcClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html#line-72">rpcClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html#line-73">rpcClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext)</span></div>
 <dl class="notes">
 <dt>Overrides:</dt>
 <dd><code><a href="../../jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#rpcClient(javax.net.ssl.SSLContext)">rpcClient</a></code>&nbsp;in class&nbsp;<code><a href="../../jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool.CommonsCLICall</a></code></dd>
@@ -190,7 +204,7 @@ <h3>rpcClient</h3>
 <li>
 <section class="detail" id="rpcClient()">
 <h3>rpcClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html#line-98">rpcClient</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html#line-99">rpcClient</a></span>()</div>
 <dl class="notes">
 <dt>Overrides:</dt>
 <dd><code><a href="../../jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#rpcClient()">rpcClient</a></code>&nbsp;in class&nbsp;<code><a href="../../jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool.CommonsCLICall</a></code></dd>
@@ -200,7 +214,7 @@ <h3>rpcClient</h3>
 <li>
 <section class="detail" id="createClient(javax.net.ssl.SSLContext,org.consensusj.bitcoin.jsonrpc.RpcConfig)">
 <h3>createClient</h3>
-<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type"><a href="../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html#line-114">createClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
+<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type"><a href="../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html#line-115">createClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
  <a href="../jsonrpc/RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a>&nbsp;config)</span></div>
 <div class="block">Override this method to customize the client implementation subclass</div>
 <dl class="notes">
@@ -214,7 +228,7 @@ <h3>createClient</h3>
 <li>
 <section class="detail" id="getRPCConfig()">
 <h3>getRPCConfig</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../jsonrpc/RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html#line-121">getRPCConfig</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../jsonrpc/RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html#line-122">getRPCConfig</a></span>()</div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/cli/BitcoinCLITool.html b/apidoc/org/consensusj/bitcoin/cli/BitcoinCLITool.html
index c5562277e..dad4c7f65 100644
--- a/apidoc/org/consensusj/bitcoin/cli/BitcoinCLITool.html
+++ b/apidoc/org/consensusj/bitcoin/cli/BitcoinCLITool.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinCLITool (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinCLITool (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.cli, class: BitcoinCLITool">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -82,7 +96,7 @@ <h1 title="Class BitcoinCLITool" class="title">Class BitcoinCLITool</h1>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html" title="class or interface in java.util.spi" class="external-link">ToolProvider</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-25">BitcoinCLITool</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-26">BitcoinCLITool</a></span>
 <span class="extends-implements">extends <a href="../../jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></span></div>
 <div class="block">An attempt at cloning the <code>bitcoin-cli</code> tool, but using Java and <b>bitcoinj</b>.
  The generic JSON-RPC client in <code>consensusj-jsonrpc-cli</code> is better-maintained.</div>
@@ -189,7 +203,7 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.spi.ToolProvider">Methods inherited from interface&nbsp;java.util.spi.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html" title="class or interface in java.util.spi" class="external-link">ToolProvider</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#run(java.io.PrintStream,java.io.PrintStream,java.lang.String...)" title="class or interface in java.util.spi" class="external-link">run</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#description()" title="class or interface in java.util.spi" class="external-link">description</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#run(java.io.PrintStream,java.io.PrintStream,java.lang.String...)" title="class or interface in java.util.spi" class="external-link">run</a></code></div>
 </section>
 </li>
 </ul>
@@ -204,11 +218,11 @@ <h2>Field Details</h2>
 <li>
 <section class="detail" id="commandName">
 <h3>commandName</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-26">commandName</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-27">commandName</a></span></div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.cli.BitcoinCLITool.commandName">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -226,7 +240,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;()">
 <h3>BitcoinCLITool</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-29">BitcoinCLITool</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-30">BitcoinCLITool</a></span>()</div>
 </section>
 </li>
 </ul>
@@ -240,7 +254,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="name()">
 <h3>name</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-33">name</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-34">name</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#name()" title="class or interface in java.util.spi" class="external-link">name</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html" title="class or interface in java.util.spi" class="external-link">ToolProvider</a></code></dd>
@@ -252,7 +266,7 @@ <h3>name</h3>
 <li>
 <section class="detail" id="options()">
 <h3>options</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.apache.commons.cli.Options</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-38">options</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.apache.commons.cli.Options</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-39">options</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../../jsonrpc/cli/BaseJsonRpcTool.html#options()">options</a></code>&nbsp;in class&nbsp;<code><a href="../../jsonrpc/cli/BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></code></dd>
@@ -262,7 +276,7 @@ <h3>options</h3>
 <li>
 <section class="detail" id="main(java.lang.String[])">
 <h3>main</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-52">main</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</span></div>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-53">main</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</span></div>
 <div class="block">main method for bitcoinj-cli tool.
  <p>
  See <a href="BitcoinRpcCliOptions.html" title="class in org.consensusj.bitcoin.cli"><code>BitcoinRpcCliOptions</code></a> for options and <a href="https://bitcoin.org/en/developer-reference#bitcoin-core-apis">Bitcoin Core JSON-RPC API</a>
@@ -277,7 +291,7 @@ <h3>main</h3>
 <li>
 <section class="detail" id="createCall(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)">
 <h3>createCall</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="BitcoinCLITool.BitcoinCLICall.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool.BitcoinCLICall</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-58">createCall</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/PrintWriter.html" title="class or interface in java.io" class="external-link">PrintWriter</a>&nbsp;out,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="BitcoinCLITool.BitcoinCLICall.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool.BitcoinCLICall</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html#line-59">createCall</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/PrintWriter.html" title="class or interface in java.io" class="external-link">PrintWriter</a>&nbsp;out,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/PrintWriter.html" title="class or interface in java.io" class="external-link">PrintWriter</a>&nbsp;err,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>...&nbsp;args)</span></div>
 <dl class="notes">
diff --git a/apidoc/org/consensusj/bitcoin/cli/BitcoinRpcCliOptions.html b/apidoc/org/consensusj/bitcoin/cli/BitcoinRpcCliOptions.html
index 8943193ac..392076464 100644
--- a/apidoc/org/consensusj/bitcoin/cli/BitcoinRpcCliOptions.html
+++ b/apidoc/org/consensusj/bitcoin/cli/BitcoinRpcCliOptions.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinRpcCliOptions (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinRpcCliOptions (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.cli, class: BitcoinRpcCliOptions">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -84,7 +102,7 @@ <h1 title="Class BitcoinRpcCliOptions" class="title">Class BitcoinRpcCliOptions<
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../serialized-form.html#org.consensusj.bitcoin.cli.BitcoinRpcCliOptions">Serialized Form</a></li>
 </ul>
 </dd>
diff --git a/apidoc/org/consensusj/bitcoin/cli/package-summary.html b/apidoc/org/consensusj/bitcoin/cli/package-summary.html
index 91c16b8b3..c246054da 100644
--- a/apidoc/org/consensusj/bitcoin/cli/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/cli/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.cli (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.cli (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.cli">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/cli/package-tree.html b/apidoc/org/consensusj/bitcoin/cli/package-tree.html
index acc220fe5..93fffbafb 100644
--- a/apidoc/org/consensusj/bitcoin/cli/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/cli/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.cli Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.cli Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.cli">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.cli</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html
index 655f14df8..9d13cf6de 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AddressDeserializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AddressDeserializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: AddressDeserializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -82,7 +96,7 @@ <h1 title="Class AddressDeserializer" class="title">Class AddressDeserializer</h
 <dd><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/deser/NullValueProvider.html" title="class or interface in com.fasterxml.jackson.databind.deser" class="external-link">NullValueProvider</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-20">AddressDeserializer</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-19">AddressDeserializer</a></span>
 <span class="extends-implements">extends <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonDeserializer.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonDeserializer</a>&lt;org.bitcoinj.base.Address&gt;</span></div>
 <div class="block">Deserialize bitcoinj (family) addresses</div>
 </section>
@@ -117,12 +131,6 @@ <h2>Constructor Summary</h2>
 <div class="col-last even-row-color">
 <div class="block">Construct an address deserializer that validates addresses for the specified <code>Network</code>.</div>
 </div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)" class="member-name-link">AddressDeserializer</a><wbr>(org.bitcoinj.core.NetworkParameters&nbsp;netParams)</code></div>
-<div class="col-last odd-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#%3Cinit%3E(org.bitcoinj.base.Network)"><code>AddressDeserializer(Network)</code></a></div>
-</div>
-</div>
 </div>
 </section>
 </li>
@@ -164,7 +172,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;()">
 <h3>AddressDeserializer</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-27">AddressDeserializer</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-26">AddressDeserializer</a></span>()</div>
 <div class="block">Construct an address deserializer that will deserialize addresses for any of the default supported networks.
  See <code>Network</code> to understand what the supported networks are.</div>
 </section>
@@ -172,7 +180,7 @@ <h3>AddressDeserializer</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.Network)">
 <h3>AddressDeserializer</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-38">AddressDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-37">AddressDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network)</span></div>
 <div class="block">Construct an address deserializer that validates addresses for the specified <code>Network</code>.
  When deserializing addresses, addresses that are not from the specified network will cause a
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/exc/InvalidFormatException.html" title="class or interface in com.fasterxml.jackson.databind.exc" class="external-link"><code>InvalidFormatException</code></a> to be thrown during deserialization.</div>
@@ -183,26 +191,9 @@ <h3>AddressDeserializer</h3>
 </section>
 </li>
 <li>
-<section class="detail" id="&lt;init&gt;(org.bitcoinj.core.NetworkParameters)">
-<h3>AddressDeserializer</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-50">AddressDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.core.NetworkParameters&nbsp;netParams)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#%3Cinit%3E(org.bitcoinj.base.Network)"><code>AddressDeserializer(Network)</code></a></div>
-</div>
-<div class="block">Construct an address deserializer that validates addresses for the specified <code>NetworkParameters</code>.
- When deserializing addresses, addresses that are not from the specified network will cause a
- <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/exc/InvalidFormatException.html" title="class or interface in com.fasterxml.jackson.databind.exc" class="external-link"><code>InvalidFormatException</code></a> to be thrown during deserialization.</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>netParams</code> - Network parameters to specify the only network we will deserialize addresses for.</dd>
-</dl>
-</section>
-</li>
-<li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.AddressParser)">
 <h3>AddressDeserializer</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-61">AddressDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.base.AddressParser&nbsp;addressParser)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-45">AddressDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.base.AddressParser&nbsp;addressParser)</span></div>
 <div class="block">Construct an address deserializer with a custom <code>AddressParser</code></div>
 <dl class="notes">
 <dt>Parameters:</dt>
@@ -221,7 +212,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)">
 <h3>deserialize</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Address</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-65">deserialize</a></span><wbr><span class="parameters">(<a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonParser.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonParser</a>&nbsp;p,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Address</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html#line-49">deserialize</a></span><wbr><span class="parameters">(<a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonParser.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonParser</a>&nbsp;p,
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/DeserializationContext.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">DeserializationContext</a>&nbsp;ctxt)</span>
                                       throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
 <a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonProcessingException.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonProcessingException</a></span></div>
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html
index 8b910dc11..fdae78de7 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AddressKeyDeserializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AddressKeyDeserializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: AddressKeyDeserializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -78,7 +92,7 @@ <h1 title="Class AddressKeyDeserializer" class="title">Class AddressKeyDeseriali
 </div>
 <section class="class-description" id="class-description">
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-18">AddressKeyDeserializer</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-17">AddressKeyDeserializer</a></span>
 <span class="extends-implements">extends <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/KeyDeserializer.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">KeyDeserializer</a></span></div>
 <div class="block">Key Deserializer to support using Address as the key in a Map.</div>
 </section>
@@ -113,12 +127,6 @@ <h2>Constructor Summary</h2>
 <div class="col-last even-row-color">
 <div class="block">Construct an address KeyDeserializer that validates addresses for the specified <code>Network</code>.</div>
 </div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)" class="member-name-link">AddressKeyDeserializer</a><wbr>(org.bitcoinj.core.NetworkParameters&nbsp;netParams)</code></div>
-<div class="col-last odd-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">use <a href="#%3Cinit%3E(org.bitcoinj.base.Network)"><code>AddressKeyDeserializer(Network)</code></a></div>
-</div>
-</div>
 </div>
 </section>
 </li>
@@ -157,7 +165,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;()">
 <h3>AddressKeyDeserializer</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-25">AddressKeyDeserializer</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-24">AddressKeyDeserializer</a></span>()</div>
 <div class="block">Construct an address deserializer that will deserialize addresses for the default supported networks.
  See <code>Network</code> to understand what the supported networks are.</div>
 </section>
@@ -165,7 +173,7 @@ <h3>AddressKeyDeserializer</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.AddressParser)">
 <h3>AddressKeyDeserializer</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-33">AddressKeyDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.base.AddressParser&nbsp;addressParser)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-32">AddressKeyDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.base.AddressParser&nbsp;addressParser)</span></div>
 <div class="block">Construct an address KeyDeserializer with a custom <code>AddressParser</code></div>
 <dl class="notes">
 <dt>Parameters:</dt>
@@ -176,7 +184,7 @@ <h3>AddressKeyDeserializer</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.Network)">
 <h3>AddressKeyDeserializer</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-44">AddressKeyDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-43">AddressKeyDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network)</span></div>
 <div class="block">Construct an address KeyDeserializer that validates addresses for the specified <code>Network</code>.
  When deserializing addresses, addresses that are not from the specified network will cause a
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/exc/InvalidFormatException.html" title="class or interface in com.fasterxml.jackson.databind.exc" class="external-link"><code>InvalidFormatException</code></a> to be thrown during deserialization.</div>
@@ -186,16 +194,6 @@ <h3>AddressKeyDeserializer</h3>
 </dl>
 </section>
 </li>
-<li>
-<section class="detail" id="&lt;init&gt;(org.bitcoinj.core.NetworkParameters)">
-<h3>AddressKeyDeserializer</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-53">AddressKeyDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.core.NetworkParameters&nbsp;netParams)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">use <a href="#%3Cinit%3E(org.bitcoinj.base.Network)"><code>AddressKeyDeserializer(Network)</code></a></div>
-</div>
-</section>
-</li>
 </ul>
 </section>
 </li>
@@ -207,7 +205,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="deserializeKey(java.lang.String,com.fasterxml.jackson.databind.DeserializationContext)">
 <h3>deserializeKey</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-58">deserializeKey</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;key,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html#line-49">deserializeKey</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;key,
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/DeserializationContext.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">DeserializationContext</a>&nbsp;ctxt)</span>
                       throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
 <a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonProcessingException.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonProcessingException</a></span></div>
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/AddressSerializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/AddressSerializer.html
index 58de92686..86f714010 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/AddressSerializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/AddressSerializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AddressSerializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AddressSerializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: AddressSerializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html
index 974a167ba..27250a73c 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BlockHexDeserializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BlockHexDeserializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: BlockHexDeserializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -82,7 +96,7 @@ <h1 title="Class BlockHexDeserializer" class="title">Class BlockHexDeserializer<
 <dd><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/deser/NullValueProvider.html" title="class or interface in com.fasterxml.jackson.databind.deser" class="external-link">NullValueProvider</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#line-20">BlockHexDeserializer</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#line-18">BlockHexDeserializer</a></span>
 <span class="extends-implements">extends <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonDeserializer.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonDeserializer</a>&lt;org.bitcoinj.core.Block&gt;</span></div>
 <div class="block">Deserializes a hex string as a Bitcoin <code>Block</code></div>
 </section>
@@ -107,14 +121,6 @@ <h2>Constructor Summary</h2>
 <div class="table-header col-last">Description</div>
 <div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E()" class="member-name-link">BlockHexDeserializer</a>()</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.base.Network)" class="member-name-link">BlockHexDeserializer</a><wbr>(org.bitcoinj.base.Network&nbsp;network)</code></div>
-<div class="col-last odd-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)" class="member-name-link">BlockHexDeserializer</a><wbr>(org.bitcoinj.core.NetworkParameters&nbsp;netParams)</code></div>
-<div class="col-last even-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
 </div>
 </section>
 </li>
@@ -156,23 +162,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;()">
 <h3>BlockHexDeserializer</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#line-22">BlockHexDeserializer</a></span>()</div>
-</section>
-</li>
-<li>
-<section class="detail" id="&lt;init&gt;(org.bitcoinj.base.Network)">
-<h3>BlockHexDeserializer</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#line-25">BlockHexDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</section>
-</li>
-<li>
-<section class="detail" id="&lt;init&gt;(org.bitcoinj.core.NetworkParameters)">
-<h3>BlockHexDeserializer</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#line-29">BlockHexDeserializer</a></span><wbr><span class="parameters">(org.bitcoinj.core.NetworkParameters&nbsp;netParams)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#line-20">BlockHexDeserializer</a></span>()</div>
 </section>
 </li>
 </ul>
@@ -186,7 +176,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="deserialize(com.fasterxml.jackson.core.JsonParser,com.fasterxml.jackson.databind.DeserializationContext)">
 <h3>deserialize</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Block</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#line-33">deserialize</a></span><wbr><span class="parameters">(<a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonParser.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonParser</a>&nbsp;p,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Block</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html#line-22">deserialize</a></span><wbr><span class="parameters">(<a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonParser.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonParser</a>&nbsp;p,
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/DeserializationContext.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">DeserializationContext</a>&nbsp;ctxt)</span>
                                     throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
 <a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonProcessingException.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonProcessingException</a></span></div>
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/CoinDeserializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/CoinDeserializer.html
index 736c15524..a3c6fb02e 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/CoinDeserializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/CoinDeserializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CoinDeserializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CoinDeserializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: CoinDeserializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/CoinSerializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/CoinSerializer.html
index 0ae51f94b..016b706a6 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/CoinSerializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/CoinSerializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CoinSerializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CoinSerializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: CoinSerializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/ECKeyDeserializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/ECKeyDeserializer.html
index 1eea83cb9..7250a39c5 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/ECKeyDeserializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/ECKeyDeserializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ECKeyDeserializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ECKeyDeserializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: ECKeyDeserializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/ECKeySerializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/ECKeySerializer.html
index 81c5668f1..fdb19d701 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/ECKeySerializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/ECKeySerializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ECKeySerializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ECKeySerializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: ECKeySerializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/HexUtil.html b/apidoc/org/consensusj/bitcoin/json/conversion/HexUtil.html
index f52deb85d..9d42abe88 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/HexUtil.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/HexUtil.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>HexUtil (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>HexUtil (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: HexUtil">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/PeerSerializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/PeerSerializer.html
index 800db2592..159235ede 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/PeerSerializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/PeerSerializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>PeerSerializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>PeerSerializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: PeerSerializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/RpcClientModule.html b/apidoc/org/consensusj/bitcoin/json/conversion/RpcClientModule.html
index 123af83c1..26e375017 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/RpcClientModule.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/RpcClientModule.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RpcClientModule (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RpcClientModule (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: RpcClientModule">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -86,7 +104,7 @@ <h1 title="Class RpcClientModule" class="title">Class RpcClientModule</h1>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../serialized-form.html#org.consensusj.bitcoin.json.conversion.RpcClientModule">Serialized Form</a></li>
 </ul>
 </dd>
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/RpcServerModule.html b/apidoc/org/consensusj/bitcoin/json/conversion/RpcServerModule.html
index 4d504bc57..02c5c5063 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/RpcServerModule.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/RpcServerModule.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RpcServerModule (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RpcServerModule (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: RpcServerModule">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,13 +98,13 @@ <h1 title="Class RpcServerModule" class="title">Class RpcServerModule</h1>
 <dd><code><a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/Versioned.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">Versioned</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/RpcServerModule.html#line-17">RpcServerModule</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/RpcServerModule.html#line-16">RpcServerModule</a></span>
 <span class="extends-implements">extends <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/module/SimpleModule.html" title="class or interface in com.fasterxml.jackson.databind.module" class="external-link">SimpleModule</a></span></div>
 <div class="block">Jackson Module with serializers and deserializers for JSON-RPC servers.</div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../serialized-form.html#org.consensusj.bitcoin.json.conversion.RpcServerModule">Serialized Form</a></li>
 </ul>
 </dd>
@@ -122,10 +140,6 @@ <h2>Constructor Summary</h2>
 <div class="table-header col-last">Description</div>
 <div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E()" class="member-name-link">RpcServerModule</a>()</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.core.NetworkParameters)" class="member-name-link">RpcServerModule</a><wbr>(org.bitcoinj.core.NetworkParameters&nbsp;netParams)</code></div>
-<div class="col-last odd-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
 </div>
 </section>
 </li>
@@ -156,15 +170,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;()">
 <h3>RpcServerModule</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/RpcServerModule.html#line-18">RpcServerModule</a></span>()</div>
-</section>
-</li>
-<li>
-<section class="detail" id="&lt;init&gt;(org.bitcoinj.core.NetworkParameters)">
-<h3>RpcServerModule</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/RpcServerModule.html#line-34">RpcServerModule</a></span><wbr><span class="parameters">(org.bitcoinj.core.NetworkParameters&nbsp;netParams)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/conversion/RpcServerModule.html#line-17">RpcServerModule</a></span>()</div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/ScriptSerializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/ScriptSerializer.html
index faf4b2013..c8b03b120 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/ScriptSerializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/ScriptSerializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ScriptSerializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ScriptSerializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: ScriptSerializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/Sha256HashDeserializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/Sha256HashDeserializer.html
index cbab9e10d..825689718 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/Sha256HashDeserializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/Sha256HashDeserializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Sha256HashDeserializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Sha256HashDeserializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: Sha256HashDeserializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/Sha256HashSerializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/Sha256HashSerializer.html
index eb059d955..14dfa9049 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/Sha256HashSerializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/Sha256HashSerializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Sha256HashSerializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Sha256HashSerializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: Sha256HashSerializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/TransactionHexSerializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/TransactionHexSerializer.html
index 442a7d481..3b78ad868 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/TransactionHexSerializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/TransactionHexSerializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionHexSerializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionHexSerializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: TransactionHexSerializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/TransactionSerializer.html b/apidoc/org/consensusj/bitcoin/json/conversion/TransactionSerializer.html
index 5b1dadd31..7ac9f060a 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/TransactionSerializer.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/TransactionSerializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionSerializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionSerializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion, class: TransactionSerializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/package-summary.html b/apidoc/org/consensusj/bitcoin/json/conversion/package-summary.html
index b7ac4a26a..73e47cd39 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.json.conversion (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.json.conversion (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.conversion">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/conversion/package-tree.html b/apidoc/org/consensusj/bitcoin/json/conversion/package-tree.html
index 3ed7c2940..7bc617c6d 100644
--- a/apidoc/org/consensusj/bitcoin/json/conversion/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/json/conversion/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.json.conversion Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.json.conversion Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.json.conversion">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.json.conversion</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html b/apidoc/org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html
index 2a74ce00d..1e13ac5c0 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AddressGroupingItem (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AddressGroupingItem (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: AddressGroupingItem">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/AddressInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/AddressInfo.html
index b2d309fd9..43b4f4950 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/AddressInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/AddressInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AddressInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AddressInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: AddressInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -145,7 +159,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getLabel()" class="member-name-link">getLabel</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getLabels()" class="member-name-link">getLabels</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
@@ -157,7 +171,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getSolvable()" class="member-name-link">getSolvable</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Instant.html" title="class or interface in java.time" class="external-link">Instant</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Instant.html" title="class or interface in java.time" class="external-link">Instant</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getTimestamp()" class="member-name-link">getTimestamp</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
@@ -197,19 +211,19 @@ <h3>AddressInfo</h3>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>address</code> - </dd>
-<dd><code>ischange</code> - </dd>
-<dd><code>ismine</code> - </dd>
-<dd><code>label</code> - </dd>
-<dd><code>iswatchonly</code> - </dd>
-<dd><code>iswitness</code> - </dd>
-<dd><code>labels</code> - </dd>
 <dd><code>scriptPubKey</code> - </dd>
+<dd><code>ismine</code> - </dd>
 <dd><code>solvable</code> - </dd>
-<dd><code>isscript</code> - </dd>
-<dd><code>iscompressed</code> - </dd>
 <dd><code>desc</code> - </dd>
+<dd><code>iswatchonly</code> - </dd>
+<dd><code>isscript</code> - </dd>
+<dd><code>iswitness</code> - </dd>
 <dd><code>pubkey</code> - </dd>
+<dd><code>iscompressed</code> - </dd>
+<dd><code>label</code> - </dd>
+<dd><code>ischange</code> - </dd>
 <dd><code>timestamp</code> - </dd>
+<dd><code>labels</code> - </dd>
 </dl>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html
index 482b95491..0d72ed500 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinTransactionInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinTransactionInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: BitcoinTransactionInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -156,7 +170,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCategory()" class="member-name-link">getCategory</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getComment()" class="member-name-link">getComment</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
@@ -168,7 +182,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getLabel()" class="member-name-link">getLabel</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getOtherInfo()" class="member-name-link">getOtherInfo</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Instant.html" title="class or interface in java.time" class="external-link">Instant</a></code></div>
@@ -183,7 +197,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getVout()" class="member-name-link">getVout</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getWalletConflicts()" class="member-name-link">getWalletConflicts</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html
index 531c3b3f1..85e27ad16 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BlockChainInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BlockChainInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: BlockChainInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -76,7 +90,7 @@ <h1 title="Class BlockChainInfo" class="title">Class BlockChainInfo</h1>
 </div>
 <section class="class-description" id="class-description">
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-14">BlockChainInfo</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-15">BlockChainInfo</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
 <div class="block">POJO for `getblockchaininfo` RPC response.</div>
 </section>
@@ -106,33 +120,43 @@ <h2>Constructor Summary</h2>
 <section class="method-summary" id="method-summary">
 <h2>Method Summary</h2>
 <div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
 <div id="method-summary-table.tabpanel" role="tabpanel">
 <div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Sha256Hash</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBestBlockHash()" class="member-name-link">getBestBlockHash</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBlocks()" class="member-name-link">getBlocks</a>()</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static org.bitcoinj.base.Network</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#chainToNetwork(org.consensusj.bitcoin.json.pojo.BlockChainInfo)" class="member-name-link">chainToNetwork</a><wbr>(<a href="BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&nbsp;info)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Map a BlockChainInfo chain string to a Network.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Sha256Hash</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBestBlockHash()" class="member-name-link">getBestBlockHash</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getChain()" class="member-name-link">getChain</a>()</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBlocks()" class="member-name-link">getBlocks</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>byte[]</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getChainWork()" class="member-name-link">getChainWork</a>()</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getChain()" class="member-name-link">getChain</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html" title="class or interface in java.math" class="external-link">BigDecimal</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getDifficulty()" class="member-name-link">getDifficulty</a>()</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>byte[]</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getChainWork()" class="member-name-link">getChainWork</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getHeaders()" class="member-name-link">getHeaders</a>()</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html" title="class or interface in java.math" class="external-link">BigDecimal</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getDifficulty()" class="member-name-link">getDifficulty</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html" title="class or interface in java.math" class="external-link">BigDecimal</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getVerificationProgress()" class="member-name-link">getVerificationProgress</a>()</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getHeaders()" class="member-name-link">getHeaders</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html" title="class or interface in java.math" class="external-link">BigDecimal</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getVerificationProgress()" class="member-name-link">getVerificationProgress</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#networkToChainName(org.bitcoinj.base.BitcoinNetwork)" class="member-name-link">networkToChainName</a><wbr>(org.bitcoinj.base.BitcoinNetwork&nbsp;network)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Map <code>BitcoinNetwork</code> to a chain-id string.</div>
+</div>
 </div>
 </div>
 </div>
@@ -153,7 +177,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(java.lang.String,int,int,org.bitcoinj.base.Sha256Hash,java.math.BigDecimal,java.math.BigDecimal,byte[])">
 <h3>BlockChainInfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-23">BlockChainInfo</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;chain,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-24">BlockChainInfo</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;chain,
  int&nbsp;blocks,
  int&nbsp;headers,
  org.bitcoinj.base.Sha256Hash&nbsp;bestBlockHash,
@@ -173,7 +197,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="getChain()">
 <h3>getChain</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-44">getChain</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-45">getChain</a></span>()</div>
 <dl class="notes">
 <dt>Returns:</dt>
 <dd>a short string identifying which chain (Note: this differs from <code>BitcoinNetwork.toString()</code></dd>
@@ -183,37 +207,65 @@ <h3>getChain</h3>
 <li>
 <section class="detail" id="getBlocks()">
 <h3>getBlocks</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-48">getBlocks</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-49">getBlocks</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getHeaders()">
 <h3>getHeaders</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-52">getHeaders</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-53">getHeaders</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getBestBlockHash()">
 <h3>getBestBlockHash</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-56">getBestBlockHash</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-57">getBestBlockHash</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getDifficulty()">
 <h3>getDifficulty</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html" title="class or interface in java.math" class="external-link">BigDecimal</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-60">getDifficulty</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html" title="class or interface in java.math" class="external-link">BigDecimal</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-61">getDifficulty</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getVerificationProgress()">
 <h3>getVerificationProgress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html" title="class or interface in java.math" class="external-link">BigDecimal</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-64">getVerificationProgress</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/math/BigDecimal.html" title="class or interface in java.math" class="external-link">BigDecimal</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-65">getVerificationProgress</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getChainWork()">
 <h3>getChainWork</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">byte[]</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-68">getChainWork</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">byte[]</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-69">getChainWork</a></span>()</div>
+</section>
+</li>
+<li>
+<section class="detail" id="chainToNetwork(org.consensusj.bitcoin.json.pojo.BlockChainInfo)">
+<h3>chainToNetwork</h3>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">org.bitcoinj.base.Network</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-79">chainToNetwork</a></span><wbr><span class="parameters">(<a href="BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&nbsp;info)</span></div>
+<div class="block">Map a BlockChainInfo chain string to a Network. These strings are different from the standard values
+ in <code>BitcoinNetwork.toString()</code>.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>info</code> - <code>BlockChainInfo</code></dd>
+<dt>Returns:</dt>
+<dd>the matching network.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="networkToChainName(org.bitcoinj.base.BitcoinNetwork)">
+<h3>networkToChainName</h3>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html#line-106">networkToChainName</a></span><wbr><span class="parameters">(org.bitcoinj.base.BitcoinNetwork&nbsp;network)</span></div>
+<div class="block">Map <code>BitcoinNetwork</code> to a chain-id string.
+ Bitcoin Core returns strings that differ from <code>BitcoinNetwork.toString()</code>.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>network</code> - bitcoinj enum type</dd>
+<dt>Returns:</dt>
+<dd>Bitcoin Core-compatible <q>chain</q> string</dd>
+</dl>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.IncludeTxFlag.html b/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.IncludeTxFlag.html
index 93e402864..e55d17e47 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.IncludeTxFlag.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.IncludeTxFlag.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BlockInfo.IncludeTxFlag (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BlockInfo.IncludeTxFlag (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: BlockInfo, enum: IncludeTxFlag">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#enum-constant-summary">Enum Constants</a></li>
+<li>Field</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#enum-constant-detail">Enum Constants</a></li>
+<li>Field</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -83,7 +97,7 @@ <h1 title="Enum Class BlockInfo.IncludeTxFlag" class="title">Enum Class BlockInf
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dd>
+<dd><code><a href="BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static enum </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.html#line-18">BlockInfo.IncludeTxFlag</a></span>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.Sha256HashList.html b/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.Sha256HashList.html
index 6c449a64f..8ed334a20 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.Sha256HashList.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.Sha256HashList.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BlockInfo.Sha256HashList (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BlockInfo.Sha256HashList (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: BlockInfo, class: Sha256HashList">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -68,8 +86,8 @@
 <h1 title="Class BlockInfo.Sha256HashList" class="title">Class BlockInfo.Sha256HashList</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">java.util.AbstractCollection</a>&lt;E&gt;
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractList.html" title="class or interface in java.util" class="external-link">java.util.AbstractList</a>&lt;E&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">java.util.AbstractCollection</a>&lt;org.bitcoinj.base.Sha256Hash&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractList.html" title="class or interface in java.util" class="external-link">java.util.AbstractList</a>&lt;org.bitcoinj.base.Sha256Hash&gt;
 <div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html" title="class or interface in java.util" class="external-link">java.util.ArrayList</a>&lt;org.bitcoinj.base.Sha256Hash&gt;
 <div class="inheritance">org.consensusj.bitcoin.json.pojo.BlockInfo.Sha256HashList</div>
 </div>
@@ -79,11 +97,11 @@ <h1 title="Class BlockInfo.Sha256HashList" class="title">Class BlockInfo.Sha256H
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Cloneable.html" title="class or interface in java.lang" class="external-link">Cloneable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/RandomAccess.html" title="class or interface in java.util" class="external-link">RandomAccess</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Cloneable.html" title="class or interface in java.lang" class="external-link">Cloneable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/RandomAccess.html" title="class or interface in java.util" class="external-link">RandomAccess</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/SequencedCollection.html" title="class or interface in java.util" class="external-link">SequencedCollection</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></dd>
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></dd>
+<dd><code><a href="BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.html#line-71">BlockInfo.Sha256HashList</a></span>
@@ -91,7 +109,7 @@ <h1 title="Class BlockInfo.Sha256HashList" class="title">Class BlockInfo.Sha256H
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../serialized-form.html#org.consensusj.bitcoin.json.pojo.BlockInfo.Sha256HashList">Serialized Form</a></li>
 </ul>
 </dd>
@@ -127,7 +145,7 @@ <h2>Constructor Summary</h2>
 <h2>Method Summary</h2>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.ArrayList">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html" title="class or interface in java.util" class="external-link">ArrayList</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(int,E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(int,java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#contains(java.lang.Object)" title="class or interface in java.util" class="external-link">contains</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#ensureCapacity(int)" title="class or interface in java.util" class="external-link">ensureCapacity</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#forEach(java.util.function.Consumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#get(int)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#indexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">indexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#iterator()" title="class or interface in java.util" class="external-link">iterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#lastIndexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">lastIndexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator()" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator(int)" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(int)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeAll(java.util.Collection)" title="class or interface in java.util" class="external-link">removeAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeIf(java.util.function.Predicate)" title="class or interface in java.util" class="external-link">removeIf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeRange(int,int)" title="class or interface in java.util" class="external-link">removeRange</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#replaceAll(java.util.function.UnaryOperator)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#retainAll(java.util.Collection)" title="class or interface in java.util" class="external-link">retainAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#set(int,E)" title="class or interface in java.util" class="external-link">set</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#sort(java.util.Comparator)" title="class or interface in java.util" class="external-link">sort</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#spliterator()" title="class or interface in java.util" class="external-link">spliterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#subList(int,int)" title="class or interface in java.util" class="external-link">subList</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray()" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray(T%5B%5D)" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#trimToSize()" title="class or interface in java.util" class="external-link">trimToSize</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(int,E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(int,java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addFirst(E)" title="class or interface in java.util" class="external-link">addFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addLast(E)" title="class or interface in java.util" class="external-link">addLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#contains(java.lang.Object)" title="class or interface in java.util" class="external-link">contains</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#ensureCapacity(int)" title="class or interface in java.util" class="external-link">ensureCapacity</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#forEach(java.util.function.Consumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#get(int)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#getFirst()" title="class or interface in java.util" class="external-link">getFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#getLast()" title="class or interface in java.util" class="external-link">getLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#indexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">indexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#iterator()" title="class or interface in java.util" class="external-link">iterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#lastIndexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">lastIndexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator()" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator(int)" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(int)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeAll(java.util.Collection)" title="class or interface in java.util" class="external-link">removeAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeFirst()" title="class or interface in java.util" class="external-link">removeFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeIf(java.util.function.Predicate)" title="class or interface in java.util" class="external-link">removeIf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeLast()" title="class or interface in java.util" class="external-link">removeLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeRange(int,int)" title="class or interface in java.util" class="external-link">removeRange</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#replaceAll(java.util.function.UnaryOperator)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#retainAll(java.util.Collection)" title="class or interface in java.util" class="external-link">retainAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#set(int,E)" title="class or interface in java.util" class="external-link">set</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#sort(java.util.Comparator)" title="class or interface in java.util" class="external-link">sort</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#spliterator()" title="class or interface in java.util" class="external-link">spliterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#subList(int,int)" title="class or interface in java.util" class="external-link">subList</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray()" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray(T%5B%5D)" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#trimToSize()" title="class or interface in java.util" class="external-link">trimToSize</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.AbstractCollection">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">AbstractCollection</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html#toString()" title="class or interface in java.util" class="external-link">toString</a></code></div>
@@ -139,7 +157,7 @@ <h3 id="methods-inherited-from-class-java.util.Collection">Methods inherited fro
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#parallelStream()" title="class or interface in java.util" class="external-link">parallelStream</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#stream()" title="class or interface in java.util" class="external-link">stream</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#toArray(java.util.function.IntFunction)" title="class or interface in java.util" class="external-link">toArray</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.List">Methods inherited from interface&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#reversed()" title="class or interface in java.util" class="external-link">reversed</a></code></div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.html
index a63d4e61a..e52a14839 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/BlockInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BlockInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BlockInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: BlockInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/ChainTip.html b/apidoc/org/consensusj/bitcoin/json/pojo/ChainTip.html
index c7fcedb43..42ffd68d4 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/ChainTip.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/ChainTip.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ChainTip (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ChainTip (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: ChainTip">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -108,9 +122,11 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;<a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#findActiveChainTip(java.util.List)" class="member-name-link">findActiveChainTip</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&nbsp;chainTips)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">&nbsp;</div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Find the active chain tip if there is one</div>
+</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#findActiveChainTipOrElseThrow(java.util.List)" class="member-name-link">findActiveChainTipOrElseThrow</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&nbsp;chainTips)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">&nbsp;</div>
@@ -193,19 +209,26 @@ <h3>getStatus</h3>
 <li>
 <section class="detail" id="findActiveChainTip(java.util.List)">
 <h3>findActiveChainTip</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/ChainTip.html#line-47">findActiveChainTip</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&nbsp;chainTips)</span></div>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/ChainTip.html#line-52">findActiveChainTip</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&nbsp;chainTips)</span></div>
+<div class="block">Find the active chain tip if there is one</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>chainTips</code> - the list to search</dd>
+<dt>Returns:</dt>
+<dd>non-empty optional if active is found, empty optional if not found</dd>
+</dl>
 </section>
 </li>
 <li>
 <section class="detail" id="findActiveChainTipOrElseThrow(java.util.List)">
 <h3>findActiveChainTipOrElseThrow</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/ChainTip.html#line-51">findActiveChainTipOrElseThrow</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&nbsp;chainTips)</span></div>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/ChainTip.html#line-56">findActiveChainTipOrElseThrow</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&nbsp;chainTips)</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="ofActive(int,org.bitcoinj.base.Sha256Hash)">
 <h3>ofActive</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/ChainTip.html#line-62">ofActive</a></span><wbr><span class="parameters">(int&nbsp;height,
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/ChainTip.html#line-67">ofActive</a></span><wbr><span class="parameters">(int&nbsp;height,
  org.bitcoinj.base.Sha256Hash&nbsp;hash)</span></div>
 <div class="block">Construct an "active" <a href="ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a></div>
 <dl class="notes">
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/LoadWalletResult.html b/apidoc/org/consensusj/bitcoin/json/pojo/LoadWalletResult.html
index 07b9da6d5..543104874 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/LoadWalletResult.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/LoadWalletResult.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>LoadWalletResult (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>LoadWalletResult (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: LoadWalletResult">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/MethodHelpEntry.html b/apidoc/org/consensusj/bitcoin/json/pojo/MethodHelpEntry.html
index d639e708c..3db259edc 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/MethodHelpEntry.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/MethodHelpEntry.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>MethodHelpEntry (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>MethodHelpEntry (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: MethodHelpEntry">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/NetworkInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/NetworkInfo.html
index 04f2894d8..953d01d55 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/NetworkInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/NetworkInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>NetworkInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>NetworkInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: NetworkInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/Outpoint.html b/apidoc/org/consensusj/bitcoin/json/pojo/Outpoint.html
index e5493e645..d5dd27f3a 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/Outpoint.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/Outpoint.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Outpoint (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Outpoint (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: Outpoint">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html
index 61a169428..d4345d93f 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>PrevTxOutInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>PrevTxOutInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: PrevTxOutInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.ScriptPubKeyInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.ScriptPubKeyInfo.html
index 746c8f70e..e4932abab 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.ScriptPubKeyInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.ScriptPubKeyInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RawTransactionInfo.ScriptPubKeyInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RawTransactionInfo.ScriptPubKeyInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo, class: ScriptPubKeyInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -77,7 +91,7 @@ <h1 title="Class RawTransactionInfo.ScriptPubKeyInfo" class="title">Class RawTra
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></dd>
+<dd><code><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html#line-201">RawTransactionInfo.ScriptPubKeyInfo</a></span>
@@ -115,7 +129,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Address&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddresses()" class="member-name-link">getAddresses</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vin.html b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vin.html
index 3a9daff87..1c100594b 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vin.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vin.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RawTransactionInfo.Vin (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RawTransactionInfo.Vin (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo, class: Vin">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -77,7 +91,7 @@ <h1 title="Class RawTransactionInfo.Vin" class="title">Class RawTransactionInfo.
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></dd>
+<dd><code><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html#line-140">RawTransactionInfo.Vin</a></span>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VinList.html b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VinList.html
index c754b8a40..7517dd002 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VinList.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VinList.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RawTransactionInfo.VinList (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RawTransactionInfo.VinList (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo, class: VinList">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -68,8 +86,8 @@
 <h1 title="Class RawTransactionInfo.VinList" class="title">Class RawTransactionInfo.VinList</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">java.util.AbstractCollection</a>&lt;E&gt;
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractList.html" title="class or interface in java.util" class="external-link">java.util.AbstractList</a>&lt;E&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">java.util.AbstractCollection</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractList.html" title="class or interface in java.util" class="external-link">java.util.AbstractList</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;
 <div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html" title="class or interface in java.util" class="external-link">java.util.ArrayList</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;
 <div class="inheritance">org.consensusj.bitcoin.json.pojo.RawTransactionInfo.VinList</div>
 </div>
@@ -79,11 +97,11 @@ <h1 title="Class RawTransactionInfo.VinList" class="title">Class RawTransactionI
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Cloneable.html" title="class or interface in java.lang" class="external-link">Cloneable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/RandomAccess.html" title="class or interface in java.util" class="external-link">RandomAccess</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Cloneable.html" title="class or interface in java.lang" class="external-link">Cloneable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/RandomAccess.html" title="class or interface in java.util" class="external-link">RandomAccess</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/SequencedCollection.html" title="class or interface in java.util" class="external-link">SequencedCollection</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;</code></dd>
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></dd>
+<dd><code><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html#line-134">RawTransactionInfo.VinList</a></span>
@@ -91,7 +109,7 @@ <h1 title="Class RawTransactionInfo.VinList" class="title">Class RawTransactionI
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../serialized-form.html#org.consensusj.bitcoin.json.pojo.RawTransactionInfo.VinList">Serialized Form</a></li>
 </ul>
 </dd>
@@ -127,7 +145,7 @@ <h2>Constructor Summary</h2>
 <h2>Method Summary</h2>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.ArrayList">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html" title="class or interface in java.util" class="external-link">ArrayList</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(int,E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(int,java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#contains(java.lang.Object)" title="class or interface in java.util" class="external-link">contains</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#ensureCapacity(int)" title="class or interface in java.util" class="external-link">ensureCapacity</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#forEach(java.util.function.Consumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#get(int)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#indexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">indexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#iterator()" title="class or interface in java.util" class="external-link">iterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#lastIndexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">lastIndexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator()" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator(int)" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(int)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeAll(java.util.Collection)" title="class or interface in java.util" class="external-link">removeAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeIf(java.util.function.Predicate)" title="class or interface in java.util" class="external-link">removeIf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeRange(int,int)" title="class or interface in java.util" class="external-link">removeRange</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#replaceAll(java.util.function.UnaryOperator)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#retainAll(java.util.Collection)" title="class or interface in java.util" class="external-link">retainAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#set(int,E)" title="class or interface in java.util" class="external-link">set</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#sort(java.util.Comparator)" title="class or interface in java.util" class="external-link">sort</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#spliterator()" title="class or interface in java.util" class="external-link">spliterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#subList(int,int)" title="class or interface in java.util" class="external-link">subList</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray()" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray(T%5B%5D)" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#trimToSize()" title="class or interface in java.util" class="external-link">trimToSize</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(int,E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(int,java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addFirst(E)" title="class or interface in java.util" class="external-link">addFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addLast(E)" title="class or interface in java.util" class="external-link">addLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#contains(java.lang.Object)" title="class or interface in java.util" class="external-link">contains</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#ensureCapacity(int)" title="class or interface in java.util" class="external-link">ensureCapacity</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#forEach(java.util.function.Consumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#get(int)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#getFirst()" title="class or interface in java.util" class="external-link">getFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#getLast()" title="class or interface in java.util" class="external-link">getLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#indexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">indexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#iterator()" title="class or interface in java.util" class="external-link">iterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#lastIndexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">lastIndexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator()" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator(int)" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(int)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeAll(java.util.Collection)" title="class or interface in java.util" class="external-link">removeAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeFirst()" title="class or interface in java.util" class="external-link">removeFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeIf(java.util.function.Predicate)" title="class or interface in java.util" class="external-link">removeIf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeLast()" title="class or interface in java.util" class="external-link">removeLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeRange(int,int)" title="class or interface in java.util" class="external-link">removeRange</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#replaceAll(java.util.function.UnaryOperator)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#retainAll(java.util.Collection)" title="class or interface in java.util" class="external-link">retainAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#set(int,E)" title="class or interface in java.util" class="external-link">set</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#sort(java.util.Comparator)" title="class or interface in java.util" class="external-link">sort</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#spliterator()" title="class or interface in java.util" class="external-link">spliterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#subList(int,int)" title="class or interface in java.util" class="external-link">subList</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray()" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray(T%5B%5D)" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#trimToSize()" title="class or interface in java.util" class="external-link">trimToSize</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.AbstractCollection">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">AbstractCollection</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html#toString()" title="class or interface in java.util" class="external-link">toString</a></code></div>
@@ -139,7 +157,7 @@ <h3 id="methods-inherited-from-class-java.util.Collection">Methods inherited fro
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#parallelStream()" title="class or interface in java.util" class="external-link">parallelStream</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#stream()" title="class or interface in java.util" class="external-link">stream</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#toArray(java.util.function.IntFunction)" title="class or interface in java.util" class="external-link">toArray</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.List">Methods inherited from interface&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#reversed()" title="class or interface in java.util" class="external-link">reversed</a></code></div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vout.html b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vout.html
index b0755b150..96e5e6506 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vout.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vout.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RawTransactionInfo.Vout (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RawTransactionInfo.Vout (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo, class: Vout">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -77,7 +91,7 @@ <h1 title="Class RawTransactionInfo.Vout" class="title">Class RawTransactionInfo
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></dd>
+<dd><code><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html#line-174">RawTransactionInfo.Vout</a></span>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VoutList.html b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VoutList.html
index 9d782cc9b..fd389ab37 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VoutList.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VoutList.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RawTransactionInfo.VoutList (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RawTransactionInfo.VoutList (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo, class: VoutList">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -68,8 +86,8 @@
 <h1 title="Class RawTransactionInfo.VoutList" class="title">Class RawTransactionInfo.VoutList</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">java.util.AbstractCollection</a>&lt;E&gt;
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractList.html" title="class or interface in java.util" class="external-link">java.util.AbstractList</a>&lt;E&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">java.util.AbstractCollection</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractList.html" title="class or interface in java.util" class="external-link">java.util.AbstractList</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;
 <div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html" title="class or interface in java.util" class="external-link">java.util.ArrayList</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;
 <div class="inheritance">org.consensusj.bitcoin.json.pojo.RawTransactionInfo.VoutList</div>
 </div>
@@ -79,11 +97,11 @@ <h1 title="Class RawTransactionInfo.VoutList" class="title">Class RawTransaction
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Cloneable.html" title="class or interface in java.lang" class="external-link">Cloneable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/RandomAccess.html" title="class or interface in java.util" class="external-link">RandomAccess</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Cloneable.html" title="class or interface in java.lang" class="external-link">Cloneable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/RandomAccess.html" title="class or interface in java.util" class="external-link">RandomAccess</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/SequencedCollection.html" title="class or interface in java.util" class="external-link">SequencedCollection</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;</code></dd>
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></dd>
+<dd><code><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html#line-137">RawTransactionInfo.VoutList</a></span>
@@ -91,7 +109,7 @@ <h1 title="Class RawTransactionInfo.VoutList" class="title">Class RawTransaction
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../serialized-form.html#org.consensusj.bitcoin.json.pojo.RawTransactionInfo.VoutList">Serialized Form</a></li>
 </ul>
 </dd>
@@ -127,7 +145,7 @@ <h2>Constructor Summary</h2>
 <h2>Method Summary</h2>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.ArrayList">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html" title="class or interface in java.util" class="external-link">ArrayList</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(int,E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(int,java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#contains(java.lang.Object)" title="class or interface in java.util" class="external-link">contains</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#ensureCapacity(int)" title="class or interface in java.util" class="external-link">ensureCapacity</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#forEach(java.util.function.Consumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#get(int)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#indexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">indexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#iterator()" title="class or interface in java.util" class="external-link">iterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#lastIndexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">lastIndexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator()" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator(int)" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(int)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeAll(java.util.Collection)" title="class or interface in java.util" class="external-link">removeAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeIf(java.util.function.Predicate)" title="class or interface in java.util" class="external-link">removeIf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeRange(int,int)" title="class or interface in java.util" class="external-link">removeRange</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#replaceAll(java.util.function.UnaryOperator)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#retainAll(java.util.Collection)" title="class or interface in java.util" class="external-link">retainAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#set(int,E)" title="class or interface in java.util" class="external-link">set</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#sort(java.util.Comparator)" title="class or interface in java.util" class="external-link">sort</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#spliterator()" title="class or interface in java.util" class="external-link">spliterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#subList(int,int)" title="class or interface in java.util" class="external-link">subList</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray()" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray(T%5B%5D)" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#trimToSize()" title="class or interface in java.util" class="external-link">trimToSize</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(int,E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(int,java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addFirst(E)" title="class or interface in java.util" class="external-link">addFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addLast(E)" title="class or interface in java.util" class="external-link">addLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#contains(java.lang.Object)" title="class or interface in java.util" class="external-link">contains</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#ensureCapacity(int)" title="class or interface in java.util" class="external-link">ensureCapacity</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#forEach(java.util.function.Consumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#get(int)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#getFirst()" title="class or interface in java.util" class="external-link">getFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#getLast()" title="class or interface in java.util" class="external-link">getLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#indexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">indexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#iterator()" title="class or interface in java.util" class="external-link">iterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#lastIndexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">lastIndexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator()" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator(int)" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(int)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeAll(java.util.Collection)" title="class or interface in java.util" class="external-link">removeAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeFirst()" title="class or interface in java.util" class="external-link">removeFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeIf(java.util.function.Predicate)" title="class or interface in java.util" class="external-link">removeIf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeLast()" title="class or interface in java.util" class="external-link">removeLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeRange(int,int)" title="class or interface in java.util" class="external-link">removeRange</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#replaceAll(java.util.function.UnaryOperator)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#retainAll(java.util.Collection)" title="class or interface in java.util" class="external-link">retainAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#set(int,E)" title="class or interface in java.util" class="external-link">set</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#sort(java.util.Comparator)" title="class or interface in java.util" class="external-link">sort</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#spliterator()" title="class or interface in java.util" class="external-link">spliterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#subList(int,int)" title="class or interface in java.util" class="external-link">subList</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray()" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray(T%5B%5D)" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#trimToSize()" title="class or interface in java.util" class="external-link">trimToSize</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.AbstractCollection">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">AbstractCollection</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html#toString()" title="class or interface in java.util" class="external-link">toString</a></code></div>
@@ -139,7 +157,7 @@ <h3 id="methods-inherited-from-class-java.util.Collection">Methods inherited fro
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#parallelStream()" title="class or interface in java.util" class="external-link">parallelStream</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#stream()" title="class or interface in java.util" class="external-link">stream</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#toArray(java.util.function.IntFunction)" title="class or interface in java.util" class="external-link">toArray</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.List">Methods inherited from interface&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#reversed()" title="class or interface in java.util" class="external-link">reversed</a></code></div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html
index f467d6db1..55b3072b0 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RawTransactionInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RawTransactionInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -192,10 +206,10 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>long</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getVersion()" class="member-name-link">getVersion</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="RawTransactionInfo.Vin.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vin</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getVin()" class="member-name-link">getVin</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="RawTransactionInfo.Vout.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.Vout</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getVout()" class="member-name-link">getVout</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html
index d542fa28c..cc04265ba 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ReceivedByAddressInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ReceivedByAddressInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: ReceivedByAddressInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -102,7 +116,7 @@ <h2>Field Summary</h2>
 <div class="col-first odd-row-color"><code>final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second odd-row-color"><code><a href="#label" class="member-name-link">label</a></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color"><code>final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color"><code><a href="#txids" class="member-name-link">txids</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 </div>
@@ -145,7 +159,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getConfirmations()" class="member-name-link">getConfirmations</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getTxids()" class="member-name-link">getTxids</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/ServerInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/ServerInfo.html
index 63ff407c5..de942a577 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/ServerInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/ServerInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ServerInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ServerInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: ServerInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/SignedRawTransaction.html b/apidoc/org/consensusj/bitcoin/json/pojo/SignedRawTransaction.html
index 37a8dcfae..c4009f0c4 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/SignedRawTransaction.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/SignedRawTransaction.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>SignedRawTransaction (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>SignedRawTransaction (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: SignedRawTransaction">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/TxOutInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/TxOutInfo.html
index 8d99738cf..38e24f5e1 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/TxOutInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/TxOutInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TxOutInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TxOutInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: TxOutInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html
index 168f185ca..9a3aa57bf 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TxOutSetInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TxOutSetInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: TxOutSetInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/UnloadWalletResult.html b/apidoc/org/consensusj/bitcoin/json/pojo/UnloadWalletResult.html
index 7cb9fbcce..6656e26b3 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/UnloadWalletResult.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/UnloadWalletResult.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>UnloadWalletResult (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>UnloadWalletResult (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: UnloadWalletResult">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/UnspentOutput.html b/apidoc/org/consensusj/bitcoin/json/pojo/UnspentOutput.html
index af9a4b2e0..55080e905 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/UnspentOutput.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/UnspentOutput.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>UnspentOutput (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>UnspentOutput (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: UnspentOutput">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/UtxoInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/UtxoInfo.html
index 3c4a96d45..930cf2602 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/UtxoInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/UtxoInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>UtxoInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>UtxoInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, interface: UtxoInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.Detail.html b/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.Detail.html
index de3be0bb9..0dd9ff0af 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.Detail.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.Detail.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>WalletTransactionInfo.Detail (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>WalletTransactionInfo.Detail (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: WalletTransactionInfo, class: Detail">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -77,7 +91,7 @@ <h1 title="Class WalletTransactionInfo.Detail" class="title">Class WalletTransac
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></dd>
+<dd><code><a href="WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html#line-121">WalletTransactionInfo.Detail</a></span>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.DetailList.html b/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.DetailList.html
index 2198f7635..a95c0b95e 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.DetailList.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.DetailList.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>WalletTransactionInfo.DetailList (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>WalletTransactionInfo.DetailList (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: WalletTransactionInfo, class: DetailList">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -68,8 +86,8 @@
 <h1 title="Class WalletTransactionInfo.DetailList" class="title">Class WalletTransactionInfo.DetailList</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">java.util.AbstractCollection</a>&lt;E&gt;
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractList.html" title="class or interface in java.util" class="external-link">java.util.AbstractList</a>&lt;E&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">java.util.AbstractCollection</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractList.html" title="class or interface in java.util" class="external-link">java.util.AbstractList</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;
 <div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html" title="class or interface in java.util" class="external-link">java.util.ArrayList</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;
 <div class="inheritance">org.consensusj.bitcoin.json.pojo.WalletTransactionInfo.DetailList</div>
 </div>
@@ -79,11 +97,11 @@ <h1 title="Class WalletTransactionInfo.DetailList" class="title">Class WalletTra
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Cloneable.html" title="class or interface in java.lang" class="external-link">Cloneable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/RandomAccess.html" title="class or interface in java.util" class="external-link">RandomAccess</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Cloneable.html" title="class or interface in java.lang" class="external-link">Cloneable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/RandomAccess.html" title="class or interface in java.util" class="external-link">RandomAccess</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/SequencedCollection.html" title="class or interface in java.util" class="external-link">SequencedCollection</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;</code></dd>
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></dd>
+<dd><code><a href="WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html#line-118">WalletTransactionInfo.DetailList</a></span>
@@ -91,7 +109,7 @@ <h1 title="Class WalletTransactionInfo.DetailList" class="title">Class WalletTra
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../serialized-form.html#org.consensusj.bitcoin.json.pojo.WalletTransactionInfo.DetailList">Serialized Form</a></li>
 </ul>
 </dd>
@@ -127,7 +145,7 @@ <h2>Constructor Summary</h2>
 <h2>Method Summary</h2>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.ArrayList">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html" title="class or interface in java.util" class="external-link">ArrayList</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(int,E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(int,java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#contains(java.lang.Object)" title="class or interface in java.util" class="external-link">contains</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#ensureCapacity(int)" title="class or interface in java.util" class="external-link">ensureCapacity</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#forEach(java.util.function.Consumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#get(int)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#indexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">indexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#iterator()" title="class or interface in java.util" class="external-link">iterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#lastIndexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">lastIndexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator()" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator(int)" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(int)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeAll(java.util.Collection)" title="class or interface in java.util" class="external-link">removeAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeIf(java.util.function.Predicate)" title="class or interface in java.util" class="external-link">removeIf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeRange(int,int)" title="class or interface in java.util" class="external-link">removeRange</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#replaceAll(java.util.function.UnaryOperator)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#retainAll(java.util.Collection)" title="class or interface in java.util" class="external-link">retainAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#set(int,E)" title="class or interface in java.util" class="external-link">set</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#sort(java.util.Comparator)" title="class or interface in java.util" class="external-link">sort</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#spliterator()" title="class or interface in java.util" class="external-link">spliterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#subList(int,int)" title="class or interface in java.util" class="external-link">subList</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray()" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray(T%5B%5D)" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#trimToSize()" title="class or interface in java.util" class="external-link">trimToSize</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(int,E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(int,java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addFirst(E)" title="class or interface in java.util" class="external-link">addFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addLast(E)" title="class or interface in java.util" class="external-link">addLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#contains(java.lang.Object)" title="class or interface in java.util" class="external-link">contains</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#ensureCapacity(int)" title="class or interface in java.util" class="external-link">ensureCapacity</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#forEach(java.util.function.Consumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#get(int)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#getFirst()" title="class or interface in java.util" class="external-link">getFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#getLast()" title="class or interface in java.util" class="external-link">getLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#indexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">indexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#iterator()" title="class or interface in java.util" class="external-link">iterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#lastIndexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">lastIndexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator()" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator(int)" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(int)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeAll(java.util.Collection)" title="class or interface in java.util" class="external-link">removeAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeFirst()" title="class or interface in java.util" class="external-link">removeFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeIf(java.util.function.Predicate)" title="class or interface in java.util" class="external-link">removeIf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeLast()" title="class or interface in java.util" class="external-link">removeLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeRange(int,int)" title="class or interface in java.util" class="external-link">removeRange</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#replaceAll(java.util.function.UnaryOperator)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#retainAll(java.util.Collection)" title="class or interface in java.util" class="external-link">retainAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#set(int,E)" title="class or interface in java.util" class="external-link">set</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#sort(java.util.Comparator)" title="class or interface in java.util" class="external-link">sort</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#spliterator()" title="class or interface in java.util" class="external-link">spliterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#subList(int,int)" title="class or interface in java.util" class="external-link">subList</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray()" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray(T%5B%5D)" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#trimToSize()" title="class or interface in java.util" class="external-link">trimToSize</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.AbstractCollection">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">AbstractCollection</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html#toString()" title="class or interface in java.util" class="external-link">toString</a></code></div>
@@ -139,7 +157,7 @@ <h3 id="methods-inherited-from-class-java.util.Collection">Methods inherited fro
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#parallelStream()" title="class or interface in java.util" class="external-link">parallelStream</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#stream()" title="class or interface in java.util" class="external-link">stream</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#toArray(java.util.function.IntFunction)" title="class or interface in java.util" class="external-link">toArray</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.List">Methods inherited from interface&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#reversed()" title="class or interface in java.util" class="external-link">reversed</a></code></div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.WalletConflictList.html b/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.WalletConflictList.html
index 43464242c..e612c7d86 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.WalletConflictList.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.WalletConflictList.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>WalletTransactionInfo.WalletConflictList (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>WalletTransactionInfo.WalletConflictList (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: WalletTransactionInfo, class: WalletConflictList">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -68,8 +86,8 @@
 <h1 title="Class WalletTransactionInfo.WalletConflictList" class="title">Class WalletTransactionInfo.WalletConflictList</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">java.util.AbstractCollection</a>&lt;E&gt;
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractList.html" title="class or interface in java.util" class="external-link">java.util.AbstractList</a>&lt;E&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">java.util.AbstractCollection</a>&lt;org.bitcoinj.base.Sha256Hash&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractList.html" title="class or interface in java.util" class="external-link">java.util.AbstractList</a>&lt;org.bitcoinj.base.Sha256Hash&gt;
 <div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html" title="class or interface in java.util" class="external-link">java.util.ArrayList</a>&lt;org.bitcoinj.base.Sha256Hash&gt;
 <div class="inheritance">org.consensusj.bitcoin.json.pojo.WalletTransactionInfo.WalletConflictList</div>
 </div>
@@ -79,11 +97,11 @@ <h1 title="Class WalletTransactionInfo.WalletConflictList" class="title">Class W
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Cloneable.html" title="class or interface in java.lang" class="external-link">Cloneable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/RandomAccess.html" title="class or interface in java.util" class="external-link">RandomAccess</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Cloneable.html" title="class or interface in java.lang" class="external-link">Cloneable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Iterable.html" title="class or interface in java.lang" class="external-link">Iterable</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/RandomAccess.html" title="class or interface in java.util" class="external-link">RandomAccess</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/SequencedCollection.html" title="class or interface in java.util" class="external-link">SequencedCollection</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></dd>
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></dd>
+<dd><code><a href="WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html#line-115">WalletTransactionInfo.WalletConflictList</a></span>
@@ -91,7 +109,7 @@ <h1 title="Class WalletTransactionInfo.WalletConflictList" class="title">Class W
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../serialized-form.html#org.consensusj.bitcoin.json.pojo.WalletTransactionInfo.WalletConflictList">Serialized Form</a></li>
 </ul>
 </dd>
@@ -127,7 +145,7 @@ <h2>Constructor Summary</h2>
 <h2>Method Summary</h2>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.ArrayList">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html" title="class or interface in java.util" class="external-link">ArrayList</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(int,E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(int,java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#contains(java.lang.Object)" title="class or interface in java.util" class="external-link">contains</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#ensureCapacity(int)" title="class or interface in java.util" class="external-link">ensureCapacity</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#forEach(java.util.function.Consumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#get(int)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#indexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">indexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#iterator()" title="class or interface in java.util" class="external-link">iterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#lastIndexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">lastIndexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator()" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator(int)" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(int)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeAll(java.util.Collection)" title="class or interface in java.util" class="external-link">removeAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeIf(java.util.function.Predicate)" title="class or interface in java.util" class="external-link">removeIf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeRange(int,int)" title="class or interface in java.util" class="external-link">removeRange</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#replaceAll(java.util.function.UnaryOperator)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#retainAll(java.util.Collection)" title="class or interface in java.util" class="external-link">retainAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#set(int,E)" title="class or interface in java.util" class="external-link">set</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#sort(java.util.Comparator)" title="class or interface in java.util" class="external-link">sort</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#spliterator()" title="class or interface in java.util" class="external-link">spliterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#subList(int,int)" title="class or interface in java.util" class="external-link">subList</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray()" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray(T%5B%5D)" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#trimToSize()" title="class or interface in java.util" class="external-link">trimToSize</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(int,E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#add(E)" title="class or interface in java.util" class="external-link">add</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(int,java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addAll(java.util.Collection)" title="class or interface in java.util" class="external-link">addAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addFirst(E)" title="class or interface in java.util" class="external-link">addFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#addLast(E)" title="class or interface in java.util" class="external-link">addLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#contains(java.lang.Object)" title="class or interface in java.util" class="external-link">contains</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#ensureCapacity(int)" title="class or interface in java.util" class="external-link">ensureCapacity</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#forEach(java.util.function.Consumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#get(int)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#getFirst()" title="class or interface in java.util" class="external-link">getFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#getLast()" title="class or interface in java.util" class="external-link">getLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#indexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">indexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#iterator()" title="class or interface in java.util" class="external-link">iterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#lastIndexOf(java.lang.Object)" title="class or interface in java.util" class="external-link">lastIndexOf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator()" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#listIterator(int)" title="class or interface in java.util" class="external-link">listIterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(int)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeAll(java.util.Collection)" title="class or interface in java.util" class="external-link">removeAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeFirst()" title="class or interface in java.util" class="external-link">removeFirst</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeIf(java.util.function.Predicate)" title="class or interface in java.util" class="external-link">removeIf</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeLast()" title="class or interface in java.util" class="external-link">removeLast</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#removeRange(int,int)" title="class or interface in java.util" class="external-link">removeRange</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#replaceAll(java.util.function.UnaryOperator)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#retainAll(java.util.Collection)" title="class or interface in java.util" class="external-link">retainAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#set(int,E)" title="class or interface in java.util" class="external-link">set</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#sort(java.util.Comparator)" title="class or interface in java.util" class="external-link">sort</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#spliterator()" title="class or interface in java.util" class="external-link">spliterator</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#subList(int,int)" title="class or interface in java.util" class="external-link">subList</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray()" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#toArray(T%5B%5D)" title="class or interface in java.util" class="external-link">toArray</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/ArrayList.html#trimToSize()" title="class or interface in java.util" class="external-link">trimToSize</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.AbstractCollection">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html" title="class or interface in java.util" class="external-link">AbstractCollection</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractCollection.html#toString()" title="class or interface in java.util" class="external-link">toString</a></code></div>
@@ -139,7 +157,7 @@ <h3 id="methods-inherited-from-class-java.util.Collection">Methods inherited fro
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#parallelStream()" title="class or interface in java.util" class="external-link">parallelStream</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#stream()" title="class or interface in java.util" class="external-link">stream</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html#toArray(java.util.function.IntFunction)" title="class or interface in java.util" class="external-link">toArray</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.List">Methods inherited from interface&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#containsAll(java.util.Collection)" title="class or interface in java.util" class="external-link">containsAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html#reversed()" title="class or interface in java.util" class="external-link">reversed</a></code></div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html
index 05b839ca3..1726edaf1 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>WalletTransactionInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>WalletTransactionInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: WalletTransactionInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -158,7 +172,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getDecoded()" class="member-name-link">getDecoded</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="WalletTransactionInfo.Detail.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo.Detail</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getDetails()" class="member-name-link">getDetails</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Coin</code></div>
@@ -176,7 +190,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Sha256Hash</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getTxid()" class="member-name-link">getTxid</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getWalletconflicts()" class="member-name-link">getWalletconflicts</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/ZmqNotification.html b/apidoc/org/consensusj/bitcoin/json/pojo/ZmqNotification.html
index c271f1246..9f7b6886c 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/ZmqNotification.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/ZmqNotification.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ZmqNotification (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ZmqNotification (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo, class: ZmqNotification">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html
index 8d8899840..8b26653b3 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AddressBalanceInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AddressBalanceInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo.bitcore, class: AddressBalanceInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html
index f2dce6e63..0e97c7a6b 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AddressRequest (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AddressRequest (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo.bitcore, class: AddressRequest">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -107,7 +121,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Address&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddresses()" class="member-name-link">getAddresses</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoInfo.html b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoInfo.html
index 15d22d8a5..3d94c9266 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoInfo.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoInfo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AddressUtxoInfo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AddressUtxoInfo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo.bitcore, class: AddressUtxoInfo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoResult.html b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoResult.html
index e5e39dd79..85a062740 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoResult.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoResult.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AddressUtxoResult (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AddressUtxoResult (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo.bitcore, class: AddressUtxoResult">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -114,7 +128,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getHeight()" class="member-name-link">getHeight</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getUtxos()" class="member-name-link">getUtxos</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/package-summary.html b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/package-summary.html
index f2a8e9093..432aec649 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.json.pojo.bitcore (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.json.pojo.bitcore (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo.bitcore">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -67,7 +76,7 @@ <h1 title="Package org.consensusj.bitcoin.json.pojo.bitcore" class="title">Packa
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list-long">
+<ul class="tag-list-long">
 <li><a href="https://github.com/OmniLayer/omnicore/blob/master/src/omnicore/doc/rpc-api.md#data-retrieval-address-index">Data retrieval (address index) in OmniCore RPC API</a>
  <p>
  <a href="https://github.com/OmniLayer/omnicore/pull/1180">OmniCore PR #1180</a></li>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/package-tree.html b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/package-tree.html
index a45aa280d..81eb203d4 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/bitcore/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.json.pojo.bitcore Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.json.pojo.bitcore Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.json.pojo.bitcore">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.json.pojo.bitcore</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/package-summary.html b/apidoc/org/consensusj/bitcoin/json/pojo/package-summary.html
index fca009678..a210308ba 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.json.pojo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.json.pojo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.pojo">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/pojo/package-tree.html b/apidoc/org/consensusj/bitcoin/json/pojo/package-tree.html
index 4336ec4e6..9257fd28f 100644
--- a/apidoc/org/consensusj/bitcoin/json/pojo/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/json/pojo/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.json.pojo Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.json.pojo Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.json.pojo">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.json.pojo</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html b/apidoc/org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html
index c941afe84..5d60b62da 100644
--- a/apidoc/org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html
+++ b/apidoc/org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinJsonRpc (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinJsonRpc (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.rpc, interface: BitcoinJsonRpc">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -114,64 +128,64 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#createrawtransaction(java.util.List,java.util.List)" class="member-name-link">createrawtransaction</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&gt;&nbsp;inputs,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;&gt;&nbsp;outputs)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Coin&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Coin&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getbalance()" class="member-name-link">getbalance</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getbestblockhash()" class="member-name-link">getbestblockhash</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getblock(java.lang.String,java.lang.Integer)" class="member-name-link">getblock</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;blockHashString,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;verbosity)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getblockchaininfo()" class="member-name-link">getblockchaininfo</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getblockcount()" class="member-name-link">getblockcount</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getblockhash(java.lang.Integer)" class="member-name-link">getblockhash</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;blockNumber)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getblockheader(java.lang.String,java.lang.Boolean)" class="member-name-link">getblockheader</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;blockHashString,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;verbose)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getconnectioncount()" class="member-name-link">getconnectioncount</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../pojo/NetworkInfo.html" title="class in org.consensusj.bitcoin.json.pojo">NetworkInfo</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../pojo/NetworkInfo.html" title="class in org.consensusj.bitcoin.json.pojo">NetworkInfo</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getnetworkinfo()" class="member-name-link">getnetworkinfo</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Address&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Address&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getnewaddress()" class="member-name-link">getnewaddress</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#help()" class="member-name-link">help</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#listunspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)" class="member-name-link">listunspent</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;&nbsp;addresses,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;includeUnsafe)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#sendrawtransaction(java.lang.String)" class="member-name-link">sendrawtransaction</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hex)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#sendtoaddress(java.lang.String,java.lang.Double)" class="member-name-link">sendtoaddress</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;address,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Double.html" title="class or interface in java.lang" class="external-link">Double</a>&nbsp;amount)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../pojo/SignedRawTransaction.html" title="class in org.consensusj.bitcoin.json.pojo">SignedRawTransaction</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../pojo/SignedRawTransaction.html" title="class in org.consensusj.bitcoin.json.pojo">SignedRawTransaction</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#signrawtransactionwithwallet(java.lang.String)" class="member-name-link">signrawtransactionwithwallet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hex)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Currently all UTXOs must be present in the wallet and <code>sighashtype</code> defaults to <code>"ALL"</code>.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#stop()" class="member-name-link">stop</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
 </div>
@@ -195,7 +209,7 @@ <h3>DEFAULT_MIN_CONF</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../constant-values.html#org.consensusj.bitcoin.json.rpc.BitcoinJsonRpc.DEFAULT_MIN_CONF">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -209,7 +223,7 @@ <h3>DEFAULT_MAX_CONF</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../constant-values.html#org.consensusj.bitcoin.json.rpc.BitcoinJsonRpc.DEFAULT_MAX_CONF">Constant Field Values</a></li>
 </ul>
 </dd>
diff --git a/apidoc/org/consensusj/bitcoin/json/rpc/package-summary.html b/apidoc/org/consensusj/bitcoin/json/rpc/package-summary.html
index b110ff43a..a6649c7e6 100644
--- a/apidoc/org/consensusj/bitcoin/json/rpc/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/json/rpc/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.json.rpc (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.json.rpc (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.json.rpc">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/json/rpc/package-tree.html b/apidoc/org/consensusj/bitcoin/json/rpc/package-tree.html
index 2f10de79a..f307c0acf 100644
--- a/apidoc/org/consensusj/bitcoin/json/rpc/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/json/rpc/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.json.rpc Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.json.rpc Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.json.rpc">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.json.rpc</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html b/apidoc/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html
index d6f6c6db5..12b925966 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinClient (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinClient (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc, class: BitcoinClient">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,24 +86,22 @@
 <h1 title="Class BitcoinClient" class="title">Class BitcoinClient</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.AbstractRpcClient</a>
-<div class="inheritance"><a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection</a>
+<div class="inheritance"><a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.DefaultRpcClient</a>
 <div class="inheritance">org.consensusj.bitcoin.jsonrpc.BitcoinClient</div>
 </div>
 </div>
-</div>
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code>, <code><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code>, <code><a href="../../jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 </dl>
 <dl class="notes">
 <dt>Direct Known Subclasses:</dt>
 <dd><code><a href="BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></code>, <code><a href="../../namecoin/jsonrpc/NamecoinClient.html" title="class in org.consensusj.namecoin.jsonrpc">NamecoinClient</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-101">BitcoinClient</a></span>
-<span class="extends-implements">extends <a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-106">BitcoinClient</a></span>
+<span class="extends-implements">extends <a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a>
 implements <a href="ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></span></div>
 <div class="block">JSON-RPC Client for <b>Bitcoin Core</b>.
  <p>
@@ -117,7 +129,7 @@ <h1 title="Class BitcoinClient" class="title">Class BitcoinClient</h1>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list-long">
+<ul class="tag-list-long">
 <li><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc"><code>JsonRpcClient</code></a></li>
 <li><a href="https://bitcoincore.org/en/doc/">Bitcoin Core JSON-RPC API reference</a></li>
 <li><a href="https://github.com/bitcoin/bitcoin/issues/2960">Bitcoin Core Issue #2960: Support JSON-RPC 2.0</a>
@@ -134,8 +146,11 @@ <h1 title="Class BitcoinClient" class="title">Class BitcoinClient</h1>
 <section class="nested-class-summary" id="nested-class-summary">
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
+<h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Nested classes/interfaces inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h2>
+<code><a href="../../jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;<a href="../../jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="type parameter in DefaultRpcClient.TransientErrorMapper">T</a>&gt;, <a href="../../jsonrpc/DefaultRpcClient.TransportFactory.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></code></div>
+<div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
+<code><a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- =========== FIELD SUMMARY =========== -->
@@ -155,8 +170,8 @@ <h2>Field Summary</h2>
 <div class="col-last odd-row-color">&nbsp;</div>
 </div>
 <div class="inherited-list">
-<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="../../jsonrpc/AbstractRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="../../jsonrpc/AbstractRpcClient.html#mapper">mapper</a></code></div>
+<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h3>
+<code><a href="../../jsonrpc/DefaultRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="../../jsonrpc/DefaultRpcClient.html#mapper">mapper</a></code></div>
 </section>
 </li>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -186,26 +201,6 @@ <h2>Constructor Summary</h2>
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinClient</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;sslSocketFactory,
- org.bitcoinj.base.Network&nbsp;network,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</code></div>
-<div class="col-last odd-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"><code>BitcoinClient(SSLContext, Network, URI, String, String)</code></a></div>
-</div>
-</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinClient</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;sslSocketFactory,
- org.bitcoinj.core.NetworkParameters&nbsp;netParams,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</code></div>
-<div class="col-last even-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"><code>BitcoinClient(SSLContext, Network, URI, String, String)</code></a></div>
-</div>
-</div>
 <div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinClient</a><wbr>(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
@@ -213,15 +208,8 @@ <h2>Constructor Summary</h2>
 <div class="col-last odd-row-color">
 <div class="block">Construct a BitcoinClient from Network, URI, user name, and password.</div>
 </div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinClient</a><wbr>(org.bitcoinj.core.NetworkParameters&nbsp;netParams,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</code></div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)" class="member-name-link">BitcoinClient</a><wbr>(<a href="RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a>&nbsp;config)</code></div>
 <div class="col-last even-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)" class="member-name-link">BitcoinClient</a><wbr>(<a href="RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a>&nbsp;config)</code></div>
-<div class="col-last odd-row-color">
 <div class="block">Construct a BitcoinClient from an RPCConfig data object.</div>
 </div>
 </div>
@@ -254,26 +242,31 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Checks whether a command exists.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createRawTransaction(java.util.List,java.util.Map)" class="member-name-link">createRawTransaction</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/Outpoint.html" title="class in org.consensusj.bitcoin.json.pojo">Outpoint</a>&gt;&nbsp;inputs,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;org.bitcoinj.base.Address,<wbr>org.bitcoinj.base.Coin&gt;&nbsp;outputs)</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Void.html" title="class or interface in java.lang" class="external-link">Void</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#connectToServer(java.time.Duration)" class="member-name-link">connectToServer</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Actively connect to server (one time) waiting for it to start if necessary</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createRawTransaction(java.util.List,java.util.Map)" class="member-name-link">createRawTransaction</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/Outpoint.html" title="class in org.consensusj.bitcoin.json.pojo">Outpoint</a>&gt;&nbsp;inputs,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;org.bitcoinj.base.Address,<wbr>org.bitcoinj.base.Coin&gt;&nbsp;outputs)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Creates a raw transaction spending the given inputs to the given destinations.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)" class="member-name-link">createWallet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)" class="member-name-link">createWallet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;disablePrivateKeys,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;blank)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)" class="member-name-link">createWallet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)" class="member-name-link">createWallet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;disablePrivateKeys,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;blank,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;passPhrase,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;avoidReuse)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)" class="member-name-link">createWallet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)" class="member-name-link">createWallet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;disablePrivateKeys,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;blank,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;passPhrase,
@@ -281,77 +274,88 @@ <h2>Method Summary</h2>
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;descriptors,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;loadOnStartup,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;externalSigner)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.crypto.ECKey</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#dumpPrivKey(org.bitcoinj.base.Address)" class="member-name-link">dumpPrivKey</a><wbr>(org.bitcoinj.base.Address&nbsp;address)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.crypto.ECKey</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#dumpPrivKey(org.bitcoinj.base.Address)" class="member-name-link">dumpPrivKey</a><wbr>(org.bitcoinj.base.Address&nbsp;address)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Return the private key from the server.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#generateToAddress(int,org.bitcoinj.base.Address)" class="member-name-link">generateToAddress</a><wbr>(int&nbsp;numBlocks,
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#generateToAddress(int,org.bitcoinj.base.Address)" class="member-name-link">generateToAddress</a><wbr>(int&nbsp;numBlocks,
  org.bitcoinj.base.Address&nbsp;address)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Mine blocks immediately (RegTest mode)</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)" class="member-name-link">generateToAddress</a><wbr>(int&nbsp;numBlocks,
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)" class="member-name-link">generateToAddress</a><wbr>(int&nbsp;numBlocks,
  org.bitcoinj.base.Address&nbsp;address,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxtries)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Mine blocks immediately (RegTest mode)</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddedNodeInfo(boolean)" class="member-name-link">getAddedNodeInfo</a><wbr>(boolean&nbsp;details)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddedNodeInfo(boolean)" class="member-name-link">getAddedNodeInfo</a><wbr>(boolean&nbsp;details)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Return information about all added nodes</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddedNodeInfo(boolean,java.lang.String)" class="member-name-link">getAddedNodeInfo</a><wbr>(boolean&nbsp;details,
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddedNodeInfo(boolean,java.lang.String)" class="member-name-link">getAddedNodeInfo</a><wbr>(boolean&nbsp;details,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;node)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Return information about the given added node</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/bitcore/AddressBalanceInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressBalanceInfo</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddressBalance(java.util.List)" class="member-name-link">getAddressBalance</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;addressList)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/bitcore/AddressBalanceInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressBalanceInfo</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddressBalance(org.bitcoinj.base.Address)" class="member-name-link">getAddressBalance</a><wbr>(org.bitcoinj.base.Address&nbsp;address)</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddressBalance(java.util.List)" class="member-name-link">getAddressBalance</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;addressList)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/AddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">AddressInfo</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddressInfo(org.bitcoinj.base.Address)" class="member-name-link">getAddressInfo</a><wbr>(org.bitcoinj.base.Address&nbsp;address)</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/bitcore/AddressBalanceInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressBalanceInfo</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddressBalance(org.bitcoinj.base.Address)" class="member-name-link">getAddressBalance</a><wbr>(org.bitcoinj.base.Address&nbsp;address)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/bitcore/AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddressUtxos(java.util.List)" class="member-name-link">getAddressUtxos</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;addressList)</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/AddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">AddressInfo</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddressInfo(org.bitcoinj.base.Address)" class="member-name-link">getAddressInfo</a><wbr>(org.bitcoinj.base.Address&nbsp;address)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/bitcore/AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddressUtxos(org.bitcoinj.base.Address)" class="member-name-link">getAddressUtxos</a><wbr>(org.bitcoinj.base.Address&nbsp;address)</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/bitcore/AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddressUtxos(java.util.List)" class="member-name-link">getAddressUtxos</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;addressList)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/bitcore/AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getAddressUtxos(org.bitcoinj.base.Address)" class="member-name-link">getAddressUtxos</a><wbr>(org.bitcoinj.base.Address&nbsp;address)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Coin</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBalance()" class="member-name-link">getBalance</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Get the balance for a the default Bitcoin "account"</div>
+</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Coin</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBalance()" class="member-name-link">getBalance</a>()</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBalance(java.lang.String)" class="member-name-link">getBalance</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Get the balance for a the default Bitcoin "account"</div>
+<div class="block">Get the balance for a Bitcoin "account"</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Coin</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBalance(java.lang.String)" class="member-name-link">getBalance</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account)</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBalance(java.lang.String,java.lang.Integer)" class="member-name-link">getBalance</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Get the balance for a Bitcoin "account"</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Coin</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBalance(java.lang.String,java.lang.Integer)" class="member-name-link">getBalance</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf)</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.core.Block&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBestBlock()" class="member-name-link">getBestBlock</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Get the balance for a Bitcoin "account"</div>
+<div class="block">Composite query that first calls ChainTips, then gets best block for the active tip</div>
 </div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.core.Block</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBlock(org.bitcoinj.base.Sha256Hash)" class="member-name-link">getBlock</a><wbr>(org.bitcoinj.base.Sha256Hash&nbsp;hash)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns information about a block with the given block hash.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBlockChainInfo()" class="member-name-link">getBlockChainInfo</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.core.Block&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBlockAsync(org.bitcoinj.base.Sha256Hash)" class="member-name-link">getBlockAsync</a><wbr>(org.bitcoinj.base.Sha256Hash&nbsp;hash)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBlockChainInfo()" class="member-name-link">getBlockChainInfo</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">The getblockchaininfo RPC provides information about the current state of the block chain.</div>
 </div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBlockChainInfoAsync()" class="member-name-link">getBlockChainInfoAsync</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBlockCount()" class="member-name-link">getBlockCount</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
@@ -367,27 +371,25 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns information about a block with the given block hash.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getChainTips()" class="member-name-link">getChainTips</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Return information about all known tips in the block tree, including the main chain as well as orphaned branches.</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getChainTips()" class="member-name-link">getChainTips</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use <a href="#getChainTipsAsync()"><code>getChainTipsAsync()</code></a></div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCommands()" class="member-name-link">getCommands</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Returns a list of available commands.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ExecutorService.html" title="class or interface in java.util.concurrent" class="external-link">ExecutorService</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getDefaultAsyncExecutor()" class="member-name-link">getDefaultAsyncExecutor</a>()</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getChainTipsAsync()" class="member-name-link">getChainTipsAsync</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCommands()" class="member-name-link">getCommands</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Return the default executor for supplying asynchronicity.</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code>org.bitcoinj.core.NetworkParameters</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getNetParams()" class="member-name-link">getNetParams</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
-<div class="block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#getNetwork()"><code>getNetwork()</code></a></div>
+<div class="block">Returns a list of available commands.</div>
 </div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ExecutorService.html" title="class or interface in java.util.concurrent" class="external-link">ExecutorService</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getDefaultAsyncExecutor()" class="member-name-link">getDefaultAsyncExecutor</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Return the default executor for supplying asynchronicity.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Network</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getNetwork()" class="member-name-link">getNetwork</a>()</code></div>
@@ -454,116 +456,126 @@ <h2>Method Summary</h2>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns statistics about the unspent transaction output set.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ZmqNotification.html" title="class in org.consensusj.bitcoin.json.pojo">ZmqNotification</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/ZmqNotification.html" title="class in org.consensusj.bitcoin.json.pojo">ZmqNotification</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getZmqNotifications()" class="member-name-link">getZmqNotifications</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">The getzmqnotifications RPC returns information about which configured ZMQ notifications are enabled
+<div class="block">The <code>getzmqnotifications</code> RPC returns information about which configured ZMQ notifications are enabled
  and on which ports.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#help()" class="member-name-link">help</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Returns a human-readable list of available commands.</div>
-</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ZmqNotification.html" title="class in org.consensusj.bitcoin.json.pojo">ZmqNotification</a>&gt;&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getZmqNotificationsAsync()" class="member-name-link">getZmqNotificationsAsync</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#help(java.lang.String)" class="member-name-link">help</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;command)</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#help()" class="member-name-link">help</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Returns helpful information for a specific command.</div>
+<div class="block">Returns a human-readable list of available commands.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#helpAsLines()" class="member-name-link">helpAsLines</a>()</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#help(java.lang.String)" class="member-name-link">help</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;command)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Returns a human-readable list of available commands.</div>
+<div class="block">Returns helpful information for a specific command.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/MethodHelpEntry.html" title="class in org.consensusj.bitcoin.json.pojo">MethodHelpEntry</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#helpAsMethodEntries()" class="member-name-link">helpAsMethodEntries</a>()</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#helpAsLines()" class="member-name-link">helpAsLines</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns a human-readable list of available commands.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#helpAsStream()" class="member-name-link">helpAsStream</a>()</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/MethodHelpEntry.html" title="class in org.consensusj.bitcoin.json.pojo">MethodHelpEntry</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#helpAsMethodEntries()" class="member-name-link">helpAsMethodEntries</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns a human-readable list of available commands.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)" class="member-name-link">importPrivKey</a><wbr>(org.bitcoinj.crypto.ECKey&nbsp;privateKey,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
- boolean&nbsp;rescan)</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#helpAsStream()" class="member-name-link">helpAsStream</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Import a private key into the server's wallet</div>
+<div class="block">Returns a human-readable list of available commands.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#invalidateBlock(org.bitcoinj.base.Sha256Hash)" class="member-name-link">invalidateBlock</a><wbr>(org.bitcoinj.base.Sha256Hash&nbsp;hash)</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)" class="member-name-link">importPrivKey</a><wbr>(org.bitcoinj.crypto.ECKey&nbsp;privateKey,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
+ boolean&nbsp;rescan)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Permanently marks a block as invalid, as if it violated a consensus rule.</div>
+<div class="block">Import a private key into the server's wallet</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#isAddressIndexEnabled()" class="member-name-link">isAddressIndexEnabled</a>()</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#invalidateBlock(org.bitcoinj.base.Sha256Hash)" class="member-name-link">invalidateBlock</a><wbr>(org.bitcoinj.base.Sha256Hash&nbsp;hash)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Test if address index is enabled, caching the result of the first successful check</div>
+<div class="block">Permanently marks a block as invalid, as if it violated a consensus rule.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/AddressGroupingItem.html" title="class in org.consensusj.bitcoin.json.pojo">AddressGroupingItem</a>&gt;&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listAddressGroupings()" class="member-name-link">listAddressGroupings</a>()</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#isAddressIndexEnabled()" class="member-name-link">isAddressIndexEnabled</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Test if address index is enabled, caching the result of the first successful check</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/AddressGroupingItem.html" title="class in org.consensusj.bitcoin.json.pojo">AddressGroupingItem</a>&gt;&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listAddressGroupings()" class="member-name-link">listAddressGroupings</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns list of related addresses.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ReceivedByAddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">ReceivedByAddressInfo</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listReceivedByAddress(java.lang.Integer,java.lang.Boolean)" class="member-name-link">listReceivedByAddress</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/ReceivedByAddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">ReceivedByAddressInfo</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listReceivedByAddress(java.lang.Integer,java.lang.Boolean)" class="member-name-link">listReceivedByAddress</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;includeEmpty)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listTransactions()" class="member-name-link">listTransactions</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listTransactions()" class="member-name-link">listTransactions</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">List the default number (10) of wallet transactions.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listTransactions(java.lang.String,java.lang.Integer)" class="member-name-link">listTransactions</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listTransactions(java.lang.String,java.lang.Integer)" class="member-name-link">listTransactions</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;count)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">List wallet transactions.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)" class="member-name-link">listTransactions</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)" class="member-name-link">listTransactions</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;count,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;skip,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;includeWatchOnly)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">List wallet transactions</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspent()" class="member-name-link">listUnspent</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspent()" class="member-name-link">listUnspent</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns a list of unspent transaction outputs with at least one confirmation.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspent(java.lang.Integer,java.lang.Integer)" class="member-name-link">listUnspent</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspent(java.lang.Integer,java.lang.Integer)" class="member-name-link">listUnspent</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns a list of unspent transaction outputs with at least <code>minConf</code> and not more than <code>maxConf</code>
  confirmations.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)" class="member-name-link">listUnspent</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)" class="member-name-link">listUnspent</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;filter)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)" class="member-name-link">listUnspent</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)" class="member-name-link">listUnspent</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;filter,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;includeUnsafe)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns a list of unspent transaction outputs with at least <code>minConf</code> and not more than <code>maxConf</code>
  confirmations, filtered by a list of addresses.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)" class="member-name-link">listUnspent</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)" class="member-name-link">listUnspent</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf,
  org.bitcoinj.base.Address&nbsp;address)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listWallets()" class="member-name-link">listWallets</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listWallets()" class="member-name-link">listWallets</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../../jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#mapBitcoinTransientErrors(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)" class="member-name-link">mapBitcoinTransientErrors</a><wbr>(<a href="../../jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="../../jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;&nbsp;response,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">TransientErrorMapper suitable for waiting for a temporarily down or restarting Bitcoin JSON-RPC server.</div>
+</div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#reconsiderBlock(org.bitcoinj.base.Sha256Hash)" class="member-name-link">reconsiderBlock</a><wbr>(org.bitcoinj.base.Sha256Hash&nbsp;hash)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
@@ -638,20 +650,42 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Wait for RPC server to reach specified block height.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#waitForServer(int)" class="member-name-link">waitForServer</a><wbr>(int&nbsp;timeout)</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#waitForBlockchainInfoAsync(java.time.Duration,java.time.Duration)" class="member-name-link">waitForBlockchainInfoAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;retry)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Void.html" title="class or interface in java.lang" class="external-link">Void</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#waitForConnected()" class="member-name-link">waitForConnected</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">This is like waitForServer but does not initiate a connection.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Void.html" title="class or interface in java.lang" class="external-link">Void</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#waitForConnected(java.time.Duration)" class="member-name-link">waitForConnected</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code>boolean</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#waitForServer(int)" class="member-name-link">waitForServer</a><wbr>(int&nbsp;timeoutSeconds)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use <a href="#waitForServer(java.time.Duration)"><code>waitForServer(Duration)</code></a></div>
+</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#waitForServer(java.time.Duration)" class="member-name-link">waitForServer</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Wait until the server is available.</div>
+<div class="block">Poll the server regularly until it responds.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#waitForServerAsync(java.time.Duration,java.time.Duration)" class="member-name-link">waitForServerAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;retry)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Wait for a connection to the server.</div>
 </div>
 </div>
 </div>
 </div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></h3>
-<code><a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#getServerURI()">getServerURI</a>, <a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponse</a>, <a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="../../jsonrpc/AbstractRpcClient.html#base64Encode(java.lang.String)">base64Encode</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getDefaultSSLContext()">getDefaultSSLContext</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getDefaultType()">getDefaultType</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getMapper()">getMapper</a></code></div>
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h3>
+<code><a href="../../jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,com.fasterxml.jackson.databind.JavaType)">collectionTypeForClasses</a>, <a href="../../jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,java.lang.Class)">collectionTypeForClasses</a>, <a href="../../jsonrpc/DefaultRpcClient.html#defaultType()">defaultType</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getMapper()">getMapper</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getServerURI()">getServerURI</a>, <a href="../../jsonrpc/DefaultRpcClient.html#identityTransientErrorMapper(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">identityTransientErrorMapper</a>, <a href="../../jsonrpc/DefaultRpcClient.html#pollOnce(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">pollOnce</a>, <a href="../../jsonrpc/DefaultRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="../../jsonrpc/DefaultRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="../../jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponseAsync</a>, <a href="../../jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a>, <a href="../../jsonrpc/DefaultRpcClient.html#statusFromErrorResponse(org.consensusj.jsonrpc.JsonRpcResponse)">statusFromErrorResponse</a>, <a href="../../jsonrpc/DefaultRpcClient.html#temporarilyUnavailableResponse(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.Throwable)">temporarilyUnavailableResponse</a>, <a href="../../jsonrpc/DefaultRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a>, <a href="../../jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">waitForServer</a>, <a href="../../jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">waitForServer</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
@@ -659,11 +693,11 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
 <code><a href="../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JacksonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></h3>
-<code><a href="../../jsonrpc/JacksonRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="../../jsonrpc/JacksonRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponse</a>, <a href="../../jsonrpc/JacksonRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a></code></div>
-<div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></h3>
-<code><a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a></code></div>
+<code><a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.lang.Object...)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.util.List)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.util.List)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.lang.Object...)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.util.List)">sendAsync</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcTransport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></h3>
+<code><a href="../../jsonrpc/JsonRpcTransport.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponse</a>, <a href="../../jsonrpc/JsonRpcTransport.html#syncGet(java.util.concurrent.CompletableFuture)">syncGet</a></code></div>
 </section>
 </li>
 </ul>
@@ -678,11 +712,11 @@ <h2>Field Details</h2>
 <li>
 <section class="detail" id="BITCOIN_CORE_VERSION_MIN">
 <h3>BITCOIN_CORE_VERSION_MIN</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-110">BITCOIN_CORE_VERSION_MIN</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-116">BITCOIN_CORE_VERSION_MIN</a></span></div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.BitcoinClient.BITCOIN_CORE_VERSION_MIN">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -692,11 +726,11 @@ <h3>BITCOIN_CORE_VERSION_MIN</h3>
 <li>
 <section class="detail" id="BITCOIN_CORE_VERSION_DESC_DEFAULT">
 <h3>BITCOIN_CORE_VERSION_DESC_DEFAULT</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-111">BITCOIN_CORE_VERSION_DESC_DEFAULT</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-117">BITCOIN_CORE_VERSION_DESC_DEFAULT</a></span></div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.BitcoinClient.BITCOIN_CORE_VERSION_DESC_DEFAULT">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -714,45 +748,17 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">
 <h3>BitcoinClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-120">BitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
- org.bitcoinj.base.Network&nbsp;network,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
-</section>
-</li>
-<li>
-<section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">
-<h3>BitcoinClient</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-134">BitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;sslSocketFactory,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-130">BitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
  org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"><code>BitcoinClient(SSLContext, Network, URI, String, String)</code></a></div>
-</div>
-</section>
-</li>
-<li>
-<section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLSocketFactory,org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)">
-<h3>BitcoinClient</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-146">BitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;sslSocketFactory,
- org.bitcoinj.core.NetworkParameters&nbsp;netParams,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#%3Cinit%3E(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)"><code>BitcoinClient(SSLContext, Network, URI, String, String)</code></a></div>
-</div>
 </section>
 </li>
 <li>
 <section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)">
 <h3>BitcoinClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-162">BitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-154">BitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
@@ -772,7 +778,7 @@ <h3>BitcoinClient</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(java.net.URI,java.lang.String,java.lang.String)">
 <h3>BitcoinClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-175">BitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-168">BitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
 <div class="block">Incubating constructor that doesn't require a <code>Network</code>.
@@ -790,7 +796,7 @@ <h3>BitcoinClient</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">
 <h3>BitcoinClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-186">BitcoinClient</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-179">BitcoinClient</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
@@ -805,20 +811,9 @@ <h3>BitcoinClient</h3>
 </section>
 </li>
 <li>
-<section class="detail" id="&lt;init&gt;(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)">
-<h3>BitcoinClient</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-190">BitcoinClient</a></span><wbr><span class="parameters">(org.bitcoinj.core.NetworkParameters&nbsp;netParams,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</section>
-</li>
-<li>
 <section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.jsonrpc.RpcConfig)">
 <h3>BitcoinClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-199">BitcoinClient</a></span><wbr><span class="parameters">(<a href="RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a>&nbsp;config)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-187">BitcoinClient</a></span><wbr><span class="parameters">(<a href="RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a>&nbsp;config)</span></div>
 <div class="block">Construct a BitcoinClient from an RPCConfig data object.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
@@ -835,36 +830,25 @@ <h3>BitcoinClient</h3>
 <h2>Method Details</h2>
 <ul class="member-list">
 <li>
-<section class="detail" id="getNetParams()">
-<h3>getNetParams</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.NetworkParameters</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-208">getNetParams</a></span>()</div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#getNetwork()"><code>getNetwork()</code></a></div>
-</div>
-<div class="block">Get network parameters</div>
-<dl class="notes">
-<dt>Returns:</dt>
-<dd>network parameters for the server</dd>
-</dl>
-</section>
-</li>
-<li>
 <section class="detail" id="getNetwork()">
 <h3>getNetwork</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Network</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-228">getNetwork</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Network</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-210">getNetwork</a></span>()</div>
 <div class="block">Get network.
  <p>
  Historically the Bitcoin network has been required as a constructor parameter and required to match
  the mode of the server. However, to simplify client configuration we have added a constructor
  that doesn't require specification of a network. This changes some assumptions about how <code>BitcoinClient</code> works.
  Previously, no JSON-RPC I/O calls would be performed unless something was explicitly requested -- which
- also gave users of <code>BitcoinClient</code> the ability to call <a href="#waitForServer(int)"><code>waitForServer(int)</code></a>
+ also gave users of <code>BitcoinClient</code> the ability to call <a href="#waitForServer(java.time.Duration)"><code>waitForServer(Duration)</code></a>
  before calling any RPCs.
  <p>
  Until further improvements/changes are made, if you use one of the constructors that does not specify a
- <code>Network</code> you should call <a href="#getNetwork()"><code>getNetwork()</code></a> as soon as possible after calling the constructor
- (especially before calling any JSON-RPC I/O methods except <a href="#waitForServer(int)"><code>waitForServer(int)</code></a>).</div>
+ <code>Network</code> you should call <a href="#connectToServer(java.time.Duration)"><code>connectToServer(Duration)</code></a> as soon as possible after calling the constructor
+ (especially before calling any JSON-RPC I/O methods.
+ <p>
+  Well-behaved users of <code>BitcoinClient</code> should only call this method <i>after</i> either providing
+  a <code>Network</code> in the constructor or calling one of the methods that makes a connection. Because this
+  method is also used internally and indirectly, there is a short timeout specified for extra safety.</div>
 <dl class="notes">
 <dt>Returns:</dt>
 <dd>network for the server</dd>
@@ -874,8 +858,8 @@ <h3>getNetwork</h3>
 <li>
 <section class="detail" id="getDefaultAsyncExecutor()">
 <h3>getDefaultAsyncExecutor</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ExecutorService.html" title="class or interface in java.util.concurrent" class="external-link">ExecutorService</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-235">getDefaultAsyncExecutor</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="../../jsonrpc/AsyncSupport.html#getDefaultAsyncExecutor()">AsyncSupport</a></code></span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ExecutorService.html" title="class or interface in java.util.concurrent" class="external-link">ExecutorService</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-215">getDefaultAsyncExecutor</a></span>()</div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="../../jsonrpc/AsyncSupport.html#getDefaultAsyncExecutor()">AsyncSupport</a></code></span></div>
 <div class="block">Return the default executor for supplying asynchronicity.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -888,14 +872,14 @@ <h3>getDefaultAsyncExecutor</h3>
 <li>
 <section class="detail" id="close()">
 <h3>close</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-245">close</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-225">close</a></span>()
            throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/InterruptedException.html" title="class or interface in java.lang" class="external-link">InterruptedException</a></span></div>
 <div class="block">Shutdown our thread pool, etc.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link">close</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
 <dt>Specified by:</dt>
-<dd><code><a href="../../jsonrpc/JsonRpcClient.html#close()">close</a></code>&nbsp;in interface&nbsp;<code><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
+<dd><code><a href="../../jsonrpc/JsonRpcClient.html#close()">close</a></code>&nbsp;in interface&nbsp;<code><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/InterruptedException.html" title="class or interface in java.lang" class="external-link">InterruptedException</a></code> - if one happens</dd>
 </dl>
@@ -904,7 +888,7 @@ <h3>close</h3>
 <li>
 <section class="detail" id="isAddressIndexEnabled()">
 <h3>isAddressIndexEnabled</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-318">isAddressIndexEnabled</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-268">isAddressIndexEnabled</a></span>()
                               throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Test if address index is enabled, caching the result of the first successful check</div>
@@ -920,16 +904,20 @@ <h3>isAddressIndexEnabled</h3>
 <li>
 <section class="detail" id="waitForServer(int)">
 <h3>waitForServer</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-380">waitForServer</a></span><wbr><span class="parameters">(int&nbsp;timeout)</span>
+<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-328">waitForServer</a></span><wbr><span class="parameters">(int&nbsp;timeoutSeconds)</span>
                       throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use <a href="#waitForServer(java.time.Duration)"><code>waitForServer(Duration)</code></a></div>
+</div>
 <div class="block">Wait until the server is available.
-
+ <p>
  Keep trying, ignoring (and logging) a known list of exception conditions that may occur while waiting for
- a `bitcoind` server to start up. This is similar to the behavior enabled by the `-rpcwait`
- option to the `bitcoin-cli` command-line tool.</div>
+ a <code>bitcoind</code> server to start up. This is similar to the behavior enabled by the <code>-rpcwait</code>
+ option to the <code>bitcoin-cli</code> command-line tool.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>timeout</code> - Timeout in seconds</dd>
+<dd><code>timeoutSeconds</code> - Timeout in seconds</dd>
 <dt>Returns:</dt>
 <dd>true if ready, false if timeout or interrupted</dd>
 <dt>Throws:</dt>
@@ -938,9 +926,78 @@ <h3>waitForServer</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="waitForServer(java.time.Duration)">
+<h3>waitForServer</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-339">waitForServer</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout)</span>
+                      throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></span></div>
+<div class="block">Poll the server regularly until it responds.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>timeout</code> - how long to wait for server</dd>
+<dt>Returns:</dt>
+<dd>Completes with <code>true</code> if server responded, <code>false</code> for timeout</dd>
+<dt>Throws:</dt>
+<dd><code><a href="../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></code> - if an unexpected JsonRpcException occurs</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="connectToServer(java.time.Duration)">
+<h3>connectToServer</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Void.html" title="class or interface in java.lang" class="external-link">Void</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-354">connectToServer</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout)</span></div>
+<div class="block">Actively connect to server (one time) waiting for it to start if necessary</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>timeout</code> - how long to wait</dd>
+<dt>Returns:</dt>
+<dd>completes successfully on connection or exceptionally on fatal error or timeout</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="waitForConnected()">
+<h3>waitForConnected</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Void.html" title="class or interface in java.lang" class="external-link">Void</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-364">waitForConnected</a></span>()</div>
+<div class="block">This is like waitForServer but does not initiate a connection. It depends upon
+ something else having done so.</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>a future (possibly already completed) that indicates we have connected at least once to the server</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="waitForConnected(java.time.Duration)">
+<h3>waitForConnected</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Void.html" title="class or interface in java.lang" class="external-link">Void</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-368">waitForConnected</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="waitForServerAsync(java.time.Duration,java.time.Duration)">
+<h3>waitForServerAsync</h3>
+<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-380">waitForServerAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;retry)</span></div>
+<div class="block">Wait for a connection to the server. Uses <code>getblockchaininfo</code> to poll server.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>timeout</code> - how long to wait for server</dd>
+<dd><code>retry</code> - time to wait between retries</dd>
+<dt>Returns:</dt>
+<dd>Completes with <code>true</code> if server responded, <code>false</code> for timeout, exceptionally for unexpected errors.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="waitForBlockchainInfoAsync(java.time.Duration,java.time.Duration)">
+<h3>waitForBlockchainInfoAsync</h3>
+<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-394">waitForBlockchainInfoAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;retry)</span></div>
+</section>
+</li>
+<li>
 <section class="detail" id="waitForBlock(int,int)">
 <h3>waitForBlock</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-451">waitForBlock</a></span><wbr><span class="parameters">(int&nbsp;blockHeight,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-414">waitForBlock</a></span><wbr><span class="parameters">(int&nbsp;blockHeight,
  int&nbsp;timeout)</span>
                      throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -958,9 +1015,19 @@ <h3>waitForBlock</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="mapBitcoinTransientErrors(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">
+<h3>mapBitcoinTransientErrors</h3>
+<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../../jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-447">mapBitcoinTransientErrors</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="../../jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;&nbsp;response,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</span></div>
+<div class="block">TransientErrorMapper suitable for waiting for a temporarily down or restarting Bitcoin JSON-RPC server. This
+ can be used to implement the <code>-rpcwait</code> command-line option, for instance.</div>
+</section>
+</li>
+<li>
 <section class="detail" id="stop()">
 <h3>stop</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-487">stop</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-502">stop</a></span>()
             throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Tell the server to stop</div>
@@ -976,7 +1043,7 @@ <h3>stop</h3>
 <li>
 <section class="detail" id="getBlockCount()">
 <h3>getBlockCount</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-498">getBlockCount</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-513">getBlockCount</a></span>()
                       throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns the number of blocks in the longest block chain.</div>
@@ -992,7 +1059,7 @@ <h3>getBlockCount</h3>
 <li>
 <section class="detail" id="getBlockHash(java.lang.Integer)">
 <h3>getBlockHash</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-510">getBlockHash</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;index)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-525">getBlockHash</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;index)</span>
                                           throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns the hash of block in best-block-chain at index provided.</div>
@@ -1010,7 +1077,7 @@ <h3>getBlockHash</h3>
 <li>
 <section class="detail" id="getBlockInfo(org.bitcoinj.base.Sha256Hash)">
 <h3>getBlockInfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-522">getBlockInfo</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;hash)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-537">getBlockInfo</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;hash)</span>
                        throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns information about a block with the given block hash.</div>
@@ -1028,7 +1095,7 @@ <h3>getBlockInfo</h3>
 <li>
 <section class="detail" id="getBlock(org.bitcoinj.base.Sha256Hash)">
 <h3>getBlock</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Block</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-535">getBlock</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;hash)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Block</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-550">getBlock</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;hash)</span>
                                  throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns information about a block with the given block hash.</div>
@@ -1044,9 +1111,26 @@ <h3>getBlock</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="getBlockAsync(org.bitcoinj.base.Sha256Hash)">
+<h3>getBlockAsync</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.core.Block&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-554">getBlockAsync</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;hash)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="getBestBlock()">
+<h3>getBestBlock</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.core.Block&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-563">getBestBlock</a></span>()</div>
+<div class="block">Composite query that first calls ChainTips, then gets best block for the active tip</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>The current best block</dd>
+</dl>
+</section>
+</li>
+<li>
 <section class="detail" id="generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)">
 <h3>generateToAddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-551">generateToAddress</a></span><wbr><span class="parameters">(int&nbsp;numBlocks,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-582">generateToAddress</a></span><wbr><span class="parameters">(int&nbsp;numBlocks,
  org.bitcoinj.base.Address&nbsp;address,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxtries)</span>
                                                      throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1069,7 +1153,7 @@ <h3>generateToAddress</h3>
 <li>
 <section class="detail" id="generateToAddress(int,org.bitcoinj.base.Address)">
 <h3>generateToAddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-566">generateToAddress</a></span><wbr><span class="parameters">(int&nbsp;numBlocks,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-597">generateToAddress</a></span><wbr><span class="parameters">(int&nbsp;numBlocks,
  org.bitcoinj.base.Address&nbsp;address)</span>
                                                      throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Mine blocks immediately (RegTest mode)</div>
@@ -1090,7 +1174,7 @@ <h3>generateToAddress</h3>
 <li>
 <section class="detail" id="listWallets()">
 <h3>listWallets</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-570">listWallets</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-601">listWallets</a></span>()
                          throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <dl class="notes">
@@ -1103,7 +1187,7 @@ <h3>listWallets</h3>
 <li>
 <section class="detail" id="createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)">
 <h3>createWallet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-575">createWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-606">createWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;disablePrivateKeys,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;blank)</span>
                               throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -1118,7 +1202,7 @@ <h3>createWallet</h3>
 <li>
 <section class="detail" id="createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)">
 <h3>createWallet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-579">createWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-610">createWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;disablePrivateKeys,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;blank,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;passPhrase,
@@ -1135,7 +1219,7 @@ <h3>createWallet</h3>
 <li>
 <section class="detail" id="createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)">
 <h3>createWallet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-585">createWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/LoadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">LoadWalletResult</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-616">createWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;disablePrivateKeys,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;blank,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;passPhrase,
@@ -1155,7 +1239,7 @@ <h3>createWallet</h3>
 <li>
 <section class="detail" id="unloadWallet()">
 <h3>unloadWallet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/UnloadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">UnloadWalletResult</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-591">unloadWallet</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/UnloadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">UnloadWalletResult</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-622">unloadWallet</a></span>()
                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <dl class="notes">
@@ -1168,7 +1252,7 @@ <h3>unloadWallet</h3>
 <li>
 <section class="detail" id="unloadWallet(java.lang.String,java.lang.Boolean)">
 <h3>unloadWallet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/UnloadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">UnloadWalletResult</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-595">unloadWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/UnloadWalletResult.html" title="class in org.consensusj.bitcoin.json.pojo">UnloadWalletResult</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-626">unloadWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;loadOnStartup)</span>
                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1182,7 +1266,7 @@ <h3>unloadWallet</h3>
 <li>
 <section class="detail" id="getNewAddress()">
 <h3>getNewAddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Address</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-606">getNewAddress</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Address</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-637">getNewAddress</a></span>()
                                         throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Creates a new Bitcoin address for receiving payments, linked to the default account "".</div>
@@ -1198,7 +1282,7 @@ <h3>getNewAddress</h3>
 <li>
 <section class="detail" id="getNewAddress(java.lang.String)">
 <h3>getNewAddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Address</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-618">getNewAddress</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Address</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-649">getNewAddress</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label)</span>
                                         throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Creates a new Bitcoin address for receiving payments.</div>
@@ -1216,7 +1300,7 @@ <h3>getNewAddress</h3>
 <li>
 <section class="detail" id="dumpPrivKey(org.bitcoinj.base.Address)">
 <h3>dumpPrivKey</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ECKey</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-632">dumpPrivKey</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ECKey</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-663">dumpPrivKey</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
                                       throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Return the private key from the server.
@@ -1236,7 +1320,7 @@ <h3>dumpPrivKey</h3>
 <li>
 <section class="detail" id="importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)">
 <h3>importPrivKey</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-645">importPrivKey</a></span><wbr><span class="parameters">(org.bitcoinj.crypto.ECKey&nbsp;privateKey,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-676">importPrivKey</a></span><wbr><span class="parameters">(org.bitcoinj.crypto.ECKey&nbsp;privateKey,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
  boolean&nbsp;rescan)</span>
                    throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -1256,7 +1340,7 @@ <h3>importPrivKey</h3>
 <li>
 <section class="detail" id="createRawTransaction(java.util.List,java.util.Map)">
 <h3>createRawTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-661">createRawTransaction</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/Outpoint.html" title="class in org.consensusj.bitcoin.json.pojo">Outpoint</a>&gt;&nbsp;inputs,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-692">createRawTransaction</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/Outpoint.html" title="class in org.consensusj.bitcoin.json.pojo">Outpoint</a>&gt;&nbsp;inputs,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;org.bitcoinj.base.Address,<wbr>org.bitcoinj.base.Coin&gt;&nbsp;outputs)</span>
                             throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1279,7 +1363,7 @@ <h3>createRawTransaction</h3>
 <li>
 <section class="detail" id="signRawTransactionWithWallet(java.lang.String)">
 <h3>signRawTransactionWithWallet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/SignedRawTransaction.html" title="class in org.consensusj.bitcoin.json.pojo">SignedRawTransaction</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-677">signRawTransactionWithWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;unsignedTransaction)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/SignedRawTransaction.html" title="class in org.consensusj.bitcoin.json.pojo">SignedRawTransaction</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-708">signRawTransactionWithWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;unsignedTransaction)</span>
                                                   throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Signs inputs of a raw transaction using the wallet. Arguments 2 and 3 of the RPC are currently
@@ -1301,7 +1385,7 @@ <h3>signRawTransactionWithWallet</h3>
 <li>
 <section class="detail" id="getRawTransaction(org.bitcoinj.base.Sha256Hash)">
 <h3>getRawTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Transaction</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-688">getRawTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Transaction</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-719">getRawTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid)</span>
                                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Get a "raw" transaction (which we use to construct a bitcoinj <code>Transaction</code>)</div>
@@ -1319,7 +1403,7 @@ <h3>getRawTransaction</h3>
 <li>
 <section class="detail" id="getRawTransactionInfo(org.bitcoinj.base.Sha256Hash)">
 <h3>getRawTransactionInfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-701">getRawTransactionInfo</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/RawTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-732">getRawTransactionInfo</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid)</span>
                                          throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Get a "raw" transaction as JSON (which we map to a RawTransactionInfo POJO)</div>
@@ -1337,7 +1421,7 @@ <h3>getRawTransactionInfo</h3>
 <li>
 <section class="detail" id="sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)">
 <h3>sendRawTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-716">sendRawTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.core.Transaction&nbsp;tx,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-747">sendRawTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.core.Transaction&nbsp;tx,
  org.bitcoinj.base.Coin&nbsp;maxFeeRate)</span>
                                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1360,7 +1444,7 @@ <h3>sendRawTransaction</h3>
 <li>
 <section class="detail" id="sendRawTransaction(java.lang.String,org.bitcoinj.base.Coin)">
 <h3>sendRawTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-731">sendRawTransaction</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hexTx,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-762">sendRawTransaction</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hexTx,
  org.bitcoinj.base.Coin&nbsp;maxFeeRate)</span>
                                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1383,7 +1467,7 @@ <h3>sendRawTransaction</h3>
 <li>
 <section class="detail" id="sendRawTransaction(org.bitcoinj.core.Transaction)">
 <h3>sendRawTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-743">sendRawTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.core.Transaction&nbsp;tx)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-774">sendRawTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.core.Transaction&nbsp;tx)</span>
                                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Submit a raw transaction to local node and network using server's default `maxFeeRate`</div>
@@ -1401,7 +1485,7 @@ <h3>sendRawTransaction</h3>
 <li>
 <section class="detail" id="sendRawTransaction(java.lang.String)">
 <h3>sendRawTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-756">sendRawTransaction</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hexTx)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-787">sendRawTransaction</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hexTx)</span>
                                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Submit a raw transaction to local node and network using server's default `maxFeeRate`</div>
@@ -1421,7 +1505,7 @@ <h3>sendRawTransaction</h3>
 <li>
 <section class="detail" id="getAddressInfo(org.bitcoinj.base.Address)">
 <h3>getAddressInfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/AddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">AddressInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-760">getAddressInfo</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/AddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">AddressInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-791">getAddressInfo</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
                            throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <dl class="notes">
@@ -1434,7 +1518,7 @@ <h3>getAddressInfo</h3>
 <li>
 <section class="detail" id="getReceivedByAddress(org.bitcoinj.base.Address)">
 <h3>getReceivedByAddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-764">getReceivedByAddress</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-795">getReceivedByAddress</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
                                             throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <dl class="notes">
@@ -1447,7 +1531,7 @@ <h3>getReceivedByAddress</h3>
 <li>
 <section class="detail" id="getReceivedByAddress(org.bitcoinj.base.Address,java.lang.Integer)">
 <h3>getReceivedByAddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-777">getReceivedByAddress</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-808">getReceivedByAddress</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf)</span>
                                             throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1467,7 +1551,7 @@ <h3>getReceivedByAddress</h3>
 <li>
 <section class="detail" id="listReceivedByAddress(java.lang.Integer,java.lang.Boolean)">
 <h3>listReceivedByAddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ReceivedByAddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">ReceivedByAddressInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-781">listReceivedByAddress</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ReceivedByAddressInfo.html" title="class in org.consensusj.bitcoin.json.pojo">ReceivedByAddressInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-812">listReceivedByAddress</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;includeEmpty)</span>
                                                   throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1481,7 +1565,7 @@ <h3>listReceivedByAddress</h3>
 <li>
 <section class="detail" id="listUnspent()">
 <h3>listUnspent</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-794">listUnspent</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-825">listUnspent</a></span>()
                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns a list of unspent transaction outputs with at least one confirmation.</div>
@@ -1497,7 +1581,7 @@ <h3>listUnspent</h3>
 <li>
 <section class="detail" id="listUnspent(java.lang.Integer,java.lang.Integer)">
 <h3>listUnspent</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-808">listUnspent</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-839">listUnspent</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf)</span>
                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1518,7 +1602,7 @@ <h3>listUnspent</h3>
 <li>
 <section class="detail" id="listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)">
 <h3>listUnspent</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-813">listUnspent</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-844">listUnspent</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf,
  org.bitcoinj.base.Address&nbsp;address)</span>
                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -1533,7 +1617,7 @@ <h3>listUnspent</h3>
 <li>
 <section class="detail" id="listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)">
 <h3>listUnspent</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-818">listUnspent</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-849">listUnspent</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;filter)</span>
                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -1548,7 +1632,7 @@ <h3>listUnspent</h3>
 <li>
 <section class="detail" id="listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)">
 <h3>listUnspent</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-835">listUnspent</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-866">listUnspent</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;filter,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;includeUnsafe)</span>
@@ -1573,7 +1657,7 @@ <h3>listUnspent</h3>
 <li>
 <section class="detail" id="getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer)">
 <h3>getTxOut</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/TxOutInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-850">getTxOut</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/TxOutInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-881">getTxOut</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;vout)</span>
                    throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1593,7 +1677,7 @@ <h3>getTxOut</h3>
 <li>
 <section class="detail" id="getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer,java.lang.Boolean)">
 <h3>getTxOut</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/TxOutInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-865">getTxOut</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/TxOutInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-896">getTxOut</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;vout,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;includeMemoryPool)</span>
                    throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -1615,7 +1699,7 @@ <h3>getTxOut</h3>
 <li>
 <section class="detail" id="getTxOutSetInfo()">
 <h3>getTxOutSetInfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutSetInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-878">getTxOutSetInfo</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutSetInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-909">getTxOutSetInfo</a></span>()
                              throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns statistics about the unspent transaction output set.
@@ -1632,7 +1716,7 @@ <h3>getTxOutSetInfo</h3>
 <li>
 <section class="detail" id="getBalance()">
 <h3>getBalance</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-889">getBalance</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-920">getBalance</a></span>()
                                   throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Get the balance for a the default Bitcoin "account"</div>
@@ -1648,7 +1732,7 @@ <h3>getBalance</h3>
 <li>
 <section class="detail" id="getBalance(java.lang.String)">
 <h3>getBalance</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-901">getBalance</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-932">getBalance</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account)</span>
                                   throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Get the balance for a Bitcoin "account"</div>
@@ -1666,7 +1750,7 @@ <h3>getBalance</h3>
 <li>
 <section class="detail" id="getBalance(java.lang.String,java.lang.Integer)">
 <h3>getBalance</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-914">getBalance</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-945">getBalance</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf)</span>
                                   throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1686,7 +1770,7 @@ <h3>getBalance</h3>
 <li>
 <section class="detail" id="sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">
 <h3>sendToAddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-918">sendToAddress</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-949">sendToAddress</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address,
  org.bitcoinj.base.Coin&nbsp;amount)</span>
                                            throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1700,7 +1784,7 @@ <h3>sendToAddress</h3>
 <li>
 <section class="detail" id="sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String,java.lang.String)">
 <h3>sendToAddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-922">sendToAddress</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-953">sendToAddress</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address,
  org.bitcoinj.base.Coin&nbsp;amount,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;comment,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;commentTo)</span>
@@ -1716,7 +1800,7 @@ <h3>sendToAddress</h3>
 <li>
 <section class="detail" id="sendFrom(java.lang.String,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">
 <h3>sendFrom</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-927">sendFrom</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-958">sendFrom</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account,
  org.bitcoinj.base.Address&nbsp;address,
  org.bitcoinj.base.Coin&nbsp;amount)</span>
                                       throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -1731,7 +1815,7 @@ <h3>sendFrom</h3>
 <li>
 <section class="detail" id="sendMany(java.lang.String,java.util.Map)">
 <h3>sendMany</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-932">sendMany</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-963">sendMany</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;account,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;org.bitcoinj.base.Address,<wbr>org.bitcoinj.base.Coin&gt;&nbsp;amounts)</span>
                                       throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1745,7 +1829,7 @@ <h3>sendMany</h3>
 <li>
 <section class="detail" id="setTxFee(org.bitcoinj.base.Coin)">
 <h3>setTxFee</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-944">setTxFee</a></span><wbr><span class="parameters">(org.bitcoinj.base.Coin&nbsp;amount)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-975">setTxFee</a></span><wbr><span class="parameters">(org.bitcoinj.base.Coin&nbsp;amount)</span>
                  throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Set the transaction fee per kB.</div>
@@ -1763,7 +1847,7 @@ <h3>setTxFee</h3>
 <li>
 <section class="detail" id="getTransaction(org.bitcoinj.base.Sha256Hash)">
 <h3>getTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-948">getTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-979">getTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid)</span>
                                      throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <dl class="notes">
@@ -1776,7 +1860,7 @@ <h3>getTransaction</h3>
 <li>
 <section class="detail" id="getTransaction(org.bitcoinj.base.Sha256Hash,java.lang.Boolean,java.lang.Boolean)">
 <h3>getTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-952">getTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/WalletTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">WalletTransactionInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-983">getTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;txid,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;includeWatchOnly,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;verbose)</span>
                                      throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -1791,7 +1875,7 @@ <h3>getTransaction</h3>
 <li>
 <section class="detail" id="listTransactions()">
 <h3>listTransactions</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-962">listTransactions</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-993">listTransactions</a></span>()
                                               throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">List the default number (10) of wallet transactions.</div>
@@ -1807,7 +1891,7 @@ <h3>listTransactions</h3>
 <li>
 <section class="detail" id="listTransactions(java.lang.String,java.lang.Integer)">
 <h3>listTransactions</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-974">listTransactions</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1005">listTransactions</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;count)</span>
                                               throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -1827,7 +1911,7 @@ <h3>listTransactions</h3>
 <li>
 <section class="detail" id="listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)">
 <h3>listTransactions</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-987">listTransactions</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/BitcoinTransactionInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BitcoinTransactionInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1018">listTransactions</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;label,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;count,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;skip,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;includeWatchOnly)</span>
@@ -1851,7 +1935,7 @@ <h3>listTransactions</h3>
 <li>
 <section class="detail" id="getBlockChainInfo()">
 <h3>getBlockChainInfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-999">getBlockChainInfo</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1030">getBlockChainInfo</a></span>()
                                  throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">The getblockchaininfo RPC provides information about the current state of the block chain.</div>
@@ -1865,9 +1949,15 @@ <h3>getBlockChainInfo</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="getBlockChainInfoAsync()">
+<h3>getBlockChainInfoAsync</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1034">getBlockChainInfoAsync</a></span>()</div>
+</section>
+</li>
+<li>
 <section class="detail" id="getNetworkInfo()">
 <h3>getNetworkInfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/NetworkInfo.html" title="class in org.consensusj.bitcoin.json.pojo">NetworkInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1010">getNetworkInfo</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/NetworkInfo.html" title="class in org.consensusj.bitcoin.json.pojo">NetworkInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1045">getNetworkInfo</a></span>()
                            throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">The getnetworkinfo RPC returns information about the node's connection to the network.</div>
@@ -1883,10 +1973,10 @@ <h3>getNetworkInfo</h3>
 <li>
 <section class="detail" id="getZmqNotifications()">
 <h3>getZmqNotifications</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ZmqNotification.html" title="class in org.consensusj.bitcoin.json.pojo">ZmqNotification</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1022">getZmqNotifications</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ZmqNotification.html" title="class in org.consensusj.bitcoin.json.pojo">ZmqNotification</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1057">getZmqNotifications</a></span>()
                                           throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
-<div class="block">The getzmqnotifications RPC returns information about which configured ZMQ notifications are enabled
+<div class="block">The <code>getzmqnotifications</code> RPC returns information about which configured ZMQ notifications are enabled
  and on which ports.</div>
 <dl class="notes">
 <dt>Returns:</dt>
@@ -1898,9 +1988,15 @@ <h3>getZmqNotifications</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="getZmqNotificationsAsync()">
+<h3>getZmqNotificationsAsync</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ZmqNotification.html" title="class in org.consensusj.bitcoin.json.pojo">ZmqNotification</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1061">getZmqNotificationsAsync</a></span>()</div>
+</section>
+</li>
+<li>
 <section class="detail" id="listAddressGroupings()">
 <h3>listAddressGroupings</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/AddressGroupingItem.html" title="class in org.consensusj.bitcoin.json.pojo">AddressGroupingItem</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1034">listAddressGroupings</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/AddressGroupingItem.html" title="class in org.consensusj.bitcoin.json.pojo">AddressGroupingItem</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1073">listAddressGroupings</a></span>()
                                                      throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns list of related addresses.
@@ -1917,7 +2013,7 @@ <h3>listAddressGroupings</h3>
 <li>
 <section class="detail" id="help()">
 <h3>help</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1051">help</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1089">help</a></span>()
             throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns a human-readable list of available commands.
@@ -1936,7 +2032,7 @@ <h3>help</h3>
 <li>
 <section class="detail" id="helpAsStream()">
 <h3>helpAsStream</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1062">helpAsStream</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1100">helpAsStream</a></span>()
                             throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns a human-readable list of available commands.</div>
@@ -1952,7 +2048,7 @@ <h3>helpAsStream</h3>
 <li>
 <section class="detail" id="helpAsLines()">
 <h3>helpAsLines</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1073">helpAsLines</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1111">helpAsLines</a></span>()
                          throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns a human-readable list of available commands.</div>
@@ -1968,7 +2064,7 @@ <h3>helpAsLines</h3>
 <li>
 <section class="detail" id="helpAsMethodEntries()">
 <h3>helpAsMethodEntries</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/MethodHelpEntry.html" title="class in org.consensusj.bitcoin.json.pojo">MethodHelpEntry</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1084">helpAsMethodEntries</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/MethodHelpEntry.html" title="class in org.consensusj.bitcoin.json.pojo">MethodHelpEntry</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1122">helpAsMethodEntries</a></span>()
                                           throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns a human-readable list of available commands.</div>
@@ -1984,7 +2080,7 @@ <h3>helpAsMethodEntries</h3>
 <li>
 <section class="detail" id="help(java.lang.String)">
 <h3>help</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1099">help</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;command)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1137">help</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;command)</span>
             throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns helpful information for a specific command.</div>
@@ -2002,11 +2098,11 @@ <h3>help</h3>
 <li>
 <section class="detail" id="getCommands()">
 <h3>getCommands</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1112">getCommands</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1150">getCommands</a></span>()
                          throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns a list of available commands.
-
+ <p>
  Commands which are unavailable will not be listed, such as wallet RPCs, if wallet support is disabled.</div>
 <dl class="notes">
 <dt>Returns:</dt>
@@ -2020,11 +2116,11 @@ <h3>getCommands</h3>
 <li>
 <section class="detail" id="commandExists(java.lang.String)">
 <h3>commandExists</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1140">commandExists</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;command)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1178">commandExists</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;command)</span>
                       throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Checks whether a command exists.
-
+ <p>
  This is done indirectly, by using {help(String) help} to get information about the command, and if information
  about the command is available, then the command exists. The absence of information does not necessarily imply
  the non-existence of a command.</div>
@@ -2042,7 +2138,7 @@ <h3>commandExists</h3>
 <li>
 <section class="detail" id="invalidateBlock(org.bitcoinj.base.Sha256Hash)">
 <h3>invalidateBlock</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1152">invalidateBlock</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;hash)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1190">invalidateBlock</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;hash)</span>
                      throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Permanently marks a block as invalid, as if it violated a consensus rule.</div>
@@ -2060,7 +2156,7 @@ <h3>invalidateBlock</h3>
 <li>
 <section class="detail" id="reconsiderBlock(org.bitcoinj.base.Sha256Hash)">
 <h3>reconsiderBlock</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1166">reconsiderBlock</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;hash)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1204">reconsiderBlock</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;hash)</span>
                      throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Removes invalidity status of a block and its descendants, reconsider them for activation.
@@ -2080,9 +2176,12 @@ <h3>reconsiderBlock</h3>
 <li>
 <section class="detail" id="getChainTips()">
 <h3>getChainTips</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1178">getChainTips</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1217">getChainTips</a></span>()
                             throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use <a href="#getChainTipsAsync()"><code>getChainTipsAsync()</code></a></div>
+</div>
 <div class="block">Return information about all known tips in the block tree, including the main chain as well as orphaned branches.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -2098,9 +2197,19 @@ <h3>getChainTips</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="getChainTipsAsync()">
+<h3>getChainTipsAsync</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1222">getChainTipsAsync</a></span>()</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="ChainTipClient.html#getChainTipsAsync()">getChainTipsAsync</a></code>&nbsp;in interface&nbsp;<code><a href="ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code></dd>
+</dl>
+</section>
+</li>
+<li>
 <section class="detail" id="addNode(java.lang.String,java.lang.String)">
 <h3>addNode</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1192">addNode</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;node,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1236">addNode</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;node,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;command)</span>
              throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -2118,7 +2227,7 @@ <h3>addNode</h3>
 <li>
 <section class="detail" id="getAddedNodeInfo(boolean,java.lang.String)">
 <h3>getAddedNodeInfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1205">getAddedNodeInfo</a></span><wbr><span class="parameters">(boolean&nbsp;details,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1249">getAddedNodeInfo</a></span><wbr><span class="parameters">(boolean&nbsp;details,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;node)</span>
                           throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -2138,7 +2247,7 @@ <h3>getAddedNodeInfo</h3>
 <li>
 <section class="detail" id="getAddedNodeInfo(boolean)">
 <h3>getAddedNodeInfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1217">getAddedNodeInfo</a></span><wbr><span class="parameters">(boolean&nbsp;details)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1261">getAddedNodeInfo</a></span><wbr><span class="parameters">(boolean&nbsp;details)</span>
                           throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Return information about all added nodes</div>
@@ -2156,7 +2265,7 @@ <h3>getAddedNodeInfo</h3>
 <li>
 <section class="detail" id="getAddressBalance(org.bitcoinj.base.Address)">
 <h3>getAddressBalance</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/bitcore/AddressBalanceInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressBalanceInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1222">getAddressBalance</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/bitcore/AddressBalanceInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressBalanceInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1266">getAddressBalance</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
                                      throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <dl class="notes">
@@ -2169,7 +2278,7 @@ <h3>getAddressBalance</h3>
 <li>
 <section class="detail" id="getAddressBalance(java.util.List)">
 <h3>getAddressBalance</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/bitcore/AddressBalanceInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressBalanceInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1227">getAddressBalance</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;addressList)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../json/pojo/bitcore/AddressBalanceInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressBalanceInfo</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1271">getAddressBalance</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;addressList)</span>
                                      throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <dl class="notes">
@@ -2182,7 +2291,7 @@ <h3>getAddressBalance</h3>
 <li>
 <section class="detail" id="getAddressUtxos(org.bitcoinj.base.Address)">
 <h3>getAddressUtxos</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/bitcore/AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1232">getAddressUtxos</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/bitcore/AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1276">getAddressUtxos</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
                                       throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <dl class="notes">
@@ -2195,7 +2304,7 @@ <h3>getAddressUtxos</h3>
 <li>
 <section class="detail" id="getAddressUtxos(java.util.List)">
 <h3>getAddressUtxos</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/bitcore/AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1238">getAddressUtxos</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;addressList)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/bitcore/AddressUtxoInfo.html" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressUtxoInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html#line-1282">getAddressUtxos</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Address&gt;&nbsp;addressList)</span>
                                       throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <dl class="notes">
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html b/apidoc/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html
index 75315ff71..b59ecdd28 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinExtendedClient (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinExtendedClient (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc, class: BitcoinExtendedClient">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,25 +86,23 @@
 <h1 title="Class BitcoinExtendedClient" class="title">Class BitcoinExtendedClient</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.AbstractRpcClient</a>
-<div class="inheritance"><a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection</a>
+<div class="inheritance"><a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.DefaultRpcClient</a>
 <div class="inheritance"><a href="BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">org.consensusj.bitcoin.jsonrpc.BitcoinClient</a>
 <div class="inheritance">org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient</div>
 </div>
 </div>
 </div>
-</div>
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code>, <code><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code>, <code><a href="../../jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 </dl>
 <dl class="notes">
 <dt>Direct Known Subclasses:</dt>
 <dd><code><a href="../rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-46">BitcoinExtendedClient</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-45">BitcoinExtendedClient</a></span>
 <span class="extends-implements">extends <a href="BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></span></div>
 <div class="block">Extended Bitcoin JSON-RPC Client with added convenience methods.
 
@@ -105,8 +117,11 @@ <h1 title="Class BitcoinExtendedClient" class="title">Class BitcoinExtendedClien
 <section class="nested-class-summary" id="nested-class-summary">
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
+<h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Nested classes/interfaces inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h2>
+<code><a href="../../jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;<a href="../../jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="type parameter in DefaultRpcClient.TransientErrorMapper">T</a>&gt;, <a href="../../jsonrpc/DefaultRpcClient.TransportFactory.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></code></div>
+<div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
+<code><a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- =========== FIELD SUMMARY =========== -->
@@ -141,8 +156,8 @@ <h2>Field Summary</h2>
 <h3 id="fields-inherited-from-class-org.consensusj.bitcoin.jsonrpc.BitcoinClient">Fields inherited from class&nbsp;org.consensusj.bitcoin.jsonrpc.<a href="BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></h3>
 <code><a href="BitcoinClient.html#BITCOIN_CORE_VERSION_DESC_DEFAULT">BITCOIN_CORE_VERSION_DESC_DEFAULT</a>, <a href="BitcoinClient.html#BITCOIN_CORE_VERSION_MIN">BITCOIN_CORE_VERSION_MIN</a></code></div>
 <div class="inherited-list">
-<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="../../jsonrpc/AbstractRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="../../jsonrpc/AbstractRpcClient.html#mapper">mapper</a></code></div>
+<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h3>
+<code><a href="../../jsonrpc/DefaultRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="../../jsonrpc/DefaultRpcClient.html#mapper">mapper</a></code></div>
 </section>
 </li>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -167,36 +182,13 @@ <h2>Constructor Summary</h2>
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinExtendedClient</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;sslSocketFactory,
- org.bitcoinj.base.Network&nbsp;network,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</code></div>
-<div class="col-last odd-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinExtendedClient</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;sslSocketFactory,
- org.bitcoinj.core.NetworkParameters&nbsp;netParams,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</code></div>
-<div class="col-last even-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
 <div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinExtendedClient</a><wbr>(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">BitcoinExtendedClient</a><wbr>(org.bitcoinj.core.NetworkParameters&nbsp;netParams,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</code></div>
-<div class="col-last even-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)" class="member-name-link">BitcoinExtendedClient</a><wbr>(<a href="RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a>&nbsp;config)</code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.RpcConfig)" class="member-name-link">BitcoinExtendedClient</a><wbr>(<a href="RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a>&nbsp;config)</code></div>
+<div class="col-last even-row-color">&nbsp;</div>
 </div>
 </section>
 </li>
@@ -211,7 +203,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#clearMemPool()" class="member-name-link">clearMemPool</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Clears the memory pool and returns a list of the removed transactions.</div>
@@ -244,7 +236,7 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Create a signed transaction locally (i.e.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#generateBlocks(int)" class="member-name-link">generateBlocks</a><wbr>(int&nbsp;numBlocks)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Generate blocks and funds (RegTest only)
@@ -299,13 +291,13 @@ <h2>Method Summary</h2>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Initialize a server-side wallet for RegTest mining and test transaction funding.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.core.TransactionOutput&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.core.TransactionOutput&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspentJ(org.bitcoinj.base.Address)" class="member-name-link">listUnspentJ</a><wbr>(org.bitcoinj.base.Address&nbsp;fromAddress)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Build a list of bitcoinj <code>TransactionOutput</code>s using <a href="BitcoinClient.html#listUnspent()"><code>BitcoinClient.listUnspent()</code></a>
  and <a href="BitcoinClient.html#getRawTransaction(org.bitcoinj.base.Sha256Hash)"><code>BitcoinClient.getRawTransaction(org.bitcoinj.base.Sha256Hash)</code></a> RPCs.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.core.TransactionOutPoint&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.core.TransactionOutPoint&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listUnspentOutPoints(org.bitcoinj.base.Address)" class="member-name-link">listUnspentOutPoints</a><wbr>(org.bitcoinj.base.Address&nbsp;fromAddress)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Build a list of bitcoinj <code>TransactionOutPoint</code>s using <a href="BitcoinClient.html#listUnspent()"><code>BitcoinClient.listUnspent()</code></a>.</div>
@@ -337,13 +329,10 @@ <h2>Method Summary</h2>
 </div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.bitcoin.jsonrpc.BitcoinClient">Methods inherited from class&nbsp;org.consensusj.bitcoin.jsonrpc.<a href="BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></h3>
-<code><a href="BitcoinClient.html#addNode(java.lang.String,java.lang.String)">addNode</a>, <a href="BitcoinClient.html#close()">close</a>, <a href="BitcoinClient.html#commandExists(java.lang.String)">commandExists</a>, <a href="BitcoinClient.html#createRawTransaction(java.util.List,java.util.Map)">createRawTransaction</a>, <a href="BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)">createWallet</a>, <a href="BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="BitcoinClient.html#dumpPrivKey(org.bitcoinj.base.Address)">dumpPrivKey</a>, <a href="BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address)">generateToAddress</a>, <a href="BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)">generateToAddress</a>, <a href="BitcoinClient.html#getAddedNodeInfo(boolean)">getAddedNodeInfo</a>, <a href="BitcoinClient.html#getAddedNodeInfo(boolean,java.lang.String)">getAddedNodeInfo</a>, <a href="BitcoinClient.html#getAddressBalance(java.util.List)">getAddressBalance</a>, <a href="BitcoinClient.html#getAddressBalance(org.bitcoinj.base.Address)">getAddressBalance</a>, <a href="BitcoinClient.html#getAddressInfo(org.bitcoinj.base.Address)">getAddressInfo</a>, <a href="BitcoinClient.html#getAddressUtxos(java.util.List)">getAddressUtxos</a>, <a href="BitcoinClient.html#getAddressUtxos(org.bitcoinj.base.Address)">getAddressUtxos</a>, <a href="BitcoinClient.html#getBalance()">getBalance</a>, <a href="BitcoinClient.html#getBalance(java.lang.String)">getBalance</a>, <a href="BitcoinClient.html#getBalance(java.lang.String,java.lang.Integer)">getBalance</a>, <a href="BitcoinClient.html#getBlock(org.bitcoinj.base.Sha256Hash)">getBlock</a>, <a href="BitcoinClient.html#getBlockChainInfo()">getBlockChainInfo</a>, <a href="BitcoinClient.html#getBlockCount()">getBlockCount</a>, <a href="BitcoinClient.html#getBlockHash(java.lang.Integer)">getBlockHash</a>, <a href="BitcoinClient.html#getBlockInfo(org.bitcoinj.base.Sha256Hash)">getBlockInfo</a>, <a href="BitcoinClient.html#getChainTips()">getChainTips</a>, <a href="BitcoinClient.html#getCommands()">getCommands</a>, <a href="BitcoinClient.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="BitcoinClient.html#getNetParams()">getNetParams</a>, <a href="BitcoinClient.html#getNetwork()">getNetwork</a>, <a href="BitcoinClient.html#getNetworkInfo()">getNetworkInfo</a>, <a href="BitcoinClient.html#getNewAddress()">getNewAddress</a>, <a href="BitcoinClient.html#getNewAddress(java.lang.String)">getNewAddress</a>, <a href="BitcoinClient.html#getRawTransaction(org.bitcoinj.base.Sha256Hash)">getRawTransaction</a>, <a href="BitcoinClient.html#getRawTransactionInfo(org.bitcoinj.base.Sha256Hash)">getRawTransactionInfo</a>, <a href="BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address)">getReceivedByAddress</a>, <a href="BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address,java.lang.Integer)">getReceivedByAddress</a>, <a href="BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash)">getTransaction</a>, <a href="BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash,java.lang.Boolean,java.lang.Boolean)">getTransaction</a>, <a href="BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer)">getTxOut</a>, <a href="BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer,java.lang.Boolean)">getTxOut</a>, <a href="BitcoinClient.html#getTxOutSetInfo()">getTxOutSetInfo</a>, <a href="BitcoinClient.html#getZmqNotifications()">getZmqNotifications</a>, <a href="BitcoinClient.html#help()">help</a>, <a href="BitcoinClient.html#help(java.lang.String)">help</a>, <a href="BitcoinClient.html#helpAsLines()">helpAsLines</a>, <a href="BitcoinClient.html#helpAsMethodEntries()">helpAsMethodEntries</a>, <a href="BitcoinClient.html#helpAsStream()">helpAsStream</a>, <a href="BitcoinClient.html#importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)">importPrivKey</a>, <a href="BitcoinClient.html#invalidateBlock(org.bitcoinj.base.Sha256Hash)">invalidateBlock</a>, <a href="BitcoinClient.html#isAddressIndexEnabled()">isAddressIndexEnabled</a>, <a href="BitcoinClient.html#listAddressGroupings()">listAddressGroupings</a>, <a href="BitcoinClient.html#listReceivedByAddress(java.lang.Integer,java.lang.Boolean)">listReceivedByAddress</a>, <a href="BitcoinClient.html#listTransactions()">listTransactions</a>, <a href="BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer)">listTransactions</a>, <a href="BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)">listTransactions</a>, <a href="BitcoinClient.html#listUnspent()">listUnspent</a>, <a href="BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer)">listUnspent</a>, <a href="BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)">listUnspent</a>, <a href="BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)">listUnspent</a>, <a href="BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)">listUnspent</a>, <a href="BitcoinClient.html#listWallets()">listWallets</a>, <a href="BitcoinClient.html#reconsiderBlock(org.bitcoinj.base.Sha256Hash)">reconsiderBlock</a>, <a href="BitcoinClient.html#sendFrom(java.lang.String,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendFrom</a>, <a href="BitcoinClient.html#sendMany(java.lang.String,java.util.Map)">sendMany</a>, <a href="BitcoinClient.html#sendRawTransaction(java.lang.String)">sendRawTransaction</a>, <a href="BitcoinClient.html#sendRawTransaction(java.lang.String,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction)">sendRawTransaction</a>, <a href="BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendToAddress</a>, <a href="BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String,java.lang.String)">sendToAddress</a>, <a href="BitcoinClient.html#setTxFee(org.bitcoinj.base.Coin)">setTxFee</a>, <a href="BitcoinClient.html#signRawTransactionWithWallet(java.lang.String)">signRawTransactionWithWallet</a>, <a href="BitcoinClient.html#stop()">stop</a>, <a href="BitcoinClient.html#unloadWallet()">unloadWallet</a>, <a href="BitcoinClient.html#unloadWallet(java.lang.String,java.lang.Boolean)">unloadWallet</a>, <a href="BitcoinClient.html#waitForBlock(int,int)">waitForBlock</a>, <a href="BitcoinClient.html#waitForServer(int)">waitForServer</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></h3>
-<code><a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#getServerURI()">getServerURI</a>, <a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponse</a>, <a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a></code></div>
+<code><a href="BitcoinClient.html#addNode(java.lang.String,java.lang.String)">addNode</a>, <a href="BitcoinClient.html#close()">close</a>, <a href="BitcoinClient.html#commandExists(java.lang.String)">commandExists</a>, <a href="BitcoinClient.html#connectToServer(java.time.Duration)">connectToServer</a>, <a href="BitcoinClient.html#createRawTransaction(java.util.List,java.util.Map)">createRawTransaction</a>, <a href="BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)">createWallet</a>, <a href="BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="BitcoinClient.html#dumpPrivKey(org.bitcoinj.base.Address)">dumpPrivKey</a>, <a href="BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address)">generateToAddress</a>, <a href="BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)">generateToAddress</a>, <a href="BitcoinClient.html#getAddedNodeInfo(boolean)">getAddedNodeInfo</a>, <a href="BitcoinClient.html#getAddedNodeInfo(boolean,java.lang.String)">getAddedNodeInfo</a>, <a href="BitcoinClient.html#getAddressBalance(java.util.List)">getAddressBalance</a>, <a href="BitcoinClient.html#getAddressBalance(org.bitcoinj.base.Address)">getAddressBalance</a>, <a href="BitcoinClient.html#getAddressInfo(org.bitcoinj.base.Address)">getAddressInfo</a>, <a href="BitcoinClient.html#getAddressUtxos(java.util.List)">getAddressUtxos</a>, <a href="BitcoinClient.html#getAddressUtxos(org.bitcoinj.base.Address)">getAddressUtxos</a>, <a href="BitcoinClient.html#getBalance()">getBalance</a>, <a href="BitcoinClient.html#getBalance(java.lang.String)">getBalance</a>, <a href="BitcoinClient.html#getBalance(java.lang.String,java.lang.Integer)">getBalance</a>, <a href="BitcoinClient.html#getBestBlock()">getBestBlock</a>, <a href="BitcoinClient.html#getBlock(org.bitcoinj.base.Sha256Hash)">getBlock</a>, <a href="BitcoinClient.html#getBlockAsync(org.bitcoinj.base.Sha256Hash)">getBlockAsync</a>, <a href="BitcoinClient.html#getBlockChainInfo()">getBlockChainInfo</a>, <a href="BitcoinClient.html#getBlockChainInfoAsync()">getBlockChainInfoAsync</a>, <a href="BitcoinClient.html#getBlockCount()">getBlockCount</a>, <a href="BitcoinClient.html#getBlockHash(java.lang.Integer)">getBlockHash</a>, <a href="BitcoinClient.html#getBlockInfo(org.bitcoinj.base.Sha256Hash)">getBlockInfo</a>, <a href="BitcoinClient.html#getChainTips()">getChainTips</a>, <a href="BitcoinClient.html#getChainTipsAsync()">getChainTipsAsync</a>, <a href="BitcoinClient.html#getCommands()">getCommands</a>, <a href="BitcoinClient.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="BitcoinClient.html#getNetwork()">getNetwork</a>, <a href="BitcoinClient.html#getNetworkInfo()">getNetworkInfo</a>, <a href="BitcoinClient.html#getNewAddress()">getNewAddress</a>, <a href="BitcoinClient.html#getNewAddress(java.lang.String)">getNewAddress</a>, <a href="BitcoinClient.html#getRawTransaction(org.bitcoinj.base.Sha256Hash)">getRawTransaction</a>, <a href="BitcoinClient.html#getRawTransactionInfo(org.bitcoinj.base.Sha256Hash)">getRawTransactionInfo</a>, <a href="BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address)">getReceivedByAddress</a>, <a href="BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address,java.lang.Integer)">getReceivedByAddress</a>, <a href="BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash)">getTransaction</a>, <a href="BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash,java.lang.Boolean,java.lang.Boolean)">getTransaction</a>, <a href="BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer)">getTxOut</a>, <a href="BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer,java.lang.Boolean)">getTxOut</a>, <a href="BitcoinClient.html#getTxOutSetInfo()">getTxOutSetInfo</a>, <a href="BitcoinClient.html#getZmqNotifications()">getZmqNotifications</a>, <a href="BitcoinClient.html#getZmqNotificationsAsync()">getZmqNotificationsAsync</a>, <a href="BitcoinClient.html#help()">help</a>, <a href="BitcoinClient.html#help(java.lang.String)">help</a>, <a href="BitcoinClient.html#helpAsLines()">helpAsLines</a>, <a href="BitcoinClient.html#helpAsMethodEntries()">helpAsMethodEntries</a>, <a href="BitcoinClient.html#helpAsStream()">helpAsStream</a>, <a href="BitcoinClient.html#importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)">importPrivKey</a>, <a href="BitcoinClient.html#invalidateBlock(org.bitcoinj.base.Sha256Hash)">invalidateBlock</a>, <a href="BitcoinClient.html#isAddressIndexEnabled()">isAddressIndexEnabled</a>, <a href="BitcoinClient.html#listAddressGroupings()">listAddressGroupings</a>, <a href="BitcoinClient.html#listReceivedByAddress(java.lang.Integer,java.lang.Boolean)">listReceivedByAddress</a>, <a href="BitcoinClient.html#listTransactions()">listTransactions</a>, <a href="BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer)">listTransactions</a>, <a href="BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)">listTransactions</a>, <a href="BitcoinClient.html#listUnspent()">listUnspent</a>, <a href="BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer)">listUnspent</a>, <a href="BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)">listUnspent</a>, <a href="BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)">listUnspent</a>, <a href="BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)">listUnspent</a>, <a href="BitcoinClient.html#listWallets()">listWallets</a>, <a href="BitcoinClient.html#mapBitcoinTransientErrors(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">mapBitcoinTransientErrors</a>, <a href="BitcoinClient.html#reconsiderBlock(org.bitcoinj.base.Sha256Hash)">reconsiderBlock</a>, <a href="BitcoinClient.html#sendFrom(java.lang.String,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendFrom</a>, <a href="BitcoinClient.html#sendMany(java.lang.String,java.util.Map)">sendMany</a>, <a href="BitcoinClient.html#sendRawTransaction(java.lang.String)">sendRawTransaction</a>, <a href="BitcoinClient.html#sendRawTransaction(java.lang.String,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction)">sendRawTransaction</a>, <a href="BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendToAddress</a>, <a href="BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String,java.lang.String)">sendToAddress</a>, <a href="BitcoinClient.html#setTxFee(org.bitcoinj.base.Coin)">setTxFee</a>, <a href="BitcoinClient.html#signRawTransactionWithWallet(java.lang.String)">signRawTransactionWithWallet</a>, <a href="BitcoinClient.html#stop()">stop</a>, <a href="BitcoinClient.html#unloadWallet()">unloadWallet</a>, <a href="BitcoinClient.html#unloadWallet(java.lang.String,java.lang.Boolean)">unloadWallet</a>, <a href="BitcoinClient.html#waitForBlock(int,int)">waitForBlock</a>, <a href="BitcoinClient.html#waitForBlockchainInfoAsync(java.time.Duration,java.time.Duration)">waitForBlockchainInfoAsync</a>, <a href="BitcoinClient.html#waitForConnected()">waitForConnected</a>, <a href="BitcoinClient.html#waitForConnected(java.time.Duration)">waitForConnected</a>, <a href="BitcoinClient.html#waitForServer(int)">waitForServer</a>, <a href="BitcoinClient.html#waitForServer(java.time.Duration)">waitForServer</a>, <a href="BitcoinClient.html#waitForServerAsync(java.time.Duration,java.time.Duration)">waitForServerAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="../../jsonrpc/AbstractRpcClient.html#base64Encode(java.lang.String)">base64Encode</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getDefaultSSLContext()">getDefaultSSLContext</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getDefaultType()">getDefaultType</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getMapper()">getMapper</a></code></div>
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h3>
+<code><a href="../../jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,com.fasterxml.jackson.databind.JavaType)">collectionTypeForClasses</a>, <a href="../../jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,java.lang.Class)">collectionTypeForClasses</a>, <a href="../../jsonrpc/DefaultRpcClient.html#defaultType()">defaultType</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getMapper()">getMapper</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getServerURI()">getServerURI</a>, <a href="../../jsonrpc/DefaultRpcClient.html#identityTransientErrorMapper(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">identityTransientErrorMapper</a>, <a href="../../jsonrpc/DefaultRpcClient.html#pollOnce(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">pollOnce</a>, <a href="../../jsonrpc/DefaultRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="../../jsonrpc/DefaultRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="../../jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponseAsync</a>, <a href="../../jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a>, <a href="../../jsonrpc/DefaultRpcClient.html#statusFromErrorResponse(org.consensusj.jsonrpc.JsonRpcResponse)">statusFromErrorResponse</a>, <a href="../../jsonrpc/DefaultRpcClient.html#temporarilyUnavailableResponse(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.Throwable)">temporarilyUnavailableResponse</a>, <a href="../../jsonrpc/DefaultRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a>, <a href="../../jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">waitForServer</a>, <a href="../../jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">waitForServer</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
@@ -351,11 +340,11 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
 <code><a href="../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JacksonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></h3>
-<code><a href="../../jsonrpc/JacksonRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="../../jsonrpc/JacksonRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponse</a>, <a href="../../jsonrpc/JacksonRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a></code></div>
-<div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></h3>
-<code><a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a></code></div>
+<code><a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.lang.Object...)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.util.List)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.util.List)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.lang.Object...)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.util.List)">sendAsync</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcTransport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></h3>
+<code><a href="../../jsonrpc/JsonRpcTransport.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponse</a>, <a href="../../jsonrpc/JsonRpcTransport.html#syncGet(java.util.concurrent.CompletableFuture)">syncGet</a></code></div>
 </section>
 </li>
 </ul>
@@ -370,17 +359,17 @@ <h2>Field Details</h2>
 <li>
 <section class="detail" id="DEFAULT_REGTEST_MINING_ADDRESS">
 <h3>DEFAULT_REGTEST_MINING_ADDRESS</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type">org.bitcoinj.base.Address</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-49">DEFAULT_REGTEST_MINING_ADDRESS</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type">org.bitcoinj.base.Address</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-48">DEFAULT_REGTEST_MINING_ADDRESS</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="REGTEST_WALLET_NAME">
 <h3>REGTEST_WALLET_NAME</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-52">REGTEST_WALLET_NAME</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-51">REGTEST_WALLET_NAME</a></span></div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient.REGTEST_WALLET_NAME">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -390,25 +379,25 @@ <h3>REGTEST_WALLET_NAME</h3>
 <li>
 <section class="detail" id="stdTxFee">
 <h3>stdTxFee</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-56">stdTxFee</a></span></div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-55">stdTxFee</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="stdRelayTxFee">
 <h3>stdRelayTxFee</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-57">stdRelayTxFee</a></span></div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-56">stdRelayTxFee</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="defaultMaxConf">
 <h3>defaultMaxConf</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-58">defaultMaxConf</a></span></div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-57">defaultMaxConf</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="stdTxFeeSatoshis">
 <h3>stdTxFeeSatoshis</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">long</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-59">stdTxFeeSatoshis</a></span></div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">long</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-58">stdTxFeeSatoshis</a></span></div>
 </section>
 </li>
 </ul>
@@ -422,7 +411,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">
 <h3>BitcoinExtendedClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-74">BitcoinExtendedClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-73">BitcoinExtendedClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
  org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
@@ -430,53 +419,18 @@ <h3>BitcoinExtendedClient</h3>
 </section>
 </li>
 <li>
-<section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">
-<h3>BitcoinExtendedClient</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-78">BitcoinExtendedClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;sslSocketFactory,
- org.bitcoinj.base.Network&nbsp;network,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</section>
-</li>
-<li>
-<section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLSocketFactory,org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)">
-<h3>BitcoinExtendedClient</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-83">BitcoinExtendedClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;sslSocketFactory,
- org.bitcoinj.core.NetworkParameters&nbsp;netParams,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</section>
-</li>
-<li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">
 <h3>BitcoinExtendedClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-88">BitcoinExtendedClient</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
-</section>
-</li>
-<li>
-<section class="detail" id="&lt;init&gt;(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)">
-<h3>BitcoinExtendedClient</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-92">BitcoinExtendedClient</a></span><wbr><span class="parameters">(org.bitcoinj.core.NetworkParameters&nbsp;netParams,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-77">BitcoinExtendedClient</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="&lt;init&gt;(java.net.URI,java.lang.String,java.lang.String)">
 <h3>BitcoinExtendedClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-97">BitcoinExtendedClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-81">BitcoinExtendedClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
 </section>
@@ -484,13 +438,13 @@ <h3>BitcoinExtendedClient</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.jsonrpc.RpcConfig)">
 <h3>BitcoinExtendedClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-101">BitcoinExtendedClient</a></span><wbr><span class="parameters">(<a href="RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a>&nbsp;config)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-85">BitcoinExtendedClient</a></span><wbr><span class="parameters">(<a href="RpcConfig.html" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a>&nbsp;config)</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="&lt;init&gt;()">
 <h3>BitcoinExtendedClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-108">BitcoinExtendedClient</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-92">BitcoinExtendedClient</a></span>()</div>
 <div class="block">Constructor that uses bitcoin.conf to get connection information (Incubating)</div>
 </section>
 </li>
@@ -505,25 +459,25 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="getStdTxFee()">
 <h3>getStdTxFee</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-61">getStdTxFee</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-60">getStdTxFee</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getStdRelayTxFee()">
 <h3>getStdRelayTxFee</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-65">getStdRelayTxFee</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-64">getStdRelayTxFee</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getDefaultMaxConf()">
 <h3>getDefaultMaxConf</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-69">getDefaultMaxConf</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-68">getDefaultMaxConf</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="withWallet(java.lang.String,java.lang.String,java.lang.String)">
 <h3>withWallet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-119">withWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;walletName,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-103">withWallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;walletName,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
 <div class="block">Incubating: clone the client with a new base URI for a named wallet.</div>
@@ -540,13 +494,13 @@ <h3>withWallet</h3>
 <li>
 <section class="detail" id="getRegTestMiningAddress()">
 <h3>getRegTestMiningAddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Address</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-123">getRegTestMiningAddress</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Address</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-107">getRegTestMiningAddress</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="initRegTestWallet()">
 <h3>initRegTestWallet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-160">initRegTestWallet</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-144">initRegTestWallet</a></span>()</div>
 <div class="block">Initialize a server-side wallet for RegTest mining and test transaction funding. Creates a non-descriptor wallet
  with name <a href="#REGTEST_WALLET_NAME"><code>REGTEST_WALLET_NAME</code></a> if it doesn't already exist.</div>
 </section>
@@ -554,7 +508,7 @@ <h3>initRegTestWallet</h3>
 <li>
 <section class="detail" id="generateBlocks(int)">
 <h3>generateBlocks</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-204">generateBlocks</a></span><wbr><span class="parameters">(int&nbsp;numBlocks)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-188">generateBlocks</a></span><wbr><span class="parameters">(int&nbsp;numBlocks)</span>
                                                   throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Generate blocks and funds (RegTest only)
@@ -575,7 +529,7 @@ <h3>generateBlocks</h3>
 <li>
 <section class="detail" id="getBlockSubsidy(int)">
 <h3>getBlockSubsidy</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-213">getBlockSubsidy</a></span><wbr><span class="parameters">(int&nbsp;height)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-197">getBlockSubsidy</a></span><wbr><span class="parameters">(int&nbsp;height)</span></div>
 <div class="block">Calculate the subsidy portion block reward for a given height on the current network</div>
 <dl class="notes">
 <dt>Parameters:</dt>
@@ -588,7 +542,7 @@ <h3>getBlockSubsidy</h3>
 <li>
 <section class="detail" id="getBlock(int)">
 <h3>getBlock</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Block</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-228">getBlock</a></span><wbr><span class="parameters">(int&nbsp;index)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Block</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-212">getBlock</a></span><wbr><span class="parameters">(int&nbsp;index)</span>
                                  throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns information about a block at index provided.
@@ -608,7 +562,7 @@ <h3>getBlock</h3>
 <li>
 <section class="detail" id="clearMemPool()">
 <h3>clearMemPool</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-243">clearMemPool</a></span>()
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-227">clearMemPool</a></span>()
                                                 throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Clears the memory pool and returns a list of the removed transactions.
@@ -627,7 +581,7 @@ <h3>clearMemPool</h3>
 <li>
 <section class="detail" id="createRawTransaction(org.bitcoinj.base.Address,java.util.Map)">
 <h3>createRawTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-259">createRawTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-243">createRawTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;org.bitcoinj.base.Address,<wbr>org.bitcoinj.base.Coin&gt;&nbsp;outputs)</span>
                             throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -651,7 +605,7 @@ <h3>createRawTransaction</h3>
 <li>
 <section class="detail" id="createRawTransaction(org.bitcoinj.base.Address,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">
 <h3>createRawTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-308">createRawTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-292">createRawTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress,
  org.bitcoinj.base.Address&nbsp;toAddress,
  org.bitcoinj.base.Coin&nbsp;amount)</span>
                             throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -677,7 +631,7 @@ <h3>createRawTransaction</h3>
 <li>
 <section class="detail" id="getBitcoinBalance(org.bitcoinj.base.Address)">
 <h3>getBitcoinBalance</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-318">getBitcoinBalance</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-302">getBitcoinBalance</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address)</span>
                                          throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Returns the Bitcoin balance of an address (in the server-side wallet.)</div>
@@ -695,7 +649,7 @@ <h3>getBitcoinBalance</h3>
 <li>
 <section class="detail" id="getBitcoinBalance(org.bitcoinj.base.Address,java.lang.Integer)">
 <h3>getBitcoinBalance</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-334">getBitcoinBalance</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-318">getBitcoinBalance</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf)</span>
                                          throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -716,7 +670,7 @@ <h3>getBitcoinBalance</h3>
 <li>
 <section class="detail" id="getBitcoinBalance(org.bitcoinj.base.Address,java.lang.Integer,java.lang.Integer)">
 <h3>getBitcoinBalance</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-347">getBitcoinBalance</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-331">getBitcoinBalance</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;address,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf)</span>
                                          throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -739,7 +693,7 @@ <h3>getBitcoinBalance</h3>
 <li>
 <section class="detail" id="sendBitcoin(org.bitcoinj.base.Address,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">
 <h3>sendBitcoin</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-363">sendBitcoin</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-347">sendBitcoin</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress,
  org.bitcoinj.base.Address&nbsp;toAddress,
  org.bitcoinj.base.Coin&nbsp;amount)</span>
                                          throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -762,7 +716,7 @@ <h3>sendBitcoin</h3>
 <li>
 <section class="detail" id="sendBitcoin(org.bitcoinj.base.Address,java.util.Map)">
 <h3>sendBitcoin</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-376">sendBitcoin</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Sha256Hash</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-360">sendBitcoin</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;org.bitcoinj.base.Address,<wbr>org.bitcoinj.base.Coin&gt;&nbsp;outputs)</span>
                                          throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -783,7 +737,7 @@ <h3>sendBitcoin</h3>
 <li>
 <section class="detail" id="createSignedTransaction(org.bitcoinj.crypto.ECKey,java.util.List)">
 <h3>createSignedTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Transaction</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-399">createSignedTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.crypto.ECKey&nbsp;fromKey,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Transaction</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-383">createSignedTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.crypto.ECKey&nbsp;fromKey,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.core.TransactionOutput&gt;&nbsp;outputs)</span>
                                                       throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
@@ -804,7 +758,7 @@ <h3>createSignedTransaction</h3>
 <li>
 <section class="detail" id="createSignedTransaction(org.bitcoinj.crypto.ECKey,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">
 <h3>createSignedTransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Transaction</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-445">createSignedTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.crypto.ECKey&nbsp;fromKey,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.Transaction</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-429">createSignedTransaction</a></span><wbr><span class="parameters">(org.bitcoinj.crypto.ECKey&nbsp;fromKey,
  org.bitcoinj.base.Address&nbsp;toAddress,
  org.bitcoinj.base.Coin&nbsp;amount)</span>
                                                       throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
@@ -827,7 +781,7 @@ <h3>createSignedTransaction</h3>
 <li>
 <section class="detail" id="listUnspentJ(org.bitcoinj.base.Address)">
 <h3>listUnspentJ</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.core.TransactionOutput&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-458">listUnspentJ</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.core.TransactionOutput&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-442">listUnspentJ</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress)</span>
                                                        throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Build a list of bitcoinj <code>TransactionOutput</code>s using <a href="BitcoinClient.html#listUnspent()"><code>BitcoinClient.listUnspent()</code></a>
@@ -846,7 +800,7 @@ <h3>listUnspentJ</h3>
 <li>
 <section class="detail" id="listUnspentOutPoints(org.bitcoinj.base.Address)">
 <h3>listUnspentOutPoints</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.core.TransactionOutPoint&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-471">listUnspentOutPoints</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.core.TransactionOutPoint&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html#line-455">listUnspentOutPoints</a></span><wbr><span class="parameters">(org.bitcoinj.base.Address&nbsp;fromAddress)</span>
                                                                  throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Build a list of bitcoinj <code>TransactionOutPoint</code>s using <a href="BitcoinClient.html#listUnspent()"><code>BitcoinClient.listUnspent()</code></a>.</div>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html b/apidoc/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html
index 3f9d1a7a7..1a69fc0b7 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ChainTipClient (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ChainTipClient (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc, interface: ChainTipClient">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -74,18 +88,18 @@ <h1 title="Interface ChainTipClient" class="title">Interface ChainTipClient</h1>
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Known Subinterfaces:</dt>
-<dd><code><a href="../rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></code>, <code><a href="../rx/jsonrpc/RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></code></dd>
+<dd><code><a href="../rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></code></dd>
 </dl>
 <dl class="notes">
 <dt>All Known Implementing Classes:</dt>
 <dd><code><a href="BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></code>, <code><a href="BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></code>, <code><a href="../../namecoin/jsonrpc/NamecoinClient.html" title="class in org.consensusj.namecoin.jsonrpc">NamecoinClient</a></code>, <code><a href="../rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></code>, <code><a href="../rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html#line-16">ChainTipClient</a></span></div>
+<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html#line-17">ChainTipClient</a></span></div>
 <div class="block">Interface for a Bitcoin JSON-RPC client that implements <code>getchaintips</code>.
  <p>
- (This is needed to provide reactive Bitcoin JSON-RPC interfaces since we can't
- use BitcoinClient itself because it is concrete. In the future we may want to create
+ (This is needed to provide reactive Bitcoin JSON-RPC interfaces because we can't
+ subclass BitcoinClient itself (because it is concrete.) In the future we may want to create
  interfaces with more Bitcoin RPC methods, but for now this is all we need.)</div>
 </section>
 <section class="summary">
@@ -95,15 +109,20 @@ <h1 title="Interface ChainTipClient" class="title">Interface ChainTipClient</h1>
 <section class="method-summary" id="method-summary">
 <h2>Method Summary</h2>
 <div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button><button id="method-summary-table-tab6" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab6', 3)" class="table-tab">Deprecated Methods</button></div>
 <div id="method-summary-table.tabpanel" role="tabpanel">
 <div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getChainTips()" class="member-name-link">getChainTips</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3 method-summary-table-tab6"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3 method-summary-table-tab6"><code><a href="#getChainTips()" class="member-name-link">getChainTips</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getChainTipsAsync()" class="member-name-link">getChainTipsAsync</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
 </div>
 </div>
 </div>
@@ -121,9 +140,11 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="getChainTips()">
 <h3>getChainTips</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html#line-17">getChainTips</a></span>()
+<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html#line-18">getChainTips</a></span>()
                      throws <span class="exceptions"><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <dl class="notes">
 <dt>Throws:</dt>
 <dd><code><a href="../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code></dd>
@@ -131,6 +152,12 @@ <h3>getChainTips</h3>
 </dl>
 </section>
 </li>
+<li>
+<section class="detail" id="getChainTipsAsync()">
+<h3>getChainTipsAsync</h3>
+<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html#line-20">getChainTipsAsync</a></span>()</div>
+</section>
+</li>
 </ul>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/RpcConfig.html b/apidoc/org/consensusj/bitcoin/jsonrpc/RpcConfig.html
index 96ae8a93d..7994a6d90 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/RpcConfig.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/RpcConfig.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RpcConfig (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RpcConfig (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc, class: RpcConfig">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -76,7 +90,7 @@ <h1 title="Class RpcConfig" class="title">Class RpcConfig</h1>
 </div>
 <section class="class-description" id="class-description">
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-15">RpcConfig</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-14">RpcConfig</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
 <div class="block">Configuration class for JSON-RPC client. Contains complete URL, username, and password.</div>
 </section>
@@ -105,13 +119,6 @@ <h2>Constructor Summary</h2>
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;username,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;password)</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">RpcConfig</a><wbr>(org.bitcoinj.core.NetworkParameters&nbsp;netParams,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;uri,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;username,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;password)</code></div>
-<div class="col-last odd-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
 </div>
 </section>
 </li>
@@ -120,7 +127,7 @@ <h2>Constructor Summary</h2>
 <section class="method-summary" id="method-summary">
 <h2>Method Summary</h2>
 <div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button><button id="method-summary-table-tab6" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab6', 3)" class="table-tab">Deprecated Methods</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
 <div id="method-summary-table.tabpanel" role="tabpanel">
 <div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
 <div class="table-header col-first">Modifier and Type</div>
@@ -129,25 +136,18 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getNetIdString()" class="member-name-link">getNetIdString</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code>org.bitcoinj.core.NetworkParameters</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getNetParams()" class="member-name-link">getNetParams</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
-<div class="block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#network()"><code>network()</code></a></div>
-</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getPassword()" class="member-name-link">getPassword</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getURI()" class="member-name-link">getURI</a>()</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getPassword()" class="member-name-link">getPassword</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getUsername()" class="member-name-link">getUsername</a>()</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getURI()" class="member-name-link">getURI</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Network</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#network()" class="member-name-link">network</a>()</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getUsername()" class="member-name-link">getUsername</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Network</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#network()" class="member-name-link">network</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
 </div>
 </div>
@@ -166,20 +166,9 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <h2>Constructor Details</h2>
 <ul class="member-list">
 <li>
-<section class="detail" id="&lt;init&gt;(org.bitcoinj.core.NetworkParameters,java.net.URI,java.lang.String,java.lang.String)">
-<h3>RpcConfig</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-22">RpcConfig</a></span><wbr><span class="parameters">(org.bitcoinj.core.NetworkParameters&nbsp;netParams,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;uri,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;username,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;password)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</section>
-</li>
-<li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">
 <h3>RpcConfig</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-27">RpcConfig</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-21">RpcConfig</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;uri,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;username,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;password)</span></div>
@@ -188,7 +177,7 @@ <h3>RpcConfig</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(java.lang.String,java.net.URI,java.lang.String,java.lang.String)">
 <h3>RpcConfig</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-34">RpcConfig</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;netIdString,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-28">RpcConfig</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;netIdString,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;uri,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;username,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;password)</span></div>
@@ -197,7 +186,7 @@ <h3>RpcConfig</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String,java.lang.String)">
 <h3>RpcConfig</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-41">RpcConfig</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;netIdString,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-35">RpcConfig</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;netIdString,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;uri,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;username,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;password)</span></div>
@@ -214,41 +203,31 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="network()">
 <h3>network</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Network</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-52">network</a></span>()</div>
-</section>
-</li>
-<li>
-<section class="detail" id="getNetParams()">
-<h3>getNetParams</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.NetworkParameters</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-60">getNetParams</a></span>()</div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#network()"><code>network()</code></a></div>
-</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Network</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-46">network</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getNetIdString()">
 <h3>getNetIdString</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-66">getNetIdString</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-51">getNetIdString</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getURI()">
 <h3>getURI</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-71">getURI</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-56">getURI</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getUsername()">
 <h3>getUsername</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-75">getUsername</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-60">getUsername</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getPassword()">
 <h3>getPassword</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-79">getPassword</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html#line-64">getPassword</a></span>()</div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/RpcURI.html b/apidoc/org/consensusj/bitcoin/jsonrpc/RpcURI.html
index 6a3f4e5d2..b9606d113 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/RpcURI.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/RpcURI.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RpcURI (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RpcURI (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc, interface: RpcURI">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -179,7 +197,7 @@ <h3>rpcproto</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.RpcURI.rpcproto">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -193,7 +211,7 @@ <h3>rpcssl</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.RpcURI.rpcssl">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -207,7 +225,7 @@ <h3>rpchost</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.RpcURI.rpchost">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -221,7 +239,7 @@ <h3>rpcfile</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.RpcURI.rpcfile">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -235,7 +253,7 @@ <h3>RPCPORT_MAINNET</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_MAINNET">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -249,7 +267,7 @@ <h3>RPCPORT_TESTNET</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_TESTNET">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -263,7 +281,7 @@ <h3>RPCPORT_REGTEST</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_REGTEST">Constant Field Values</a></li>
 </ul>
 </dd>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html b/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html
index 3f6f14f3f..a72a558ab 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinConf (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinConf (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.bitcoind, class: BitcoinConf">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,7 +86,7 @@
 <h1 title="Class BitcoinConf" class="title">Class BitcoinConf</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.html" title="class or interface in java.util" class="external-link">java.util.AbstractMap</a>&lt;K,<wbr>V&gt;
+<div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.html" title="class or interface in java.util" class="external-link">java.util.AbstractMap</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;
 <div class="inheritance"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html" title="class or interface in java.util" class="external-link">java.util.HashMap</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;
 <div class="inheritance">org.consensusj.bitcoin.jsonrpc.bitcoind.BitcoinConf</div>
 </div>
@@ -91,7 +105,7 @@ <h1 title="Class BitcoinConf" class="title">Class BitcoinConf</h1>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../serialized-form.html#org.consensusj.bitcoin.jsonrpc.bitcoind.BitcoinConf">Serialized Form</a></li>
 </ul>
 </dd>
@@ -105,10 +119,10 @@ <h1 title="Class BitcoinConf" class="title">Class BitcoinConf</h1>
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-java.util.AbstractMap">Nested classes/interfaces inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.html" title="class or interface in java.util" class="external-link">AbstractMap</a></h2>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleEntry.html" title="class or interface in java.util" class="external-link">AbstractMap.SimpleEntry</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleEntry.html" title="class or interface in java.util" class="external-link">K</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleEntry.html" title="class or interface in java.util" class="external-link">V</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleImmutableEntry.html" title="class or interface in java.util" class="external-link">AbstractMap.SimpleImmutableEntry</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleImmutableEntry.html" title="class or interface in java.util" class="external-link">K</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleImmutableEntry.html" title="class or interface in java.util" class="external-link">V</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleEntry.html" title="class or interface in java.util" class="external-link">AbstractMap.SimpleEntry</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleEntry.html" title="class or interface in java.util" class="external-link">K</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleEntry.html" title="class or interface in java.util" class="external-link">V</a>&gt;, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleImmutableEntry.html" title="class or interface in java.util" class="external-link">AbstractMap.SimpleImmutableEntry</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleImmutableEntry.html" title="class or interface in java.util" class="external-link">K</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.SimpleImmutableEntry.html" title="class or interface in java.util" class="external-link">V</a>&gt;</code></div>
 <div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-java.util.Map">Nested classes/interfaces inherited from interface&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a></h2>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.Entry.html" title="class or interface in java.util" class="external-link">Map.Entry</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.Entry.html" title="class or interface in java.util" class="external-link">K</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.Entry.html" title="class or interface in java.util" class="external-link">V</a> extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.Entry.html" title="class or interface in java.util" class="external-link">Map.Entry</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.Entry.html" title="class or interface in java.util" class="external-link">K</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.Entry.html" title="class or interface in java.util" class="external-link">V</a>&gt;</code></div>
 </section>
 </li>
 <!-- =========== FIELD SUMMARY =========== -->
@@ -169,7 +183,7 @@ <h2>Method Summary</h2>
 </div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.HashMap">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html" title="class or interface in java.util" class="external-link">HashMap</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#compute(K,java.util.function.BiFunction)" title="class or interface in java.util" class="external-link">compute</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#computeIfAbsent(K,java.util.function.Function)" title="class or interface in java.util" class="external-link">computeIfAbsent</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#computeIfPresent(K,java.util.function.BiFunction)" title="class or interface in java.util" class="external-link">computeIfPresent</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#containsKey(java.lang.Object)" title="class or interface in java.util" class="external-link">containsKey</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#containsValue(java.lang.Object)" title="class or interface in java.util" class="external-link">containsValue</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#entrySet()" title="class or interface in java.util" class="external-link">entrySet</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#forEach(java.util.function.BiConsumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#get(java.lang.Object)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#getOrDefault(java.lang.Object,V)" title="class or interface in java.util" class="external-link">getOrDefault</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#keySet()" title="class or interface in java.util" class="external-link">keySet</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#merge(K,V,java.util.function.BiFunction)" title="class or interface in java.util" class="external-link">merge</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#put(K,V)" title="class or interface in java.util" class="external-link">put</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#putAll(java.util.Map)" title="class or interface in java.util" class="external-link">putAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#putIfAbsent(K,V)" title="class or interface in java.util" class="external-link">putIfAbsent</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#remove(java.lang.Object,java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#replace(K,V)" title="class or interface in java.util" class="external-link">replace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#replace(K,V,V)" title="class or interface in java.util" class="external-link">replace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#replaceAll(java.util.function.BiFunction)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#values()" title="class or interface in java.util" class="external-link">values</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#clear()" title="class or interface in java.util" class="external-link">clear</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#clone()" title="class or interface in java.util" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#compute(K,java.util.function.BiFunction)" title="class or interface in java.util" class="external-link">compute</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#computeIfAbsent(K,java.util.function.Function)" title="class or interface in java.util" class="external-link">computeIfAbsent</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#computeIfPresent(K,java.util.function.BiFunction)" title="class or interface in java.util" class="external-link">computeIfPresent</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#containsKey(java.lang.Object)" title="class or interface in java.util" class="external-link">containsKey</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#containsValue(java.lang.Object)" title="class or interface in java.util" class="external-link">containsValue</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#entrySet()" title="class or interface in java.util" class="external-link">entrySet</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#forEach(java.util.function.BiConsumer)" title="class or interface in java.util" class="external-link">forEach</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#get(java.lang.Object)" title="class or interface in java.util" class="external-link">get</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#getOrDefault(java.lang.Object,V)" title="class or interface in java.util" class="external-link">getOrDefault</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#isEmpty()" title="class or interface in java.util" class="external-link">isEmpty</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#keySet()" title="class or interface in java.util" class="external-link">keySet</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#merge(K,V,java.util.function.BiFunction)" title="class or interface in java.util" class="external-link">merge</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#newHashMap(int)" title="class or interface in java.util" class="external-link">newHashMap</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#put(K,V)" title="class or interface in java.util" class="external-link">put</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#putAll(java.util.Map)" title="class or interface in java.util" class="external-link">putAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#putIfAbsent(K,V)" title="class or interface in java.util" class="external-link">putIfAbsent</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#remove(java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#remove(java.lang.Object,java.lang.Object)" title="class or interface in java.util" class="external-link">remove</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#replace(K,V)" title="class or interface in java.util" class="external-link">replace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#replace(K,V,V)" title="class or interface in java.util" class="external-link">replace</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#replaceAll(java.util.function.BiFunction)" title="class or interface in java.util" class="external-link">replaceAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#size()" title="class or interface in java.util" class="external-link">size</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/HashMap.html#values()" title="class or interface in java.util" class="external-link">values</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.AbstractMap">Methods inherited from class&nbsp;java.util.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.html" title="class or interface in java.util" class="external-link">AbstractMap</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.html#equals(java.lang.Object)" title="class or interface in java.util" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.html#hashCode()" title="class or interface in java.util" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/AbstractMap.html#toString()" title="class or interface in java.util" class="external-link">toString</a></code></div>
@@ -197,7 +211,7 @@ <h3>rpcconnect</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.bitcoind.BitcoinConf.rpcconnect">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -211,7 +225,7 @@ <h3>rpcport</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.bitcoind.BitcoinConf.rpcport">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -225,7 +239,7 @@ <h3>RPCCONNECT_DEFAULT</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../constant-values.html#org.consensusj.bitcoin.jsonrpc.bitcoind.BitcoinConf.RPCCONNECT_DEFAULT">Constant Field Values</a></li>
 </ul>
 </dd>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConfFile.html b/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConfFile.html
index 654c66c27..cce30014c 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConfFile.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConfFile.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinConfFile (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinConfFile (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.bitcoind, class: BitcoinConfFile">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/package-summary.html b/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/package-summary.html
index a5c6cf56c..bf75321fb 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.jsonrpc.bitcoind (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.jsonrpc.bitcoind (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.bitcoind">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/package-tree.html b/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/package-tree.html
index c125c8cec..a9653c2d3 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/bitcoind/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.jsonrpc.bitcoind Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.jsonrpc.bitcoind Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.jsonrpc.bitcoind">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.jsonrpc.bitcoind</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/internal/BitcoinClientThreadFactory.html b/apidoc/org/consensusj/bitcoin/jsonrpc/internal/BitcoinClientThreadFactory.html
index 6d4bc0b23..ca8fa5ee7 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/internal/BitcoinClientThreadFactory.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/internal/BitcoinClientThreadFactory.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinClientThreadFactory (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinClientThreadFactory (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.internal, class: BitcoinClientThreadFactory">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/internal/package-summary.html b/apidoc/org/consensusj/bitcoin/jsonrpc/internal/package-summary.html
index 4e553ca5b..33e2b774f 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/internal/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/internal/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.jsonrpc.internal (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.jsonrpc.internal (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.internal">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/internal/package-tree.html b/apidoc/org/consensusj/bitcoin/jsonrpc/internal/package-tree.html
index a5ff9c1b7..c401f42b6 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/internal/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/internal/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.jsonrpc.internal Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.jsonrpc.internal Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.jsonrpc.internal">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.jsonrpc.internal</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/package-summary.html b/apidoc/org/consensusj/bitcoin/jsonrpc/package-summary.html
index 88ffdf38d..8a772a191 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.jsonrpc (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.jsonrpc (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/package-tree.html b/apidoc/org/consensusj/bitcoin/jsonrpc/package-tree.html
index 64041f27c..07fdd63cb 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.jsonrpc">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,19 +49,17 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.jsonrpc</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
 <ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a> (implements org.consensusj.jsonrpc.<a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a>)
-<ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a>
+<li class="circle">org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a> (implements org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt;)
 <ul>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="BitcoinClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a> (implements org.consensusj.bitcoin.jsonrpc.<a href="ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>)
 <ul>
@@ -70,8 +68,6 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </li>
 </ul>
 </li>
-</ul>
-</li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="RpcConfig.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a></li>
 </ul>
 </li>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html
new file mode 100644
index 000000000..16ab88a34
--- /dev/null
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html
@@ -0,0 +1,157 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>BTCTestSupport (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, interface: BTCTestSupport">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.bitcoin.jsonrpc.test</a></div>
+<h1 title="Interface BTCTestSupport" class="title">Interface BTCTestSupport</h1>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Superinterfaces:</dt>
+<dd><code><a href="BitcoinClientAccessor.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BitcoinClientAccessor</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html#line-11">BTCTestSupport</a></span><span class="extends-implements">
+extends <a href="BitcoinClientAccessor.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BitcoinClientAccessor</a></span></div>
+<div class="block">Test support functions intended to be mixed-in to Spock test specs</div>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#serverReady(org.bitcoinj.base.Network)" class="member-name-link">serverReady</a><wbr>(org.bitcoinj.base.Network&nbsp;expectedNetwork)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
+<div class="block">Wait for the server to become ready and validate the Bitcoin network it is running on</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.consensusj.bitcoin.jsonrpc.test.BitcoinClientAccessor">Methods inherited from interface&nbsp;org.consensusj.bitcoin.jsonrpc.test.<a href="BitcoinClientAccessor.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BitcoinClientAccessor</a></h3>
+<code><a href="BitcoinClientAccessor.html#client()">client</a>, <a href="BitcoinClientAccessor.html#getClient()">getClient</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="serverReady(org.bitcoinj.base.Network)">
+<h3>serverReady</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html#line-17">serverReady</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;expectedNetwork)</span>
+                  throws <span class="exceptions"><a href="../../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></span></div>
+<div class="block">Wait for the server to become ready and validate the Bitcoin network it is running on</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>expectedNetwork</code> - The network the server is expected to be running on</dd>
+<dt>Throws:</dt>
+<dd><code><a href="../../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></code></dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html
index ee986086b..8cef7fdd4 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinClientAccessor (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinClientAccessor (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, interface: BitcoinClientAccessor">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,6 +86,10 @@
 <h1 title="Interface BitcoinClientAccessor" class="title">Interface BitcoinClientAccessor</h1>
 </div>
 <section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Known Subinterfaces:</dt>
+<dd><code><a href="BTCTestSupport.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BTCTestSupport</a></code></dd>
+</dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html#line-8">BitcoinClientAccessor</a></span></div>
 <div class="block">Interface for tests that use a BitcoinExtendedClient</div>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html
index 5a7f99682..a8112118c 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BlockChainEnvironment (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BlockChainEnvironment (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, interface: BlockChainEnvironment">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -95,12 +109,12 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#waitForBlock()" class="member-name-link">waitForBlock</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Wait for (and possible *hasten*) the creation of a single block</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#waitForBlocks(int)" class="member-name-link">waitForBlocks</a><wbr>(int&nbsp;numBlocks)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Wait for (and possible *hasten*) the creation of blocks</div>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html
index 3d893caa3..6205fc78e 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BlockchainSyncing (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BlockchainSyncing (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, interface: BlockchainSyncing">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/FundingSource.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/FundingSource.html
index b54e112ff..dad4f9443 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/FundingSource.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/FundingSource.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>FundingSource (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>FundingSource (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, interface: FundingSource">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/FundingSourceAccessor.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/FundingSourceAccessor.html
index e75ceff30..98c04ee9d 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/FundingSourceAccessor.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/FundingSourceAccessor.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>FundingSourceAccessor (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>FundingSourceAccessor (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, interface: FundingSourceAccessor">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html
index 041dd0388..2132a9cdf 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RegTestEnvironment (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RegTestEnvironment (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, class: RegTestEnvironment">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -114,12 +128,12 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#waitForBlock()" class="member-name-link">waitForBlock</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Wait for (and possible *hasten*) the creation of a single block</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#waitForBlocks(int)" class="member-name-link">waitForBlocks</a><wbr>(int&nbsp;numBlocks)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Wait for (and possible *hasten*) the creation of blocks</div>
@@ -160,7 +174,7 @@ <h2>Method Details</h2>
 <h3>waitForBlock</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html#line-26">waitForBlock</a></span>()
                                                 throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a></span></div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="BlockChainEnvironment.html#waitForBlock()">BlockChainEnvironment</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="BlockChainEnvironment.html#waitForBlock()">BlockChainEnvironment</a></code></span></div>
 <div class="block">Wait for (and possible *hasten*) the creation of a single block</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -178,7 +192,7 @@ <h3>waitForBlocks</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html#line-31">waitForBlocks</a></span><wbr><span class="parameters">(int&nbsp;numBlocks)</span>
                                                  throws <span class="exceptions"><a href="../../../jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="BlockChainEnvironment.html#waitForBlocks(int)">BlockChainEnvironment</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="BlockChainEnvironment.html#waitForBlocks(int)">BlockChainEnvironment</a></code></span></div>
 <div class="block">Wait for (and possible *hasten*) the creation of blocks</div>
 <dl class="notes">
 <dt>Specified by:</dt>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/RegTestFundingSource.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/RegTestFundingSource.html
index b19494d05..28a01d083 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/RegTestFundingSource.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/RegTestFundingSource.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RegTestFundingSource (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RegTestFundingSource (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, class: RegTestFundingSource">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -261,7 +275,7 @@ <h3>createIngredients</h3>
 <section class="detail" id="fundingSourceMaintenance()">
 <h3>fundingSourceMaintenance</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestFundingSource.html#line-147">fundingSourceMaintenance</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="FundingSource.html#fundingSourceMaintenance()">FundingSource</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="FundingSource.html#fundingSourceMaintenance()">FundingSource</a></code></span></div>
 <div class="block">An opportunity to do any necessary housekeeping. (e.g. consolidation)</div>
 <dl class="notes">
 <dt>Specified by:</dt>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/TestServers.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/TestServers.html
index 2ddb17c03..9e4d3395d 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/TestServers.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/TestServers.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TestServers (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TestServers (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, class: TestServers">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/TransactionIngredients.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/TransactionIngredients.html
index 5813323f1..0c8c1174e 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/TransactionIngredients.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/TransactionIngredients.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionIngredients (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionIngredients (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, class: TransactionIngredients">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -91,7 +109,7 @@ <h2>Field Summary</h2>
 <div class="col-first even-row-color"><code>org.bitcoinj.base.Address</code></div>
 <div class="col-second even-row-color"><code><a href="#address" class="member-name-link">address</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;org.bitcoinj.core.TransactionOutPoint&gt;</code></div>
+<div class="col-first odd-row-color"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;org.bitcoinj.core.TransactionOutPoint&gt;</code></div>
 <div class="col-second odd-row-color"><code><a href="#outPoints" class="member-name-link">outPoints</a></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>org.bitcoinj.crypto.ECKey</code></div>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/WalletTestUtil.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/WalletTestUtil.html
index ff83b8bdc..b8409820e 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/WalletTestUtil.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/WalletTestUtil.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>WalletTestUtil (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>WalletTestUtil (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test, class: WalletTestUtil">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/package-summary.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/package-summary.html
index 8431b2e94..47aa10ea4 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.jsonrpc.test (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.jsonrpc.test (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.jsonrpc.test">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -108,37 +113,41 @@ <h1 title="Package org.consensusj.bitcoin.jsonrpc.test" class="title">Package or
 <div class="col-last even-row-color class-summary class-summary-tab1">
 <div class="block">Wait for synchronization with a reference source of block height.</div>
 </div>
-<div class="col-first odd-row-color class-summary class-summary-tab1"><a href="FundingSource.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">FundingSource</a></div>
+<div class="col-first odd-row-color class-summary class-summary-tab1"><a href="BTCTestSupport.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BTCTestSupport</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
+<div class="block">Test support functions intended to be mixed-in to Spock test specs</div>
+</div>
+<div class="col-first even-row-color class-summary class-summary-tab1"><a href="FundingSource.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">FundingSource</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab1">
 <div class="block">A source of Bitcoin funds for testing
 
  In RegTest mode, it can be a RegTestFundingSource that mines coins in RegTest mode and sends them
  to a requesting address.</div>
 </div>
-<div class="col-first even-row-color class-summary class-summary-tab1"><a href="FundingSourceAccessor.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">FundingSourceAccessor</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab1">
+<div class="col-first odd-row-color class-summary class-summary-tab1"><a href="FundingSourceAccessor.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">FundingSourceAccessor</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab1">
 <div class="block">Interface for tests that use a FundingSource</div>
 </div>
-<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="RegTestEnvironment.html" title="class in org.consensusj.bitcoin.jsonrpc.test">RegTestEnvironment</a></div>
-<div class="col-last odd-row-color class-summary class-summary-tab2">
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="RegTestEnvironment.html" title="class in org.consensusj.bitcoin.jsonrpc.test">RegTestEnvironment</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
 <div class="block">Single-threaded RegTest testing environment.</div>
 </div>
-<div class="col-first even-row-color class-summary class-summary-tab2"><a href="RegTestFundingSource.html" title="class in org.consensusj.bitcoin.jsonrpc.test">RegTestFundingSource</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab2">
+<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="RegTestFundingSource.html" title="class in org.consensusj.bitcoin.jsonrpc.test">RegTestFundingSource</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab2">
 <div class="block">FundingSource using RegTest mining, BitcoinExtendedClient (with getRegTestMiningAddress),
  and the server's default wallet for accumulating coins.</div>
 </div>
-<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="TestServers.html" title="class in org.consensusj.bitcoin.jsonrpc.test">TestServers</a></div>
-<div class="col-last odd-row-color class-summary class-summary-tab2">
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="TestServers.html" title="class in org.consensusj.bitcoin.jsonrpc.test">TestServers</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
 <div class="block">Credentials to server under test.</div>
 </div>
-<div class="col-first even-row-color class-summary class-summary-tab2"><a href="TransactionIngredients.html" title="class in org.consensusj.bitcoin.jsonrpc.test">TransactionIngredients</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab2">
+<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="TransactionIngredients.html" title="class in org.consensusj.bitcoin.jsonrpc.test">TransactionIngredients</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab2">
 <div class="block">Everything needed to build your own custom transaction
  TODO: Make this an immutable bean</div>
 </div>
-<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="WalletTestUtil.html" title="class in org.consensusj.bitcoin.jsonrpc.test">WalletTestUtil</a></div>
-<div class="col-last odd-row-color class-summary class-summary-tab2">
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="WalletTestUtil.html" title="class in org.consensusj.bitcoin.jsonrpc.test">WalletTestUtil</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
 <div class="block">Utilities for integration testing server-side wallets</div>
 </div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoin/jsonrpc/test/package-tree.html b/apidoc/org/consensusj/bitcoin/jsonrpc/test/package-tree.html
index f0be64b03..e54b4b471 100644
--- a/apidoc/org/consensusj/bitcoin/jsonrpc/test/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/jsonrpc/test/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.jsonrpc.test Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.jsonrpc.test Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.jsonrpc.test">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.jsonrpc.test</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
@@ -71,7 +71,11 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <section class="hierarchy">
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
-<li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="BitcoinClientAccessor.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BitcoinClientAccessor</a></li>
+<li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="BitcoinClientAccessor.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BitcoinClientAccessor</a>
+<ul>
+<li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="BTCTestSupport.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BTCTestSupport</a></li>
+</ul>
+</li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="BlockChainEnvironment.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BlockChainEnvironment</a></li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="BlockchainSyncing.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BlockchainSyncing</a></li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="FundingSource.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">FundingSource</a></li>
diff --git a/apidoc/org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html b/apidoc/org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html
new file mode 100644
index 000000000..185b0f4be
--- /dev/null
+++ b/apidoc/org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html
@@ -0,0 +1,167 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>ChainTipPublisher.Wrapper (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: package: org.consensusj.bitcoin.rx, interface: ChainTipPublisher, class: Wrapper">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.bitcoin.rx</a></div>
+<h1 title="Class ChainTipPublisher.Wrapper" class="title">Class ChainTipPublisher.Wrapper</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance">org.consensusj.bitcoin.rx.ChainTipPublisher.Wrapper</div>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></code>, <code>org.reactivestreams.Publisher&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></dd>
+</dl>
+<dl class="notes">
+<dt>Enclosing interface:</dt>
+<dd><code><a href="ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/rx/ChainTipPublisher.html#line-21">ChainTipPublisher.Wrapper</a></span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
+implements <a href="ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></span></div>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<li>
+<section class="nested-class-summary" id="nested-class-summary">
+<h2>Nested Class Summary</h2>
+<div class="inherited-list">
+<h2 id="nested-classes-inherited-from-class-org.consensusj.bitcoin.rx.ChainTipPublisher">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.bitcoin.rx.<a href="ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></h2>
+<code><a href="ChainTipPublisher.Wrapper.html" title="class in org.consensusj.bitcoin.rx">ChainTipPublisher.Wrapper</a></code></div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#subscribe(org.reactivestreams.Subscriber)" class="member-name-link">subscribe</a><wbr>(org.reactivestreams.Subscriber&lt;? super <a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&nbsp;s)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="subscribe(org.reactivestreams.Subscriber)">
+<h3>subscribe</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html#line-28">subscribe</a></span><wbr><span class="parameters">(org.reactivestreams.Subscriber&lt;? super <a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&nbsp;s)</span></div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code>subscribe</code>&nbsp;in interface&nbsp;<code>org.reactivestreams.Publisher&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/bitcoin/rx/ChainTipPublisher.html b/apidoc/org/consensusj/bitcoin/rx/ChainTipPublisher.html
new file mode 100644
index 000000000..1fd5d06d2
--- /dev/null
+++ b/apidoc/org/consensusj/bitcoin/rx/ChainTipPublisher.html
@@ -0,0 +1,174 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>ChainTipPublisher (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: package: org.consensusj.bitcoin.rx, interface: ChainTipPublisher">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../script.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../index-all.html">Index</a></li>
+<li><a href="../../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.bitcoin.rx</a></div>
+<h1 title="Interface ChainTipPublisher" class="title">Interface ChainTipPublisher</h1>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Superinterfaces:</dt>
+<dd><code>org.reactivestreams.Publisher&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></dd>
+</dl>
+<dl class="notes">
+<dt>All Known Implementing Classes:</dt>
+<dd><code><a href="ChainTipPublisher.Wrapper.html" title="class in org.consensusj.bitcoin.rx">ChainTipPublisher.Wrapper</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/rx/ChainTipPublisher.html#line-11">ChainTipPublisher</a></span><span class="extends-implements">
+extends org.reactivestreams.Publisher&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span></div>
+<div class="block">Marker type for <code>Publisher&lt;ChainTip&gt;</code>. In a future release this may use <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/Flow.Publisher.html" title="class or interface in java.util.concurrent" class="external-link"><code>Flow.Publisher</code></a>.
+ Because of type erasure in Java generics we need this to strongly type parameters that require a <code>Publisher&lt;ChainTip&gt;</code>.</div>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<li>
+<section class="nested-class-summary" id="nested-class-summary">
+<h2>Nested Class Summary</h2>
+<div class="caption"><span>Nested Classes</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Interface</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>static class&nbsp;</code></div>
+<div class="col-second even-row-color"><code><a href="ChainTipPublisher.Wrapper.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx">ChainTipPublisher.Wrapper</a></code></div>
+<div class="col-last even-row-color">&nbsp;</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="caption"><span>Static Methods</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1"><code>static <a href="ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1"><code><a href="#of(org.reactivestreams.Publisher)" class="member-name-link">of</a><wbr>(org.reactivestreams.Publisher&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&nbsp;publisher)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1">
+<div class="block">Adapt a <code>Publisher&lt;ChainTip</code></div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.reactivestreams.Publisher">Methods inherited from interface&nbsp;org.reactivestreams.Publisher</h3>
+<code>subscribe</code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="of(org.reactivestreams.Publisher)">
+<h3>of</h3>
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/rx/ChainTipPublisher.html#line-17">of</a></span><wbr><span class="parameters">(org.reactivestreams.Publisher&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&nbsp;publisher)</span></div>
+<div class="block">Adapt a <code>Publisher&lt;ChainTip</code></div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>publisher</code> - to wrap</dd>
+<dt>Returns:</dt>
+<dd>wrapped publisher</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/bitcoin/rx/ChainTipService.html b/apidoc/org/consensusj/bitcoin/rx/ChainTipService.html
index 6c830f9a9..137ae08d8 100644
--- a/apidoc/org/consensusj/bitcoin/rx/ChainTipService.html
+++ b/apidoc/org/consensusj/bitcoin/rx/ChainTipService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ChainTipService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ChainTipService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx, interface: ChainTipService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -97,7 +111,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#chainTipPublisher()" class="member-name-link">chainTipPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">This method will give you a stream of ChainTips</div>
@@ -119,7 +133,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="chainTipPublisher()">
 <h3>chainTipPublisher</h3>
-<div class="member-signature"><span class="return-type">org.reactivestreams.Publisher&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/rx/ChainTipService.html#line-15">chainTipPublisher</a></span>()</div>
+<div class="member-signature"><span class="return-type"><a href="ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/rx/ChainTipService.html#line-15">chainTipPublisher</a></span>()</div>
 <div class="block">This method will give you a stream of ChainTips</div>
 <dl class="notes">
 <dt>Returns:</dt>
diff --git a/apidoc/org/consensusj/bitcoin/rx/RxBlockchainBinaryService.html b/apidoc/org/consensusj/bitcoin/rx/RxBlockchainBinaryService.html
index 1dd65e1ee..742bff7e5 100644
--- a/apidoc/org/consensusj/bitcoin/rx/RxBlockchainBinaryService.html
+++ b/apidoc/org/consensusj/bitcoin/rx/RxBlockchainBinaryService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RxBlockchainBinaryService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RxBlockchainBinaryService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx, interface: RxBlockchainBinaryService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -103,16 +117,16 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;byte[]&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#blockBinaryPublisher()" class="member-name-link">blockBinaryPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;byte[]&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#blockHashBinaryPublisher()" class="member-name-link">blockHashBinaryPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;byte[]&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#transactionBinaryPublisher()" class="member-name-link">transactionBinaryPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;byte[]&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#transactionHashBinaryPublisher()" class="member-name-link">transactionHashBinaryPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoin/rx/RxBlockchainService.html b/apidoc/org/consensusj/bitcoin/rx/RxBlockchainService.html
index 1dd72ae34..4b55d4104 100644
--- a/apidoc/org/consensusj/bitcoin/rx/RxBlockchainService.html
+++ b/apidoc/org/consensusj/bitcoin/rx/RxBlockchainService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RxBlockchainService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RxBlockchainService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx, interface: RxBlockchainService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -106,22 +120,22 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#blockHashPublisher()" class="member-name-link">blockHashPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#blockHeightPublisher()" class="member-name-link">blockHeightPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;org.bitcoinj.core.Block&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.core.Block&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#blockPublisher()" class="member-name-link">blockPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;<a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#chainTipPublisher()" class="member-name-link">chainTipPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#transactionHashPublisher()" class="member-name-link">transactionHashPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher&lt;org.bitcoinj.core.Transaction&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#transactionPublisher()" class="member-name-link">transactionPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html
index 7aa978dd2..191a300a1 100644
--- a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>PollingChainTipService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>PollingChainTipService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.jsonrpc, interface: PollingChainTipService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -74,15 +88,15 @@ <h1 title="Interface PollingChainTipService" class="title">Interface PollingChai
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Superinterfaces:</dt>
-<dd><code><a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code>, <code><a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></code>, <code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></code></dd>
-</dl>
-<dl class="notes">
-<dt>All Known Implementing Classes:</dt>
-<dd><code><a href="PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></code></dd>
+<dd><code><a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code>, <code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#line-13">PollingChainTipService</a></span><span class="extends-implements">
-extends <a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></span></div>
+<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#line-18">PollingChainTipService</a></span><span class="extends-implements">
+extends <a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, <a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use the <a href="PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc"><code>PollingChainTipServiceImpl</code></a> implementation</div>
+</div>
 <div class="block">Interface with <a href="#pollForDistinctChainTip()"><code>pollForDistinctChainTip()</code></a> method.</div>
 </section>
 <section class="summary">
@@ -93,7 +107,7 @@ <h1 title="Interface PollingChainTipService" class="title">Interface PollingChai
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
+<code><a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="../../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- =========== FIELD SUMMARY =========== -->
@@ -107,7 +121,9 @@ <h2>Field Summary</h2>
 <div class="table-header col-last">Description</div>
 <div class="col-first even-row-color"><code>static final org.slf4j.Logger</code></div>
 <div class="col-second even-row-color"><code><a href="#log" class="member-name-link">log</a></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-last even-row-color">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+&nbsp;</div>
 </div>
 </section>
 </li>
@@ -116,20 +132,22 @@ <h2>Field Summary</h2>
 <section class="method-summary" id="method-summary">
 <h2>Method Summary</h2>
 <div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button><button id="method-summary-table-tab6" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab6', 3)" class="table-tab">Deprecated Methods</button></div>
 <div id="method-summary-table.tabpanel" role="tabpanel">
 <div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>io.reactivex.rxjava3.core.Observable&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getPollingInterval()" class="member-name-link">getPollingInterval</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3 method-summary-table-tab6"><code>io.reactivex.rxjava3.core.Observable<wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3 method-summary-table-tab6"><code><a href="#getPollingInterval()" class="member-name-link">getPollingInterval</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Implement this method to provide a polling interval</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default io.reactivex.rxjava3.core.Flowable&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#pollForDistinctChainTip()" class="member-name-link">pollForDistinctChainTip</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code>default org.reactivestreams.Publisher<wbr>&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code><a href="#pollForDistinctChainTip()" class="member-name-link">pollForDistinctChainTip</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Using a polling interval provided by <a href="#getPollingInterval()"><code>getPollingInterval()</code></a> provide a
  stream of distinct <a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a>s.</div>
 </div>
@@ -141,16 +159,13 @@ <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Method
 <code><a href="../../../jsonrpc/AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="../../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="../../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.bitcoin.jsonrpc.ChainTipClient">Methods inherited from interface&nbsp;org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></h3>
-<code><a href="../../jsonrpc/ChainTipClient.html#getChainTips()">getChainTips</a></code></div>
+<code><a href="../../jsonrpc/ChainTipClient.html#getChainTips()">getChainTips</a>, <a href="../../jsonrpc/ChainTipClient.html#getChainTipsAsync()">getChainTipsAsync</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.bitcoin.rx.ChainTipService">Methods inherited from interface&nbsp;org.consensusj.bitcoin.rx.<a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></h3>
 <code><a href="../ChainTipService.html#chainTipPublisher()">chainTipPublisher</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.bitcoin.rx.jsonrpc.RxJsonChainTipClient">Methods inherited from interface&nbsp;org.consensusj.bitcoin.rx.jsonrpc.<a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></h3>
-<code><a href="RxJsonChainTipClient.html#currentChainTipMaybe()">currentChainTipMaybe</a>, <a href="RxJsonChainTipClient.html#pollOnNewBlock(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnNewBlock</a></code></div>
-<div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.rx.jsonrpc.RxJsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></h3>
-<code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">call</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#defer(java.util.function.Supplier)">defer</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnce</a></code></div>
+<code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">call</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#callAsync(java.util.function.Supplier)">callAsync</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnce</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier)">pollOnceAsPublisher</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)">pollOnceAsPublisher</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsync(java.util.function.Supplier)">pollOnceAsync</a></code></div>
 </section>
 </li>
 </ul>
@@ -165,7 +180,8 @@ <h2>Field Details</h2>
 <li>
 <section class="detail" id="log">
 <h3>log</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.slf4j.Logger</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#line-14">log</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.slf4j.Logger</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#line-20">log</a></span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
 </ul>
@@ -179,7 +195,8 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="getPollingInterval()">
 <h3>getPollingInterval</h3>
-<div class="member-signature"><span class="return-type">io.reactivex.rxjava3.core.Observable&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#line-21">getPollingInterval</a></span>()</div>
+<div class="member-signature"><span class="return-type">io.reactivex.rxjava3.core.Observable&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#line-27">getPollingInterval</a></span>()</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Implement this method to provide a polling interval</div>
 <dl class="notes">
 <dt>Returns:</dt>
@@ -190,7 +207,8 @@ <h3>getPollingInterval</h3>
 <li>
 <section class="detail" id="pollForDistinctChainTip()">
 <h3>pollForDistinctChainTip</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#line-29">pollForDistinctChainTip</a></span>()</div>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html#line-35">pollForDistinctChainTip</a></span>()</div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Using a polling interval provided by <a href="#getPollingInterval()"><code>getPollingInterval()</code></a> provide a
  stream of distinct <a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a>s.</div>
 <dl class="notes">
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html
index ec82472a3..305602087 100644
--- a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>PollingChainTipServiceImpl (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>PollingChainTipServiceImpl (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.jsonrpc, class: PollingChainTipServiceImpl">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -77,14 +91,14 @@ <h1 title="Class PollingChainTipServiceImpl" class="title">Class PollingChainTip
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code>, <code><a href="PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></code>, <code><a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></code>, <code><a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code>, <code><a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-24">PollingChainTipServiceImpl</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-35">PollingChainTipServiceImpl</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
-implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a>, <a href="PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></span></div>
-<div class="block">Implementation of <a href="PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc"><code>PollingChainTipService</code></a> using a <a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> and a polling interval.
- This can be used as a fallback if ZeroMQ is not available</div>
+implements <a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, <a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></span></div>
+<div class="block">Provides <a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx"><code>ChainTipService</code></a> a using a <a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> and a polling interval.
+ This can be used as a fallback if ZeroMQ is not available.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -94,7 +108,7 @@ <h1 title="Class PollingChainTipServiceImpl" class="title">Class PollingChainTip
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
+<code><a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="../../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -120,13 +134,13 @@ <h2>Constructor Summary</h2>
 <section class="method-summary" id="method-summary">
 <h2>Method Summary</h2>
 <div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button><button id="method-summary-table-tab6" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab6', 3)" class="table-tab">Deprecated Methods</button></div>
 <div id="method-summary-table.tabpanel" role="tabpanel">
 <div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#chainTipPublisher()" class="member-name-link">chainTipPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">This method will give you a stream of ChainTips</div>
@@ -134,17 +148,22 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#close()" class="member-name-link">close</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getChainTips()" class="member-name-link">getChainTips</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Observable&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getPollingInterval()" class="member-name-link">getPollingInterval</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Implement this method to provide a polling interval</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getChainTips()" class="member-name-link">getChainTips</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#start()" class="member-name-link">start</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getChainTipsAsync()" class="member-name-link">getChainTipsAsync</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Observable<wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getPollingInterval()" class="member-name-link">getPollingInterval</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Provide a polling interval</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#start()" class="member-name-link">start</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
 </div>
 </div>
@@ -155,14 +174,8 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
 <code><a href="../../../jsonrpc/AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="../../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="../../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.bitcoin.rx.jsonrpc.PollingChainTipService">Methods inherited from interface&nbsp;org.consensusj.bitcoin.rx.jsonrpc.<a href="PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></h3>
-<code><a href="PollingChainTipService.html#pollForDistinctChainTip()">pollForDistinctChainTip</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.bitcoin.rx.jsonrpc.RxJsonChainTipClient">Methods inherited from interface&nbsp;org.consensusj.bitcoin.rx.jsonrpc.<a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></h3>
-<code><a href="RxJsonChainTipClient.html#currentChainTipMaybe()">currentChainTipMaybe</a>, <a href="RxJsonChainTipClient.html#pollOnNewBlock(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnNewBlock</a></code></div>
-<div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.rx.jsonrpc.RxJsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></h3>
-<code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">call</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#defer(java.util.function.Supplier)">defer</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnce</a></code></div>
+<code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">call</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#callAsync(java.util.function.Supplier)">callAsync</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnce</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier)">pollOnceAsPublisher</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)">pollOnceAsPublisher</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsync(java.util.function.Supplier)">pollOnceAsync</a></code></div>
 </section>
 </li>
 </ul>
@@ -177,7 +190,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.jsonrpc.BitcoinClient,io.reactivex.rxjava3.core.Observable)">
 <h3>PollingChainTipServiceImpl</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-38">PollingChainTipServiceImpl</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a>&nbsp;bitcoinClient,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-49">PollingChainTipServiceImpl</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a>&nbsp;bitcoinClient,
  io.reactivex.rxjava3.core.Observable&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;&nbsp;interval)</span></div>
 <div class="block">Construct from a <a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> or subclass and a polling interval</div>
 <dl class="notes">
@@ -190,7 +203,7 @@ <h3>PollingChainTipServiceImpl</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.jsonrpc.BitcoinClient)">
 <h3>PollingChainTipServiceImpl</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-45">PollingChainTipServiceImpl</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a>&nbsp;bitcoinClient)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-56">PollingChainTipServiceImpl</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a>&nbsp;bitcoinClient)</span></div>
 </section>
 </li>
 </ul>
@@ -204,14 +217,14 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="start()">
 <h3>start</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-49">start</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-60">start</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="chainTipPublisher()">
 <h3>chainTipPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-55">chainTipPublisher</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="../ChainTipService.html#chainTipPublisher()">ChainTipService</a></code></span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-66">chainTipPublisher</a></span>()</div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="../ChainTipService.html#chainTipPublisher()">ChainTipService</a></code></span></div>
 <div class="block">This method will give you a stream of ChainTips</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -224,12 +237,9 @@ <h3>chainTipPublisher</h3>
 <li>
 <section class="detail" id="getPollingInterval()">
 <h3>getPollingInterval</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Observable&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-61">getPollingInterval</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="PollingChainTipService.html#getPollingInterval()">PollingChainTipService</a></code></span></div>
-<div class="block">Implement this method to provide a polling interval</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Observable&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-77">getPollingInterval</a></span>()</div>
+<div class="block">Provide a polling interval</div>
 <dl class="notes">
-<dt>Specified by:</dt>
-<dd><code><a href="PollingChainTipService.html#getPollingInterval()">getPollingInterval</a></code>&nbsp;in interface&nbsp;<code><a href="PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></code></dd>
 <dt>Returns:</dt>
 <dd>polling interval with desired frequency for polling for new ChainTips.</dd>
 </dl>
@@ -238,7 +248,7 @@ <h3>getPollingInterval</h3>
 <li>
 <section class="detail" id="close()">
 <h3>close</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-66">close</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-108">close</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link">close</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
@@ -248,11 +258,23 @@ <h3>close</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="getChainTipsAsync()">
+<h3>getChainTipsAsync</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-113">getChainTipsAsync</a></span>()</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="../../jsonrpc/ChainTipClient.html#getChainTipsAsync()">getChainTipsAsync</a></code>&nbsp;in interface&nbsp;<code><a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code></dd>
+</dl>
+</section>
+</li>
+<li>
 <section class="detail" id="getChainTips()">
 <h3>getChainTips</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-71">getChainTips</a></span>()
+<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html#line-118">getChainTips</a></span>()
                             throws <span class="exceptions"><a href="../../../jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../../jsonrpc/ChainTipClient.html#getChainTips()">getChainTips</a></code>&nbsp;in interface&nbsp;<code><a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code></dd>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html
index 5ca725ba5..958cf3bb4 100644
--- a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RxBitcoinClient (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RxBitcoinClient (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.jsonrpc, class: RxBitcoinClient">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,8 +86,7 @@
 <h1 title="Class RxBitcoinClient" class="title">Class RxBitcoinClient</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="../../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.AbstractRpcClient</a>
-<div class="inheritance"><a href="../../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection</a>
+<div class="inheritance"><a href="../../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.DefaultRpcClient</a>
 <div class="inheritance"><a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">org.consensusj.bitcoin.jsonrpc.BitcoinClient</a>
 <div class="inheritance"><a href="../../jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient</a>
 <div class="inheritance">org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient</div>
@@ -81,18 +94,17 @@ <h1 title="Class RxBitcoinClient" class="title">Class RxBitcoinClient</h1>
 </div>
 </div>
 </div>
-</div>
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code>, <code><a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></code>, <code><a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code>, <code><a href="../../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code>, <code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code>, <code><a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code>, <code><a href="../../../jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code>, <code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-31">RxBitcoinClient</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-34">RxBitcoinClient</a></span>
 <span class="extends-implements">extends <a href="../../jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a>
-implements <a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></span></div>
+implements <a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></span></div>
 <div class="block">A <a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> enhanced with Reactive features. Can use either ZeroMQ or polling
- to implement <a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc"><code>RxJsonChainTipClient</code></a>.
+ to implement <a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx"><code>ChainTipService</code></a>.
  <p>
  TODO: answer the below questions
  <p>
@@ -109,8 +121,11 @@ <h1 title="Class RxBitcoinClient" class="title">Class RxBitcoinClient</h1>
 <section class="nested-class-summary" id="nested-class-summary">
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
+<h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Nested classes/interfaces inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h2>
+<code><a href="../../../jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;<a href="../../../jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="type parameter in DefaultRpcClient.TransientErrorMapper">T</a>&gt;, <a href="../../../jsonrpc/DefaultRpcClient.TransportFactory.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></code></div>
+<div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
+<code><a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="../../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- =========== FIELD SUMMARY =========== -->
@@ -124,8 +139,8 @@ <h3 id="fields-inherited-from-class-org.consensusj.bitcoin.jsonrpc.BitcoinExtend
 <h3 id="fields-inherited-from-class-org.consensusj.bitcoin.jsonrpc.BitcoinClient">Fields inherited from class&nbsp;org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></h3>
 <code><a href="../../jsonrpc/BitcoinClient.html#BITCOIN_CORE_VERSION_DESC_DEFAULT">BITCOIN_CORE_VERSION_DESC_DEFAULT</a>, <a href="../../jsonrpc/BitcoinClient.html#BITCOIN_CORE_VERSION_MIN">BITCOIN_CORE_VERSION_MIN</a></code></div>
 <div class="inherited-list">
-<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="../../../jsonrpc/AbstractRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="../../../jsonrpc/AbstractRpcClient.html#mapper">mapper</a></code></div>
+<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h3>
+<code><a href="../../../jsonrpc/DefaultRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#mapper">mapper</a></code></div>
 <div class="inherited-list">
 <h3 id="fields-inherited-from-class-org.consensusj.rx.jsonrpc.RxJsonRpcClient">Fields inherited from interface&nbsp;org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></h3>
 <code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html#log">log</a></code></div>
@@ -146,26 +161,17 @@ <h2>Constructor Summary</h2>
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword,
  boolean&nbsp;useZmq)</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)" class="member-name-link">RxBitcoinClient</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;sslSocketFactory,
- org.bitcoinj.base.Network&nbsp;network,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword,
- boolean&nbsp;useZmq)</code></div>
-<div class="col-last odd-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">RxBitcoinClient</a><wbr>(org.bitcoinj.base.Network&nbsp;network,
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">RxBitcoinClient</a><wbr>(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)" class="member-name-link">RxBitcoinClient</a><wbr>(org.bitcoinj.base.Network&nbsp;network,
+<div class="col-last odd-row-color">&nbsp;</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)" class="member-name-link">RxBitcoinClient</a><wbr>(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword,
  boolean&nbsp;useZmq)</code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
+<div class="col-last even-row-color">&nbsp;</div>
 </div>
 </section>
 </li>
@@ -180,20 +186,15 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Single&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#activeChainTipFromBestBlock(org.bitcoinj.core.Block)" class="member-name-link">activeChainTipFromBestBlock</a><wbr>(org.bitcoinj.core.Block&nbsp;block)</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#chainTipPublisher()" class="member-name-link">chainTipPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Convert best <code>Block</code> to active <a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a>.</div>
+<div class="block">The BitcoinClient must have "connected once" before this is called.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#chainTipPublisher()" class="member-name-link">chainTipPublisher</a>()</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;RSLT&gt;&nbsp;org.reactivestreams.Publisher<wbr>&lt;RSLT&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#pollOnNewBlockAsync(java.util.function.Supplier)" class="member-name-link">pollOnNewBlockAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">This method will give you a stream of ChainTips</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Single&lt;org.bitcoinj.core.Block&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBestBlockViaRpc()" class="member-name-link">getBestBlockViaRpc</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Get the latest (aka "best") <code>Block</code> via JSON-RPC.</div>
+<div class="block">Repeatedly once-per-new-block poll an async method</div>
 </div>
 </div>
 </div>
@@ -203,13 +204,10 @@ <h3 id="methods-inherited-from-class-org.consensusj.bitcoin.jsonrpc.BitcoinExten
 <code><a href="../../jsonrpc/BitcoinExtendedClient.html#clearMemPool()">clearMemPool</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#createRawTransaction(org.bitcoinj.base.Address,java.util.Map)">createRawTransaction</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#createRawTransaction(org.bitcoinj.base.Address,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">createRawTransaction</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#createSignedTransaction(org.bitcoinj.crypto.ECKey,java.util.List)">createSignedTransaction</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#createSignedTransaction(org.bitcoinj.crypto.ECKey,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">createSignedTransaction</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#generateBlocks(int)">generateBlocks</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#getBitcoinBalance(org.bitcoinj.base.Address)">getBitcoinBalance</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#getBitcoinBalance(org.bitcoinj.base.Address,java.lang.Integer)">getBitcoinBalance</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#getBitcoinBalance(org.bitcoinj.base.Address,java.lang.Integer,java.lang.Integer)">getBitcoinBalance</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#getBlock(int)">getBlock</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#getBlockSubsidy(int)">getBlockSubsidy</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#getDefaultMaxConf()">getDefaultMaxConf</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#getRegTestMiningAddress()">getRegTestMiningAddress</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#getStdRelayTxFee()">getStdRelayTxFee</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#getStdTxFee()">getStdTxFee</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#initRegTestWallet()">initRegTestWallet</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#listUnspentJ(org.bitcoinj.base.Address)">listUnspentJ</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#listUnspentOutPoints(org.bitcoinj.base.Address)">listUnspentOutPoints</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#sendBitcoin(org.bitcoinj.base.Address,java.util.Map)">sendBitcoin</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#sendBitcoin(org.bitcoinj.base.Address,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendBitcoin</a>, <a href="../../jsonrpc/BitcoinExtendedClient.html#withWallet(java.lang.String,java.lang.String,java.lang.String)">withWallet</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.bitcoin.jsonrpc.BitcoinClient">Methods inherited from class&nbsp;org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></h3>
-<code><a href="../../jsonrpc/BitcoinClient.html#addNode(java.lang.String,java.lang.String)">addNode</a>, <a href="../../jsonrpc/BitcoinClient.html#close()">close</a>, <a href="../../jsonrpc/BitcoinClient.html#commandExists(java.lang.String)">commandExists</a>, <a href="../../jsonrpc/BitcoinClient.html#createRawTransaction(java.util.List,java.util.Map)">createRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)">createWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#dumpPrivKey(org.bitcoinj.base.Address)">dumpPrivKey</a>, <a href="../../jsonrpc/BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address)">generateToAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)">generateToAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddedNodeInfo(boolean)">getAddedNodeInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddedNodeInfo(boolean,java.lang.String)">getAddedNodeInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddressBalance(java.util.List)">getAddressBalance</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddressBalance(org.bitcoinj.base.Address)">getAddressBalance</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddressInfo(org.bitcoinj.base.Address)">getAddressInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddressUtxos(java.util.List)">getAddressUtxos</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddressUtxos(org.bitcoinj.base.Address)">getAddressUtxos</a>, <a href="../../jsonrpc/BitcoinClient.html#getBalance()">getBalance</a>, <a href="../../jsonrpc/BitcoinClient.html#getBalance(java.lang.String)">getBalance</a>, <a href="../../jsonrpc/BitcoinClient.html#getBalance(java.lang.String,java.lang.Integer)">getBalance</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlock(org.bitcoinj.base.Sha256Hash)">getBlock</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlockChainInfo()">getBlockChainInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlockCount()">getBlockCount</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlockHash(java.lang.Integer)">getBlockHash</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlockInfo(org.bitcoinj.base.Sha256Hash)">getBlockInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getChainTips()">getChainTips</a>, <a href="../../jsonrpc/BitcoinClient.html#getCommands()">getCommands</a>, <a href="../../jsonrpc/BitcoinClient.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="../../jsonrpc/BitcoinClient.html#getNetParams()">getNetParams</a>, <a href="../../jsonrpc/BitcoinClient.html#getNetwork()">getNetwork</a>, <a href="../../jsonrpc/BitcoinClient.html#getNetworkInfo()">getNetworkInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getNewAddress()">getNewAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#getNewAddress(java.lang.String)">getNewAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#getRawTransaction(org.bitcoinj.base.Sha256Hash)">getRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#getRawTransactionInfo(org.bitcoinj.base.Sha256Hash)">getRawTransactionInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address)">getReceivedByAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address,java.lang.Integer)">getReceivedByAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash)">getTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash,java.lang.Boolean,java.lang.Boolean)">getTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer)">getTxOut</a>, <a href="../../jsonrpc/BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer,java.lang.Boolean)">getTxOut</a>, <a href="../../jsonrpc/BitcoinClient.html#getTxOutSetInfo()">getTxOutSetInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getZmqNotifications()">getZmqNotifications</a>, <a href="../../jsonrpc/BitcoinClient.html#help()">help</a>, <a href="../../jsonrpc/BitcoinClient.html#help(java.lang.String)">help</a>, <a href="../../jsonrpc/BitcoinClient.html#helpAsLines()">helpAsLines</a>, <a href="../../jsonrpc/BitcoinClient.html#helpAsMethodEntries()">helpAsMethodEntries</a>, <a href="../../jsonrpc/BitcoinClient.html#helpAsStream()">helpAsStream</a>, <a href="../../jsonrpc/BitcoinClient.html#importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)">importPrivKey</a>, <a href="../../jsonrpc/BitcoinClient.html#invalidateBlock(org.bitcoinj.base.Sha256Hash)">invalidateBlock</a>, <a href="../../jsonrpc/BitcoinClient.html#isAddressIndexEnabled()">isAddressIndexEnabled</a>, <a href="../../jsonrpc/BitcoinClient.html#listAddressGroupings()">listAddressGroupings</a>, <a href="../../jsonrpc/BitcoinClient.html#listReceivedByAddress(java.lang.Integer,java.lang.Boolean)">listReceivedByAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#listTransactions()">listTransactions</a>, <a href="../../jsonrpc/BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer)">listTransactions</a>, <a href="../../jsonrpc/BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)">listTransactions</a>, <a href="../../jsonrpc/BitcoinClient.html#listUnspent()">listUnspent</a>, <a href="../../jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer)">listUnspent</a>, <a href="../../jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)">listUnspent</a>, <a href="../../jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)">listUnspent</a>, <a href="../../jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)">listUnspent</a>, <a href="../../jsonrpc/BitcoinClient.html#listWallets()">listWallets</a>, <a href="../../jsonrpc/BitcoinClient.html#reconsiderBlock(org.bitcoinj.base.Sha256Hash)">reconsiderBlock</a>, <a href="../../jsonrpc/BitcoinClient.html#sendFrom(java.lang.String,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendFrom</a>, <a href="../../jsonrpc/BitcoinClient.html#sendMany(java.lang.String,java.util.Map)">sendMany</a>, <a href="../../jsonrpc/BitcoinClient.html#sendRawTransaction(java.lang.String)">sendRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#sendRawTransaction(java.lang.String,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction)">sendRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendToAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String,java.lang.String)">sendToAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#setTxFee(org.bitcoinj.base.Coin)">setTxFee</a>, <a href="../../jsonrpc/BitcoinClient.html#signRawTransactionWithWallet(java.lang.String)">signRawTransactionWithWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#stop()">stop</a>, <a href="../../jsonrpc/BitcoinClient.html#unloadWallet()">unloadWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#unloadWallet(java.lang.String,java.lang.Boolean)">unloadWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#waitForBlock(int,int)">waitForBlock</a>, <a href="../../jsonrpc/BitcoinClient.html#waitForServer(int)">waitForServer</a></code></div>
+<code><a href="../../jsonrpc/BitcoinClient.html#addNode(java.lang.String,java.lang.String)">addNode</a>, <a href="../../jsonrpc/BitcoinClient.html#close()">close</a>, <a href="../../jsonrpc/BitcoinClient.html#commandExists(java.lang.String)">commandExists</a>, <a href="../../jsonrpc/BitcoinClient.html#connectToServer(java.time.Duration)">connectToServer</a>, <a href="../../jsonrpc/BitcoinClient.html#createRawTransaction(java.util.List,java.util.Map)">createRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)">createWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#dumpPrivKey(org.bitcoinj.base.Address)">dumpPrivKey</a>, <a href="../../jsonrpc/BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address)">generateToAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)">generateToAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddedNodeInfo(boolean)">getAddedNodeInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddedNodeInfo(boolean,java.lang.String)">getAddedNodeInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddressBalance(java.util.List)">getAddressBalance</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddressBalance(org.bitcoinj.base.Address)">getAddressBalance</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddressInfo(org.bitcoinj.base.Address)">getAddressInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddressUtxos(java.util.List)">getAddressUtxos</a>, <a href="../../jsonrpc/BitcoinClient.html#getAddressUtxos(org.bitcoinj.base.Address)">getAddressUtxos</a>, <a href="../../jsonrpc/BitcoinClient.html#getBalance()">getBalance</a>, <a href="../../jsonrpc/BitcoinClient.html#getBalance(java.lang.String)">getBalance</a>, <a href="../../jsonrpc/BitcoinClient.html#getBalance(java.lang.String,java.lang.Integer)">getBalance</a>, <a href="../../jsonrpc/BitcoinClient.html#getBestBlock()">getBestBlock</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlock(org.bitcoinj.base.Sha256Hash)">getBlock</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlockAsync(org.bitcoinj.base.Sha256Hash)">getBlockAsync</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlockChainInfo()">getBlockChainInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlockChainInfoAsync()">getBlockChainInfoAsync</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlockCount()">getBlockCount</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlockHash(java.lang.Integer)">getBlockHash</a>, <a href="../../jsonrpc/BitcoinClient.html#getBlockInfo(org.bitcoinj.base.Sha256Hash)">getBlockInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getChainTips()">getChainTips</a>, <a href="../../jsonrpc/BitcoinClient.html#getChainTipsAsync()">getChainTipsAsync</a>, <a href="../../jsonrpc/BitcoinClient.html#getCommands()">getCommands</a>, <a href="../../jsonrpc/BitcoinClient.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="../../jsonrpc/BitcoinClient.html#getNetwork()">getNetwork</a>, <a href="../../jsonrpc/BitcoinClient.html#getNetworkInfo()">getNetworkInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getNewAddress()">getNewAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#getNewAddress(java.lang.String)">getNewAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#getRawTransaction(org.bitcoinj.base.Sha256Hash)">getRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#getRawTransactionInfo(org.bitcoinj.base.Sha256Hash)">getRawTransactionInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address)">getReceivedByAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address,java.lang.Integer)">getReceivedByAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash)">getTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash,java.lang.Boolean,java.lang.Boolean)">getTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer)">getTxOut</a>, <a href="../../jsonrpc/BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer,java.lang.Boolean)">getTxOut</a>, <a href="../../jsonrpc/BitcoinClient.html#getTxOutSetInfo()">getTxOutSetInfo</a>, <a href="../../jsonrpc/BitcoinClient.html#getZmqNotifications()">getZmqNotifications</a>, <a href="../../jsonrpc/BitcoinClient.html#getZmqNotificationsAsync()">getZmqNotificationsAsync</a>, <a href="../../jsonrpc/BitcoinClient.html#help()">help</a>, <a href="../../jsonrpc/BitcoinClient.html#help(java.lang.String)">help</a>, <a href="../../jsonrpc/BitcoinClient.html#helpAsLines()">helpAsLines</a>, <a href="../../jsonrpc/BitcoinClient.html#helpAsMethodEntries()">helpAsMethodEntries</a>, <a href="../../jsonrpc/BitcoinClient.html#helpAsStream()">helpAsStream</a>, <a href="../../jsonrpc/BitcoinClient.html#importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)">importPrivKey</a>, <a href="../../jsonrpc/BitcoinClient.html#invalidateBlock(org.bitcoinj.base.Sha256Hash)">invalidateBlock</a>, <a href="../../jsonrpc/BitcoinClient.html#isAddressIndexEnabled()">isAddressIndexEnabled</a>, <a href="../../jsonrpc/BitcoinClient.html#listAddressGroupings()">listAddressGroupings</a>, <a href="../../jsonrpc/BitcoinClient.html#listReceivedByAddress(java.lang.Integer,java.lang.Boolean)">listReceivedByAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#listTransactions()">listTransactions</a>, <a href="../../jsonrpc/BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer)">listTransactions</a>, <a href="../../jsonrpc/BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)">listTransactions</a>, <a href="../../jsonrpc/BitcoinClient.html#listUnspent()">listUnspent</a>, <a href="../../jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer)">listUnspent</a>, <a href="../../jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)">listUnspent</a>, <a href="../../jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)">listUnspent</a>, <a href="../../jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)">listUnspent</a>, <a href="../../jsonrpc/BitcoinClient.html#listWallets()">listWallets</a>, <a href="../../jsonrpc/BitcoinClient.html#mapBitcoinTransientErrors(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">mapBitcoinTransientErrors</a>, <a href="../../jsonrpc/BitcoinClient.html#reconsiderBlock(org.bitcoinj.base.Sha256Hash)">reconsiderBlock</a>, <a href="../../jsonrpc/BitcoinClient.html#sendFrom(java.lang.String,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendFrom</a>, <a href="../../jsonrpc/BitcoinClient.html#sendMany(java.lang.String,java.util.Map)">sendMany</a>, <a href="../../jsonrpc/BitcoinClient.html#sendRawTransaction(java.lang.String)">sendRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#sendRawTransaction(java.lang.String,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction)">sendRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="../../jsonrpc/BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendToAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String,java.lang.String)">sendToAddress</a>, <a href="../../jsonrpc/BitcoinClient.html#setTxFee(org.bitcoinj.base.Coin)">setTxFee</a>, <a href="../../jsonrpc/BitcoinClient.html#signRawTransactionWithWallet(java.lang.String)">signRawTransactionWithWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#stop()">stop</a>, <a href="../../jsonrpc/BitcoinClient.html#unloadWallet()">unloadWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#unloadWallet(java.lang.String,java.lang.Boolean)">unloadWallet</a>, <a href="../../jsonrpc/BitcoinClient.html#waitForBlock(int,int)">waitForBlock</a>, <a href="../../jsonrpc/BitcoinClient.html#waitForBlockchainInfoAsync(java.time.Duration,java.time.Duration)">waitForBlockchainInfoAsync</a>, <a href="../../jsonrpc/BitcoinClient.html#waitForConnected()">waitForConnected</a>, <a href="../../jsonrpc/BitcoinClient.html#waitForConnected(java.time.Duration)">waitForConnected</a>, <a href="../../jsonrpc/BitcoinClient.html#waitForServer(int)">waitForServer</a>, <a href="../../jsonrpc/BitcoinClient.html#waitForServer(java.time.Duration)">waitForServer</a>, <a href="../../jsonrpc/BitcoinClient.html#waitForServerAsync(java.time.Duration,java.time.Duration)">waitForServerAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></h3>
-<code><a href="../../../jsonrpc/JsonRpcClientHttpUrlConnection.html#getServerURI()">getServerURI</a>, <a href="../../../jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponse</a>, <a href="../../../jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="../../../jsonrpc/AbstractRpcClient.html#base64Encode(java.lang.String)">base64Encode</a>, <a href="../../../jsonrpc/AbstractRpcClient.html#getDefaultSSLContext()">getDefaultSSLContext</a>, <a href="../../../jsonrpc/AbstractRpcClient.html#getDefaultType()">getDefaultType</a>, <a href="../../../jsonrpc/AbstractRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="../../../jsonrpc/AbstractRpcClient.html#getMapper()">getMapper</a></code></div>
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h3>
+<code><a href="../../../jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,com.fasterxml.jackson.databind.JavaType)">collectionTypeForClasses</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,java.lang.Class)">collectionTypeForClasses</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#defaultType()">defaultType</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#getMapper()">getMapper</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#getServerURI()">getServerURI</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#identityTransientErrorMapper(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">identityTransientErrorMapper</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#pollOnce(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">pollOnce</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponseAsync</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#statusFromErrorResponse(org.consensusj.jsonrpc.JsonRpcResponse)">statusFromErrorResponse</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#temporarilyUnavailableResponse(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.Throwable)">temporarilyUnavailableResponse</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">waitForServer</a>, <a href="../../../jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">waitForServer</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
@@ -217,20 +215,14 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
 <code><a href="../../../jsonrpc/AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="../../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="../../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.bitcoin.jsonrpc.ChainTipClient">Methods inherited from interface&nbsp;org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></h3>
-<code><a href="../../jsonrpc/ChainTipClient.html#getChainTips()">getChainTips</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JacksonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></h3>
-<code><a href="../../../jsonrpc/JacksonRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="../../../jsonrpc/JacksonRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="../../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)">send</a>, <a href="../../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)">send</a>, <a href="../../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="../../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="../../../jsonrpc/JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponse</a>, <a href="../../../jsonrpc/JacksonRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a></code></div>
-<div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></h3>
-<code><a href="../../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="../../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="../../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="../../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a></code></div>
+<code><a href="../../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="../../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="../../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="../../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="../../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a>, <a href="../../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="../../../jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.lang.Object...)">send</a>, <a href="../../../jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.util.List)">send</a>, <a href="../../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.lang.Object...)">sendAsync</a>, <a href="../../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.util.List)">sendAsync</a>, <a href="../../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.util.List)">sendAsync</a>, <a href="../../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.lang.Object...)">sendAsync</a>, <a href="../../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.util.List)">sendAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.bitcoin.rx.jsonrpc.RxJsonChainTipClient">Methods inherited from interface&nbsp;org.consensusj.bitcoin.rx.jsonrpc.<a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></h3>
-<code><a href="RxJsonChainTipClient.html#currentChainTipMaybe()">currentChainTipMaybe</a>, <a href="RxJsonChainTipClient.html#pollOnNewBlock(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnNewBlock</a></code></div>
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcTransport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></h3>
+<code><a href="../../../jsonrpc/JsonRpcTransport.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponse</a>, <a href="../../../jsonrpc/JsonRpcTransport.html#syncGet(java.util.concurrent.CompletableFuture)">syncGet</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.rx.jsonrpc.RxJsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></h3>
-<code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">call</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#defer(java.util.function.Supplier)">defer</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnce</a></code></div>
+<code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">call</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#callAsync(java.util.function.Supplier)">callAsync</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnce</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier)">pollOnceAsPublisher</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)">pollOnceAsPublisher</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsync(java.util.function.Supplier)">pollOnceAsync</a></code></div>
 </section>
 </li>
 </ul>
@@ -245,7 +237,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">
 <h3>RxBitcoinClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-34">RxBitcoinClient</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-38">RxBitcoinClient</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword)</span></div>
@@ -254,7 +246,7 @@ <h3>RxBitcoinClient</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)">
 <h3>RxBitcoinClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-38">RxBitcoinClient</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-42">RxBitcoinClient</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword,
@@ -264,7 +256,7 @@ <h3>RxBitcoinClient</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLContext,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)">
 <h3>RxBitcoinClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-42">RxBitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-46">RxBitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
  org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
@@ -272,19 +264,6 @@ <h3>RxBitcoinClient</h3>
  boolean&nbsp;useZmq)</span></div>
 </section>
 </li>
-<li>
-<section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLSocketFactory,org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String,boolean)">
-<h3>RxBitcoinClient</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-53">RxBitcoinClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;sslSocketFactory,
- org.bitcoinj.base.Network&nbsp;network,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcuser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcpassword,
- boolean&nbsp;useZmq)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-</section>
-</li>
 </ul>
 </section>
 </li>
@@ -294,46 +273,31 @@ <h3>RxBitcoinClient</h3>
 <h2>Method Details</h2>
 <ul class="member-list">
 <li>
-<section class="detail" id="chainTipPublisher()">
-<h3>chainTipPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-63">chainTipPublisher</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="../ChainTipService.html#chainTipPublisher()">ChainTipService</a></code></span></div>
-<div class="block">This method will give you a stream of ChainTips</div>
-<dl class="notes">
-<dt>Specified by:</dt>
-<dd><code><a href="../ChainTipService.html#chainTipPublisher()">chainTipPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code></dd>
-<dt>Returns:</dt>
-<dd>A Publisher for the sequence</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="activeChainTipFromBestBlock(org.bitcoinj.core.Block)">
-<h3>activeChainTipFromBestBlock</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Single&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-75">activeChainTipFromBestBlock</a></span><wbr><span class="parameters">(org.bitcoinj.core.Block&nbsp;block)</span></div>
-<div class="block">Convert best <code>Block</code> to active <a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a>. If BIP34 is activated this
- is purely computational, otherwise I/O is required to fetch the <code>ChainTip</code></div>
+<section class="detail" id="pollOnNewBlockAsync(java.util.function.Supplier)">
+<h3>pollOnNewBlockAsync</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-72">pollOnNewBlockAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</span></div>
+<div class="block">Repeatedly once-per-new-block poll an async method</div>
 <dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>RSLT</code> - The type of the expected result</dd>
 <dt>Parameters:</dt>
-<dd><code>block</code> - Input best block</dd>
+<dd><code>supplier</code> - A supplier (should be an RPC Method) of a CompletionStage</dd>
 <dt>Returns:</dt>
-<dd>active ChainTip assuming this block is the "best block"</dd>
+<dd>An Observable for the expected result type, so we can expect one call to <code>onNext</code> per block.</dd>
 </dl>
 </section>
 </li>
 <li>
-<section class="detail" id="getBestBlockViaRpc()">
-<h3>getBestBlockViaRpc</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Single&lt;org.bitcoinj.core.Block&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-94">getBestBlockViaRpc</a></span>()</div>
-<div class="block">Get the latest (aka "best") <code>Block</code> via JSON-RPC.
- <p>
- Generally, you should use the <a href="../RxBlockchainService.html" title="interface in org.consensusj.bitcoin.rx"><code>RxBlockchainService</code></a> or
- <a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx"><code>RxBlockchainBinaryService</code></a> interface if you
- are looking for a reactive interface to blocks, because those interfaces will
- be more efficient. This method <b>always</b> composes two unique RPC calls to the server.</div>
+<section class="detail" id="chainTipPublisher()">
+<h3>chainTipPublisher</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html#line-81">chainTipPublisher</a></span>()</div>
+<div class="block">The BitcoinClient must have "connected once" before this is called. This means something else
+ needs to have called something to do that.</div>
 <dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="../ChainTipService.html#chainTipPublisher()">chainTipPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code></dd>
 <dt>Returns:</dt>
-<dd>A "hot" <code>Single</code> that will fetch the "best" block via JSON-RPC</dd>
+<dd>a publisher of Chain Tips</dd>
 </dl>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html
index 19e4fe129..d0707852f 100644
--- a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RxJsonChainTipClient (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RxJsonChainTipClient (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.jsonrpc, interface: RxJsonChainTipClient">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -74,19 +88,13 @@ <h1 title="Interface RxJsonChainTipClient" class="title">Interface RxJsonChainTi
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Superinterfaces:</dt>
-<dd><code><a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code>, <code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></code></dd>
-</dl>
-<dl class="notes">
-<dt>All Known Subinterfaces:</dt>
-<dd><code><a href="PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></code></dd>
-</dl>
-<dl class="notes">
-<dt>All Known Implementing Classes:</dt>
-<dd><code><a href="PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></code>, <code><a href="RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></dd>
+<dd><code><a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code>, <code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html#line-14">RxJsonChainTipClient</a></span><span class="extends-implements">
-extends <a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, <a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></span></div>
+<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html#line-15">RxJsonChainTipClient</a></span><span class="extends-implements">
+extends <a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">A JSON-RPC client interface that provides ChainTipService</div>
 </section>
 <section class="summary">
@@ -97,7 +105,7 @@ <h1 title="Interface RxJsonChainTipClient" class="title">Interface RxJsonChainTi
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
+<code><a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="../../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- =========== FIELD SUMMARY =========== -->
@@ -114,21 +122,22 @@ <h3 id="fields-inherited-from-class-org.consensusj.rx.jsonrpc.RxJsonRpcClient">F
 <section class="method-summary" id="method-summary">
 <h2>Method Summary</h2>
 <div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button><button id="method-summary-table-tab6" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab6', 3)" class="table-tab">Deprecated Methods</button></div>
 <div id="method-summary-table.tabpanel" role="tabpanel">
 <div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default io.reactivex.rxjava3.core.Maybe&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#currentChainTipMaybe()" class="member-name-link">currentChainTipMaybe</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Get the active chain tip if there is one (useful for polling clients)</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code>default &lt;RSLT&gt;&nbsp;org.reactivestreams.Publisher<wbr>&lt;RSLT&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code><a href="#pollOnNewBlock(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)" class="member-name-link">pollOnNewBlock</a><wbr>(<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;RSLT&gt;&nbsp;io.reactivex.rxjava3.core.Flowable&lt;RSLT&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#pollOnNewBlock(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)" class="member-name-link">pollOnNewBlock</a><wbr>(<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Repeatedly once-per-new-block poll a method</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code>default &lt;RSLT&gt;&nbsp;org.reactivestreams.Publisher<wbr>&lt;RSLT&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code><a href="#pollOnNewBlockAsync(java.util.function.Supplier)" class="member-name-link">pollOnNewBlockAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+<div class="block">Repeatedly once-per-new-block poll an async method</div>
 </div>
 </div>
 </div>
@@ -137,14 +146,11 @@ <h2>Method Summary</h2>
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
 <code><a href="../../../jsonrpc/AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="../../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="../../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.bitcoin.jsonrpc.ChainTipClient">Methods inherited from interface&nbsp;org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></h3>
-<code><a href="../../jsonrpc/ChainTipClient.html#getChainTips()">getChainTips</a></code></div>
-<div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.bitcoin.rx.ChainTipService">Methods inherited from interface&nbsp;org.consensusj.bitcoin.rx.<a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></h3>
 <code><a href="../ChainTipService.html#chainTipPublisher()">chainTipPublisher</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.rx.jsonrpc.RxJsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></h3>
-<code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">call</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#defer(java.util.function.Supplier)">defer</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnce</a></code></div>
+<code><a href="../../../rx/jsonrpc/RxJsonRpcClient.html#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">call</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#callAsync(java.util.function.Supplier)">callAsync</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">pollOnce</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier)">pollOnceAsPublisher</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)">pollOnceAsPublisher</a>, <a href="../../../rx/jsonrpc/RxJsonRpcClient.html#pollOnceAsync(java.util.function.Supplier)">pollOnceAsync</a></code></div>
 </section>
 </li>
 </ul>
@@ -159,8 +165,9 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="pollOnNewBlock(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">
 <h3>pollOnNewBlock</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>
-<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html#line-23">pollOnNewBlock</a></span><wbr><span class="parameters">(<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</span></div>
+<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html#line-25">pollOnNewBlock</a></span><wbr><span class="parameters">(<a href="../../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Repeatedly once-per-new-block poll a method</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
@@ -173,13 +180,18 @@ <h3>pollOnNewBlock</h3>
 </section>
 </li>
 <li>
-<section class="detail" id="currentChainTipMaybe()">
-<h3>currentChainTipMaybe</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Maybe&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html#line-32">currentChainTipMaybe</a></span>()</div>
-<div class="block">Get the active chain tip if there is one (useful for polling clients)</div>
+<section class="detail" id="pollOnNewBlockAsync(java.util.function.Supplier)">
+<h3>pollOnNewBlockAsync</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html#line-37">pollOnNewBlockAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+<div class="block">Repeatedly once-per-new-block poll an async method</div>
 <dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>RSLT</code> - The type of the expected result</dd>
+<dt>Parameters:</dt>
+<dd><code>supplier</code> - A supplier (should be an RPC Method) of a CompletionStage</dd>
 <dt>Returns:</dt>
-<dd>The active ChainTip if available (onSuccess) otherwise onComplete (if not available) or onError (if error occurred)</dd>
+<dd>An Observable for the expected result type, so we can expect one call to <code>onNext</code> per block.</dd>
 </dl>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html
index f3b7226fd..7cd887bfa 100644
--- a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TxOutSetWatcherSample (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TxOutSetWatcherSample (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.jsonrpc, class: TxOutSetWatcherSample">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -76,7 +90,7 @@ <h1 title="Class TxOutSetWatcherSample" class="title">Class TxOutSetWatcherSampl
 </div>
 <section class="class-description" id="class-description">
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html#line-16">TxOutSetWatcherSample</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html#line-18">TxOutSetWatcherSample</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
 <div class="block">Sample command-line tool that subscribes to ChainTip and TxOutSetInfo</div>
 </section>
@@ -129,7 +143,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;()">
 <h3>TxOutSetWatcherSample</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html#line-16">TxOutSetWatcherSample</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html#line-18">TxOutSetWatcherSample</a></span>()</div>
 </section>
 </li>
 </ul>
@@ -143,7 +157,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="main(java.lang.String[])">
 <h3>main</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html#line-17">main</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</span>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html#line-19">main</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</span>
                  throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/InterruptedException.html" title="class or interface in java.lang" class="external-link">InterruptedException</a></span></div>
 <dl class="notes">
 <dt>Throws:</dt>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/package-summary.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/package-summary.html
index 9ab06762b..e040f4122 100644
--- a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.rx.jsonrpc (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx.jsonrpc (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.jsonrpc">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -76,10 +81,12 @@ <h1 title="Package org.consensusj.bitcoin.rx.jsonrpc" class="title">Package org.
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><a href="service/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.service</a></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><a href="../peergroup/package-summary.html">org.consensusj.bitcoin.rx.peergroup</a></div>
+<div class="col-first even-row-color"><a href="test/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.test</a></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><a href="../zeromq/package-summary.html">org.consensusj.bitcoin.rx.zeromq</a></div>
+<div class="col-first odd-row-color"><a href="../peergroup/package-summary.html">org.consensusj.bitcoin.rx.peergroup</a></div>
 <div class="col-last odd-row-color">&nbsp;</div>
+<div class="col-first even-row-color"><a href="../zeromq/package-summary.html">org.consensusj.bitcoin.rx.zeromq</a></div>
+<div class="col-last even-row-color">&nbsp;</div>
 </div>
 </div>
 </li>
@@ -91,21 +98,19 @@ <h1 title="Package org.consensusj.bitcoin.rx.jsonrpc" class="title">Package org.
 <div class="table-header col-first">Class</div>
 <div class="table-header col-last">Description</div>
 <div class="col-first even-row-color class-summary class-summary-tab1"><a href="PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Interface with <a href="PollingChainTipService.html#pollForDistinctChainTip()"><code>PollingChainTipService.pollForDistinctChainTip()</code></a> method.</div>
+<div class="col-last even-row-color class-summary class-summary-tab1">Deprecated.
+<div class="deprecation-comment">Use the <a href="PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc"><code>PollingChainTipServiceImpl</code></a> implementation</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab2"><a href="PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab2">
-<div class="block">Implementation of <a href="PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc"><code>PollingChainTipService</code></a> using a <a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> and a polling interval.</div>
+<div class="block">Provides <a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx"><code>ChainTipService</code></a> a using a <a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> and a polling interval.</div>
 </div>
 <div class="col-first even-row-color class-summary class-summary-tab2"><a href="RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab2">
 <div class="block">A <a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc"><code>BitcoinClient</code></a> enhanced with Reactive features.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab1"><a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></div>
-<div class="col-last odd-row-color class-summary class-summary-tab1">
-<div class="block">A JSON-RPC client interface that provides ChainTipService</div>
-</div>
+<div class="col-last odd-row-color class-summary class-summary-tab1">Deprecated.</div>
 <div class="col-first even-row-color class-summary class-summary-tab2"><a href="TxOutSetWatcherSample.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">TxOutSetWatcherSample</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab2">
 <div class="block">Sample command-line tool that subscribes to ChainTip and TxOutSetInfo</div>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/package-tree.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/package-tree.html
index 1b33db82c..8940affa9 100644
--- a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.rx.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.rx.jsonrpc">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,34 +49,30 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.rx.jsonrpc</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
 <ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="../../../jsonrpc/AbstractRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a> (implements org.consensusj.jsonrpc.<a href="../../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a>)
-<ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="../../../jsonrpc/JsonRpcClientHttpUrlConnection.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a>
+<li class="circle">org.consensusj.jsonrpc.<a href="../../../jsonrpc/DefaultRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a> (implements org.consensusj.jsonrpc.<a href="../../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt;)
 <ul>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/BitcoinClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a> (implements org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>)
 <ul>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/BitcoinExtendedClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a>
 <ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="RxBitcoinClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a> (implements org.consensusj.bitcoin.rx.jsonrpc.<a href="RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a>)</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="RxBitcoinClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a> (implements org.consensusj.bitcoin.rx.<a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)</li>
 </ul>
 </li>
 </ul>
 </li>
 </ul>
 </li>
-</ul>
-</li>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="PollingChainTipServiceImpl.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a> (implements java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a>, org.consensusj.bitcoin.rx.jsonrpc.<a href="PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a>)</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="PollingChainTipServiceImpl.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a> (implements org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, org.consensusj.bitcoin.rx.<a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a>, org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)</li>
 <li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="TxOutSetWatcherSample.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">TxOutSetWatcherSample</a></li>
 </ul>
 </li>
@@ -89,31 +85,21 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
 <li class="circle">org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>
 <ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> (also extends org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, org.consensusj.bitcoin.rx.<a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>)
-<ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></li>
-</ul>
-</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a> (also extends org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, org.consensusj.bitcoin.rx.<a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>)</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> (also extends org.consensusj.bitcoin.rx.<a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>)</li>
 </ul>
 </li>
 </ul>
 </li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/ChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>
 <ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> (also extends org.consensusj.bitcoin.rx.<a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)
-<ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></li>
-</ul>
-</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a> (also extends org.consensusj.bitcoin.rx.<a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)</li>
 </ul>
 </li>
 <li class="circle">org.consensusj.bitcoin.rx.<a href="../ChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>
 <ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> (also extends org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)
-<ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></li>
-</ul>
-</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a> (also extends org.consensusj.bitcoin.jsonrpc.<a href="../../jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> (also extends org.consensusj.rx.jsonrpc.<a href="../../../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)</li>
 </ul>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html
index 9ab2090c5..f65837a57 100644
--- a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TxOutSetService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TxOutSetService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.jsonrpc.service, class: TxOutSetService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,7 +94,7 @@ <h1 title="Class TxOutSetService" class="title">Class TxOutSetService</h1>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html#line-26">TxOutSetService</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html#line-30">TxOutSetService</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
 implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></span></div>
 <div class="block">Service to return a stream of TxOutSetInfos for a given blockchain/client.
@@ -98,7 +112,8 @@ <h2>Constructor Summary</h2>
 <div class="summary-table two-column-summary">
 <div class="table-header col-first">Constructor</div>
 <div class="table-header col-last">Description</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)" class="member-name-link">TxOutSetService</a><wbr>(<a href="../RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a>&nbsp;client)</code></div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient,org.consensusj.bitcoin.rx.ChainTipPublisher)" class="member-name-link">TxOutSetService</a><wbr>(<a href="../RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a>&nbsp;client,
+ <a href="../../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a>&nbsp;chainTipPublisher)</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 </div>
 </section>
@@ -117,7 +132,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#close()" class="member-name-link">close</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;<a href="../../../json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutSetInfo</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;<a href="../../../json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutSetInfo</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getTxOutSetPublisher()" class="member-name-link">getTxOutSetPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
@@ -138,9 +153,15 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <h2>Constructor Details</h2>
 <ul class="member-list">
 <li>
-<section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)">
+<section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient,org.consensusj.bitcoin.rx.ChainTipPublisher)">
 <h3>TxOutSetService</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html#line-37">TxOutSetService</a></span><wbr><span class="parameters">(<a href="../RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a>&nbsp;client)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html#line-48">TxOutSetService</a></span><wbr><span class="parameters">(<a href="../RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a>&nbsp;client,
+ <a href="../../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a>&nbsp;chainTipPublisher)</span></div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>client</code> - Client for requesting <a href="../../../json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo"><code>TxOutSetInfo</code></a> objects.</dd>
+<dd><code>chainTipPublisher</code> - Publisher telling us when new blocks are available.</dd>
+</dl>
 </section>
 </li>
 </ul>
@@ -154,13 +175,13 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="getTxOutSetPublisher()">
 <h3>getTxOutSetPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;<a href="../../../json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutSetInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html#line-51">getTxOutSetPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;<a href="../../../json/pojo/TxOutSetInfo.html" title="class in org.consensusj.bitcoin.json.pojo">TxOutSetInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html#line-62">getTxOutSetPublisher</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="close()">
 <h3>close</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html#line-104">close</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html#line-130">close</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link">close</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/package-summary.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/package-summary.html
index b6986d890..c225342ed 100644
--- a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.rx.jsonrpc.service (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx.jsonrpc.service (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.jsonrpc.service">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -70,6 +79,8 @@ <h1 title="Package org.consensusj.bitcoin.rx.jsonrpc.service" class="title">Pack
 <div class="table-header col-last">Description</div>
 <div class="col-first even-row-color"><a href="../package-summary.html">org.consensusj.bitcoin.rx.jsonrpc</a></div>
 <div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><a href="../test/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.test</a></div>
+<div class="col-last odd-row-color">&nbsp;</div>
 </div>
 </div>
 </li>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/package-tree.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/package-tree.html
index 2b340396d..b100e398c 100644
--- a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/service/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.rx.jsonrpc.service Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx.jsonrpc.service Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.rx.jsonrpc.service">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.rx.jsonrpc.service</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html
new file mode 100644
index 000000000..f5c830610
--- /dev/null
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html
@@ -0,0 +1,177 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>TestChainTipPublishers (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.jsonrpc.test, class: TestChainTipPublishers">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor-summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li><a href="#constructor-detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.test</a></div>
+<h1 title="Class TestChainTipPublishers" class="title">Class TestChainTipPublishers</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance">org.consensusj.bitcoin.rx.jsonrpc.test.TestChainTipPublishers</div>
+</div>
+<section class="class-description" id="class-description">
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html#line-9">TestChainTipPublishers</a></span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
+<div class="block">Useful for testing.</div>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E()" class="member-name-link">TestChainTipPublishers</a>()</code></div>
+<div class="col-last even-row-color">&nbsp;</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="../../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#never()" class="member-name-link">never</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">&nbsp;</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="&lt;init&gt;()">
+<h3>TestChainTipPublishers</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html#line-9">TestChainTipPublishers</a></span>()</div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="never()">
+<h3>never</h3>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="../../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></span>&nbsp;<span class="element-name"><a href="../../../../../../src-html/org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html#line-13">never</a></span>()</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>A <a href="../../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx"><code>ChainTipPublisher</code></a> that never emits items and never closes.</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/test/package-summary.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/test/package-summary.html
new file mode 100644
index 000000000..bda85aff9
--- /dev/null
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/test/package-summary.html
@@ -0,0 +1,106 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx.jsonrpc.test (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.jsonrpc.test">
+<meta name="generator" content="javadoc/PackageWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="package-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../index.html">Overview</a></li>
+<li class="nav-bar-cell1-rev">Package</li>
+<li>Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html#package">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Package:&nbsp;</li>
+<li>Description&nbsp;|&nbsp;</li>
+<li><a href="#related-package-summary">Related Packages</a>&nbsp;|&nbsp;</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 title="Package org.consensusj.bitcoin.rx.jsonrpc.test" class="title">Package org.consensusj.bitcoin.rx.jsonrpc.test</h1>
+</div>
+<hr>
+<div class="package-signature">package <span class="element-name">org.consensusj.bitcoin.rx.jsonrpc.test</span></div>
+<section class="summary">
+<ul class="summary-list">
+<li>
+<div id="related-package-summary">
+<div class="caption"><span>Related Packages</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Package</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><a href="../package-summary.html">org.consensusj.bitcoin.rx.jsonrpc</a></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><a href="../service/package-summary.html">org.consensusj.bitcoin.rx.jsonrpc.service</a></div>
+<div class="col-last odd-row-color">&nbsp;</div>
+</div>
+</div>
+</li>
+<li>
+<div id="class-summary">
+<div class="caption"><span>Classes</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Class</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="TestChainTipPublishers.html" title="class in org.consensusj.bitcoin.rx.jsonrpc.test">TestChainTipPublishers</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
+<div class="block">Useful for testing.</div>
+</div>
+</div>
+</div>
+</li>
+</ul>
+</section>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/bitcoin/rx/jsonrpc/test/package-tree.html b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/test/package-tree.html
new file mode 100644
index 000000000..56d042fb7
--- /dev/null
+++ b/apidoc/org/consensusj/bitcoin/rx/jsonrpc/test/package-tree.html
@@ -0,0 +1,71 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx.jsonrpc.test Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="tree: package: org.consensusj.bitcoin.rx.jsonrpc.test">
+<meta name="generator" content="javadoc/PackageTreeWriter">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../../../../script.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="package-tree-page">
+<script type="text/javascript">var pathtoroot = "../../../../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li>Class</li>
+<li class="nav-bar-cell1-rev">Tree</li>
+<li><a href="../../../../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../../../../index-all.html">Index</a></li>
+<li><a href="../../../../../../help-doc.html#tree">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<div class="header">
+<h1 class="title">Hierarchy For Package org.consensusj.bitcoin.rx.jsonrpc.test</h1>
+</div>
+<span class="package-hierarchy-label">Package Hierarchies:</span>
+<ul class="horizontal contents-list">
+<li><a href="../../../../../../overview-tree.html">All Packages</a></li>
+</ul>
+<section class="hierarchy">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.test.<a href="TestChainTipPublishers.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc.test">TestChainTipPublishers</a></li>
+</ul>
+</li>
+</ul>
+</section>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/bitcoin/rx/package-summary.html b/apidoc/org/consensusj/bitcoin/rx/package-summary.html
index f3396aa04..2daec9595 100644
--- a/apidoc/org/consensusj/bitcoin/rx/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/rx/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.rx (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -79,10 +88,17 @@ <h1 title="Package org.consensusj.bitcoin.rx" class="title">Package org.consensu
 </li>
 <li>
 <div id="class-summary">
-<div class="caption"><span>Interfaces</span></div>
-<div class="summary-table two-column-summary">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="class-summary-tab0" role="tab" aria-selected="true" aria-controls="class-summary.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="class-summary-tab1" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab1', 2)" class="table-tab">Interfaces</button><button id="class-summary-tab2" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab2', 2)" class="table-tab">Classes</button></div>
+<div id="class-summary.tabpanel" role="tabpanel">
+<div class="summary-table two-column-summary" aria-labelledby="class-summary-tab0">
 <div class="table-header col-first">Class</div>
 <div class="table-header col-last">Description</div>
+<div class="col-first even-row-color class-summary class-summary-tab1"><a href="ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab1">
+<div class="block">Marker type for <code>Publisher&lt;ChainTip&gt;</code>.</div>
+</div>
+<div class="col-first odd-row-color class-summary class-summary-tab2"><a href="ChainTipPublisher.Wrapper.html" title="class in org.consensusj.bitcoin.rx">ChainTipPublisher.Wrapper</a></div>
+<div class="col-last odd-row-color class-summary class-summary-tab2">&nbsp;</div>
 <div class="col-first even-row-color class-summary class-summary-tab1"><a href="ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
 <div class="block">A publisher of <a href="../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo"><code>ChainTip</code></a></div>
@@ -98,6 +114,7 @@ <h1 title="Package org.consensusj.bitcoin.rx" class="title">Package org.consensu
 </div>
 </div>
 </div>
+</div>
 </li>
 </ul>
 </section>
diff --git a/apidoc/org/consensusj/bitcoin/rx/package-tree.html b/apidoc/org/consensusj/bitcoin/rx/package-tree.html
index bc55337a0..ee7c61d5e 100644
--- a/apidoc/org/consensusj/bitcoin/rx/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/rx/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.rx Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.rx">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,21 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.rx</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
+<section class="hierarchy">
+<h2 title="Class Hierarchy">Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">org.consensusj.bitcoin.rx.<a href="ChainTipPublisher.Wrapper.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx">ChainTipPublisher.Wrapper</a> (implements org.consensusj.bitcoin.rx.<a href="ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a>)</li>
+</ul>
+</li>
+</ul>
+</section>
 <section class="hierarchy">
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
@@ -68,6 +78,11 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 </ul>
 </li>
 <li class="circle">org.consensusj.bitcoin.rx.<a href="ChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></li>
+<li class="circle">org.reactivestreams.Publisher&lt;T&gt;
+<ul>
+<li class="circle">org.consensusj.bitcoin.rx.<a href="ChainTipPublisher.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></li>
+</ul>
+</li>
 </ul>
 </section>
 </main>
diff --git a/apidoc/org/consensusj/bitcoin/rx/peergroup/RxPeerGroup.html b/apidoc/org/consensusj/bitcoin/rx/peergroup/RxPeerGroup.html
index 955d45fae..c48f7b895 100644
--- a/apidoc/org/consensusj/bitcoin/rx/peergroup/RxPeerGroup.html
+++ b/apidoc/org/consensusj/bitcoin/rx/peergroup/RxPeerGroup.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RxPeerGroup (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RxPeerGroup (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.peergroup, class: RxPeerGroup">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,20 +126,20 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockHashPublisher()" class="member-name-link">blockHashPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">TBD: Can <code>BlocksDownloadedEventListener</code> be used here?</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockHeightPublisher()" class="member-name-link">blockHeightPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher&lt;org.bitcoinj.core.Block&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.core.Block&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockPublisher()" class="member-name-link">blockPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">TBD: Can <code>BlocksDownloadedEventListener</code> be used here?</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#chainTipPublisher()" class="member-name-link">chainTipPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
@@ -136,10 +150,10 @@ <h2>Method Summary</h2>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">TODO: Fix this.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#transactionHashPublisher()" class="member-name-link">transactionHashPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher&lt;org.bitcoinj.core.Transaction&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#transactionPublisher()" class="member-name-link">transactionPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoin/rx/peergroup/package-summary.html b/apidoc/org/consensusj/bitcoin/rx/peergroup/package-summary.html
index 123d97c34..737eb41d0 100644
--- a/apidoc/org/consensusj/bitcoin/rx/peergroup/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/rx/peergroup/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.rx.peergroup (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx.peergroup (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.peergroup">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/rx/peergroup/package-tree.html b/apidoc/org/consensusj/bitcoin/rx/peergroup/package-tree.html
index f69c87529..aea07982c 100644
--- a/apidoc/org/consensusj/bitcoin/rx/peergroup/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/rx/peergroup/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.rx.peergroup Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx.peergroup Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.rx.peergroup">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.rx.peergroup</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.Topic.html b/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.Topic.html
index 4655a5241..9e22a5992 100644
--- a/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.Topic.html
+++ b/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.Topic.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinZmqMessage.Topic (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinZmqMessage.Topic (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.zeromq, class: BitcoinZmqMessage, enum: Topic">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#enum-constant-summary">Enum Constants</a></li>
+<li>Field</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#enum-constant-detail">Enum Constants</a></li>
+<li>Field</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -83,7 +97,7 @@ <h1 title="Enum Class BitcoinZmqMessage.Topic" class="title">Enum Class BitcoinZ
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="BitcoinZmqMessage.html" title="class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage</a>&lt;<a href="BitcoinZmqMessage.html" title="type parameter in BitcoinZmqMessage">T</a>&gt;</dd>
+<dd><code><a href="BitcoinZmqMessage.html" title="class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage</a>&lt;<a href="BitcoinZmqMessage.html" title="type parameter in BitcoinZmqMessage">T</a>&gt;</code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static enum </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html#line-36">BitcoinZmqMessage.Topic</a></span>
diff --git a/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html b/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html
index 2821c0187..f8868214c 100644
--- a/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html
+++ b/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinZmqMessage (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinZmqMessage (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.zeromq, class: BitcoinZmqMessage">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html b/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html
index f6b71b077..e50ec3991 100644
--- a/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html
+++ b/apidoc/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinZmqPortFinder (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinZmqPortFinder (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.zeromq, class: BitcoinZmqPortFinder">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -76,7 +90,7 @@ <h1 title="Class BitcoinZmqPortFinder" class="title">Class BitcoinZmqPortFinder<
 </div>
 <section class="class-description" id="class-description">
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html#line-15">BitcoinZmqPortFinder</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html#line-16">BitcoinZmqPortFinder</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
 <div class="block">Utility to use Bitcoin Core JSON-RPC to find configured ZMQ notification ports.</div>
 </section>
@@ -106,7 +120,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#findPort(org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic)" class="member-name-link">findPort</a><wbr>(<a href="BitcoinZmqMessage.Topic.html" title="enum class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage.Topic</a>&nbsp;topic)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
@@ -129,7 +143,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.jsonrpc.BitcoinClient)">
 <h3>BitcoinZmqPortFinder</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html#line-20">BitcoinZmqPortFinder</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a>&nbsp;client)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html#line-21">BitcoinZmqPortFinder</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a>&nbsp;client)</span></div>
 </section>
 </li>
 </ul>
@@ -143,7 +157,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="findPort(org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic)">
 <h3>findPort</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html#line-25">findPort</a></span><wbr><span class="parameters">(<a href="BitcoinZmqMessage.Topic.html" title="enum class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage.Topic</a>&nbsp;topic)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html#line-26">findPort</a></span><wbr><span class="parameters">(<a href="BitcoinZmqMessage.Topic.html" title="enum class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage.Topic</a>&nbsp;topic)</span></div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html b/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html
index 1a96e52f3..892ace089 100644
--- a/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html
+++ b/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RxBitcoinSinglePortZmqService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RxBitcoinSinglePortZmqService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.zeromq, class: RxBitcoinSinglePortZmqService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,7 +94,7 @@ <h1 title="Class RxBitcoinSinglePortZmqService" class="title">Class RxBitcoinSin
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-26">RxBitcoinSinglePortZmqService</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-27">RxBitcoinSinglePortZmqService</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
 implements <a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></span></div>
 <div class="block">Bitcoin Zmq <b>binary</b> service that connects to a single port.
@@ -115,19 +129,19 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockBinaryPublisher()" class="member-name-link">blockBinaryPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockHashBinaryPublisher()" class="member-name-link">blockHashBinaryPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#close()" class="member-name-link">close</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#transactionBinaryPublisher()" class="member-name-link">transactionBinaryPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#transactionHashBinaryPublisher()" class="member-name-link">transactionHashBinaryPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
@@ -150,7 +164,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(java.net.URI,java.util.concurrent.ThreadFactory,org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic...)">
 <h3>RxBitcoinSinglePortZmqService</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-45">RxBitcoinSinglePortZmqService</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;tcpAddress,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-46">RxBitcoinSinglePortZmqService</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;tcpAddress,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ThreadFactory.html" title="class or interface in java.util.concurrent" class="external-link">ThreadFactory</a>&nbsp;threadFactory,
  <a href="BitcoinZmqMessage.Topic.html" title="enum class in org.consensusj.bitcoin.rx.zeromq">BitcoinZmqMessage.Topic</a>...&nbsp;topics)</span></div>
 </section>
@@ -166,7 +180,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="transactionBinaryPublisher()">
 <h3>transactionBinaryPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-78">transactionBinaryPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-84">transactionBinaryPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainBinaryService.html#transactionBinaryPublisher()">transactionBinaryPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a></code></dd>
@@ -176,7 +190,7 @@ <h3>transactionBinaryPublisher</h3>
 <li>
 <section class="detail" id="transactionHashBinaryPublisher()">
 <h3>transactionHashBinaryPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-83">transactionHashBinaryPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-89">transactionHashBinaryPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainBinaryService.html#transactionHashBinaryPublisher()">transactionHashBinaryPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a></code></dd>
@@ -186,7 +200,7 @@ <h3>transactionHashBinaryPublisher</h3>
 <li>
 <section class="detail" id="blockBinaryPublisher()">
 <h3>blockBinaryPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-88">blockBinaryPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-94">blockBinaryPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainBinaryService.html#blockBinaryPublisher()">blockBinaryPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a></code></dd>
@@ -196,7 +210,7 @@ <h3>blockBinaryPublisher</h3>
 <li>
 <section class="detail" id="blockHashBinaryPublisher()">
 <h3>blockHashBinaryPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-93">blockHashBinaryPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-99">blockHashBinaryPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainBinaryService.html#blockHashBinaryPublisher()">blockHashBinaryPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a></code></dd>
@@ -206,7 +220,7 @@ <h3>blockHashBinaryPublisher</h3>
 <li>
 <section class="detail" id="close()">
 <h3>close</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-99">close</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html#line-105">close</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link">close</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
diff --git a/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html b/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html
index 2be001577..97bce47b5 100644
--- a/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html
+++ b/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RxBitcoinZmqBinaryService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RxBitcoinZmqBinaryService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.zeromq, class: RxBitcoinZmqBinaryService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -84,7 +98,7 @@ <h1 title="Class RxBitcoinZmqBinaryService" class="title">Class RxBitcoinZmqBina
 <dd><code><a href="RxBitcoinZmqService.html" title="class in org.consensusj.bitcoin.rx.zeromq">RxBitcoinZmqService</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-21">RxBitcoinZmqBinaryService</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-23">RxBitcoinZmqBinaryService</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
 implements <a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></span></div>
 <div class="block">Service to listen for ZMQ messages from multiple TCP ports. Uses Bitcoin Core JSON-RPC to find
@@ -102,7 +116,7 @@ <h2>Field Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Field</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code>protected final <a href="../jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></div>
+<div class="col-first even-row-color"><code>protected final <a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></code></div>
 <div class="col-second even-row-color"><code><a href="#client" class="member-name-link">client</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 </div>
@@ -121,7 +135,7 @@ <h2>Constructor Summary</h2>
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)" class="member-name-link">RxBitcoinZmqBinaryService</a><wbr>(<a href="../jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a>&nbsp;client)</code></div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)" class="member-name-link">RxBitcoinZmqBinaryService</a><wbr>(<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a>&nbsp;client)</code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 </div>
 </section>
@@ -137,19 +151,19 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockBinaryPublisher()" class="member-name-link">blockBinaryPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockHashBinaryPublisher()" class="member-name-link">blockHashBinaryPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#close()" class="member-name-link">close</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#transactionBinaryPublisher()" class="member-name-link">transactionBinaryPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;byte[]&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#transactionHashBinaryPublisher()" class="member-name-link">transactionHashBinaryPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
@@ -172,7 +186,7 @@ <h2>Field Details</h2>
 <li>
 <section class="detail" id="client">
 <h3>client</h3>
-<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="../jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-22">client</a></span></div>
+<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-24">client</a></span></div>
 </section>
 </li>
 </ul>
@@ -186,16 +200,16 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">
 <h3>RxBitcoinZmqBinaryService</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-31">RxBitcoinZmqBinaryService</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-33">RxBitcoinZmqBinaryService</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;rpcUri,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
 </section>
 </li>
 <li>
-<section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)">
+<section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.jsonrpc.BitcoinClient)">
 <h3>RxBitcoinZmqBinaryService</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-35">RxBitcoinZmqBinaryService</a></span><wbr><span class="parameters">(<a href="../jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a>&nbsp;client)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-37">RxBitcoinZmqBinaryService</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a>&nbsp;client)</span></div>
 </section>
 </li>
 </ul>
@@ -209,7 +223,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="transactionBinaryPublisher()">
 <h3>transactionBinaryPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-62">transactionBinaryPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-64">transactionBinaryPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainBinaryService.html#transactionBinaryPublisher()">transactionBinaryPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a></code></dd>
@@ -219,7 +233,7 @@ <h3>transactionBinaryPublisher</h3>
 <li>
 <section class="detail" id="transactionHashBinaryPublisher()">
 <h3>transactionHashBinaryPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-67">transactionHashBinaryPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-69">transactionHashBinaryPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainBinaryService.html#transactionHashBinaryPublisher()">transactionHashBinaryPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a></code></dd>
@@ -229,7 +243,7 @@ <h3>transactionHashBinaryPublisher</h3>
 <li>
 <section class="detail" id="blockBinaryPublisher()">
 <h3>blockBinaryPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-72">blockBinaryPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-74">blockBinaryPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainBinaryService.html#blockBinaryPublisher()">blockBinaryPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a></code></dd>
@@ -239,7 +253,7 @@ <h3>blockBinaryPublisher</h3>
 <li>
 <section class="detail" id="blockHashBinaryPublisher()">
 <h3>blockHashBinaryPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-77">blockHashBinaryPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;byte[]&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-79">blockHashBinaryPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainBinaryService.html#blockHashBinaryPublisher()">blockHashBinaryPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a></code></dd>
@@ -249,7 +263,7 @@ <h3>blockHashBinaryPublisher</h3>
 <li>
 <section class="detail" id="close()">
 <h3>close</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-82">close</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html#line-84">close</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link">close</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
diff --git a/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html b/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html
index 3ef67fd94..5aff75277 100644
--- a/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html
+++ b/apidoc/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RxBitcoinZmqService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RxBitcoinZmqService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.zeromq, class: RxBitcoinZmqService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -82,7 +96,7 @@ <h1 title="Class RxBitcoinZmqService" class="title">Class RxBitcoinZmqService</h
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a></code>, <code><a href="../RxBlockchainBinaryService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainBinaryService</a></code>, <code><a href="../RxBlockchainService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainService</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-26">RxBitcoinZmqService</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-34">RxBitcoinZmqService</a></span>
 <span class="extends-implements">extends <a href="RxBitcoinZmqBinaryService.html" title="class in org.consensusj.bitcoin.rx.zeromq">RxBitcoinZmqBinaryService</a>
 implements <a href="../RxBlockchainService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainService</a>, <a href="../ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></span></div>
 <div class="block">Add conversion to bitcoinj-types to <code>RxBitcoinZmqBinaryService</code>. Also
@@ -113,7 +127,7 @@ <h2>Constructor Summary</h2>
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)" class="member-name-link">RxBitcoinZmqService</a><wbr>(<a href="../jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a>&nbsp;client)</code></div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.consensusj.bitcoin.jsonrpc.BitcoinClient)" class="member-name-link">RxBitcoinZmqService</a><wbr>(<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a>&nbsp;client)</code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 </div>
 </section>
@@ -129,16 +143,16 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockHashPublisher()" class="member-name-link">blockHashPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockHeightPublisher()" class="member-name-link">blockHeightPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;org.bitcoinj.core.Block&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.core.Block&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockPublisher()" class="member-name-link">blockPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#chainTipPublisher()" class="member-name-link">chainTipPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">This method will give you a stream of ChainTips</div>
@@ -146,10 +160,10 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#close()" class="member-name-link">close</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#transactionHashPublisher()" class="member-name-link">transactionHashPublisher</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;org.bitcoinj.core.Transaction&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#transactionPublisher()" class="member-name-link">transactionPublisher</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
@@ -175,16 +189,16 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(org.bitcoinj.base.Network,java.net.URI,java.lang.String,java.lang.String)">
 <h3>RxBitcoinZmqService</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-31">RxBitcoinZmqService</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-39">RxBitcoinZmqService</a></span><wbr><span class="parameters">(org.bitcoinj.base.Network&nbsp;network,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;rpcUri,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
 </section>
 </li>
 <li>
-<section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient)">
+<section class="detail" id="&lt;init&gt;(org.consensusj.bitcoin.jsonrpc.BitcoinClient)">
 <h3>RxBitcoinZmqService</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-35">RxBitcoinZmqService</a></span><wbr><span class="parameters">(<a href="../jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a>&nbsp;client)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-43">RxBitcoinZmqService</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a>&nbsp;client)</span></div>
 </section>
 </li>
 </ul>
@@ -198,7 +212,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="transactionPublisher()">
 <h3>transactionPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;org.bitcoinj.core.Transaction&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-43">transactionPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;org.bitcoinj.core.Transaction&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-51">transactionPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainService.html#transactionPublisher()">transactionPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainService</a></code></dd>
@@ -208,7 +222,7 @@ <h3>transactionPublisher</h3>
 <li>
 <section class="detail" id="transactionHashPublisher()">
 <h3>transactionHashPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-49">transactionHashPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-57">transactionHashPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainService.html#transactionHashPublisher()">transactionHashPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainService</a></code></dd>
@@ -218,7 +232,7 @@ <h3>transactionHashPublisher</h3>
 <li>
 <section class="detail" id="blockPublisher()">
 <h3>blockPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;org.bitcoinj.core.Block&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-55">blockPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;org.bitcoinj.core.Block&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-63">blockPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainService.html#blockPublisher()">blockPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainService</a></code></dd>
@@ -228,7 +242,7 @@ <h3>blockPublisher</h3>
 <li>
 <section class="detail" id="blockHashPublisher()">
 <h3>blockHashPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-63">blockHashPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-71">blockHashPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainService.html#blockHashPublisher()">blockHashPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainService</a></code></dd>
@@ -238,7 +252,7 @@ <h3>blockHashPublisher</h3>
 <li>
 <section class="detail" id="blockHeightPublisher()">
 <h3>blockHeightPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-69">blockHeightPublisher</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-77">blockHeightPublisher</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../RxBlockchainService.html#blockHeightPublisher()">blockHeightPublisher</a></code>&nbsp;in interface&nbsp;<code><a href="../RxBlockchainService.html" title="interface in org.consensusj.bitcoin.rx">RxBlockchainService</a></code></dd>
@@ -248,8 +262,8 @@ <h3>blockHeightPublisher</h3>
 <li>
 <section class="detail" id="chainTipPublisher()">
 <h3>chainTipPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;<a href="../../json/pojo/ChainTip.html" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-75">chainTipPublisher</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="../ChainTipService.html#chainTipPublisher()">ChainTipService</a></code></span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-83">chainTipPublisher</a></span>()</div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="../ChainTipService.html#chainTipPublisher()">ChainTipService</a></code></span></div>
 <div class="block">This method will give you a stream of ChainTips</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -264,7 +278,7 @@ <h3>chainTipPublisher</h3>
 <li>
 <section class="detail" id="close()">
 <h3>close</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-80">close</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html#line-88">close</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link">close</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
diff --git a/apidoc/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html b/apidoc/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html
index afa00ddfe..bee0e8276 100644
--- a/apidoc/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html
+++ b/apidoc/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>SampleBitcoinZmqClient (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>SampleBitcoinZmqClient (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.zeromq, class: SampleBitcoinZmqClient">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -76,7 +90,7 @@ <h1 title="Class SampleBitcoinZmqClient" class="title">Class SampleBitcoinZmqCli
 </div>
 <section class="class-description" id="class-description">
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html#line-18">SampleBitcoinZmqClient</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html#line-19">SampleBitcoinZmqClient</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
 <div class="block">Sample Bitcoin ZMQ client</div>
 </section>
@@ -129,7 +143,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;()">
 <h3>SampleBitcoinZmqClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html#line-18">SampleBitcoinZmqClient</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html#line-19">SampleBitcoinZmqClient</a></span>()</div>
 </section>
 </li>
 </ul>
@@ -143,7 +157,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="main(java.lang.String[])">
 <h3>main</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html#line-20">main</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</span></div>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html#line-21">main</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</span></div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/bitcoin/rx/zeromq/package-summary.html b/apidoc/org/consensusj/bitcoin/rx/zeromq/package-summary.html
index 5b5724805..6d2fd2956 100644
--- a/apidoc/org/consensusj/bitcoin/rx/zeromq/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/rx/zeromq/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.rx.zeromq (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx.zeromq (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.rx.zeromq">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/rx/zeromq/package-tree.html b/apidoc/org/consensusj/bitcoin/rx/zeromq/package-tree.html
index 8c0e8558a..14df793eb 100644
--- a/apidoc/org/consensusj/bitcoin/rx/zeromq/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/rx/zeromq/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.rx.zeromq Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.rx.zeromq Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.rx.zeromq">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.rx.zeromq</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoin/services/WalletAppKitService.html b/apidoc/org/consensusj/bitcoin/services/WalletAppKitService.html
index b8a98c3ee..f5d2b70ac 100644
--- a/apidoc/org/consensusj/bitcoin/services/WalletAppKitService.html
+++ b/apidoc/org/consensusj/bitcoin/services/WalletAppKitService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>WalletAppKitService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>WalletAppKitService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.services, class: WalletAppKitService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -148,7 +162,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#close()" class="member-name-link">close</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#createrawtransaction(java.util.List,java.util.List)" class="member-name-link">createrawtransaction</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&gt;&nbsp;inputs,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;&gt;&nbsp;outputs)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
@@ -164,13 +178,13 @@ <h2>Method Summary</h2>
  org.bitcoinj.base.ScriptType&nbsp;scriptType,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;walletBaseName)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Coin&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Coin&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getbalance()" class="member-name-link">getbalance</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getbestblockhash()" class="member-name-link">getbestblockhash</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getblock(java.lang.String,java.lang.Integer)" class="member-name-link">getblock</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;blockHashString,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;verbosity)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
@@ -180,49 +194,49 @@ <h2>Method Summary</h2>
  For verbosity = 1, we return a BlockInfo, but some fields may be missing or incorrect, including a list of TXIDs
  For verbosity = 2, we are currently throwing an exception.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getblock2(org.bitcoinj.base.Sha256Hash,java.lang.Integer)" class="member-name-link">getblock2</a><wbr>(org.bitcoinj.base.Sha256Hash&nbsp;blockHash,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;verbosity)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getblockchaininfo()" class="member-name-link">getblockchaininfo</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getblockcount()" class="member-name-link">getblockcount</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getblockhash(java.lang.Integer)" class="member-name-link">getblockhash</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;blockNumber)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Placeholder -- currently throws `UnsupportedOperationException`</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getblockheader(java.lang.String,java.lang.Boolean)" class="member-name-link">getblockheader</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;blockHashString,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;verbose)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getblockheader2(org.bitcoinj.base.Sha256Hash,java.lang.Boolean)" class="member-name-link">getblockheader2</a><wbr>(org.bitcoinj.base.Sha256Hash&nbsp;blockHash,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;verbose)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getBlockInfo(org.bitcoinj.base.Sha256Hash,org.consensusj.bitcoin.json.pojo.BlockInfo.IncludeTxFlag)" class="member-name-link">getBlockInfo</a><wbr>(org.bitcoinj.base.Sha256Hash&nbsp;blockHash,
  <a href="../json/pojo/BlockInfo.IncludeTxFlag.html" title="enum class in org.consensusj.bitcoin.json.pojo">BlockInfo.IncludeTxFlag</a>&nbsp;includeTx)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getconnectioncount()" class="member-name-link">getconnectioncount</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/NetworkInfo.html" title="class in org.consensusj.bitcoin.json.pojo">NetworkInfo</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../json/pojo/NetworkInfo.html" title="class in org.consensusj.bitcoin.json.pojo">NetworkInfo</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getnetworkinfo()" class="member-name-link">getnetworkinfo</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Address&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Address&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getnewaddress()" class="member-name-link">getnewaddress</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.core.PeerGroup</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getPeerGroup()" class="member-name-link">getPeerGroup</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#help()" class="member-name-link">help</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#listunspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)" class="member-name-link">listunspent</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;&nbsp;addresses,
@@ -231,19 +245,19 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Network</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#network()" class="member-name-link">network</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;T&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#result(T)" class="member-name-link">result</a><wbr>(T&nbsp;result)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#sendrawtransaction(java.lang.String)" class="member-name-link">sendrawtransaction</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hex)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#sendtoaddress(java.lang.String,java.lang.Double)" class="member-name-link">sendtoaddress</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;toAddressString,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Double.html" title="class or interface in java.lang" class="external-link">Double</a>&nbsp;amountDouble)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Send coins to an address</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/SignedRawTransaction.html" title="class in org.consensusj.bitcoin.json.pojo">SignedRawTransaction</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../json/pojo/SignedRawTransaction.html" title="class in org.consensusj.bitcoin.json.pojo">SignedRawTransaction</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#signrawtransactionwithwallet(java.lang.String)" class="member-name-link">signrawtransactionwithwallet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hex)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Currently all UTXOs must be present in the wallet and <code>sighashtype</code> defaults to <code>"ALL"</code>.</div>
@@ -251,7 +265,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#start()" class="member-name-link">start</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#stop()" class="member-name-link">stop</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
@@ -491,7 +505,7 @@ <h3>getblockchaininfo</h3>
 <li>
 <section class="detail" id="getnetworkinfo()">
 <h3>getnetworkinfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/NetworkInfo.html" title="class in org.consensusj.bitcoin.json.pojo">NetworkInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-300">getnetworkinfo</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/NetworkInfo.html" title="class in org.consensusj.bitcoin.json.pojo">NetworkInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-286">getnetworkinfo</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../json/rpc/BitcoinJsonRpc.html#getnetworkinfo()">getnetworkinfo</a></code>&nbsp;in interface&nbsp;<code><a href="../json/rpc/BitcoinJsonRpc.html" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a></code></dd>
@@ -501,7 +515,7 @@ <h3>getnetworkinfo</h3>
 <li>
 <section class="detail" id="createrawtransaction(java.util.List,java.util.List)">
 <h3>createrawtransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-335">createrawtransaction</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&gt;&nbsp;inputs,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-321">createrawtransaction</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&gt;&nbsp;inputs,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;&gt;&nbsp;outputs)</span></div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -512,7 +526,7 @@ <h3>createrawtransaction</h3>
 <li>
 <section class="detail" id="getnewaddress()">
 <h3>getnewaddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Address&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-357">getnewaddress</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Address&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-343">getnewaddress</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../json/rpc/BitcoinJsonRpc.html#getnewaddress()">getnewaddress</a></code>&nbsp;in interface&nbsp;<code><a href="../json/rpc/BitcoinJsonRpc.html" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a></code></dd>
@@ -522,7 +536,7 @@ <h3>getnewaddress</h3>
 <li>
 <section class="detail" id="getbalance()">
 <h3>getbalance</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Coin&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-365">getbalance</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Coin&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-351">getbalance</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../json/rpc/BitcoinJsonRpc.html#getbalance()">getbalance</a></code>&nbsp;in interface&nbsp;<code><a href="../json/rpc/BitcoinJsonRpc.html" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a></code></dd>
@@ -532,7 +546,7 @@ <h3>getbalance</h3>
 <li>
 <section class="detail" id="listunspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)">
 <h3>listunspent</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-370">listunspent</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../json/pojo/UnspentOutput.html" title="class in org.consensusj.bitcoin.json.pojo">UnspentOutput</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-356">listunspent</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;minConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;maxConf,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;&nbsp;addresses,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Boolean.html" title="class or interface in java.lang" class="external-link">Boolean</a>&nbsp;includeUnsafe)</span></div>
@@ -545,7 +559,7 @@ <h3>listunspent</h3>
 <li>
 <section class="detail" id="sendtoaddress(java.lang.String,java.lang.Double)">
 <h3>sendtoaddress</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-405">sendtoaddress</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;toAddressString,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-391">sendtoaddress</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;toAddressString,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Double.html" title="class or interface in java.lang" class="external-link">Double</a>&nbsp;amountDouble)</span></div>
 <div class="block">Send coins to an address</div>
 <dl class="notes">
@@ -562,7 +576,7 @@ <h3>sendtoaddress</h3>
 <li>
 <section class="detail" id="sendrawtransaction(java.lang.String)">
 <h3>sendrawtransaction</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-424">sendrawtransaction</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hex)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-410">sendrawtransaction</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hex)</span></div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="../json/rpc/BitcoinJsonRpc.html#sendrawtransaction(java.lang.String)">sendrawtransaction</a></code>&nbsp;in interface&nbsp;<code><a href="../json/rpc/BitcoinJsonRpc.html" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a></code></dd>
@@ -572,8 +586,8 @@ <h3>sendrawtransaction</h3>
 <li>
 <section class="detail" id="signrawtransactionwithwallet(java.lang.String)">
 <h3>signrawtransactionwithwallet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/SignedRawTransaction.html" title="class in org.consensusj.bitcoin.json.pojo">SignedRawTransaction</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-460">signrawtransactionwithwallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hex)</span></div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="../json/rpc/BitcoinJsonRpc.html#signrawtransactionwithwallet(java.lang.String)">BitcoinJsonRpc</a></code></span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/SignedRawTransaction.html" title="class in org.consensusj.bitcoin.json.pojo">SignedRawTransaction</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-446">signrawtransactionwithwallet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hex)</span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="../json/rpc/BitcoinJsonRpc.html#signrawtransactionwithwallet(java.lang.String)">BitcoinJsonRpc</a></code></span></div>
 <div class="block">Currently all UTXOs must be present in the wallet and <code>sighashtype</code> defaults to <code>"ALL"</code>.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -588,21 +602,21 @@ <h3>signrawtransactionwithwallet</h3>
 <li>
 <section class="detail" id="getBlockInfo(org.bitcoinj.base.Sha256Hash,org.consensusj.bitcoin.json.pojo.BlockInfo.IncludeTxFlag)">
 <h3>getBlockInfo</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-500">getBlockInfo</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;blockHash,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-486">getBlockInfo</a></span><wbr><span class="parameters">(org.bitcoinj.base.Sha256Hash&nbsp;blockHash,
  <a href="../json/pojo/BlockInfo.IncludeTxFlag.html" title="enum class in org.consensusj.bitcoin.json.pojo">BlockInfo.IncludeTxFlag</a>&nbsp;includeTx)</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="result(T)">
 <h3 id="result(java.lang.Object)">result</h3>
-<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-511">result</a></span><wbr><span class="parameters">(T&nbsp;result)</span></div>
+<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-497">result</a></span><wbr><span class="parameters">(T&nbsp;result)</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="close()">
 <h3>close</h3>
 <div class="member-signature"><span class="annotations">@PreDestroy
-</span><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-569">close</a></span>()</div>
+</span><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletAppKitService.html#line-555">close</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link">close</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
diff --git a/apidoc/org/consensusj/bitcoin/services/WalletSigningService.html b/apidoc/org/consensusj/bitcoin/services/WalletSigningService.html
index b5f31ca54..84efd6dc3 100644
--- a/apidoc/org/consensusj/bitcoin/services/WalletSigningService.html
+++ b/apidoc/org/consensusj/bitcoin/services/WalletSigningService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>WalletSigningService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>WalletSigningService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.services, class: WalletSigningService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -119,23 +133,23 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Create a signing request, given a list of inputs, a list of outputs and a change address.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;org.bitcoinj.core.TransactionOutput&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;org.bitcoinj.core.TransactionOutput&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#findUnspentOutput(org.bitcoinj.base.Sha256Hash,int)" class="member-name-link">findUnspentOutput</a><wbr>(org.bitcoinj.base.Sha256Hash&nbsp;txId,
  int&nbsp;vout)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="../../bitcoinj/signing/Utxo.Complete.html" title="class in org.consensusj.bitcoinj.signing">Utxo.Complete</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;<a href="../../bitcoinj/signing/Utxo.Complete.html" title="class in org.consensusj.bitcoinj.signing">Utxo.Complete</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#findUtxo(org.consensusj.bitcoinj.signing.Utxo)" class="member-name-link">findUtxo</a><wbr>(<a href="../../bitcoinj/signing/Utxo.html" title="interface in org.consensusj.bitcoinj.signing">Utxo</a>&nbsp;utxo)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#signSendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)" class="member-name-link">signSendToAddress</a><wbr>(org.bitcoinj.base.Address&nbsp;toAddress,
  org.bitcoinj.base.Coin&nbsp;amount)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Create and sign a transaction to send coins to the specified address.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#signTransaction(org.consensusj.bitcoinj.signing.RawTransactionSigningRequest)" class="member-name-link">signTransaction</a><wbr>(<a href="../../bitcoinj/signing/RawTransactionSigningRequest.html" title="class in org.consensusj.bitcoinj.signing">RawTransactionSigningRequest</a>&nbsp;rawRequest)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)" class="member-name-link">signTransaction</a><wbr>(<a href="../../bitcoinj/signing/SigningRequest.html" title="interface in org.consensusj.bitcoinj.signing">SigningRequest</a>&nbsp;request)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Create a signed bitcoinj transaction from the signing request.</div>
@@ -187,7 +201,7 @@ <h3>signTransaction</h3>
 <section class="detail" id="signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)">
 <h3>signTransaction</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.core.Transaction&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoin/services/WalletSigningService.html#line-73">signTransaction</a></span><wbr><span class="parameters">(<a href="../../bitcoinj/signing/SigningRequest.html" title="interface in org.consensusj.bitcoinj.signing">SigningRequest</a>&nbsp;request)</span></div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="../../bitcoinj/signing/TransactionSigner.html#signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)">TransactionSigner</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="../../bitcoinj/signing/TransactionSigner.html#signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)">TransactionSigner</a></code></span></div>
 <div class="block">Create a signed bitcoinj transaction from the signing request. This is asynchronous because
  user (or other) confirmation may be required.</div>
 <dl class="notes">
@@ -230,7 +244,7 @@ <h3>createBitcoinSigningRequest</h3>
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../../bitcoinj/signing/TransactionOutputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionOutputData</a>&gt;&nbsp;outputs,
  org.bitcoinj.base.Address&nbsp;changeAddress)</span>
                                            throws <span class="exceptions">org.bitcoinj.core.InsufficientMoneyException</span></div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="../../bitcoinj/service/SignTransactionService.html#createBitcoinSigningRequest(java.util.List,java.util.List,org.bitcoinj.base.Address)">SignTransactionService</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="../../bitcoinj/service/SignTransactionService.html#createBitcoinSigningRequest(java.util.List,java.util.List,org.bitcoinj.base.Address)">SignTransactionService</a></code></span></div>
 <div class="block">Create a signing request, given a list of inputs, a list of outputs and a change address. Calculates
  the fee, adds a change output, and returns a completed signing request.</div>
 <dl class="notes">
diff --git a/apidoc/org/consensusj/bitcoin/services/package-summary.html b/apidoc/org/consensusj/bitcoin/services/package-summary.html
index 7fe7dfac4..27475f6ec 100644
--- a/apidoc/org/consensusj/bitcoin/services/package-summary.html
+++ b/apidoc/org/consensusj/bitcoin/services/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.services (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.services (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoin.services">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoin/services/package-tree.html b/apidoc/org/consensusj/bitcoin/services/package-tree.html
index f11305c77..52950a40d 100644
--- a/apidoc/org/consensusj/bitcoin/services/package-tree.html
+++ b/apidoc/org/consensusj/bitcoin/services/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoin.services Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoin.services Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoin.services">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoin.services</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoinj/dsl/js/Demo.html b/apidoc/org/consensusj/bitcoinj/dsl/js/Demo.html
index ef1c4a9d8..407b6eda4 100644
--- a/apidoc/org/consensusj/bitcoinj/dsl/js/Demo.html
+++ b/apidoc/org/consensusj/bitcoinj/dsl/js/Demo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Demo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Demo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.dsl.js, class: Demo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/dsl/js/ScriptRunner.html b/apidoc/org/consensusj/bitcoinj/dsl/js/ScriptRunner.html
index 04d80cf6d..9c21b152a 100644
--- a/apidoc/org/consensusj/bitcoinj/dsl/js/ScriptRunner.html
+++ b/apidoc/org/consensusj/bitcoinj/dsl/js/ScriptRunner.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ScriptRunner (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ScriptRunner (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.dsl.js, class: ScriptRunner">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/dsl/js/package-summary.html b/apidoc/org/consensusj/bitcoinj/dsl/js/package-summary.html
index 728548b22..858a101fe 100644
--- a/apidoc/org/consensusj/bitcoinj/dsl/js/package-summary.html
+++ b/apidoc/org/consensusj/bitcoinj/dsl/js/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoinj.dsl.js (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoinj.dsl.js (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.dsl.js">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/dsl/js/package-tree.html b/apidoc/org/consensusj/bitcoinj/dsl/js/package-tree.html
index 1e9ccfa05..e53209499 100644
--- a/apidoc/org/consensusj/bitcoinj/dsl/js/package-tree.html
+++ b/apidoc/org/consensusj/bitcoinj/dsl/js/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoinj.dsl.js Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoinj.dsl.js Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoinj.dsl.js">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoinj.dsl.js</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoinj/service/SendTransactionService.html b/apidoc/org/consensusj/bitcoinj/service/SendTransactionService.html
index 4fccb1438..c39907bc5 100644
--- a/apidoc/org/consensusj/bitcoinj/service/SendTransactionService.html
+++ b/apidoc/org/consensusj/bitcoinj/service/SendTransactionService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>SendTransactionService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>SendTransactionService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.service, interface: SendTransactionService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -89,12 +103,12 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#sendRawTransaction(org.bitcoinj.core.Transaction)" class="member-name-link">sendRawTransaction</a><wbr>(org.bitcoinj.core.Transaction&nbsp;signedTransaction)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
 <div class="block">Broadcast a signed transaction on the P2P network.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.base.Sha256Hash&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)" class="member-name-link">sendRawTransaction</a><wbr>(org.bitcoinj.core.Transaction&nbsp;signedTransaction,
  org.bitcoinj.base.Coin&nbsp;maxFeeRate)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
diff --git a/apidoc/org/consensusj/bitcoinj/service/SignTransactionService.html b/apidoc/org/consensusj/bitcoinj/service/SignTransactionService.html
index e61590ea9..54021f304 100644
--- a/apidoc/org/consensusj/bitcoinj/service/SignTransactionService.html
+++ b/apidoc/org/consensusj/bitcoinj/service/SignTransactionService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>SignTransactionService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>SignTransactionService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.service, interface: SignTransactionService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -105,7 +119,7 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Create a signing request, given a list of inputs, a list of outputs and a change address.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#signSendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)" class="member-name-link">signSendToAddress</a><wbr>(org.bitcoinj.base.Address&nbsp;toAddress,
  org.bitcoinj.base.Coin&nbsp;amount)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
diff --git a/apidoc/org/consensusj/bitcoinj/service/package-summary.html b/apidoc/org/consensusj/bitcoinj/service/package-summary.html
index bf2034836..294f1eeef 100644
--- a/apidoc/org/consensusj/bitcoinj/service/package-summary.html
+++ b/apidoc/org/consensusj/bitcoinj/service/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoinj.service (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoinj.service (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.service">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/service/package-tree.html b/apidoc/org/consensusj/bitcoinj/service/package-tree.html
index 68504eff5..9886f333a 100644
--- a/apidoc/org/consensusj/bitcoinj/service/package-tree.html
+++ b/apidoc/org/consensusj/bitcoinj/service/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoinj.service Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoinj.service Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoinj.service">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoinj.service</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/BaseTransactionSigner.html b/apidoc/org/consensusj/bitcoinj/signing/BaseTransactionSigner.html
index e6872568f..a8bfb2a12 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/BaseTransactionSigner.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/BaseTransactionSigner.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BaseTransactionSigner (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BaseTransactionSigner (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: BaseTransactionSigner">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -121,24 +135,24 @@ <h2>Method Summary</h2>
  <a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&nbsp;in,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;? extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" title="class or interface in java.lang" class="external-link">RuntimeException</a>&gt;&nbsp;exceptionSupplier)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#keyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)" class="member-name-link">keyForInput</a><wbr>(<a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&nbsp;input)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Return an ECKey, if available for the provided input</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#pubKeyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)" class="member-name-link">pubKeyForInput</a><wbr>(<a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&nbsp;input)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)" class="member-name-link">signTransaction</a><wbr>(<a href="SigningRequest.html" title="interface in org.consensusj.bitcoinj.signing">SigningRequest</a>&nbsp;request)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
 <div class="block">Create a signed bitcoinj transaction from the signing request</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#verify(org.bitcoinj.core.Transaction,java.util.List)" class="member-name-link">verify</a><wbr>(org.bitcoinj.core.Transaction&nbsp;tx,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&gt;&nbsp;reqInputs)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#verifyInput(org.bitcoinj.core.Transaction,int,org.consensusj.bitcoinj.signing.TransactionInputData)" class="member-name-link">verifyInput</a><wbr>(org.bitcoinj.core.Transaction&nbsp;tx,
  int&nbsp;index,
  <a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&nbsp;inputData)</code></div>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/DefaultSigningRequest.html b/apidoc/org/consensusj/bitcoinj/signing/DefaultSigningRequest.html
index 803b17771..200633883 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/DefaultSigningRequest.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/DefaultSigningRequest.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>DefaultSigningRequest (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>DefaultSigningRequest (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: DefaultSigningRequest">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -112,10 +126,10 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#inputs()" class="member-name-link">inputs</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="TransactionOutputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionOutputData</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="TransactionOutputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionOutputData</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#outputs()" class="member-name-link">outputs</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.core.Transaction</code></div>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/ECKeySigner.html b/apidoc/org/consensusj/bitcoinj/signing/ECKeySigner.html
index dfbeef360..bd9724efc 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/ECKeySigner.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/ECKeySigner.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ECKeySigner (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ECKeySigner (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: ECKeySigner">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -123,7 +137,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#keyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)" class="member-name-link">keyForInput</a><wbr>(<a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&nbsp;input)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Return the signing key for an input, if available</div>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/FeeCalculator.html b/apidoc/org/consensusj/bitcoinj/signing/FeeCalculator.html
index d60618c52..680ebd0db 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/FeeCalculator.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/FeeCalculator.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>FeeCalculator (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>FeeCalculator (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: FeeCalculator">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/signing/HDKeychainSigner.html b/apidoc/org/consensusj/bitcoinj/signing/HDKeychainSigner.html
index fcfacf8d7..b5fcf7d62 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/HDKeychainSigner.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/HDKeychainSigner.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>HDKeychainSigner (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>HDKeychainSigner (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: HDKeychainSigner">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -121,17 +135,17 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#keyForHash(byte%5B%5D)" class="member-name-link">keyForHash</a><wbr>(byte[]&nbsp;pubKeyHash)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Return the signing key for an input, if available</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#keyForInput(org.consensusj.bitcoinj.signing.TransactionInputData)" class="member-name-link">keyForInput</a><wbr>(<a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&nbsp;input)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Return the signing key for an input, if available</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;org.bitcoinj.crypto.ECKey&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#pubKeyFromPubKeyHash(byte%5B%5D)" class="member-name-link">pubKeyFromPubKeyHash</a><wbr>(byte[]&nbsp;pubKeyHash)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.RawInput.html b/apidoc/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.RawInput.html
index 5f1623c9e..706d0f72e 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.RawInput.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.RawInput.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RawTransactionSigningRequest.RawInput (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RawTransactionSigningRequest.RawInput (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: RawTransactionSigningRequest, class: RawInput">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -77,7 +91,7 @@ <h1 title="Class RawTransactionSigningRequest.RawInput" class="title">Class RawT
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="RawTransactionSigningRequest.html" title="class in org.consensusj.bitcoinj.signing">RawTransactionSigningRequest</a></dd>
+<dd><code><a href="RawTransactionSigningRequest.html" title="class in org.consensusj.bitcoinj.signing">RawTransactionSigningRequest</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html#line-46">RawTransactionSigningRequest.RawInput</a></span>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html b/apidoc/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html
index 62584298e..36b62a007 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RawTransactionSigningRequest (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RawTransactionSigningRequest (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: RawTransactionSigningRequest">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -123,7 +137,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="RawTransactionSigningRequest.RawInput.html" title="class in org.consensusj.bitcoinj.signing">RawTransactionSigningRequest.RawInput</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="RawTransactionSigningRequest.RawInput.html" title="class in org.consensusj.bitcoinj.signing">RawTransactionSigningRequest.RawInput</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#inputs()" class="member-name-link">inputs</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="RawTransactionSigningRequest.html" title="class in org.consensusj.bitcoinj.signing">RawTransactionSigningRequest</a></code></div>
@@ -133,7 +147,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="RawTransactionSigningRequest.html" title="class in org.consensusj.bitcoinj.signing">RawTransactionSigningRequest</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#ofTransaction(org.bitcoinj.core.Transaction)" class="member-name-link">ofTransaction</a><wbr>(org.bitcoinj.core.Transaction&nbsp;transaction)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="TransactionOutputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionOutputData</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="TransactionOutputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionOutputData</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#outputs()" class="member-name-link">outputs</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/SigningRequest.html b/apidoc/org/consensusj/bitcoinj/signing/SigningRequest.html
index 88265219d..a723feb72 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/SigningRequest.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/SigningRequest.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>SigningRequest (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>SigningRequest (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: SigningRequest">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -97,7 +111,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#inputs()" class="member-name-link">inputs</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab1"><code>static <a href="SigningRequest.html" title="interface in org.consensusj.bitcoinj.signing">SigningRequest</a></code></div>
@@ -108,7 +122,7 @@ <h2>Method Summary</h2>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab1"><code><a href="#of(java.util.List,java.util.Map)" class="member-name-link">of</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="TransactionInputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionInputData</a>&gt;&nbsp;inputs,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;org.bitcoinj.base.Address,<wbr>org.bitcoinj.base.Coin&gt;&nbsp;outputMap)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab1">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="TransactionOutputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionOutputData</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="TransactionOutputData.html" title="interface in org.consensusj.bitcoinj.signing">TransactionOutputData</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#outputs()" class="member-name-link">outputs</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>org.bitcoinj.core.Transaction</code></div>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/SigningUtils.html b/apidoc/org/consensusj/bitcoinj/signing/SigningUtils.html
index 36d556482..a06148c03 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/SigningUtils.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/SigningUtils.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>SigningUtils (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>SigningUtils (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: SigningUtils">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html b/apidoc/org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html
index 5a70e5745..1fb9033b7 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TestnetFeeCalculator (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TestnetFeeCalculator (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: TestnetFeeCalculator">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -151,7 +165,7 @@ <h2>Method Details</h2>
 <section class="detail" id="calculateFee(org.consensusj.bitcoinj.signing.SigningRequest)">
 <h3>calculateFee</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html#line-11">calculateFee</a></span><wbr><span class="parameters">(<a href="SigningRequest.html" title="interface in org.consensusj.bitcoinj.signing">SigningRequest</a>&nbsp;proposedTx)</span></div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="FeeCalculator.html#calculateFee(org.consensusj.bitcoinj.signing.SigningRequest)">FeeCalculator</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="FeeCalculator.html#calculateFee(org.consensusj.bitcoinj.signing.SigningRequest)">FeeCalculator</a></code></span></div>
 <div class="block">Calculate the fee for an almost-complete transaction. The proposed transaction
  should contain all inputs and outputs. Typically, this means having a change output
  with a value of <code>Coin.ZERO</code>. After calculating the correct fee the change output
diff --git a/apidoc/org/consensusj/bitcoinj/signing/TransactionInputData.html b/apidoc/org/consensusj/bitcoinj/signing/TransactionInputData.html
index 89a8de0a8..753ddff3e 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/TransactionInputData.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/TransactionInputData.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionInputData (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionInputData (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: TransactionInputData">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html b/apidoc/org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html
index adde07b15..1debd2c41 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionInputDataUtxo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionInputDataUtxo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: TransactionInputDataUtxo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -224,7 +238,7 @@ <h3>amount</h3>
 <section class="detail" id="script()">
 <h3>script</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.script.Script</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html#line-45">script</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="TransactionInputData.html#script()">TransactionInputData</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="TransactionInputData.html#script()">TransactionInputData</a></code></span></div>
 <div class="block">prevOut ScriptPubKey</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -252,7 +266,7 @@ <h3>toUtxo</h3>
 <section class="detail" id="toOutPoint()">
 <h3>toOutPoint</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.core.TransactionOutPoint</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html#line-59">toOutPoint</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="TransactionInputData.html#toOutPoint()">TransactionInputData</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="TransactionInputData.html#toOutPoint()">TransactionInputData</a></code></span></div>
 <div class="block">This probably shouldn't be here but is needed for proper operation with bitcoinj</div>
 <dl class="notes">
 <dt>Specified by:</dt>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputAddress.html b/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputAddress.html
index 189f82cf7..a39e4c7e4 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputAddress.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputAddress.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionOutputAddress (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionOutputAddress (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: TransactionOutputAddress">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputData.html b/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputData.html
index e8f4eb7db..26de6d874 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputData.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputData.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionOutputData (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionOutputData (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: TransactionOutputData">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputDataScript.html b/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputDataScript.html
index 440660e74..4f0ff535b 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputDataScript.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputDataScript.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionOutputDataScript (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionOutputDataScript (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: TransactionOutputDataScript">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputOpReturn.html b/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputOpReturn.html
index 46868b784..98ecf3eae 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputOpReturn.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/TransactionOutputOpReturn.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionOutputOpReturn (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionOutputOpReturn (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: TransactionOutputOpReturn">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/signing/TransactionSigner.html b/apidoc/org/consensusj/bitcoinj/signing/TransactionSigner.html
index 7c90cce5f..756319405 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/TransactionSigner.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/TransactionSigner.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionSigner (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionSigner (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: TransactionSigner">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -99,7 +113,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;org.bitcoinj.core.Transaction&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#signTransaction(org.consensusj.bitcoinj.signing.SigningRequest)" class="member-name-link">signTransaction</a><wbr>(<a href="SigningRequest.html" title="interface in org.consensusj.bitcoinj.signing">SigningRequest</a>&nbsp;request)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Create a signed bitcoinj transaction from the signing request.</div>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/TransactionVerification.html b/apidoc/org/consensusj/bitcoinj/signing/TransactionVerification.html
index dc97b151c..ce7bafff5 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/TransactionVerification.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/TransactionVerification.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>TransactionVerification (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>TransactionVerification (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, class: TransactionVerification">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/signing/Utxo.Basic.html b/apidoc/org/consensusj/bitcoinj/signing/Utxo.Basic.html
index 8c5434b94..9c8764568 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/Utxo.Basic.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/Utxo.Basic.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Utxo.Basic (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Utxo.Basic (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: Utxo, class: Basic">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -81,7 +95,7 @@ <h1 title="Class Utxo.Basic" class="title">Class Utxo.Basic</h1>
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="Utxo.html" title="interface in org.consensusj.bitcoinj.signing">Utxo</a></dd>
+<dd><code><a href="Utxo.html" title="interface in org.consensusj.bitcoinj.signing">Utxo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/signing/Utxo.html#line-45">Utxo.Basic</a></span>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/Utxo.Complete.html b/apidoc/org/consensusj/bitcoinj/signing/Utxo.Complete.html
index 2ac225832..63337b19b 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/Utxo.Complete.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/Utxo.Complete.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Utxo.Complete (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Utxo.Complete (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: Utxo, class: Complete">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -81,7 +95,7 @@ <h1 title="Class Utxo.Complete" class="title">Class Utxo.Complete</h1>
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="Utxo.html" title="interface in org.consensusj.bitcoinj.signing">Utxo</a></dd>
+<dd><code><a href="Utxo.html" title="interface in org.consensusj.bitcoinj.signing">Utxo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/signing/Utxo.html#line-102">Utxo.Complete</a></span>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/Utxo.Signable.html b/apidoc/org/consensusj/bitcoinj/signing/Utxo.Signable.html
index 06671737a..39571b847 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/Utxo.Signable.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/Utxo.Signable.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Utxo.Signable (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Utxo.Signable (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: Utxo, class: Signable">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -81,7 +95,7 @@ <h1 title="Class Utxo.Signable" class="title">Class Utxo.Signable</h1>
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="Utxo.html" title="interface in org.consensusj.bitcoinj.signing">Utxo</a></dd>
+<dd><code><a href="Utxo.html" title="interface in org.consensusj.bitcoinj.signing">Utxo</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/signing/Utxo.html#line-72">Utxo.Signable</a></span>
diff --git a/apidoc/org/consensusj/bitcoinj/signing/Utxo.html b/apidoc/org/consensusj/bitcoinj/signing/Utxo.html
index a166cad4e..d571c6003 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/Utxo.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/Utxo.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Utxo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Utxo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing, interface: Utxo">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/signing/package-summary.html b/apidoc/org/consensusj/bitcoinj/signing/package-summary.html
index 867d9f351..8f582f4b0 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/package-summary.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoinj.signing (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoinj.signing (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.signing">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/signing/package-tree.html b/apidoc/org/consensusj/bitcoinj/signing/package-tree.html
index 87e10dc60..8963b4566 100644
--- a/apidoc/org/consensusj/bitcoinj/signing/package-tree.html
+++ b/apidoc/org/consensusj/bitcoinj/signing/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoinj.signing Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoinj.signing Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoinj.signing">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoinj.signing</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoinj/util/BlockUtil.html b/apidoc/org/consensusj/bitcoinj/util/BlockUtil.html
index 0418534c5..113b219f7 100644
--- a/apidoc/org/consensusj/bitcoinj/util/BlockUtil.html
+++ b/apidoc/org/consensusj/bitcoinj/util/BlockUtil.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BlockUtil (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BlockUtil (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.util, class: BlockUtil">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/util/package-summary.html b/apidoc/org/consensusj/bitcoinj/util/package-summary.html
index be7aca092..723d935b8 100644
--- a/apidoc/org/consensusj/bitcoinj/util/package-summary.html
+++ b/apidoc/org/consensusj/bitcoinj/util/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoinj.util (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoinj.util (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.util">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/util/package-tree.html b/apidoc/org/consensusj/bitcoinj/util/package-tree.html
index def614218..0fbe580ed 100644
--- a/apidoc/org/consensusj/bitcoinj/util/package-tree.html
+++ b/apidoc/org/consensusj/bitcoinj/util/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoinj.util Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoinj.util Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoinj.util">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoinj.util</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/bitcoinj/wallet/BipStandardDeterministicKeyChain.html b/apidoc/org/consensusj/bitcoinj/wallet/BipStandardDeterministicKeyChain.html
index 84b981407..737470467 100644
--- a/apidoc/org/consensusj/bitcoinj/wallet/BipStandardDeterministicKeyChain.html
+++ b/apidoc/org/consensusj/bitcoinj/wallet/BipStandardDeterministicKeyChain.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BipStandardDeterministicKeyChain (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BipStandardDeterministicKeyChain (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.wallet, class: BipStandardDeterministicKeyChain">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -203,8 +217,8 @@ <h3>BipStandardDeterministicKeyChain</h3>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>seed</code> - Seed to use</dd>
-<dd><code>network</code> - used to set coinType, etc</dd>
 <dd><code>outputScriptType</code> - script type for determining the purpose child</dd>
+<dd><code>network</code> - used to set coinType, etc</dd>
 </dl>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html b/apidoc/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html
index 8b637b4d5..f2385fc21 100644
--- a/apidoc/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html
+++ b/apidoc/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BipStandardKeyChainGroupStructure (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BipStandardKeyChainGroupStructure (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.wallet, interface: BipStandardKeyChainGroupStructure">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -74,7 +88,7 @@ <h1 title="Interface BipStandardKeyChainGroupStructure" class="title">Interface
 <section class="class-description" id="class-description">
 <hr>
 <div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-16">BipStandardKeyChainGroupStructure</a></span></div>
+</span><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-15">BipStandardKeyChainGroupStructure</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
 <div class="deprecation-comment">Use <code>KeyChainGroupStructure.BIP43</code> and constants in <code>DeterministicKeyChain</code></div>
 </div>
@@ -171,16 +185,9 @@ <h2>Method Summary</h2>
 <div class="block">Map desired output script type and account index to an account path</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab6"><code>static org.bitcoinj.crypto.HDPath</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab6"><code><a href="#pathFor(org.bitcoinj.base.ScriptType,org.bitcoinj.core.NetworkParameters)" class="member-name-link">pathFor</a><wbr>(org.bitcoinj.base.ScriptType&nbsp;outputScriptType,
- org.bitcoinj.core.NetworkParameters&nbsp;networkParameters)</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab6"><code><a href="#purpose(org.bitcoinj.base.ScriptType)" class="member-name-link">purpose</a><wbr>(org.bitcoinj.base.ScriptType&nbsp;scriptType)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab6">
 <div class="block"><span class="deprecated-label">Deprecated.</span></div>
-<div class="block">Map desired output script type and account index to an account path</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab6"><code>static org.bitcoinj.crypto.HDPath</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab6"><code><a href="#purpose(org.bitcoinj.base.ScriptType)" class="member-name-link">purpose</a><wbr>(org.bitcoinj.base.ScriptType&nbsp;scriptType)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab6">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Return the (root) path containing "purpose" for the specified scriptType</div>
 </div>
 </div>
@@ -200,63 +207,63 @@ <h2>Field Details</h2>
 <li>
 <section class="detail" id="PURPOSE_BIP44">
 <h3>PURPOSE_BIP44</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-18">PURPOSE_BIP44</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-17">PURPOSE_BIP44</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="PURPOSE_BIP49">
 <h3>PURPOSE_BIP49</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-19">PURPOSE_BIP49</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-18">PURPOSE_BIP49</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="PURPOSE_BIP84">
 <h3>PURPOSE_BIP84</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-20">PURPOSE_BIP84</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-19">PURPOSE_BIP84</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="COINTYPE_BTC">
 <h3>COINTYPE_BTC</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-22">COINTYPE_BTC</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-21">COINTYPE_BTC</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="COINTYPE_TBTC">
 <h3>COINTYPE_TBTC</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-23">COINTYPE_TBTC</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-22">COINTYPE_TBTC</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="CHANGE_RECEIVING">
 <h3>CHANGE_RECEIVING</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-25">CHANGE_RECEIVING</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-24">CHANGE_RECEIVING</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="CHANGE_CHANGE">
 <h3>CHANGE_CHANGE</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-26">CHANGE_CHANGE</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-25">CHANGE_CHANGE</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="BIP44_PARENT">
 <h3>BIP44_PARENT</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.HDPath</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-28">BIP44_PARENT</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.HDPath</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-27">BIP44_PARENT</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="BIP84_PARENT">
 <h3>BIP84_PARENT</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.HDPath</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-29">BIP84_PARENT</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.HDPath</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-28">BIP84_PARENT</a></span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 </section>
 </li>
@@ -271,7 +278,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="pathFor(org.bitcoinj.base.ScriptType,java.lang.String)">
 <h3>pathFor</h3>
-<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.HDPath</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-38">pathFor</a></span><wbr><span class="parameters">(org.bitcoinj.base.ScriptType&nbsp;outputScriptType,
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.HDPath</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-37">pathFor</a></span><wbr><span class="parameters">(org.bitcoinj.base.ScriptType&nbsp;outputScriptType,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;netId)</span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Map desired output script type and account index to an account path</div>
@@ -285,25 +292,9 @@ <h3>pathFor</h3>
 </section>
 </li>
 <li>
-<section class="detail" id="pathFor(org.bitcoinj.base.ScriptType,org.bitcoinj.core.NetworkParameters)">
-<h3>pathFor</h3>
-<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.HDPath</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-49">pathFor</a></span><wbr><span class="parameters">(org.bitcoinj.base.ScriptType&nbsp;outputScriptType,
- org.bitcoinj.core.NetworkParameters&nbsp;networkParameters)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-<div class="block">Map desired output script type and account index to an account path</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>outputScriptType</code> - output script type (purpose)</dd>
-<dd><code>networkParameters</code> - network/coin type</dd>
-<dt>Returns:</dt>
-<dd>The HD Path: purpose / coinType / accountIndex</dd>
-</dl>
-</section>
-</li>
-<li>
 <section class="detail" id="purpose(org.bitcoinj.base.ScriptType)">
 <h3>purpose</h3>
-<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.HDPath</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-58">purpose</a></span><wbr><span class="parameters">(org.bitcoinj.base.ScriptType&nbsp;scriptType)</span></div>
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.HDPath</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-47">purpose</a></span><wbr><span class="parameters">(org.bitcoinj.base.ScriptType&nbsp;scriptType)</span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Return the (root) path containing "purpose" for the specified scriptType</div>
 <dl class="notes">
@@ -317,7 +308,7 @@ <h3>purpose</h3>
 <li>
 <section class="detail" id="coinType(java.lang.String)">
 <h3>coinType</h3>
-<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-72">coinType</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;networkId)</span></div>
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-61">coinType</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;networkId)</span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Return coin type path component for a network id</div>
 <dl class="notes">
@@ -329,7 +320,7 @@ <h3>coinType</h3>
 <li>
 <section class="detail" id="account(int)">
 <h3>account</h3>
-<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-93">account</a></span><wbr><span class="parameters">(int&nbsp;accountIndex)</span></div>
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type">org.bitcoinj.crypto.ChildNumber</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html#line-82">account</a></span><wbr><span class="parameters">(int&nbsp;accountIndex)</span></div>
 <div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Return path component for an account</div>
 <dl class="notes">
diff --git a/apidoc/org/consensusj/bitcoinj/wallet/package-summary.html b/apidoc/org/consensusj/bitcoinj/wallet/package-summary.html
index 4da2193bf..d1e53094a 100644
--- a/apidoc/org/consensusj/bitcoinj/wallet/package-summary.html
+++ b/apidoc/org/consensusj/bitcoinj/wallet/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoinj.wallet (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoinj.wallet (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.bitcoinj.wallet">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/bitcoinj/wallet/package-tree.html b/apidoc/org/consensusj/bitcoinj/wallet/package-tree.html
index 5e2bfa861..0e191085e 100644
--- a/apidoc/org/consensusj/bitcoinj/wallet/package-tree.html
+++ b/apidoc/org/consensusj/bitcoinj/wallet/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.bitcoinj.wallet Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.bitcoinj.wallet Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.bitcoinj.wallet">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.bitcoinj.wallet</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/currency/BitcoinCurrencyProvider.html b/apidoc/org/consensusj/currency/BitcoinCurrencyProvider.html
index 18a3159fe..cf9b615ca 100644
--- a/apidoc/org/consensusj/currency/BitcoinCurrencyProvider.html
+++ b/apidoc/org/consensusj/currency/BitcoinCurrencyProvider.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinCurrencyProvider (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinCurrencyProvider (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.currency, class: BitcoinCurrencyProvider">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -111,7 +125,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Set.html" title="class or interface in java.util" class="external-link">Set</a>&lt;javax.money.CurrencyUnit&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Set.html" title="class or interface in java.util" class="external-link">Set</a><wbr>&lt;javax.money.CurrencyUnit&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getCurrencies(javax.money.CurrencyQuery)" class="member-name-link">getCurrencies</a><wbr>(javax.money.CurrencyQuery&nbsp;query)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Return a <code>CurrencyUnit</code> instances matching the given
diff --git a/apidoc/org/consensusj/currency/package-summary.html b/apidoc/org/consensusj/currency/package-summary.html
index 555e00437..dffe1d74f 100644
--- a/apidoc/org/consensusj/currency/package-summary.html
+++ b/apidoc/org/consensusj/currency/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.currency (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.currency (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.currency">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/currency/package-tree.html b/apidoc/org/consensusj/currency/package-tree.html
index dad9bd2d1..0278b5043 100644
--- a/apidoc/org/consensusj/currency/package-tree.html
+++ b/apidoc/org/consensusj/currency/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.currency Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.currency Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.currency">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.currency</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/daemon/micronaut/Application.html b/apidoc/org/consensusj/daemon/micronaut/Application.html
index 27f427ebc..a4d9afb85 100644
--- a/apidoc/org/consensusj/daemon/micronaut/Application.html
+++ b/apidoc/org/consensusj/daemon/micronaut/Application.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Application (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Application (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.daemon.micronaut, class: Application">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html b/apidoc/org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html
index 0e05f4317..efeb92370 100644
--- a/apidoc/org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html
+++ b/apidoc/org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinDaemonConfig (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinDaemonConfig (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.daemon.micronaut, record: BitcoinDaemonConfig">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/daemon/micronaut/BitcoinFactory.html b/apidoc/org/consensusj/daemon/micronaut/BitcoinFactory.html
index 34edd066e..498df6b8f 100644
--- a/apidoc/org/consensusj/daemon/micronaut/BitcoinFactory.html
+++ b/apidoc/org/consensusj/daemon/micronaut/BitcoinFactory.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinFactory (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinFactory (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.daemon.micronaut, class: BitcoinFactory">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/daemon/micronaut/BitcoinRestController.html b/apidoc/org/consensusj/daemon/micronaut/BitcoinRestController.html
index bcdaba59b..2cb70a9df 100644
--- a/apidoc/org/consensusj/daemon/micronaut/BitcoinRestController.html
+++ b/apidoc/org/consensusj/daemon/micronaut/BitcoinRestController.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BitcoinRestController (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BitcoinRestController (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.daemon.micronaut, class: BitcoinRestController">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -108,13 +122,13 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../../bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../../bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#block(java.lang.String)" class="member-name-link">block</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hash)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../../bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../../bitcoin/json/pojo/BlockInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#blockNoTxDetails(java.lang.String)" class="member-name-link">blockNoTxDetails</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;hash)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../../bitcoin/json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../../bitcoin/json/pojo/BlockChainInfo.html" title="class in org.consensusj.bitcoin.json.pojo">BlockChainInfo</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#chaininfo()" class="member-name-link">chaininfo</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/daemon/micronaut/JsonRpcController.html b/apidoc/org/consensusj/daemon/micronaut/JsonRpcController.html
index c675064be..f6929ec6d 100644
--- a/apidoc/org/consensusj/daemon/micronaut/JsonRpcController.html
+++ b/apidoc/org/consensusj/daemon/micronaut/JsonRpcController.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcController (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcController (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.daemon.micronaut, class: JsonRpcController">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -110,7 +124,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../../jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../../jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#index(org.consensusj.jsonrpc.JsonRpcRequest)" class="member-name-link">index</a><wbr>(<a href="../../jsonrpc/JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;req)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/daemon/micronaut/MicronautWalletAppKitService.html b/apidoc/org/consensusj/daemon/micronaut/MicronautWalletAppKitService.html
index ae17ed5eb..6237583e9 100644
--- a/apidoc/org/consensusj/daemon/micronaut/MicronautWalletAppKitService.html
+++ b/apidoc/org/consensusj/daemon/micronaut/MicronautWalletAppKitService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>MicronautWalletAppKitService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>MicronautWalletAppKitService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.daemon.micronaut, class: MicronautWalletAppKitService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -132,7 +146,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#onStartup(io.micronaut.runtime.server.event.ServerStartupEvent)" class="member-name-link">onStartup</a><wbr>(io.micronaut.runtime.server.event.ServerStartupEvent&nbsp;event)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#stop()" class="member-name-link">stop</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Initiate server shutdown.</div>
diff --git a/apidoc/org/consensusj/daemon/micronaut/WalletAppKitJsonRpcService.html b/apidoc/org/consensusj/daemon/micronaut/WalletAppKitJsonRpcService.html
index 628917928..c691bddb4 100644
--- a/apidoc/org/consensusj/daemon/micronaut/WalletAppKitJsonRpcService.html
+++ b/apidoc/org/consensusj/daemon/micronaut/WalletAppKitJsonRpcService.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>WalletAppKitJsonRpcService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>WalletAppKitJsonRpcService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.daemon.micronaut, class: WalletAppKitJsonRpcService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/daemon/micronaut/package-summary.html b/apidoc/org/consensusj/daemon/micronaut/package-summary.html
index e88be34c6..4bad2a502 100644
--- a/apidoc/org/consensusj/daemon/micronaut/package-summary.html
+++ b/apidoc/org/consensusj/daemon/micronaut/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.daemon.micronaut (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.daemon.micronaut (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.daemon.micronaut">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/daemon/micronaut/package-tree.html b/apidoc/org/consensusj/daemon/micronaut/package-tree.html
index 60161560c..ecd961783 100644
--- a/apidoc/org/consensusj/daemon/micronaut/package-tree.html
+++ b/apidoc/org/consensusj/daemon/micronaut/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.daemon.micronaut Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.daemon.micronaut Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.daemon.micronaut">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.daemon.micronaut</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
@@ -72,14 +72,23 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li class="circle">org.consensusj.daemon.micronaut.<a href="BitcoinFactory.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">BitcoinFactory</a></li>
 <li class="circle">org.consensusj.daemon.micronaut.<a href="BitcoinRestController.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">BitcoinRestController</a></li>
 <li class="circle">org.consensusj.daemon.micronaut.<a href="JsonRpcController.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">JsonRpcController</a></li>
-<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Record.html" class="type-name-link external-link" title="class or interface in java.lang">Record</a>
+<li class="circle">org.consensusj.bitcoin.services.<a href="../../bitcoin/services/WalletAppKitService.html" class="type-name-link" title="class in org.consensusj.bitcoin.services">WalletAppKitService</a> (implements org.consensusj.bitcoin.json.rpc.<a href="../../bitcoin/json/rpc/BitcoinJsonRpc.html" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a>, java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a>)
 <ul>
-<li class="circle">org.consensusj.daemon.micronaut.<a href="BitcoinDaemonConfig.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">BitcoinDaemonConfig</a></li>
+<li class="circle">org.consensusj.daemon.micronaut.<a href="MicronautWalletAppKitService.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">MicronautWalletAppKitService</a></li>
 </ul>
 </li>
-<li class="circle">org.consensusj.bitcoin.services.<a href="../../bitcoin/services/WalletAppKitService.html" class="type-name-link" title="class in org.consensusj.bitcoin.services">WalletAppKitService</a> (implements org.consensusj.bitcoin.json.rpc.<a href="../../bitcoin/json/rpc/BitcoinJsonRpc.html" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a>, java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a>)
+</ul>
+</li>
+</ul>
+</section>
+<section class="hierarchy">
+<h2 title="Record Class Hierarchy">Record Class Hierarchy</h2>
 <ul>
-<li class="circle">org.consensusj.daemon.micronaut.<a href="MicronautWalletAppKitService.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">MicronautWalletAppKitService</a></li>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Record.html" class="type-name-link external-link" title="class or interface in java.lang">Record</a>
+<ul>
+<li class="circle">org.consensusj.daemon.micronaut.<a href="BitcoinDaemonConfig.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">BitcoinDaemonConfig</a></li>
 </ul>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/decentralizedid/Did.html b/apidoc/org/consensusj/decentralizedid/Did.html
index b7de39781..34ff8bc38 100644
--- a/apidoc/org/consensusj/decentralizedid/Did.html
+++ b/apidoc/org/consensusj/decentralizedid/Did.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Did (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Did (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.decentralizedid, class: Did">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/decentralizedid/btcr/BtcrDid.html b/apidoc/org/consensusj/decentralizedid/btcr/BtcrDid.html
index c31fd5d4c..219ad4a80 100644
--- a/apidoc/org/consensusj/decentralizedid/btcr/BtcrDid.html
+++ b/apidoc/org/consensusj/decentralizedid/btcr/BtcrDid.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BtcrDid (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BtcrDid (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.decentralizedid.btcr, class: BtcrDid">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -171,7 +185,7 @@ <h3>METHOD</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.decentralizedid.btcr.BtcrDid.METHOD">Constant Field Values</a></li>
 </ul>
 </dd>
diff --git a/apidoc/org/consensusj/decentralizedid/btcr/ExtendedTxRef.html b/apidoc/org/consensusj/decentralizedid/btcr/ExtendedTxRef.html
index 46651adaf..b561a21dc 100644
--- a/apidoc/org/consensusj/decentralizedid/btcr/ExtendedTxRef.html
+++ b/apidoc/org/consensusj/decentralizedid/btcr/ExtendedTxRef.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ExtendedTxRef (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ExtendedTxRef (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.decentralizedid.btcr, class: ExtendedTxRef">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/decentralizedid/btcr/package-summary.html b/apidoc/org/consensusj/decentralizedid/btcr/package-summary.html
index 82497f3a2..16bc00e4b 100644
--- a/apidoc/org/consensusj/decentralizedid/btcr/package-summary.html
+++ b/apidoc/org/consensusj/decentralizedid/btcr/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.decentralizedid.btcr (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.decentralizedid.btcr (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.decentralizedid.btcr">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/decentralizedid/btcr/package-tree.html b/apidoc/org/consensusj/decentralizedid/btcr/package-tree.html
index bb09661a0..ecf9cc801 100644
--- a/apidoc/org/consensusj/decentralizedid/btcr/package-tree.html
+++ b/apidoc/org/consensusj/decentralizedid/btcr/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.decentralizedid.btcr Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.decentralizedid.btcr Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.decentralizedid.btcr">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.decentralizedid.btcr</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/decentralizedid/package-summary.html b/apidoc/org/consensusj/decentralizedid/package-summary.html
index 3084120cd..9ff353d63 100644
--- a/apidoc/org/consensusj/decentralizedid/package-summary.html
+++ b/apidoc/org/consensusj/decentralizedid/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.decentralizedid (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.decentralizedid (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.decentralizedid">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/decentralizedid/package-tree.html b/apidoc/org/consensusj/decentralizedid/package-tree.html
index 779709e4d..186a59f9f 100644
--- a/apidoc/org/consensusj/decentralizedid/package-tree.html
+++ b/apidoc/org/consensusj/decentralizedid/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.decentralizedid Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.decentralizedid Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.decentralizedid">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.decentralizedid</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/ethereum/jsonrpc/EthTxCallObject.html b/apidoc/org/consensusj/ethereum/jsonrpc/EthTxCallObject.html
index 83d76914c..9675a8b07 100644
--- a/apidoc/org/consensusj/ethereum/jsonrpc/EthTxCallObject.html
+++ b/apidoc/org/consensusj/ethereum/jsonrpc/EthTxCallObject.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>EthTxCallObject (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>EthTxCallObject (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.ethereum.jsonrpc, class: EthTxCallObject">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/ethereum/jsonrpc/EthereumClient.html b/apidoc/org/consensusj/ethereum/jsonrpc/EthereumClient.html
index ea66f0e31..6fc35e36c 100644
--- a/apidoc/org/consensusj/ethereum/jsonrpc/EthereumClient.html
+++ b/apidoc/org/consensusj/ethereum/jsonrpc/EthereumClient.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>EthereumClient (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>EthereumClient (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.ethereum.jsonrpc, class: EthereumClient">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,20 +86,18 @@
 <h1 title="Class EthereumClient" class="title">Class EthereumClient</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.AbstractRpcClient</a>
-<div class="inheritance"><a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection</a>
+<div class="inheritance"><a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.DefaultRpcClient</a>
 <div class="inheritance">org.consensusj.ethereum.jsonrpc.EthereumClient</div>
 </div>
 </div>
-</div>
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code>, <code><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code>, <code><a href="../../jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/ethereum/jsonrpc/EthereumClient.html#line-19">EthereumClient</a></span>
-<span class="extends-implements">extends <a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></span></div>
+<span class="extends-implements">extends <a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></span></div>
 <div class="block">A partial implementation of an Ethereum RPC Client
 
  How to mine just a little for "reg test mode" in Eth:
@@ -100,8 +112,11 @@ <h1 title="Class EthereumClient" class="title">Class EthereumClient</h1>
 <section class="nested-class-summary" id="nested-class-summary">
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
+<h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Nested classes/interfaces inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h2>
+<code><a href="../../jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;<a href="../../jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="type parameter in DefaultRpcClient.TransientErrorMapper">T</a>&gt;, <a href="../../jsonrpc/DefaultRpcClient.TransportFactory.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></code></div>
+<div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
+<code><a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- =========== FIELD SUMMARY =========== -->
@@ -118,8 +133,8 @@ <h2>Field Summary</h2>
 <div class="col-last even-row-color">&nbsp;</div>
 </div>
 <div class="inherited-list">
-<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="../../jsonrpc/AbstractRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="../../jsonrpc/AbstractRpcClient.html#mapper">mapper</a></code></div>
+<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h3>
+<code><a href="../../jsonrpc/DefaultRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="../../jsonrpc/DefaultRpcClient.html#mapper">mapper</a></code></div>
 </section>
 </li>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -184,11 +199,8 @@ <h2>Method Summary</h2>
 </div>
 </div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></h3>
-<code><a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#getServerURI()">getServerURI</a>, <a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponse</a>, <a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="../../jsonrpc/AbstractRpcClient.html#base64Encode(java.lang.String)">base64Encode</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getDefaultSSLContext()">getDefaultSSLContext</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getDefaultType()">getDefaultType</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getMapper()">getMapper</a></code></div>
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h3>
+<code><a href="../../jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,com.fasterxml.jackson.databind.JavaType)">collectionTypeForClasses</a>, <a href="../../jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,java.lang.Class)">collectionTypeForClasses</a>, <a href="../../jsonrpc/DefaultRpcClient.html#defaultType()">defaultType</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getMapper()">getMapper</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getServerURI()">getServerURI</a>, <a href="../../jsonrpc/DefaultRpcClient.html#identityTransientErrorMapper(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">identityTransientErrorMapper</a>, <a href="../../jsonrpc/DefaultRpcClient.html#pollOnce(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">pollOnce</a>, <a href="../../jsonrpc/DefaultRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="../../jsonrpc/DefaultRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="../../jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponseAsync</a>, <a href="../../jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a>, <a href="../../jsonrpc/DefaultRpcClient.html#statusFromErrorResponse(org.consensusj.jsonrpc.JsonRpcResponse)">statusFromErrorResponse</a>, <a href="../../jsonrpc/DefaultRpcClient.html#temporarilyUnavailableResponse(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.Throwable)">temporarilyUnavailableResponse</a>, <a href="../../jsonrpc/DefaultRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a>, <a href="../../jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">waitForServer</a>, <a href="../../jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">waitForServer</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
@@ -196,11 +208,11 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
 <code><a href="../../jsonrpc/AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JacksonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></h3>
-<code><a href="../../jsonrpc/JacksonRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="../../jsonrpc/JacksonRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponse</a>, <a href="../../jsonrpc/JacksonRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a></code></div>
-<div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></h3>
-<code><a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#close()">close</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a></code></div>
+<code><a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#close()">close</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.lang.Object...)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.util.List)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.util.List)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.lang.Object...)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.util.List)">sendAsync</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcTransport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></h3>
+<code><a href="../../jsonrpc/JsonRpcTransport.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponse</a>, <a href="../../jsonrpc/JsonRpcTransport.html#syncGet(java.util.concurrent.CompletableFuture)">syncGet</a></code></div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/ethereum/jsonrpc/package-summary.html b/apidoc/org/consensusj/ethereum/jsonrpc/package-summary.html
index a523a3022..9c90fdc52 100644
--- a/apidoc/org/consensusj/ethereum/jsonrpc/package-summary.html
+++ b/apidoc/org/consensusj/ethereum/jsonrpc/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.ethereum.jsonrpc (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.ethereum.jsonrpc (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.ethereum.jsonrpc">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/ethereum/jsonrpc/package-tree.html b/apidoc/org/consensusj/ethereum/jsonrpc/package-tree.html
index ef28a819a..9d2591228 100644
--- a/apidoc/org/consensusj/ethereum/jsonrpc/package-tree.html
+++ b/apidoc/org/consensusj/ethereum/jsonrpc/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.ethereum.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.ethereum.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.ethereum.jsonrpc">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,25 +49,21 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.ethereum.jsonrpc</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
 <ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a> (implements org.consensusj.jsonrpc.<a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a>)
-<ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a>
+<li class="circle">org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a> (implements org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt;)
 <ul>
 <li class="circle">org.consensusj.ethereum.jsonrpc.<a href="EthereumClient.html" class="type-name-link" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></li>
 </ul>
 </li>
-</ul>
-</li>
 <li class="circle">org.consensusj.ethereum.jsonrpc.<a href="EthTxCallObject.html" class="type-name-link" title="class in org.consensusj.ethereum.jsonrpc">EthTxCallObject</a></li>
 </ul>
 </li>
diff --git a/apidoc/org/consensusj/exchange/BaseXChangeExchangeRateProvider.html b/apidoc/org/consensusj/exchange/BaseXChangeExchangeRateProvider.html
index 175ba2ea4..210b657f1 100644
--- a/apidoc/org/consensusj/exchange/BaseXChangeExchangeRateProvider.html
+++ b/apidoc/org/consensusj/exchange/BaseXChangeExchangeRateProvider.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BaseXChangeExchangeRateProvider (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BaseXChangeExchangeRateProvider (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange, class: BaseXChangeExchangeRateProvider">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -179,27 +193,21 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code>protected void</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#poll()" class="member-name-link">poll</a>()</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#registerExchangeRateObserver(org.consensusj.exchange.CurrencyUnitPair,org.consensusj.exchange.ExchangeRateObserver)" class="member-name-link">registerExchangeRateObserver</a><wbr>(<a href="CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>&nbsp;pair,
+ <a href="ExchangeRateObserver.html" title="interface in org.consensusj.exchange">ExchangeRateObserver</a>&nbsp;observer)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
 <div class="block"><span class="deprecated-label">Deprecated.</span></div>
-<div class="block">Poll the exchange for updated Tickers</div>
-</div>
+&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#registerExchangeRateObserver(org.consensusj.exchange.CurrencyUnitPair,org.consensusj.exchange.ExchangeRateObserver)" class="member-name-link">registerExchangeRateObserver</a><wbr>(<a href="CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>&nbsp;pair,
- <a href="ExchangeRateObserver.html" title="interface in org.consensusj.exchange">ExchangeRateObserver</a>&nbsp;observer)</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#start()" class="member-name-link">start</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
 <div class="block"><span class="deprecated-label">Deprecated.</span></div>
-&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code>void</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#start()" class="member-name-link">start</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Initialize the exchange provider and start polling thread</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code>void</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#stop()" class="member-name-link">stop</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#stop()" class="member-name-link">stop</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4 method-summary-table-tab6">
 <div class="block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">stop the polling thread</div>
 </div>
@@ -342,14 +350,6 @@ <h3>stop</h3>
 </section>
 </li>
 <li>
-<section class="detail" id="poll()">
-<h3>poll</h3>
-<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/exchange/BaseXChangeExchangeRateProvider.html#line-133">poll</a></span>()</div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-<div class="block">Poll the exchange for updated Tickers</div>
-</section>
-</li>
-<li>
 <section class="detail" id="registerExchangeRateObserver(org.consensusj.exchange.CurrencyUnitPair,org.consensusj.exchange.ExchangeRateObserver)">
 <h3>registerExchangeRateObserver</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/exchange/BaseXChangeExchangeRateProvider.html#line-149">registerExchangeRateObserver</a></span><wbr><span class="parameters">(<a href="CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>&nbsp;pair,
diff --git a/apidoc/org/consensusj/exchange/CurrencyUnitPair.html b/apidoc/org/consensusj/exchange/CurrencyUnitPair.html
index a3dc2eb9a..a3ea9bb8f 100644
--- a/apidoc/org/consensusj/exchange/CurrencyUnitPair.html
+++ b/apidoc/org/consensusj/exchange/CurrencyUnitPair.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CurrencyUnitPair (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CurrencyUnitPair (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange, class: CurrencyUnitPair">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/ExchangeRateChange.html b/apidoc/org/consensusj/exchange/ExchangeRateChange.html
index 2b609c9e4..622e46561 100644
--- a/apidoc/org/consensusj/exchange/ExchangeRateChange.html
+++ b/apidoc/org/consensusj/exchange/ExchangeRateChange.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ExchangeRateChange (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ExchangeRateChange (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange, class: ExchangeRateChange">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/ExchangeRateObserver.html b/apidoc/org/consensusj/exchange/ExchangeRateObserver.html
index a14bd594e..69d4a485a 100644
--- a/apidoc/org/consensusj/exchange/ExchangeRateObserver.html
+++ b/apidoc/org/consensusj/exchange/ExchangeRateObserver.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ExchangeRateObserver (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ExchangeRateObserver (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange, interface: ExchangeRateObserver">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/ExchangeUtils.html b/apidoc/org/consensusj/exchange/ExchangeUtils.html
index 2b289db41..2287db41b 100644
--- a/apidoc/org/consensusj/exchange/ExchangeUtils.html
+++ b/apidoc/org/consensusj/exchange/ExchangeUtils.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ExchangeUtils (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ExchangeUtils (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange, interface: ExchangeUtils">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -83,10 +101,10 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab1"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab1"><code><a href="#pairsConvert(java.lang.String%5B%5D)" class="member-name-link">pairsConvert</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;strings)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab1">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab1"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab1"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab1"><code><a href="#pairsConvert(java.util.List)" class="member-name-link">pairsConvert</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;&nbsp;strings)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/exchange/ObservableExchangeRateProvider.html b/apidoc/org/consensusj/exchange/ObservableExchangeRateProvider.html
index 3b48a7d21..7ab61f6fe 100644
--- a/apidoc/org/consensusj/exchange/ObservableExchangeRateProvider.html
+++ b/apidoc/org/consensusj/exchange/ObservableExchangeRateProvider.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ObservableExchangeRateProvider (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ObservableExchangeRateProvider (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange, interface: ObservableExchangeRateProvider">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html b/apidoc/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html
index de4161519..3f9f28ddb 100644
--- a/apidoc/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html
+++ b/apidoc/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>KnowmExchangeRateProvider.MonitoredCurrency (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>KnowmExchangeRateProvider.MonitoredCurrency (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange.knowm, class: KnowmExchangeRateProvider, class: MonitoredCurrency">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -77,7 +91,7 @@ <h1 title="Class KnowmExchangeRateProvider.MonitoredCurrency" class="title">Clas
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="KnowmExchangeRateProvider.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider</a></dd>
+<dd><code><a href="KnowmExchangeRateProvider.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">protected static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html#line-172">KnowmExchangeRateProvider.MonitoredCurrency</a></span>
@@ -97,7 +111,7 @@ <h2>Field Summary</h2>
 <div class="col-first even-row-color"><code>final org.knowm.xchange.currency.CurrencyPair</code></div>
 <div class="col-second even-row-color"><code><a href="#exchangePair" class="member-name-link">exchangePair</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="../ExchangeRateObserver.html" title="interface in org.consensusj.exchange">ExchangeRateObserver</a>&gt;</code></div>
+<div class="col-first odd-row-color"><code>final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="../ExchangeRateObserver.html" title="interface in org.consensusj.exchange">ExchangeRateObserver</a>&gt;</code></div>
 <div class="col-second odd-row-color"><code><a href="#observerList" class="member-name-link">observerList</a></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>final <a href="../CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a></code></div>
diff --git a/apidoc/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html b/apidoc/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html
index 0ca851d29..4a16feff6 100644
--- a/apidoc/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html
+++ b/apidoc/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>KnowmExchangeRateProvider (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>KnowmExchangeRateProvider (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange.knowm, class: KnowmExchangeRateProvider">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -123,7 +137,7 @@ <h2>Field Summary</h2>
 <div class="col-first even-row-color"><code>protected org.knowm.xchange.service.marketdata.MarketDataService</code></div>
 <div class="col-second even-row-color"><code><a href="#marketDataService" class="member-name-link">marketDataService</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="../CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>,<wbr><a href="KnowmExchangeRateProvider.MonitoredCurrency.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider.MonitoredCurrency</a>&gt;</code></div>
+<div class="col-first odd-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a><wbr>&lt;<a href="../CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>,<wbr><a href="KnowmExchangeRateProvider.MonitoredCurrency.html" title="class in org.consensusj.exchange.knowm">KnowmExchangeRateProvider.MonitoredCurrency</a>&gt;</code></div>
 <div class="col-second odd-row-color"><code><a href="#monitoredCurrencies" class="member-name-link">monitoredCurrencies</a></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>protected <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
@@ -132,7 +146,7 @@ <h2>Field Summary</h2>
 <div class="col-first odd-row-color"><code>protected javax.money.convert.ProviderContext</code></div>
 <div class="col-second odd-row-color"><code><a href="#providerContext" class="member-name-link">providerContext</a></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;javax.money.CurrencyUnit,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first even-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a><wbr>&lt;javax.money.CurrencyUnit,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second even-row-color"><code><a href="#tickerSymbolConversions" class="member-name-link">tickerSymbolConversions</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.MonitoredCurrency.html b/apidoc/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.MonitoredCurrency.html
index dd1d79fdb..d41cdaeeb 100644
--- a/apidoc/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.MonitoredCurrency.html
+++ b/apidoc/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.MonitoredCurrency.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ReactiveKnowmExchangeProvider.MonitoredCurrency (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ReactiveKnowmExchangeProvider.MonitoredCurrency (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange.knowm, class: ReactiveKnowmExchangeProvider, class: MonitoredCurrency">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -77,7 +91,7 @@ <h1 title="Class ReactiveKnowmExchangeProvider.MonitoredCurrency" class="title">
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="ReactiveKnowmExchangeProvider.html" title="class in org.consensusj.exchange.knowm">ReactiveKnowmExchangeProvider</a></dd>
+<dd><code><a href="ReactiveKnowmExchangeProvider.html" title="class in org.consensusj.exchange.knowm">ReactiveKnowmExchangeProvider</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">protected class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.html#line-111">ReactiveKnowmExchangeProvider.MonitoredCurrency</a></span>
diff --git a/apidoc/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.html b/apidoc/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.html
index f20393df4..9872681cb 100644
--- a/apidoc/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.html
+++ b/apidoc/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ReactiveKnowmExchangeProvider (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ReactiveKnowmExchangeProvider (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange.knowm, class: ReactiveKnowmExchangeProvider">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -119,7 +133,7 @@ <h2>Field Summary</h2>
 <div class="col-first even-row-color"><code>protected final org.knowm.xchange.ExchangeSpecification</code></div>
 <div class="col-second even-row-color"><code><a href="#exchangeSpecification" class="member-name-link">exchangeSpecification</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>protected final io.reactivex.rxjava3.core.Observable&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;</code></div>
+<div class="col-first odd-row-color"><code>protected final io.reactivex.rxjava3.core.Observable<wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Long.html" title="class or interface in java.lang" class="external-link">Long</a>&gt;</code></div>
 <div class="col-second odd-row-color"><code><a href="#interval" class="member-name-link">interval</a></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
 <div class="col-first even-row-color"><code>protected org.knowm.xchange.service.marketdata.MarketDataService</code></div>
@@ -128,13 +142,13 @@ <h2>Field Summary</h2>
 <div class="col-first odd-row-color"><code>protected <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second odd-row-color"><code><a href="#name" class="member-name-link">name</a></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="../CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>,<wbr><a href="ReactiveKnowmExchangeProvider.MonitoredCurrency.html" title="class in org.consensusj.exchange.knowm">ReactiveKnowmExchangeProvider.MonitoredCurrency</a>&gt;</code></div>
+<div class="col-first even-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a><wbr>&lt;<a href="../CurrencyUnitPair.html" title="class in org.consensusj.exchange">CurrencyUnitPair</a>,<wbr><a href="ReactiveKnowmExchangeProvider.MonitoredCurrency.html" title="class in org.consensusj.exchange.knowm">ReactiveKnowmExchangeProvider.MonitoredCurrency</a>&gt;</code></div>
 <div class="col-second even-row-color"><code><a href="#observablePairs" class="member-name-link">observablePairs</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>protected javax.money.convert.ProviderContext</code></div>
 <div class="col-second odd-row-color"><code><a href="#providerContext" class="member-name-link">providerContext</a></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;javax.money.CurrencyUnit,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first even-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a><wbr>&lt;javax.money.CurrencyUnit,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second even-row-color"><code><a href="#tickerSymbolConversions" class="member-name-link">tickerSymbolConversions</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/exchange/knowm/package-summary.html b/apidoc/org/consensusj/exchange/knowm/package-summary.html
index 82471b154..8f10604fb 100644
--- a/apidoc/org/consensusj/exchange/knowm/package-summary.html
+++ b/apidoc/org/consensusj/exchange/knowm/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.exchange.knowm (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.exchange.knowm (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange.knowm">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/knowm/package-tree.html b/apidoc/org/consensusj/exchange/knowm/package-tree.html
index f8e650027..e804bc431 100644
--- a/apidoc/org/consensusj/exchange/knowm/package-tree.html
+++ b/apidoc/org/consensusj/exchange/knowm/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.exchange.knowm Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.exchange.knowm Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.exchange.knowm">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.exchange.knowm</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/exchange/package-summary.html b/apidoc/org/consensusj/exchange/package-summary.html
index 6dc5f9878..cc71a78a1 100644
--- a/apidoc/org/consensusj/exchange/package-summary.html
+++ b/apidoc/org/consensusj/exchange/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.exchange (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.exchange (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/package-tree.html b/apidoc/org/consensusj/exchange/package-tree.html
index bc0db401c..e6f33c4d0 100644
--- a/apidoc/org/consensusj/exchange/package-tree.html
+++ b/apidoc/org/consensusj/exchange/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.exchange Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.exchange Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.exchange">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.exchange</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/exchange/rx/ExchangeRateUpdate.html b/apidoc/org/consensusj/exchange/rx/ExchangeRateUpdate.html
index 87d4c87d5..fc9cc943b 100644
--- a/apidoc/org/consensusj/exchange/rx/ExchangeRateUpdate.html
+++ b/apidoc/org/consensusj/exchange/rx/ExchangeRateUpdate.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ExchangeRateUpdate (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ExchangeRateUpdate (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange.rx, class: ExchangeRateUpdate">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/rx/ObservablePair.html b/apidoc/org/consensusj/exchange/rx/ObservablePair.html
index 81d141ddd..174f76f76 100644
--- a/apidoc/org/consensusj/exchange/rx/ObservablePair.html
+++ b/apidoc/org/consensusj/exchange/rx/ObservablePair.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ObservablePair (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ObservablePair (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange.rx, interface: ObservablePair">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/rx/PolledObservablePair.html b/apidoc/org/consensusj/exchange/rx/PolledObservablePair.html
index 710309701..20e73683d 100644
--- a/apidoc/org/consensusj/exchange/rx/PolledObservablePair.html
+++ b/apidoc/org/consensusj/exchange/rx/PolledObservablePair.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>PolledObservablePair (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>PolledObservablePair (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange.rx, class: PolledObservablePair">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/rx/ReactiveExchange.html b/apidoc/org/consensusj/exchange/rx/ReactiveExchange.html
index cea2eb443..656314197 100644
--- a/apidoc/org/consensusj/exchange/rx/ReactiveExchange.html
+++ b/apidoc/org/consensusj/exchange/rx/ReactiveExchange.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ReactiveExchange (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ReactiveExchange (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange.rx, interface: ReactiveExchange">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/rx/package-summary.html b/apidoc/org/consensusj/exchange/rx/package-summary.html
index 400da28b1..c48bf34fd 100644
--- a/apidoc/org/consensusj/exchange/rx/package-summary.html
+++ b/apidoc/org/consensusj/exchange/rx/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.exchange.rx (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.exchange.rx (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.exchange.rx">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/exchange/rx/package-tree.html b/apidoc/org/consensusj/exchange/rx/package-tree.html
index ed4af9677..7184845da 100644
--- a/apidoc/org/consensusj/exchange/rx/package-tree.html
+++ b/apidoc/org/consensusj/exchange/rx/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.exchange.rx Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.exchange.rx Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.exchange.rx">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.exchange.rx</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/jsonrpc/AbstractRpcClient.html b/apidoc/org/consensusj/jsonrpc/AbstractRpcClient.html
deleted file mode 100644
index ed2a32ecd..000000000
--- a/apidoc/org/consensusj/jsonrpc/AbstractRpcClient.html
+++ /dev/null
@@ -1,299 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>AbstractRpcClient (consensusj 0.7.0-alpha2 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: AbstractRpcClient">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../script.js"></script>
-<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../index-all.html">Index</a></li>
-<li><a href="../../../help-doc.html#class">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field-summary">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor-summary">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method-summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li><a href="#field-detail">Field</a>&nbsp;|&nbsp;</li>
-<li><a href="#constructor-detail">Constr</a>&nbsp;|&nbsp;</li>
-<li><a href="#method-detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.jsonrpc</a></div>
-<h1 title="Class AbstractRpcClient" class="title">Class AbstractRpcClient</h1>
-</div>
-<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">org.consensusj.jsonrpc.AbstractRpcClient</div>
-</div>
-<section class="class-description" id="class-description">
-<dl class="notes">
-<dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code>, <code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
-</dl>
-<dl class="notes">
-<dt>Direct Known Subclasses:</dt>
-<dd><code><a href="JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></code>, <code><a href="JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></code></dd>
-</dl>
-<hr>
-<div class="type-signature"><span class="modifiers">public abstract class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AbstractRpcClient.html#line-48">AbstractRpcClient</a></span>
-<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
-implements <a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></span></div>
-<div class="block">Abstract Base class for a strongly-typed, Jackson-based JSON-RPC client. Most of the work is done
- in default methods in <a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc"><code>JacksonRpcClient</code></a> This abstract class implements the constructors, static fields, and
- getters, but leaves the core <code>sendRequestForResponse</code> method as <code>abstract</code> to be implemented by subclasses
- allowing implementation with alternative HTTP client libraries.</div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-<li>
-<section class="nested-class-summary" id="nested-class-summary">
-<h2>Nested Class Summary</h2>
-<div class="inherited-list">
-<h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
-</section>
-</li>
-<!-- =========== FIELD SUMMARY =========== -->
-<li>
-<section class="field-summary" id="field-summary">
-<h2>Field Summary</h2>
-<div class="caption"><span>Fields</span></div>
-<div class="summary-table three-column-summary">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Field</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code>protected final <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></code></div>
-<div class="col-second even-row-color"><code><a href="#jsonRpcVersion" class="member-name-link">jsonRpcVersion</a></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-<div class="col-first odd-row-color"><code>protected final <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a></code></div>
-<div class="col-second odd-row-color"><code><a href="#mapper" class="member-name-link">mapper</a></code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-</div>
-</section>
-</li>
-<!-- ======== CONSTRUCTOR SUMMARY ======== -->
-<li>
-<section class="constructor-summary" id="constructor-summary">
-<h2>Constructor Summary</h2>
-<div class="caption"><span>Constructors</span></div>
-<div class="summary-table two-column-summary">
-<div class="table-header col-first">Constructor</div>
-<div class="table-header col-last">Description</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version)" class="member-name-link">AbstractRpcClient</a><wbr>(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion)</code></div>
-<div class="col-last even-row-color">&nbsp;</div>
-</div>
-</section>
-</li>
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method-summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>protected static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#base64Encode(java.lang.String)" class="member-name-link">base64Encode</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;authString)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
-<div class="block">Encode username password as Base64 for basic authentication</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>protected static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#getDefaultSSLContext()" class="member-name-link">getDefaultSSLContext</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
-<div class="block">Return the default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link"><code>SSLContext</code></a> without declaring a checked exception</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getDefaultType()" class="member-name-link">getDefaultType</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getJsonRpcVersion()" class="member-name-link">getJsonRpcVersion</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Return the JSON-RPC version used by the implementation</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getMapper()" class="member-name-link">getMapper</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-</div>
-</div>
-</div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
-<code><a href="AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JacksonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></h3>
-<code><a href="JacksonRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="JacksonRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)">send</a>, <a href="JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)">send</a>, <a href="JacksonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="JacksonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponse</a>, <a href="JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponse</a>, <a href="JacksonRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a>, <a href="JacksonRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></h3>
-<code><a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="JsonRpcClient.html#close()">close</a>, <a href="JsonRpcClient.html#getServerURI()">getServerURI</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a></code></div>
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ============ FIELD DETAIL =========== -->
-<li>
-<section class="field-details" id="field-detail">
-<h2>Field Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="jsonRpcVersion">
-<h3>jsonRpcVersion</h3>
-<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AbstractRpcClient.html#line-56">jsonRpcVersion</a></span></div>
-</section>
-</li>
-<li>
-<section class="detail" id="mapper">
-<h3>mapper</h3>
-<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AbstractRpcClient.html#line-57">mapper</a></span></div>
-</section>
-</li>
-</ul>
-</section>
-</li>
-<!-- ========= CONSTRUCTOR DETAIL ======== -->
-<li>
-<section class="constructor-details" id="constructor-detail">
-<h2>Constructor Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="&lt;init&gt;(org.consensusj.jsonrpc.JsonRpcMessage.Version)">
-<h3>AbstractRpcClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AbstractRpcClient.html#line-60">AbstractRpcClient</a></span><wbr><span class="parameters">(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion)</span></div>
-</section>
-</li>
-</ul>
-</section>
-</li>
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method-detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="getJsonRpcVersion()">
-<h3>getJsonRpcVersion</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AbstractRpcClient.html#line-68">getJsonRpcVersion</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcClient.html#getJsonRpcVersion()">JsonRpcClient</a></code></span></div>
-<div class="block">Return the JSON-RPC version used by the implementation</div>
-<dl class="notes">
-<dt>Specified by:</dt>
-<dd><code><a href="JsonRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
-<dt>Returns:</dt>
-<dd>JSON-RPC version</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getMapper()">
-<h3>getMapper</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AbstractRpcClient.html#line-73">getMapper</a></span>()</div>
-<dl class="notes">
-<dt>Specified by:</dt>
-<dd><code><a href="JacksonRpcClient.html#getMapper()">getMapper</a></code>&nbsp;in interface&nbsp;<code><a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getDefaultType()">
-<h3>getDefaultType</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AbstractRpcClient.html#line-78">getDefaultType</a></span>()</div>
-<dl class="notes">
-<dt>Specified by:</dt>
-<dd><code><a href="JacksonRpcClient.html#getDefaultType()">getDefaultType</a></code>&nbsp;in interface&nbsp;<code><a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getDefaultSSLContext()">
-<h3>getDefaultSSLContext</h3>
-<div class="member-signature"><span class="modifiers">protected static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AbstractRpcClient.html#line-87">getDefaultSSLContext</a></span>()</div>
-<div class="block">Return the default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link"><code>SSLContext</code></a> without declaring a checked exception</div>
-<dl class="notes">
-<dt>Returns:</dt>
-<dd>The default <code>SSLContext</code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="base64Encode(java.lang.String)">
-<h3>base64Encode</h3>
-<div class="member-signature"><span class="modifiers">protected static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AbstractRpcClient.html#line-103">base64Encode</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;authString)</span></div>
-<div class="block">Encode username password as Base64 for basic authentication
- <p>
- We're using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Base64.html" title="class or interface in java.util" class="external-link"><code>Base64</code></a>, which requires Android 8.0 or later.</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>authString</code> - An authorization string of the form `username:password`</dd>
-<dt>Returns:</dt>
-<dd>A compliant Base64 encoding of `authString`</dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-</ul>
-</section>
-<!-- ========= END OF CLASS DATA ========= -->
-</main>
-</div>
-</div>
-</body>
-</html>
diff --git a/apidoc/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html b/apidoc/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html
index 5091b7288..1cf55f002 100644
--- a/apidoc/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html
+++ b/apidoc/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AsyncSupport.ThrowingSupplier (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AsyncSupport.ThrowingSupplier (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, interface: AsyncSupport, interface: ThrowingSupplier">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -82,7 +96,7 @@ <h1 title="Interface AsyncSupport.ThrowingSupplier" class="title">Interface Asyn
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></dd>
+<dd><code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code></dd>
 </dl>
 <dl class="notes">
 <dt>Functional Interface:</dt>
@@ -90,7 +104,7 @@ <h1 title="Interface AsyncSupport.ThrowingSupplier" class="title">Interface Asyn
 </dl>
 <hr>
 <div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/FunctionalInterface.html" title="class or interface in java.lang" class="external-link">@FunctionalInterface</a>
-</span><span class="modifiers">public static interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-74">AsyncSupport.ThrowingSupplier</a>&lt;T&gt;</span><span class="extends-implements">
+</span><span class="modifiers">public static interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-79">AsyncSupport.ThrowingSupplier</a>&lt;T&gt;</span><span class="extends-implements">
 extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;T&gt;</span></div>
 <div class="block">Subinterface of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link"><code>Supplier</code></a> for Lambdas which throw <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a>.
  Can be used for two purposes:
@@ -144,7 +158,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="get()">
 <h3>get</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html#line-81">get</a></span>()</div>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html#line-86">get</a></span>()</div>
 <div class="block">Gets a result wrapping checked Exceptions with <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" title="class or interface in java.lang" class="external-link"><code>RuntimeException</code></a></div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -157,7 +171,7 @@ <h3>get</h3>
 <li>
 <section class="detail" id="getThrows()">
 <h3>getThrows</h3>
-<div class="member-signature"><span class="return-type"><a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html#line-96">getThrows</a></span>()
+<div class="member-signature"><span class="return-type"><a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html#line-101">getThrows</a></span>()
      throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></span></div>
 <div class="block">Gets a result.</div>
 <dl class="notes">
diff --git a/apidoc/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html b/apidoc/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html
new file mode 100644
index 000000000..86b670a8d
--- /dev/null
+++ b/apidoc/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html
@@ -0,0 +1,198 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>AsyncSupport.TransientErrorFilter (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: package: org.consensusj.jsonrpc, interface: AsyncSupport, interface: TransientErrorFilter">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.jsonrpc</a></div>
+<h1 title="Interface AsyncSupport.TransientErrorFilter" class="title">Interface AsyncSupport.TransientErrorFilter</h1>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>Enclosing interface:</dt>
+<dd><code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public static interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-108">AsyncSupport.TransientErrorFilter</a></span></div>
+<div class="block">Error filter for resilient polling. Uses a Predicate to specify what to ignore and a Consumer to log
+ what is ignored.</div>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#handle(T,java.lang.Throwable)" class="member-name-link">handle</a><wbr>(T&nbsp;result,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
+<div class="block">Handler to transpose to a "future maybe".</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>boolean</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#isTransient(java.lang.Throwable)" class="member-name-link">isTransient</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#log(java.lang.Throwable)" class="member-name-link">log</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab1"><code>static <a href="AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab1"><code><a href="#none()" class="member-name-link">none</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab1">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1"><code>static <a href="AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1"><code><a href="#of(java.util.function.Predicate,java.util.function.Consumer)" class="member-name-link">of</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Predicate.html" title="class or interface in java.util.function" class="external-link">Predicate</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&gt;&nbsp;filter,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Consumer.html" title="class or interface in java.util.function" class="external-link">Consumer</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&gt;&nbsp;logger)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1">&nbsp;</div>
+</div>
+</div>
+</div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="of(java.util.function.Predicate,java.util.function.Consumer)">
+<h3>of</h3>
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html#line-109">of</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Predicate.html" title="class or interface in java.util.function" class="external-link">Predicate</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&gt;&nbsp;filter,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Consumer.html" title="class or interface in java.util.function" class="external-link">Consumer</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&gt;&nbsp;logger)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="none()">
+<h3>none</h3>
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html#line-123">none</a></span>()</div>
+</section>
+</li>
+<li>
+<section class="detail" id="handle(T,java.lang.Throwable)">
+<h3 id="handle(java.lang.Object,java.lang.Throwable)">handle</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;T&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html#line-139">handle</a></span><wbr><span class="parameters">(T&nbsp;result,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</span></div>
+<div class="block">Handler to transpose to a "future maybe". Use with <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html#handle(java.util.function.BiFunction)" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture.handle(BiFunction)</code></a>
+ followed by <code>.thenCompose(Function.identity())</code> (or if JDK 12+ <code>CompletableFuture#exceptionallyCompose(Function)</code>)
+ to swallow transient errors.</div>
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>T</code> - The desired return type</dd>
+<dt>Parameters:</dt>
+<dd><code>result</code> - T</dd>
+<dd><code>t</code> - An error, possibly transient</dd>
+<dt>Returns:</dt>
+<dd>A completable future of future maybe</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="isTransient(java.lang.Throwable)">
+<h3>isTransient</h3>
+<div class="member-signature"><span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html#line-151">isTransient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="log(java.lang.Throwable)">
+<h3>log</h3>
+<div class="member-signature"><span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html#line-152">log</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/jsonrpc/AsyncSupport.html b/apidoc/org/consensusj/jsonrpc/AsyncSupport.html
index cdfbebc80..a9fc2e969 100644
--- a/apidoc/org/consensusj/jsonrpc/AsyncSupport.html
+++ b/apidoc/org/consensusj/jsonrpc/AsyncSupport.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AsyncSupport (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AsyncSupport (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, interface: AsyncSupport">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -74,16 +88,16 @@ <h1 title="Interface AsyncSupport" class="title">Interface AsyncSupport</h1>
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Known Subinterfaces:</dt>
-<dd><code><a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code>, <code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code>, <code><a href="../bitcoin/rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></code>, <code><a href="../bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></code>, <code><a href="../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></code></dd>
+<dd><code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt;</code>, <code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;</code>, <code><a href="../bitcoin/rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></code>, <code><a href="../bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a></code>, <code><a href="../rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a></code></dd>
 </dl>
 <dl class="notes">
 <dt>All Known Implementing Classes:</dt>
-<dd><code><a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></code>, <code><a href="../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></code>, <code><a href="../bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></code>, <code><a href="../ethereum/jsonrpc/EthereumClient.html" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></code>, <code><a href="JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></code>, <code><a href="JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></code>, <code><a href="../namecoin/jsonrpc/NamecoinClient.html" title="class in org.consensusj.namecoin.jsonrpc">NamecoinClient</a></code>, <code><a href="../bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></code>, <code><a href="../bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></dd>
+<dd><code><a href="../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></code>, <code><a href="../bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></code>, <code><a href="DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></code>, <code><a href="../ethereum/jsonrpc/EthereumClient.html" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></code>, <code><a href="JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></code>, <code><a href="JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></code>, <code><a href="../namecoin/jsonrpc/NamecoinClient.html" title="class in org.consensusj.namecoin.jsonrpc">NamecoinClient</a></code>, <code><a href="../bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></code>, <code><a href="../bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-13">AsyncSupport</a></span></div>
+<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-18">AsyncSupport</a></span></div>
 <div class="block">Helper methods for creating asynchronous calls using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture</code></a>. Since the
- synchronous methods in <a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc"><code>AbstractRpcClient</code></a> throw checked exceptions this interface
+ synchronous methods in <a href="DefaultRpcClient.html" title="class in org.consensusj.jsonrpc"><code>DefaultRpcClient</code></a> throw checked exceptions this interface
  provides wrapper support to make it easier to convert them to async calls.</div>
 </section>
 <section class="summary">
@@ -102,6 +116,11 @@ <h2>Nested Class Summary</h2>
 <div class="col-last even-row-color">
 <div class="block">Subinterface of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link"><code>Supplier</code></a> for Lambdas which throw <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a>.</div>
 </div>
+<div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
+<div class="col-second odd-row-color"><code><a href="AsyncSupport.TransientErrorFilter.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
+<div class="col-last odd-row-color">
+<div class="block">Error filter for resilient polling.</div>
+</div>
 </div>
 </section>
 </li>
@@ -121,12 +140,12 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
 <div class="block">Return the default executor for supplying asynchronicity.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;T&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)" class="member-name-link">supplyAsync</a><wbr>(<a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;T&gt;&nbsp;throwingSupplier)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
 <div class="block">Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;T&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)" class="member-name-link">supplyAsync</a><wbr>(<a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;T&gt;&nbsp;throwingSupplier,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/Executor.html" title="class or interface in java.util.concurrent" class="external-link">Executor</a>&nbsp;executor)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
@@ -149,7 +168,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">
 <h3>supplyAsync</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-21">supplyAsync</a></span><wbr><span class="parameters">(<a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;T&gt;&nbsp;throwingSupplier)</span></div>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-26">supplyAsync</a></span><wbr><span class="parameters">(<a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;T&gt;&nbsp;throwingSupplier)</span></div>
 <div class="block">Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
@@ -164,7 +183,7 @@ <h3>supplyAsync</h3>
 <li>
 <section class="detail" id="supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">
 <h3>supplyAsync</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-33">supplyAsync</a></span><wbr><span class="parameters">(<a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;T&gt;&nbsp;throwingSupplier,
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-38">supplyAsync</a></span><wbr><span class="parameters">(<a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;T&gt;&nbsp;throwingSupplier,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/Executor.html" title="class or interface in java.util.concurrent" class="external-link">Executor</a>&nbsp;executor)</span></div>
 <div class="block">Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</div>
 <dl class="notes">
@@ -181,7 +200,7 @@ <h3>supplyAsync</h3>
 <li>
 <section class="detail" id="getDefaultAsyncExecutor()">
 <h3>getDefaultAsyncExecutor</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/Executor.html" title="class or interface in java.util.concurrent" class="external-link">Executor</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-42">getDefaultAsyncExecutor</a></span>()</div>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/Executor.html" title="class or interface in java.util.concurrent" class="external-link">Executor</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/AsyncSupport.html#line-47">getDefaultAsyncExecutor</a></span>()</div>
 <div class="block">Return the default executor for supplying asynchronicity.</div>
 <dl class="notes">
 <dt>Returns:</dt>
diff --git a/apidoc/org/consensusj/jsonrpc/CompositeTrustManager.html b/apidoc/org/consensusj/jsonrpc/CompositeTrustManager.html
index 1c1ff92fe..00900748e 100644
--- a/apidoc/org/consensusj/jsonrpc/CompositeTrustManager.html
+++ b/apidoc/org/consensusj/jsonrpc/CompositeTrustManager.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CompositeTrustManager (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CompositeTrustManager (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: CompositeTrustManager">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,7 +94,7 @@ <h1 title="Class CompositeTrustManager" class="title">Class CompositeTrustManage
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/TrustManager.html" title="class or interface in javax.net.ssl" class="external-link">TrustManager</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/X509TrustManager.html" title="class or interface in javax.net.ssl" class="external-link">X509TrustManager</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-30">CompositeTrustManager</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-29">CompositeTrustManager</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
 implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/X509TrustManager.html" title="class or interface in javax.net.ssl" class="external-link">X509TrustManager</a></span></div>
 <div class="block">A Trust Manager that adds a second trust store (key store) to the default trust store.
@@ -108,7 +122,7 @@ <h2>Constructor Summary</h2>
 <section class="method-summary" id="method-summary">
 <h2>Method Summary</h2>
 <div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button><button id="method-summary-table-tab6" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab6', 3)" class="table-tab">Deprecated Methods</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
 <div id="method-summary-table.tabpanel" role="tabpanel">
 <div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
 <div class="table-header col-first">Modifier and Type</div>
@@ -135,16 +149,6 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
 <div class="block">Create an SSLContext using an alternative Trust Store</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getAlternateSSLSocketFactory(java.io.InputStream)" class="member-name-link">getAlternateSSLSocketFactory</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getAlternateSSLSocketFactory(java.nio.file.Path)" class="member-name-link">getAlternateSSLSocketFactory</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/Path.html" title="class or interface in java.nio.file" class="external-link">Path</a>&nbsp;trustStorePath)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#getCompositeSSLContext(java.io.InputStream)" class="member-name-link">getCompositeSSLContext</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
@@ -157,16 +161,6 @@ <h2>Method Summary</h2>
 <div class="block">Used to create an SSLContext using <a href="CompositeTrustManager.html" title="class in org.consensusj.jsonrpc"><code>CompositeTrustManager</code></a>
  See: https://stackoverflow.com/questions/859111/how-can-i-use-different-certificates-on-specific-connections</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getCompositeSSLSocketFactory(java.io.InputStream)" class="member-name-link">getCompositeSSLSocketFactory</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6"><code><a href="#getCompositeSSLSocketFactory(java.nio.file.Path)" class="member-name-link">getCompositeSSLSocketFactory</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/Path.html" title="class or interface in java.nio.file" class="external-link">Path</a>&nbsp;trustStorePath)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4 method-summary-table-tab6">
-<div class="block"><span class="deprecated-label">Deprecated.</span></div>
-</div>
 </div>
 </div>
 </div>
@@ -187,7 +181,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(java.io.InputStream)">
 <h3>CompositeTrustManager</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-39">CompositeTrustManager</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-38">CompositeTrustManager</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</span></div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>trustStoreStream</code> - Input stream for Java keystore with additional certificates</dd>
@@ -197,7 +191,7 @@ <h3>CompositeTrustManager</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(java.nio.file.Path)">
 <h3>CompositeTrustManager</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-61">CompositeTrustManager</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/Path.html" title="class or interface in java.nio.file" class="external-link">Path</a>&nbsp;trustStorePath)</span>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-60">CompositeTrustManager</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/Path.html" title="class or interface in java.nio.file" class="external-link">Path</a>&nbsp;trustStorePath)</span>
                       throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/FileNotFoundException.html" title="class or interface in java.io" class="external-link">FileNotFoundException</a></span></div>
 <dl class="notes">
 <dt>Parameters:</dt>
@@ -216,83 +210,9 @@ <h3>CompositeTrustManager</h3>
 <h2>Method Details</h2>
 <ul class="member-list">
 <li>
-<section class="detail" id="getCompositeSSLSocketFactory(java.nio.file.Path)">
-<h3>getCompositeSSLSocketFactory</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-65">getCompositeSSLSocketFactory</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/Path.html" title="class or interface in java.nio.file" class="external-link">Path</a>&nbsp;trustStorePath)</span>
-                                                     throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyManagementException.html" title="class or interface in java.security" class="external-link">KeyManagementException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/FileNotFoundException.html" title="class or interface in java.io" class="external-link">FileNotFoundException</a></span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyManagementException.html" title="class or interface in java.security" class="external-link">KeyManagementException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/FileNotFoundException.html" title="class or interface in java.io" class="external-link">FileNotFoundException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getCompositeSSLSocketFactory(java.io.InputStream)">
-<h3>getCompositeSSLSocketFactory</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-72">getCompositeSSLSocketFactory</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</span>
-                                                     throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyManagementException.html" title="class or interface in java.security" class="external-link">KeyManagementException</a></span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyManagementException.html" title="class or interface in java.security" class="external-link">KeyManagementException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getAlternateSSLSocketFactory(java.nio.file.Path)">
-<h3>getAlternateSSLSocketFactory</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-78">getAlternateSSLSocketFactory</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/Path.html" title="class or interface in java.nio.file" class="external-link">Path</a>&nbsp;trustStorePath)</span>
-                                                     throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyStoreException.html" title="class or interface in java.security" class="external-link">KeyStoreException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyManagementException.html" title="class or interface in java.security" class="external-link">KeyManagementException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/CertificateException.html" title="class or interface in java.security.cert" class="external-link">CertificateException</a></span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyStoreException.html" title="class or interface in java.security" class="external-link">KeyStoreException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyManagementException.html" title="class or interface in java.security" class="external-link">KeyManagementException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/CertificateException.html" title="class or interface in java.security.cert" class="external-link">CertificateException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="getAlternateSSLSocketFactory(java.io.InputStream)">
-<h3>getAlternateSSLSocketFactory</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-83">getAlternateSSLSocketFactory</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</span>
-                                                     throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyStoreException.html" title="class or interface in java.security" class="external-link">KeyStoreException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyManagementException.html" title="class or interface in java.security" class="external-link">KeyManagementException</a>,
-<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/CertificateException.html" title="class or interface in java.security.cert" class="external-link">CertificateException</a></span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyStoreException.html" title="class or interface in java.security" class="external-link">KeyStoreException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyManagementException.html" title="class or interface in java.security" class="external-link">KeyManagementException</a></code></dd>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/CertificateException.html" title="class or interface in java.security.cert" class="external-link">CertificateException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
 <section class="detail" id="getCompositeSSLContext(java.nio.file.Path)">
 <h3>getCompositeSSLContext</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-93">getCompositeSSLContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/Path.html" title="class or interface in java.nio.file" class="external-link">Path</a>&nbsp;trustStorePath)</span>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-68">getCompositeSSLContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/Path.html" title="class or interface in java.nio.file" class="external-link">Path</a>&nbsp;trustStorePath)</span>
                                          throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyManagementException.html" title="class or interface in java.security" class="external-link">KeyManagementException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/FileNotFoundException.html" title="class or interface in java.io" class="external-link">FileNotFoundException</a></span></div>
@@ -309,7 +229,7 @@ <h3>getCompositeSSLContext</h3>
 <li>
 <section class="detail" id="getCompositeSSLContext(java.io.InputStream)">
 <h3>getCompositeSSLContext</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-103">getCompositeSSLContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</span>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-78">getCompositeSSLContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</span>
                                          throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyManagementException.html" title="class or interface in java.security" class="external-link">KeyManagementException</a></span></div>
 <div class="block">Used to create an SSLContext using <a href="CompositeTrustManager.html" title="class in org.consensusj.jsonrpc"><code>CompositeTrustManager</code></a>
@@ -324,7 +244,7 @@ <h3>getCompositeSSLContext</h3>
 <li>
 <section class="detail" id="getAlternateSSLContext(java.nio.file.Path)">
 <h3>getAlternateSSLContext</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-111">getAlternateSSLContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/Path.html" title="class or interface in java.nio.file" class="external-link">Path</a>&nbsp;trustStorePath)</span>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-86">getAlternateSSLContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/nio/file/Path.html" title="class or interface in java.nio.file" class="external-link">Path</a>&nbsp;trustStorePath)</span>
                                          throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyStoreException.html" title="class or interface in java.security" class="external-link">KeyStoreException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a>,
@@ -344,7 +264,7 @@ <h3>getAlternateSSLContext</h3>
 <li>
 <section class="detail" id="getAlternateSSLContext(java.io.InputStream)">
 <h3>getAlternateSSLContext</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-119">getAlternateSSLContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</span>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-94">getAlternateSSLContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/InputStream.html" title="class or interface in java.io" class="external-link">InputStream</a>&nbsp;trustStoreStream)</span>
                                          throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/KeyStoreException.html" title="class or interface in java.security" class="external-link">KeyStoreException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
 <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/NoSuchAlgorithmException.html" title="class or interface in java.security" class="external-link">NoSuchAlgorithmException</a>,
@@ -366,7 +286,7 @@ <h3>getAlternateSSLContext</h3>
 <li>
 <section class="detail" id="checkClientTrusted(java.security.cert.X509Certificate[],java.lang.String)">
 <h3>checkClientTrusted</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-135">checkClientTrusted</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/X509Certificate.html" title="class or interface in java.security.cert" class="external-link">X509Certificate</a>[]&nbsp;chain,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-105">checkClientTrusted</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/X509Certificate.html" title="class or interface in java.security.cert" class="external-link">X509Certificate</a>[]&nbsp;chain,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;authType)</span>
                         throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/CertificateException.html" title="class or interface in java.security.cert" class="external-link">CertificateException</a></span></div>
 <dl class="notes">
@@ -380,7 +300,7 @@ <h3>checkClientTrusted</h3>
 <li>
 <section class="detail" id="checkServerTrusted(java.security.cert.X509Certificate[],java.lang.String)">
 <h3>checkServerTrusted</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-148">checkServerTrusted</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/X509Certificate.html" title="class or interface in java.security.cert" class="external-link">X509Certificate</a>[]&nbsp;chain,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-118">checkServerTrusted</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/X509Certificate.html" title="class or interface in java.security.cert" class="external-link">X509Certificate</a>[]&nbsp;chain,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;authType)</span>
                         throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/CertificateException.html" title="class or interface in java.security.cert" class="external-link">CertificateException</a></span></div>
 <dl class="notes">
@@ -394,7 +314,7 @@ <h3>checkServerTrusted</h3>
 <li>
 <section class="detail" id="getAcceptedIssuers()">
 <h3>getAcceptedIssuers</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/X509Certificate.html" title="class or interface in java.security.cert" class="external-link">X509Certificate</a>[]</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-161">getAcceptedIssuers</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/security/cert/X509Certificate.html" title="class or interface in java.security.cert" class="external-link">X509Certificate</a>[]</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/CompositeTrustManager.html#line-131">getAcceptedIssuers</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/X509TrustManager.html#getAcceptedIssuers()" title="class or interface in javax.net.ssl" class="external-link">getAcceptedIssuers</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/X509TrustManager.html" title="class or interface in javax.net.ssl" class="external-link">X509TrustManager</a></code></dd>
diff --git a/apidoc/org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html b/apidoc/org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html
new file mode 100644
index 000000000..0f7d97705
--- /dev/null
+++ b/apidoc/org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html
@@ -0,0 +1,174 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>DefaultRpcClient.TransientErrorMapper (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: DefaultRpcClient, interface: TransientErrorMapper">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.jsonrpc</a></div>
+<h1 title="Interface DefaultRpcClient.TransientErrorMapper" class="title">Interface DefaultRpcClient.TransientErrorMapper&lt;T&gt;</h1>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>T</code> - The expected result type</dd>
+</dl>
+<dl class="notes">
+<dt>Enclosing class:</dt>
+<dd><code><a href="DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></code></dd>
+</dl>
+<dl class="notes">
+<dt>Functional Interface:</dt>
+<dd>This is a functional interface and can therefore be used as the assignment target for a lambda expression or method reference.</dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/FunctionalInterface.html" title="class or interface in java.lang" class="external-link">@FunctionalInterface</a>
+</span><span class="modifiers">public static interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-253">DefaultRpcClient.TransientErrorMapper</a>&lt;T&gt;</span></div>
+<div class="block">Functional interface for ignoring what are considered "transient" errors. The definition of what is transient
+ may vary depending upon the application. Different implementations of this function can be created for
+ different applications.
+ <p>
+ The <code>JsonRpcResponse</code> returned may be a "synthetic" response, that is generated by the client,
+ not by the server. The synthetic response will look like this:
+     <ul>
+         <li>error.code: -20000</li>
+         <li>error.message: "Server temporarily unavailable"</li>
+         <li>error.data: Detailed string message, e.g. "Connection refused"</li>
+     </ul></div>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="DefaultRpcClient.TransientErrorMapper.html" title="type parameter in DefaultRpcClient.TransientErrorMapper">T</a>&gt;&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#map(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)" class="member-name-link">map</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="DefaultRpcClient.TransientErrorMapper.html" title="type parameter in DefaultRpcClient.TransientErrorMapper">T</a>&gt;&nbsp;response,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;throwable)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
+</div>
+</div>
+</div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="map(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">
+<h3>map</h3>
+<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="DefaultRpcClient.TransientErrorMapper.html" title="type parameter in DefaultRpcClient.TransientErrorMapper">T</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html#line-261">map</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="DefaultRpcClient.TransientErrorMapper.html" title="type parameter in DefaultRpcClient.TransientErrorMapper">T</a>&gt;&nbsp;response,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;throwable)</span></div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>request</code> - The request we're handling completions for</dd>
+<dd><code>response</code> - response if one was successfully returned (or null)</dd>
+<dd><code>throwable</code> - exception if the call failed (or null)</dd>
+<dt>Returns:</dt>
+<dd>A completed or failed future than can replace the input (response, throwable) pair</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html b/apidoc/org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html
new file mode 100644
index 000000000..75f25621c
--- /dev/null
+++ b/apidoc/org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html
@@ -0,0 +1,155 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>DefaultRpcClient.TransportFactory (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: DefaultRpcClient, interface: TransportFactory">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li>Nested&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.jsonrpc</a></div>
+<h1 title="Interface DefaultRpcClient.TransportFactory" class="title">Interface DefaultRpcClient.TransportFactory</h1>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>Enclosing class:</dt>
+<dd><code><a href="DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></code></dd>
+</dl>
+<dl class="notes">
+<dt>Functional Interface:</dt>
+<dd>This is a functional interface and can therefore be used as the assignment target for a lambda expression or method reference.</dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/FunctionalInterface.html" title="class or interface in java.lang" class="external-link">@FunctionalInterface</a>
+</span><span class="modifiers">public static interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-60">DefaultRpcClient.TransportFactory</a></span></div>
+<div class="block">Functional interface for creating JsonRpcTransport instances. This is used to prevent a circular
+ dependency on <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link"><code>ObjectMapper</code></a>.</div>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a><wbr>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#create(com.fasterxml.jackson.databind.ObjectMapper)" class="member-name-link">create</a><wbr>(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a>&nbsp;mapper)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
+</div>
+</div>
+</div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="create(com.fasterxml.jackson.databind.ObjectMapper)">
+<h3>create</h3>
+<div class="member-signature"><span class="return-type"><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html#line-66">create</a></span><wbr><span class="parameters">(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a>&nbsp;mapper)</span></div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>mapper</code> - mapper that is shared between <code>DefaultRpcClient</code> and the <a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc"><code>JsonRpcTransport</code></a>.</dd>
+<dt>Returns:</dt>
+<dd>a transport instance</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/jsonrpc/DefaultRpcClient.html b/apidoc/org/consensusj/jsonrpc/DefaultRpcClient.html
new file mode 100644
index 000000000..9be2e3620
--- /dev/null
+++ b/apidoc/org/consensusj/jsonrpc/DefaultRpcClient.html
@@ -0,0 +1,585 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>DefaultRpcClient (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: DefaultRpcClient">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
+<li><a href="#field-summary">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor-summary">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li><a href="#field-detail">Field</a>&nbsp;|&nbsp;</li>
+<li><a href="#constructor-detail">Constr</a>&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.jsonrpc</a></div>
+<h1 title="Class DefaultRpcClient" class="title">Class DefaultRpcClient</h1>
+</div>
+<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
+<div class="inheritance">org.consensusj.jsonrpc.DefaultRpcClient</div>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Implemented Interfaces:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code>, <code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
+</dl>
+<dl class="notes">
+<dt>Direct Known Subclasses:</dt>
+<dd><code><a href="../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></code>, <code><a href="../ethereum/jsonrpc/EthereumClient.html" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-52">DefaultRpcClient</a></span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
+implements <a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</span></div>
+<div class="block">A strongly-typed, Jackson-based JSON-RPC client. <a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc"><code>JsonRpcClient</code></a> provides many convenience send `default` methods in a
+ JSON-library-independent way. DefaultRpcClient provides the needed implementation support for Jackson. This class implements
+ the constructors, static fields, and getters, but delegates the core
+ <a href="JsonRpcTransport.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)"><code>JsonRpcTransport.sendRequestForResponseAsync(JsonRpcRequest, Type)</code></a> method to a <a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc"><code>JsonRpcTransport</code></a> implementation component.</div>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<li>
+<section class="nested-class-summary" id="nested-class-summary">
+<h2>Nested Class Summary</h2>
+<div class="caption"><span>Nested Classes</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Class</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>static interface&nbsp;</code></div>
+<div class="col-second even-row-color"><code><a href="DefaultRpcClient.TransientErrorMapper.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;<a href="DefaultRpcClient.TransientErrorMapper.html" title="type parameter in DefaultRpcClient.TransientErrorMapper">T</a>&gt;</code></div>
+<div class="col-last even-row-color">
+<div class="block">Functional interface for ignoring what are considered "transient" errors.</div>
+</div>
+<div class="col-first odd-row-color"><code>static interface&nbsp;</code></div>
+<div class="col-second odd-row-color"><code><a href="DefaultRpcClient.TransportFactory.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></code></div>
+<div class="col-last odd-row-color">
+<div class="block">Functional interface for creating JsonRpcTransport instances.</div>
+</div>
+</div>
+<div class="inherited-list">
+<h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
+<code><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
+</section>
+</li>
+<!-- =========== FIELD SUMMARY =========== -->
+<li>
+<section class="field-summary" id="field-summary">
+<h2>Field Summary</h2>
+<div class="caption"><span>Fields</span></div>
+<div class="summary-table three-column-summary">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Field</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color"><code>protected final <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></code></div>
+<div class="col-second even-row-color"><code><a href="#jsonRpcVersion" class="member-name-link">jsonRpcVersion</a></code></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-first odd-row-color"><code>protected final <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a></code></div>
+<div class="col-second odd-row-color"><code><a href="#mapper" class="member-name-link">mapper</a></code></div>
+<div class="col-last odd-row-color">&nbsp;</div>
+</div>
+</section>
+</li>
+<!-- ======== CONSTRUCTOR SUMMARY ======== -->
+<li>
+<section class="constructor-summary" id="constructor-summary">
+<h2>Constructor Summary</h2>
+<div class="caption"><span>Constructors</span></div>
+<div class="summary-table two-column-summary">
+<div class="table-header col-first">Constructor</div>
+<div class="table-header col-last">Description</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">DefaultRpcClient</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">DefaultRpcClient</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
+ <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
+<div class="col-last odd-row-color">&nbsp;</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.consensusj.jsonrpc.DefaultRpcClient.TransportFactory,org.consensusj.jsonrpc.JsonRpcMessage.Version)" class="member-name-link">DefaultRpcClient</a><wbr>(<a href="DefaultRpcClient.TransportFactory.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a>&nbsp;transportFactory,
+ <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion)</code></div>
+<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">DefaultRpcClient</a><wbr>(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
+<div class="col-last odd-row-color">&nbsp;</div>
+</div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab4" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab4', 3)" class="table-tab">Concrete Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#collectionTypeForClasses(java.lang.Class,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">collectionTypeForClasses</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;? extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&gt;&nbsp;collection,
+ <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;type)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#collectionTypeForClasses(java.lang.Class,java.lang.Class)" class="member-name-link">collectionTypeForClasses</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;? extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&gt;&nbsp;collection,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;clazz)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#defaultType()" class="member-name-link">defaultType</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getJsonRpcVersion()" class="member-name-link">getJsonRpcVersion</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Return the JSON-RPC version used by the implementation</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getMapper()" class="member-name-link">getMapper</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getServerURI()" class="member-name-link">getServerURI</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Get the URI of the remote server</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected &lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#identityTransientErrorMapper(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)" class="member-name-link">identityTransientErrorMapper</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;&nbsp;response,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Transient error mapper that is a no-op, i.e.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#pollOnce(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)" class="member-name-link">pollOnce</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType,
+ <a href="DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;T&gt;&nbsp;errorMapper)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#responseTypeFor(com.fasterxml.jackson.databind.JavaType)" class="member-name-link">responseTypeFor</a><wbr>(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#responseTypeFor(java.lang.Class)" class="member-name-link">responseTypeFor</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;resultType)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest)" class="member-name-link">sendRequestForResponseAsync</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Convenience method for requesting an asynchronous response with a <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link"><code>JsonNode</code></a> for the result.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponseAsync</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#statusFromErrorResponse(org.consensusj.jsonrpc.JsonRpcResponse)" class="member-name-link">statusFromErrorResponse</a><wbr>(<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;&nbsp;response)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected &lt;T&gt;&nbsp;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a><wbr>&lt;T&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#temporarilyUnavailableResponse(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.Throwable)" class="member-name-link">temporarilyUnavailableResponse</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#typeForClass(java.lang.Class)" class="member-name-link">typeForClass</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;clazz)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;T&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)" class="member-name-link">waitForServer</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;retry,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&gt;&nbsp;requestSupplier,
+ <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType,
+ <a href="DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;T&gt;&nbsp;errorMapper)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">A wait-for-server routine that is agnostic about which RPC methods the server supports.</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;T&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;T&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)" class="member-name-link">waitForServer</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;retry,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&gt;&nbsp;requestSupplier,
+ <a href="DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;T&gt;&nbsp;errorMapper)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
+<div class="block">A wait-for-server routine that is agnostic about which RPC methods the server supports.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
+<code><a href="AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></h3>
+<code><a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="JsonRpcClient.html#close()">close</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="JsonRpcClient.html#send(java.lang.String,T,java.lang.Object...)">send</a>, <a href="JsonRpcClient.html#send(java.lang.String,T,java.util.List)">send</a>, <a href="JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.lang.Object...)">sendAsync</a>, <a href="JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.util.List)">sendAsync</a>, <a href="JsonRpcClient.html#sendAsync(java.lang.String,java.util.List)">sendAsync</a>, <a href="JsonRpcClient.html#sendAsync(java.lang.String,T,java.lang.Object...)">sendAsync</a>, <a href="JsonRpcClient.html#sendAsync(java.lang.String,T,java.util.List)">sendAsync</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcTransport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></h3>
+<code><a href="JsonRpcTransport.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponse</a>, <a href="JsonRpcTransport.html#syncGet(java.util.concurrent.CompletableFuture)">syncGet</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ FIELD DETAIL =========== -->
+<li>
+<section class="field-details" id="field-detail">
+<h2>Field Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="jsonRpcVersion">
+<h3>jsonRpcVersion</h3>
+<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-68">jsonRpcVersion</a></span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="mapper">
+<h3>mapper</h3>
+<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-69">mapper</a></span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ========= CONSTRUCTOR DETAIL ======== -->
+<li>
+<section class="constructor-details" id="constructor-detail">
+<h2>Constructor Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="&lt;init&gt;(java.net.URI,java.lang.String,java.lang.String)">
+<h3>DefaultRpcClient</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-73">DefaultRpcClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="&lt;init&gt;(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)">
+<h3>DefaultRpcClient</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-77">DefaultRpcClient</a></span><wbr><span class="parameters">(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)">
+<h3>DefaultRpcClient</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-80">DefaultRpcClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
+ <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="&lt;init&gt;(org.consensusj.jsonrpc.DefaultRpcClient.TransportFactory,org.consensusj.jsonrpc.JsonRpcMessage.Version)">
+<h3>DefaultRpcClient</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-84">DefaultRpcClient</a></span><wbr><span class="parameters">(<a href="DefaultRpcClient.TransportFactory.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a>&nbsp;transportFactory,
+ <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion)</span></div>
+</section>
+</li>
+</ul>
+</section>
+</li>
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="getJsonRpcVersion()">
+<h3>getJsonRpcVersion</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-93">getJsonRpcVersion</a></span>()</div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcClient.html#getJsonRpcVersion()">JsonRpcClient</a></code></span></div>
+<div class="block">Return the JSON-RPC version used by the implementation</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
+<dt>Returns:</dt>
+<dd>JSON-RPC version</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getServerURI()">
+<h3>getServerURI</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-98">getServerURI</a></span>()</div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcTransport.html#getServerURI()">JsonRpcTransport</a></code></span></div>
+<div class="block">Get the URI of the remote server</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcTransport.html#getServerURI()">getServerURI</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
+<dt>Returns:</dt>
+<dd>URI of remote server</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">
+<h3>sendRequestForResponseAsync</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-103">sendRequestForResponseAsync</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcTransport.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)">JsonRpcTransport</a></code></span></div>
+<div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcTransport.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponseAsync</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
+<dt>Type Parameters:</dt>
+<dd><code>R</code> - Type of result object</dd>
+<dt>Parameters:</dt>
+<dd><code>request</code> - The request to send</dd>
+<dd><code>responseType</code> - The response type expected (used by Jackson for conversion)</dd>
+<dt>Returns:</dt>
+<dd>A future JSON RPC Response with `result` of type `R`</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest)">
+<h3>sendRequestForResponseAsync</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-113">sendRequestForResponseAsync</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request)</span></div>
+<div class="block">Convenience method for requesting an asynchronous response with a <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link"><code>JsonNode</code></a> for the result.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>request</code> - The request to send</dd>
+<dt>Returns:</dt>
+<dd>A future JSON RPC Response with `result` of type <code>JsonNode</code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getMapper()">
+<h3>getMapper</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-117">getMapper</a></span>()</div>
+</section>
+</li>
+<li>
+<section class="detail" id="defaultType()">
+<h3>defaultType</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-121">defaultType</a></span>()</div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcClient.html#defaultType()">defaultType</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="responseTypeFor(com.fasterxml.jackson.databind.JavaType)">
+<h3>responseTypeFor</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-126">responseTypeFor</a></span><wbr><span class="parameters">(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType)</span></div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcClient.html#responseTypeFor(T)">responseTypeFor</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="responseTypeFor(java.lang.Class)">
+<h3>responseTypeFor</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-132">responseTypeFor</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;resultType)</span></div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="typeForClass(java.lang.Class)">
+<h3>typeForClass</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-138">typeForClass</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;clazz)</span></div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="collectionTypeForClasses(java.lang.Class,java.lang.Class)">
+<h3>collectionTypeForClasses</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-143">collectionTypeForClasses</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;? extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&gt;&nbsp;collection,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;clazz)</span></div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcClient.html#collectionTypeForClasses(java.lang.Class,java.lang.Class)">collectionTypeForClasses</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="collectionTypeForClasses(java.lang.Class,com.fasterxml.jackson.databind.JavaType)">
+<h3>collectionTypeForClasses</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-149">collectionTypeForClasses</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;? extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&gt;&nbsp;collection,
+ <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;type)</span></div>
+<dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcClient.html#collectionTypeForClasses(java.lang.Class,T)">collectionTypeForClasses</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="pollOnce(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">
+<h3>pollOnce</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-155">pollOnce</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType,
+ <a href="DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;T&gt;&nbsp;errorMapper)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">
+<h3>waitForServer</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-174">waitForServer</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;retry,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&gt;&nbsp;requestSupplier,
+ <a href="DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;T&gt;&nbsp;errorMapper)</span></div>
+<div class="block">A wait-for-server routine that is agnostic about which RPC methods the server supports. In addition to two <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link"><code>Duration</code></a>
+ parameters, there are 2 lambda parameters to enable this method to work with any JSON-RPC server. This version will tell
+ the JSON-RPC Mapper to return an <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> with a result of type <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link"><code>Object</code></a>. If you need more precise
+ control over the type, use <a href="#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)"><code>waitForServer(Duration, Duration, Supplier, JavaType, TransientErrorMapper)</code></a>.</div>
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>T</code> - The desired result type to be returned when the server is running</dd>
+<dt>Parameters:</dt>
+<dd><code>timeout</code> - how long to wait</dd>
+<dd><code>retry</code> - delay between retries</dd>
+<dd><code>requestSupplier</code> - supplier of requests (needs to increment request ID at the very least)</dd>
+<dd><code>errorMapper</code> - function that maps non-fatal errors (i.e. cases to keep polling)</dd>
+<dt>Returns:</dt>
+<dd>A future that returns a successful</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">
+<h3>waitForServer</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-190">waitForServer</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;timeout,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link">Duration</a>&nbsp;retry,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&gt;&nbsp;requestSupplier,
+ <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType,
+ <a href="DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;T&gt;&nbsp;errorMapper)</span></div>
+<div class="block">A wait-for-server routine that is agnostic about which RPC methods the server supports. In addition to two <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/time/Duration.html" title="class or interface in java.time" class="external-link"><code>Duration</code></a>
+ parameters, there are 3 parameters (2 functions and a generic type specifier) to enable this method to work with any JSON-RPC server.</div>
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>T</code> - The desired result type to be returned when the server is running</dd>
+<dt>Parameters:</dt>
+<dd><code>timeout</code> - how long to wait</dd>
+<dd><code>retry</code> - delay between retries</dd>
+<dd><code>requestSupplier</code> - supplier of requests (needs to increment request ID at the very least)</dd>
+<dd><code>resultType</code> - the result type for the response</dd>
+<dd><code>errorMapper</code> - function that maps non-fatal errors (i.e. cases to keep polling)</dd>
+<dt>Returns:</dt>
+<dd>A future that returns a successful</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="identityTransientErrorMapper(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">
+<h3>identityTransientErrorMapper</h3>
+<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-267">identityTransientErrorMapper</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;&nbsp;response,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</span></div>
+<div class="block">Transient error mapper that is a no-op, i.e. it passes all errors through unchanged.</div>
+</section>
+</li>
+<li>
+<section class="detail" id="temporarilyUnavailableResponse(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.Throwable)">
+<h3>temporarilyUnavailableResponse</h3>
+<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type"><a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-273">temporarilyUnavailableResponse</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;t)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="statusFromErrorResponse(org.consensusj.jsonrpc.JsonRpcResponse)">
+<h3>statusFromErrorResponse</h3>
+<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/DefaultRpcClient.html#line-281">statusFromErrorResponse</a></span><wbr><span class="parameters">(<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;&nbsp;response)</span></div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>response</code> - A response where <code>getResult() == null</code></dd>
+<dt>Returns:</dt>
+<dd>An error status string suitable for log messages</dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/jsonrpc/JacksonRpcClient.html b/apidoc/org/consensusj/jsonrpc/JacksonRpcClient.html
deleted file mode 100644
index e011b9d34..000000000
--- a/apidoc/org/consensusj/jsonrpc/JacksonRpcClient.html
+++ /dev/null
@@ -1,386 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>JacksonRpcClient (consensusj 0.7.0-alpha2 API)</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="description" content="declaration: package: org.consensusj.jsonrpc, interface: JacksonRpcClient">
-<meta name="generator" content="javadoc/ClassWriterImpl">
-<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
-<script type="text/javascript" src="../../../script.js"></script>
-<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
-<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
-</head>
-<body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
-loadScripts(document, 'script');</script>
-<noscript>
-<div>JavaScript is disabled on your browser.</div>
-</noscript>
-<div class="flex-box">
-<header role="banner" class="flex-header">
-<nav role="navigation">
-<!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
-<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
-<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
-<li><a href="../../../index.html">Overview</a></li>
-<li><a href="package-summary.html">Package</a></li>
-<li class="nav-bar-cell1-rev">Class</li>
-<li><a href="package-tree.html">Tree</a></li>
-<li><a href="../../../deprecated-list.html">Deprecated</a></li>
-<li><a href="../../../index-all.html">Index</a></li>
-<li><a href="../../../help-doc.html#class">Help</a></li>
-</ul>
-</div>
-<div class="sub-nav">
-<div>
-<ul class="sub-nav-list">
-<li>Summary:&nbsp;</li>
-<li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method-summary">Method</a></li>
-</ul>
-<ul class="sub-nav-list">
-<li>Detail:&nbsp;</li>
-<li>Field&nbsp;|&nbsp;</li>
-<li>Constr&nbsp;|&nbsp;</li>
-<li><a href="#method-detail">Method</a></li>
-</ul>
-</div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
-</div>
-</div>
-<!-- ========= END OF TOP NAVBAR ========= -->
-<span class="skip-nav" id="skip-navbar-top"></span></nav>
-</header>
-<div class="flex-content">
-<main role="main">
-<!-- ======== START OF CLASS DATA ======== -->
-<div class="header">
-<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.jsonrpc</a></div>
-<h1 title="Interface JacksonRpcClient" class="title">Interface JacksonRpcClient</h1>
-</div>
-<section class="class-description" id="class-description">
-<dl class="notes">
-<dt>All Superinterfaces:</dt>
-<dd><code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
-</dl>
-<dl class="notes">
-<dt>All Known Implementing Classes:</dt>
-<dd><code><a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></code>, <code><a href="../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></code>, <code><a href="../bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></code>, <code><a href="../ethereum/jsonrpc/EthereumClient.html" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></code>, <code><a href="JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></code>, <code><a href="JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></code>, <code><a href="../namecoin/jsonrpc/NamecoinClient.html" title="class in org.consensusj.namecoin.jsonrpc">NamecoinClient</a></code>, <code><a href="../bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></dd>
-</dl>
-<hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-16">JacksonRpcClient</a></span><span class="extends-implements">
-extends <a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></span></div>
-<div class="block">Interface with default methods for a strongly-typed JSON-RPC client that uses Jackson to map from JSON to Java Objects.</div>
-</section>
-<section class="summary">
-<ul class="summary-list">
-<!-- ======== NESTED CLASS SUMMARY ======== -->
-<li>
-<section class="nested-class-summary" id="nested-class-summary">
-<h2>Nested Class Summary</h2>
-<div class="inherited-list">
-<h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
-</section>
-</li>
-<!-- ========== METHOD SUMMARY =========== -->
-<li>
-<section class="method-summary" id="method-summary">
-<h2>Method Summary</h2>
-<div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button></div>
-<div id="method-summary-table.tabpanel" role="tabpanel">
-<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
-<div class="table-header col-first">Modifier and Type</div>
-<div class="table-header col-second">Method</div>
-<div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getDefaultType()" class="member-name-link">getDefaultType</a>()</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getMapper()" class="member-name-link">getMapper</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#responseTypeFor(com.fasterxml.jackson.databind.JavaType)" class="member-name-link">responseTypeFor</a><wbr>(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#responseTypeFor(java.lang.Class)" class="member-name-link">responseTypeFor</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;resultType)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Varargs version</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">JSON-RPC remote method call that returns 'response.result`</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#send(java.lang.String,java.lang.Class,java.util.List)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;R&gt;&nbsp;resultType,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">JSON-RPC remote method call that returns 'response.result`</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#send(java.lang.String,java.util.List)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Call an RPC method and return default object type.</div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)" class="member-name-link">sendRequestForResponse</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Convenience method for requesting a response with a <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link"><code>JsonNode</code></a> for the result.</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponse</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
- <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a></div>
-</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponseAsync</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
- <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#typeForClass(java.lang.Class)" class="member-name-link">typeForClass</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;clazz)</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
-</div>
-</div>
-</div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
-<code><a href="AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></h3>
-<code><a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="JsonRpcClient.html#close()">close</a>, <a href="JsonRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="JsonRpcClient.html#getServerURI()">getServerURI</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a></code></div>
-</section>
-</li>
-</ul>
-</section>
-<section class="details">
-<ul class="details-list">
-<!-- ============ METHOD DETAIL ========== -->
-<li>
-<section class="method-details" id="method-detail">
-<h2>Method Details</h2>
-<ul class="member-list">
-<li>
-<section class="detail" id="getMapper()">
-<h3>getMapper</h3>
-<div class="member-signature"><span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-18">getMapper</a></span>()</div>
-</section>
-</li>
-<li>
-<section class="detail" id="getDefaultType()">
-<h3>getDefaultType</h3>
-<div class="member-signature"><span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-20">getDefaultType</a></span>()</div>
-</section>
-</li>
-<li>
-<section class="detail" id="responseTypeFor(com.fasterxml.jackson.databind.JavaType)">
-<h3>responseTypeFor</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-22">responseTypeFor</a></span><wbr><span class="parameters">(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType)</span></div>
-</section>
-</li>
-<li>
-<section class="detail" id="responseTypeFor(java.lang.Class)">
-<h3>responseTypeFor</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-27">responseTypeFor</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;resultType)</span></div>
-</section>
-</li>
-<li>
-<section class="detail" id="typeForClass(java.lang.Class)">
-<h3>typeForClass</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-32">typeForClass</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;clazz)</span></div>
-</section>
-</li>
-<li>
-<section class="detail" id="sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">
-<h3>sendRequestForResponse</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-48">sendRequestForResponse</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
- <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</span>
-                                               throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
-<a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
-<div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a>
- <p>Synchronous subclasses should override this method to prevent <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html#supplyAsync(java.util.function.Supplier)" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture.supplyAsync(Supplier)</code></a> from
- being called twice when <a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc"><code>AsyncSupport</code></a> is being used. Eventually we'll migrate more of the codebase to native
- async, and then we won't have to worry about calling <code>supplyAsync</code> twice.</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>R</code> - Type of result object</dd>
-<dt>Parameters:</dt>
-<dd><code>request</code> - The request to send</dd>
-<dd><code>responseType</code> - The response type expected (used by Jackson for conversion)</dd>
-<dt>Returns:</dt>
-<dd>A JSON RPC Response with `result` of type `R`</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - network error</dd>
-<dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code> - JSON RPC status error</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">
-<h3>sendRequestForResponseAsync</h3>
-<div class="member-signature"><span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-72">sendRequestForResponseAsync</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
- <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</span></div>
-<div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>R</code> - Type of result object</dd>
-<dt>Parameters:</dt>
-<dd><code>request</code> - The request to send</dd>
-<dd><code>responseType</code> - The response type expected (used by Jackson for conversion)</dd>
-<dt>Returns:</dt>
-<dd>A future JSON RPC Response with `result` of type `R`</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)">
-<h3>sendRequestForResponse</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-81">sendRequestForResponse</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request)</span>
-                                                  throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
-<a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
-<div class="block">Convenience method for requesting a response with a <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link"><code>JsonNode</code></a> for the result.</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>request</code> - The request to send</dd>
-<dt>Returns:</dt>
-<dd>A JSON RPC Response with `result` of type <code>JsonNode</code></dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - network error</dd>
-<dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code> - JSON RPC status error</dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="send(java.lang.String,java.lang.Class,java.util.List)">
-<h3>send</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-115">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;R&gt;&nbsp;resultType,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span>
-            throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
-<a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
-<div class="block">JSON-RPC remote method call that returns 'response.result`</div>
-<dl class="notes">
-<dt>Specified by:</dt>
-<dd><code><a href="JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
-<dt>Type Parameters:</dt>
-<dd><code>R</code> - Type of result object</dd>
-<dt>Parameters:</dt>
-<dd><code>method</code> - JSON RPC method call to send</dd>
-<dd><code>resultType</code> - desired result type as a Java class object</dd>
-<dd><code>params</code> - JSON RPC params</dd>
-<dt>Returns:</dt>
-<dd>the 'response.result' field of the JSON RPC response converted to type R</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
-<dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)">
-<h3>send</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-133">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span>
-            throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
-<a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
-<div class="block">JSON-RPC remote method call that returns 'response.result`</div>
-<dl class="notes">
-<dt>Type Parameters:</dt>
-<dd><code>R</code> - Type of result object</dd>
-<dt>Parameters:</dt>
-<dd><code>method</code> - JSON RPC method call to send</dd>
-<dd><code>resultType</code> - desired result type as a Jackson JavaType object</dd>
-<dd><code>params</code> - JSON RPC params</dd>
-<dt>Returns:</dt>
-<dd>the 'response.result' field of the JSON RPC response converted to type R</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
-<dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)">
-<h3>send</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-144">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;resultType,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</span>
-            throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
-<a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
-<div class="block">Varargs version</div>
-<dl class="notes">
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
-<dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code></dd>
-</dl>
-</section>
-</li>
-<li>
-<section class="detail" id="send(java.lang.String,java.util.List)">
-<h3>send</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JacksonRpcClient.html#line-165">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span>
-            throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
-<a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
-<div class="block">Call an RPC method and return default object type.
-
- Caller should cast returned object to the correct type.
-
- Useful for:
- * Dynamically-dispatched JSON-RPC methods calls via Groovy subclasses
- * Simple (not client-side validated) command line utilities
- * Functional tests that need to send incorrect types to the server to test error handling</div>
-<dl class="notes">
-<dt>Specified by:</dt>
-<dd><code><a href="JsonRpcClient.html#send(java.lang.String,java.util.List)">send</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
-<dt>Type Parameters:</dt>
-<dd><code>R</code> - Type of result object</dd>
-<dt>Parameters:</dt>
-<dd><code>method</code> - JSON RPC method call to send</dd>
-<dd><code>params</code> - JSON RPC parameters as a `List`</dd>
-<dt>Returns:</dt>
-<dd>the 'response.result' field of the JSON RPC response cast to type R</dd>
-<dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - network error</dd>
-<dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code> - JSON RPC status error</dd>
-</dl>
-</section>
-</li>
-</ul>
-</section>
-</li>
-</ul>
-</section>
-<!-- ========= END OF CLASS DATA ========= -->
-</main>
-</div>
-</div>
-</body>
-</html>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcClient.html b/apidoc/org/consensusj/jsonrpc/JsonRpcClient.html
index d596310d0..a3e1bde0a 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcClient.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcClient.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcClient (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcClient (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, interface: JsonRpcClient">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -69,27 +83,23 @@
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
 <div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.jsonrpc</a></div>
-<h1 title="Interface JsonRpcClient" class="title">Interface JsonRpcClient</h1>
+<h1 title="Interface JsonRpcClient" class="title">Interface JsonRpcClient&lt;T extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Type.html" title="class or interface in java.lang.reflect" class="external-link">Type</a>&gt;</h1>
 </div>
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Superinterfaces:</dt>
-<dd><code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
-</dl>
-<dl class="notes">
-<dt>All Known Subinterfaces:</dt>
-<dd><code><a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code></dd>
+<dd><code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;</code></dd>
 </dl>
 <dl class="notes">
 <dt>All Known Implementing Classes:</dt>
-<dd><code><a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></code>, <code><a href="../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></code>, <code><a href="../bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></code>, <code><a href="../ethereum/jsonrpc/EthereumClient.html" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></code>, <code><a href="JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></code>, <code><a href="JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></code>, <code><a href="../namecoin/jsonrpc/NamecoinClient.html" title="class in org.consensusj.namecoin.jsonrpc">NamecoinClient</a></code>, <code><a href="../bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></dd>
+<dd><code><a href="../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></code>, <code><a href="../bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></code>, <code><a href="DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></code>, <code><a href="../ethereum/jsonrpc/EthereumClient.html" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></code>, <code><a href="../namecoin/jsonrpc/NamecoinClient.html" title="class in org.consensusj.namecoin.jsonrpc">NamecoinClient</a></code>, <code><a href="../bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-21">JsonRpcClient</a></span><span class="extends-implements">
-extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a>, <a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></span></div>
+<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-23">JsonRpcClient</a>&lt;T extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Type.html" title="class or interface in java.lang.reflect" class="external-link">Type</a>&gt;</span><span class="extends-implements">
+extends <a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></span></div>
 <div class="block">JSON-RPC client interface. This interface is independent of the JSON conversion library
   (the default implementation uses Jackson) and HTTP client library (currently <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/HttpURLConnection.html" title="class or interface in java.net" class="external-link"><code>HttpURLConnection</code></a>).
-  For historical reasons the interface is synchronous, but <a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc"><code>AsyncSupport</code></a> makes it easier
+  For historical reasons the interface is mostly synchronous, but <a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc"><code>AsyncSupport</code></a> makes it easier
   to add use of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture</code></a> for special cases. In the future
   this interface may change to natively asynchronous.
   <p>
@@ -98,7 +108,7 @@ <h1 title="Interface JsonRpcClient" class="title">Interface JsonRpcClient</h1>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list-long">
+<ul class="tag-list-long">
 <li><a href="https://www.jsonrpc.org/specification_v1">JSON-RPC 1.0 Specification (2005)</a></li>
 <li><a href="https://www.jsonrpc.org/specification">JSON-RPC 2.0 Specification</a></li>
 </ul>
@@ -113,7 +123,7 @@ <h1 title="Interface JsonRpcClient" class="title">Interface JsonRpcClient</h1>
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
+<code><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- ========== METHOD SUMMARY =========== -->
@@ -140,46 +150,104 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#close()" class="member-name-link">close</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Default no-op implementation of close.</div>
-</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getJsonRpcVersion()" class="member-name-link">getJsonRpcVersion</a>()</code></div>
-<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Return the JSON-RPC version used by the implementation</div>
+<div class="block">Default no-op implementation of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link"><code>AutoCloseable.close()</code></a>.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getServerURI()" class="member-name-link">getServerURI</a>()</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#collectionTypeForClasses(java.lang.Class,java.lang.Class)" class="member-name-link">collectionTypeForClasses</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;? extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&gt;&nbsp;collectionClazz,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;clazz)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#collectionTypeForClasses(java.lang.Class,T)" class="member-name-link">collectionTypeForClasses</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;? extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&gt;&nbsp;collectionClazz,
+ <a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;itemType)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#defaultType()" class="member-name-link">defaultType</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getJsonRpcVersion()" class="member-name-link">getJsonRpcVersion</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Get the URI of the remote server</div>
+<div class="block">Return the JSON-RPC version used by the implementation</div>
 </div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#responseTypeFor(java.lang.Class)" class="member-name-link">responseTypeFor</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;resultType)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#responseTypeFor(T)" class="member-name-link">responseTypeFor</a><wbr>(<a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;resultType)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#send(java.lang.String,java.lang.Class,java.lang.Object...)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;R&gt;&nbsp;resultType,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;R&gt;&nbsp;R</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#send(java.lang.String,java.lang.Class,java.util.List)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#send(java.lang.String,java.lang.Class,java.util.List)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;R&gt;&nbsp;resultType,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
+<div class="block">JSON-RPC remote method call that returns 'response.result`</div>
+</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#send(java.lang.String,java.lang.Object...)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
 <div class="block">Call an RPC method and return default object type.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;R&gt;&nbsp;R</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#send(java.lang.String,java.util.List)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#send(java.lang.String,java.util.List)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
-<div class="block">Call an RPC method and return "default" object type.</div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
+<div class="block">Call an RPC method and return default object type.</div>
 </div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#send(java.lang.String,T,java.lang.Object...)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
+<div class="block">Varargs version</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#send(java.lang.String,T,java.util.List)" class="member-name-link">send</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
+<div class="block">JSON-RPC remote method call that returns <code>response.result</code></div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;R&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#sendAsync(java.lang.String,java.lang.Class,java.lang.Object...)" class="member-name-link">sendAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;R&gt;&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;R&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#sendAsync(java.lang.String,java.lang.Class,java.util.List)" class="member-name-link">sendAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;R&gt;&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;R&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#sendAsync(java.lang.String,java.util.List)" class="member-name-link">sendAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;R&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#sendAsync(java.lang.String,T,java.lang.Object...)" class="member-name-link">sendAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;R&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#sendAsync(java.lang.String,T,java.util.List)" class="member-name-link">sendAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#typeForClass(java.lang.Class)" class="member-name-link">typeForClass</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;clazz)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
 </div>
 </div>
 </div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
 <code><a href="AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcTransport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></h3>
+<code><a href="JsonRpcTransport.html#getServerURI()">getServerURI</a>, <a href="JsonRpcTransport.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponse</a>, <a href="JsonRpcTransport.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponseAsync</a>, <a href="JsonRpcTransport.html#syncGet(java.util.concurrent.CompletableFuture)">syncGet</a></code></div>
 </section>
 </li>
 </ul>
@@ -194,7 +262,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="getJsonRpcVersion()">
 <h3>getJsonRpcVersion</h3>
-<div class="member-signature"><span class="return-type"><a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-28">getJsonRpcVersion</a></span>()</div>
+<div class="member-signature"><span class="return-type"><a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-30">getJsonRpcVersion</a></span>()</div>
 <div class="block">Return the JSON-RPC version used by the implementation</div>
 <dl class="notes">
 <dt>Returns:</dt>
@@ -203,40 +271,30 @@ <h3>getJsonRpcVersion</h3>
 </section>
 </li>
 <li>
-<section class="detail" id="getServerURI()">
-<h3>getServerURI</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-34">getServerURI</a></span>()</div>
-<div class="block">Get the URI of the remote server</div>
-<dl class="notes">
-<dt>Returns:</dt>
-<dd>URI of remote server</dd>
-</dl>
-</section>
-</li>
-<li>
 <section class="detail" id="send(java.lang.String,java.util.List)">
 <h3>send</h3>
-<div class="member-signature"><span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-54">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-51">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span>
-    throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
+            throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
 <a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
-<div class="block">Call an RPC method and return "default" object type. Caller should cast returned object to the correct type.
+<div class="block">Call an RPC method and return default object type.
  <p>
- The parameter list is "untyped" (declared as <code>List&lt;Object&gt;</code>) and implementations are responsible
- for converting each Java object parameter to a valid and correctly-typed (for <code>method</code>) JSON object.
+ Caller should cast returned object to the correct type.
  <p>
- This is used to implement the <code>DynamicRpcMethodFallback</code> trait in Groovy which is applied
- to various Groovy RPC client implementations that typically inherit statically-dispatched
- methods from Java classes, but use <code>methodMissing()</code> to add JSON-RPC methods dynamically.
- This may be useful in other Dynamic JVM languages, as well.</div>
+ Useful for:
+ <ul>
+ <li>Dynamically-dispatched JSON-RPC methods calls via Groovy subclasses</li>
+ <li>Simple (not client-side validated) command line utilities</li>
+ <li>Functional tests that need to send incorrect types to the server to test error handling</li>
+ </ul></div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>R</code> - Type of result object</dd>
 <dt>Parameters:</dt>
 <dd><code>method</code> - JSON RPC method call to send</dd>
-<dd><code>params</code> - JSON RPC parameters using types that are convertible to JSON</dd>
+<dd><code>params</code> - JSON RPC parameters as a `List`</dd>
 <dt>Returns:</dt>
-<dd>the `response.result` field of the JSON-RPC response cast to type R</dd>
+<dd>the 'response.result' field of the JSON RPC response cast to type R</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - network error</dd>
 <dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code> - JSON RPC status error</dd>
@@ -244,15 +302,22 @@ <h3>send</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="sendAsync(java.lang.String,java.util.List)">
+<h3>sendAsync</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;R&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-55">sendAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span></div>
+</section>
+</li>
+<li>
 <section class="detail" id="send(java.lang.String,java.lang.Object...)">
 <h3>send</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-68">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-71">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</span>
             throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
 <a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
 <div class="block">Call an RPC method and return default object type.
-
- Convenience version that takes `params` as array/varargs.</div>
+ <p>
+ Convenience version that takes <code>params</code> as array/varargs.</div>
 <dl class="notes">
 <dt>Type Parameters:</dt>
 <dd><code>R</code> - Type of result object</dd>
@@ -268,14 +333,46 @@ <h3>send</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="send(java.lang.String,java.lang.Class,java.lang.Object...)">
+<h3>send</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-75">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;R&gt;&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</span>
+            throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
+<a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
+<dl class="notes">
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
+<dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="sendAsync(java.lang.String,java.lang.Class,java.lang.Object...)">
+<h3>sendAsync</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;R&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-79">sendAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;R&gt;&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</span></div>
+</section>
+</li>
+<li>
 <section class="detail" id="send(java.lang.String,java.lang.Class,java.util.List)">
 <h3>send</h3>
-<div class="member-signature"><span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-72">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-92">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;R&gt;&nbsp;resultType,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span>
-    throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
+            throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
 <a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
+<div class="block">JSON-RPC remote method call that returns 'response.result`</div>
 <dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>R</code> - Type of result object</dd>
+<dt>Parameters:</dt>
+<dd><code>method</code> - JSON RPC method call to send</dd>
+<dd><code>resultType</code> - desired result type as a Java class object</dd>
+<dd><code>params</code> - JSON RPC params</dd>
+<dt>Returns:</dt>
+<dd>the 'response.result' field of the JSON RPC response converted to type R</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
 <dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code></dd>
@@ -283,13 +380,54 @@ <h3>send</h3>
 </section>
 </li>
 <li>
-<section class="detail" id="send(java.lang.String,java.lang.Class,java.lang.Object...)">
-<h3>send</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-74">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+<section class="detail" id="sendAsync(java.lang.String,java.lang.Class,java.util.List)">
+<h3>sendAsync</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;R&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-96">sendAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;R&gt;&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="sendAsync(java.lang.String,T,java.util.List)">
+<h3 id="sendAsync(java.lang.String,java.lang.reflect.Type,java.util.List)">sendAsync</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;R&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-100">sendAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="send(java.lang.String,T,java.util.List)">
+<h3 id="send(java.lang.String,java.lang.reflect.Type,java.util.List)">send</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-113">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span>
+            throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
+<a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
+<div class="block">JSON-RPC remote method call that returns <code>response.result</code></div>
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>R</code> - Type of result object</dd>
+<dt>Parameters:</dt>
+<dd><code>method</code> - JSON RPC method call to send</dd>
+<dd><code>resultType</code> - desired result type as a Jackson JavaType object</dd>
+<dd><code>params</code> - JSON RPC params</dd>
+<dt>Returns:</dt>
+<dd>the 'response.result' field of the JSON RPC response converted to type R</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
+<dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code></dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="send(java.lang.String,T,java.lang.Object...)">
+<h3 id="send(java.lang.String,java.lang.reflect.Type,java.lang.Object[])">send</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-120">send</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;resultType,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</span>
             throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
 <a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
+<div class="block">Varargs version</div>
 <dl class="notes">
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code></dd>
@@ -298,9 +436,17 @@ <h3>send</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="sendAsync(java.lang.String,T,java.lang.Object...)">
+<h3 id="sendAsync(java.lang.String,java.lang.reflect.Type,java.lang.Object[])">sendAsync</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;R&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-124">sendAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;resultType,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</span></div>
+</section>
+</li>
+<li>
 <section class="detail" id="buildJsonRequest(java.lang.String,java.util.List)">
 <h3>buildJsonRequest</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-85">buildJsonRequest</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-151">buildJsonRequest</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span></div>
 <div class="block">Create a JsonRpcRequest from method and parameters</div>
 <dl class="notes">
@@ -315,16 +461,16 @@ <h3>buildJsonRequest</h3>
 <li>
 <section class="detail" id="buildJsonRequest(java.lang.String,java.lang.Object...)">
 <h3>buildJsonRequest</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-89">buildJsonRequest</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-155">buildJsonRequest</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>...&nbsp;params)</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="close()">
 <h3>close</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-99">close</a></span>()
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-165">close</a></span>()
             throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a></span></div>
-<div class="block">Default no-op implementation of close. Classes should override when
+<div class="block">Default no-op implementation of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link"><code>AutoCloseable.close()</code></a>. Classes should override when
  they have something they need to close properly.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -335,6 +481,44 @@ <h3>close</h3>
 </dl>
 </section>
 </li>
+<li>
+<section class="detail" id="defaultType()">
+<h3>defaultType</h3>
+<div class="member-signature"><span class="return-type"><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-169">defaultType</a></span>()</div>
+</section>
+</li>
+<li>
+<section class="detail" id="responseTypeFor(T)">
+<h3 id="responseTypeFor(java.lang.reflect.Type)">responseTypeFor</h3>
+<div class="member-signature"><span class="return-type"><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-171">responseTypeFor</a></span><wbr><span class="parameters">(<a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;resultType)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="responseTypeFor(java.lang.Class)">
+<h3>responseTypeFor</h3>
+<div class="member-signature"><span class="return-type"><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-172">responseTypeFor</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;resultType)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="typeForClass(java.lang.Class)">
+<h3>typeForClass</h3>
+<div class="member-signature"><span class="return-type"><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-174">typeForClass</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;clazz)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="collectionTypeForClasses(java.lang.Class,java.lang.Class)">
+<h3>collectionTypeForClasses</h3>
+<div class="member-signature"><span class="return-type"><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-176">collectionTypeForClasses</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;? extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&gt;&nbsp;collectionClazz,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;clazz)</span></div>
+</section>
+</li>
+<li>
+<section class="detail" id="collectionTypeForClasses(java.lang.Class,T)">
+<h3 id="collectionTypeForClasses(java.lang.Class,java.lang.reflect.Type)">collectionTypeForClasses</h3>
+<div class="member-signature"><span class="return-type"><a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClient.html#line-178">collectionTypeForClasses</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;? extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Collection.html" title="class or interface in java.util" class="external-link">Collection</a>&gt;&nbsp;collectionClazz,
+ <a href="JsonRpcClient.html" title="type parameter in JsonRpcClient">T</a>&nbsp;itemType)</span></div>
+</section>
+</li>
 </ul>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html b/apidoc/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html
index 91da6713e..0aab6e2da 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcClientHttpUrlConnection (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcClientHttpUrlConnection (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcClientHttpUrlConnection">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,13 +34,32 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field-summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor-summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method-summary">Method</a></li>
 </ul>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,26 +86,21 @@
 <h1 title="Class JsonRpcClientHttpUrlConnection" class="title">Class JsonRpcClientHttpUrlConnection</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.AbstractRpcClient</a>
 <div class="inheritance">org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection</div>
 </div>
-</div>
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code>, <code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
-</dl>
-<dl class="notes">
-<dt>Direct Known Subclasses:</dt>
-<dd><code><a href="../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></code>, <code><a href="../ethereum/jsonrpc/EthereumClient.html" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></code></dd>
+<dd><code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-32">JsonRpcClientHttpUrlConnection</a></span>
-<span class="extends-implements">extends <a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></span></div>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-33">JsonRpcClientHttpUrlConnection</a></span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
+implements <a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</span></div>
 <div class="block">JSON-RPC Client using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/HttpURLConnection.html" title="class or interface in java.net" class="external-link"><code>HttpURLConnection</code></a> formerly named<code>RpcClient</code>.
  <p>
  This is a concrete class with generic JSON-RPC functionality, it implements the abstract
- method <a href="JacksonRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)"><code>JacksonRpcClient.sendRequestForResponseAsync(JsonRpcRequest, JavaType)</code></a> using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/HttpURLConnection.html" title="class or interface in java.net" class="external-link"><code>HttpURLConnection</code></a>.
+ method <a href="JsonRpcTransport.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)"><code>JsonRpcTransport.sendRequestForResponseAsync(JsonRpcRequest, Type)</code></a> using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/HttpURLConnection.html" title="class or interface in java.net" class="external-link"><code>HttpURLConnection</code></a>.
  <p>
  Uses strongly-typed POJOs representing <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> and <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a>. The
  response object uses a parameterized type for the object that is the actual JSON-RPC `result`.
@@ -106,16 +115,7 @@ <h1 title="Class JsonRpcClientHttpUrlConnection" class="title">Class JsonRpcClie
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
-</section>
-</li>
-<!-- =========== FIELD SUMMARY =========== -->
-<li>
-<section class="field-summary" id="field-summary">
-<h2>Field Summary</h2>
-<div class="inherited-list">
-<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="AbstractRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="AbstractRpcClient.html#mapper">mapper</a></code></div>
+<code><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -126,29 +126,12 @@ <h2>Constructor Summary</h2>
 <div class="summary-table two-column-summary">
 <div class="table-header col-first">Constructor</div>
 <div class="table-header col-last">Description</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientHttpUrlConnection</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
- <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper,javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientHttpUrlConnection</a><wbr>(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a>&nbsp;mapper,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(javax.net.ssl.SSLSocketFactory,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientHttpUrlConnection</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;socketFactory,
- <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
-<div class="col-last odd-row-color">
-<div class="block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"><code>JsonRpcClientHttpUrlConnection(SSLContext, JsonRpcMessage.Version, URI, String, String)</code></a></div>
-</div>
-</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientHttpUrlConnection</a><wbr>(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
-<div class="col-last even-row-color">
-<div class="block">Construct a JSON-RPC client from URI, username, and password</div>
-</div>
 </div>
 </section>
 </li>
@@ -168,13 +151,13 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Get the URI of the server this client connects to</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;R&gt;&nbsp;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;R&gt;&nbsp;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a><wbr>&lt;R&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponse</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Send a JSON-RPC request to the server and return a JSON-RPC response.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponseAsync</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
@@ -184,20 +167,14 @@ <h2>Method Summary</h2>
 </div>
 </div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="AbstractRpcClient.html#base64Encode(java.lang.String)">base64Encode</a>, <a href="AbstractRpcClient.html#getDefaultSSLContext()">getDefaultSSLContext</a>, <a href="AbstractRpcClient.html#getDefaultType()">getDefaultType</a>, <a href="AbstractRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="AbstractRpcClient.html#getMapper()">getMapper</a></code></div>
-<div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
 <code><a href="AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JacksonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></h3>
-<code><a href="JacksonRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="JacksonRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)">send</a>, <a href="JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)">send</a>, <a href="JacksonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="JacksonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponse</a>, <a href="JacksonRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></h3>
-<code><a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="JsonRpcClient.html#close()">close</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a></code></div>
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcTransport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></h3>
+<code><a href="JsonRpcTransport.html#syncGet(java.util.concurrent.CompletableFuture)">syncGet</a></code></div>
 </section>
 </li>
 </ul>
@@ -210,44 +187,13 @@ <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Metho
 <h2>Constructor Details</h2>
 <ul class="member-list">
 <li>
-<section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLSocketFactory,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)">
+<section class="detail" id="&lt;init&gt;(com.fasterxml.jackson.databind.ObjectMapper,javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)">
 <h3>JsonRpcClientHttpUrlConnection</h3>
-<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
-</span><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-43">JsonRpcClientHttpUrlConnection</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLSocketFactory.html" title="class or interface in javax.net.ssl" class="external-link">SSLSocketFactory</a>&nbsp;socketFactory,
- <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-42">JsonRpcClientHttpUrlConnection</a></span><wbr><span class="parameters">(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a>&nbsp;mapper,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
-<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
-<div class="deprecation-comment">Use <a href="#%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)"><code>JsonRpcClientHttpUrlConnection(SSLContext, JsonRpcMessage.Version, URI, String, String)</code></a></div>
-</div>
-</section>
-</li>
-<li>
-<section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)">
-<h3>JsonRpcClientHttpUrlConnection</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-53">JsonRpcClientHttpUrlConnection</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
- <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
-</section>
-</li>
-<li>
-<section class="detail" id="&lt;init&gt;(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)">
-<h3>JsonRpcClientHttpUrlConnection</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-70">JsonRpcClientHttpUrlConnection</a></span><wbr><span class="parameters">(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
-<div class="block">Construct a JSON-RPC client from URI, username, and password</div>
-<dl class="notes">
-<dt>Parameters:</dt>
-<dd><code>jsonRpcVersion</code> - version for <code>jsonrpc</code> field in messages</dd>
-<dd><code>server</code> - server URI should not contain username/password</dd>
-<dd><code>rpcUser</code> - username for the RPC HTTP connection</dd>
-<dd><code>rpcPassword</code> - password for the RPC HTTP connection</dd>
-</dl>
 </section>
 </li>
 </ul>
@@ -261,9 +207,11 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="getServerURI()">
 <h3>getServerURI</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-78">getServerURI</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-55">getServerURI</a></span>()</div>
 <div class="block">Get the URI of the server this client connects to</div>
 <dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcTransport.html#getServerURI()">getServerURI</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 <dt>Returns:</dt>
 <dd>Server URI</dd>
 </dl>
@@ -272,12 +220,14 @@ <h3>getServerURI</h3>
 <li>
 <section class="detail" id="sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">
 <h3>sendRequestForResponse</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-92">sendRequestForResponse</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-69">sendRequestForResponse</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</span>
                                               throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
 <a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
 <div class="block">Send a JSON-RPC request to the server and return a JSON-RPC response.</div>
 <dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcTransport.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponse</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 <dt>Type Parameters:</dt>
 <dd><code>R</code> - Type of result object</dd>
 <dt>Parameters:</dt>
@@ -294,11 +244,13 @@ <h3>sendRequestForResponse</h3>
 <li>
 <section class="detail" id="sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">
 <h3>sendRequestForResponseAsync</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-121">sendRequestForResponseAsync</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html#line-98">sendRequestForResponseAsync</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</span></div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="JacksonRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">JacksonRpcClient</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcTransport.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)">JsonRpcTransport</a></code></span></div>
 <div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
 <dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcTransport.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponseAsync</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 <dt>Type Parameters:</dt>
 <dd><code>R</code> - Type of result object</dd>
 <dt>Parameters:</dt>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html b/apidoc/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html
index aff09219c..f4e0acf43 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcClientJavaNet.MappingFunction (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcClientJavaNet.MappingFunction (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcClientJavaNet, interface: MappingFunction">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -82,7 +96,7 @@ <h1 title="Interface JsonRpcClientJavaNet.MappingFunction" class="title">Interfa
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></dd>
+<dd><code><a href="JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></code></dd>
 </dl>
 <dl class="notes">
 <dt>Functional Interface:</dt>
@@ -90,7 +104,7 @@ <h1 title="Interface JsonRpcClientJavaNet.MappingFunction" class="title">Interfa
 </dl>
 <hr>
 <div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/FunctionalInterface.html" title="class or interface in java.lang" class="external-link">@FunctionalInterface</a>
-</span><span class="modifiers">protected static interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-136">JsonRpcClientJavaNet.MappingFunction</a>&lt;R&gt;</span><span class="extends-implements">
+</span><span class="modifiers">protected static interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-162">JsonRpcClientJavaNet.MappingFunction</a>&lt;R&gt;</span><span class="extends-implements">
 extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Function.html" title="class or interface in java.util.function" class="external-link">Function</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr>R&gt;</span></div>
 <div class="block">Map a response string to a Java object. Wraps checked <a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonProcessingException.html" title="class or interface in com.fasterxml.jackson.core" class="external-link"><code>JsonProcessingException</code></a>
  in unchecked <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionException.html" title="class or interface in java.util.concurrent" class="external-link"><code>CompletionException</code></a>.</div>
@@ -138,7 +152,8 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="apply(java.lang.String)">
 <h3>apply</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="JsonRpcClientJavaNet.MappingFunction.html" title="type parameter in JsonRpcClientJavaNet.MappingFunction">R</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html#line-144">apply</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;s)</span></div>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type"><a href="JsonRpcClientJavaNet.MappingFunction.html" title="type parameter in JsonRpcClientJavaNet.MappingFunction">R</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html#line-171">apply</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;s)</span>
+         throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionException.html" title="class or interface in java.util.concurrent" class="external-link">CompletionException</a></span></div>
 <div class="block">Gets a result. Wraps checked <a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonProcessingException.html" title="class or interface in com.fasterxml.jackson.core" class="external-link"><code>JsonProcessingException</code></a> in <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionException.html" title="class or interface in java.util.concurrent" class="external-link"><code>CompletionException</code></a></div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -147,14 +162,16 @@ <h3>apply</h3>
 <dd><code>s</code> - input</dd>
 <dt>Returns:</dt>
 <dd>a result</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionException.html" title="class or interface in java.util.concurrent" class="external-link">CompletionException</a></code> - (unchecked) if a JsonProcessingException exception occurs</dd>
 </dl>
 </section>
 </li>
 <li>
 <section class="detail" id="applyThrows(java.lang.String)">
 <h3>applyThrows</h3>
-<div class="member-signature"><span class="return-type"><a href="JsonRpcClientJavaNet.MappingFunction.html" title="type parameter in JsonRpcClientJavaNet.MappingFunction">R</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html#line-160">applyThrows</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;s)</span>
-       throws <span class="exceptions"><a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonProcessingException.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonProcessingException</a></span></div>
+<div class="member-signature"><span class="return-type"><a href="JsonRpcClientJavaNet.MappingFunction.html" title="type parameter in JsonRpcClientJavaNet.MappingFunction">R</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html#line-186">applyThrows</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;s)</span>
+       throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a></span></div>
 <div class="block">Gets a result and may throw a checked exception.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
@@ -163,6 +180,7 @@ <h3>applyThrows</h3>
 <dd>a result</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonProcessingException.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonProcessingException</a></code> - Checked Exception</dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a></code></dd>
 </dl>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html b/apidoc/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html
index c4aa0d4fc..14aef98b7 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcClientJavaNet (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcClientJavaNet (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcClientJavaNet">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,13 +34,32 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
-<li><a href="#field-summary">Field</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
 <li><a href="#constructor-summary">Constr</a>&nbsp;|&nbsp;</li>
 <li><a href="#method-summary">Method</a></li>
 </ul>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,18 +86,17 @@
 <h1 title="Class JsonRpcClientJavaNet" class="title">Class JsonRpcClientJavaNet</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.AbstractRpcClient</a>
 <div class="inheritance">org.consensusj.jsonrpc.JsonRpcClientJavaNet</div>
 </div>
-</div>
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code>, <code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
+<dd><code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-22">JsonRpcClientJavaNet</a></span>
-<span class="extends-implements">extends <a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></span></div>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-25">JsonRpcClientJavaNet</a></span>
+<span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
+implements <a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</span></div>
 <div class="block">Incubating JSON-RPC client using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.net.http/java/net/http/HttpClient.html" title="class or interface in java.net.http" class="external-link"><code>HttpClient</code></a></div>
 </section>
 <section class="summary">
@@ -105,16 +118,7 @@ <h2>Nested Class Summary</h2>
 </div>
 <div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
-</section>
-</li>
-<!-- =========== FIELD SUMMARY =========== -->
-<li>
-<section class="field-summary" id="field-summary">
-<h2>Field Summary</h2>
-<div class="inherited-list">
-<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="AbstractRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="AbstractRpcClient.html#mapper">mapper</a></code></div>
+<code><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -125,21 +129,17 @@ <h2>Constructor Summary</h2>
 <div class="summary-table two-column-summary">
 <div class="table-header col-first">Constructor</div>
 <div class="table-header col-last">Description</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientJavaNet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientJavaNet</a><wbr>(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a>&nbsp;mapper,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
 <div class="col-last even-row-color">&nbsp;</div>
-<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientJavaNet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
- <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(com.fasterxml.jackson.databind.ObjectMapper,javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientJavaNet</a><wbr>(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a>&nbsp;mapper,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)" class="member-name-link">JsonRpcClientJavaNet</a><wbr>(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</code></div>
-<div class="col-last even-row-color">&nbsp;</div>
 </div>
 </section>
 </li>
@@ -159,7 +159,7 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Get the URI of the remote server</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>&lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)" class="member-name-link">sendRequestForResponseAsync</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
@@ -169,20 +169,14 @@ <h2>Method Summary</h2>
 </div>
 </div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="AbstractRpcClient.html#base64Encode(java.lang.String)">base64Encode</a>, <a href="AbstractRpcClient.html#getDefaultSSLContext()">getDefaultSSLContext</a>, <a href="AbstractRpcClient.html#getDefaultType()">getDefaultType</a>, <a href="AbstractRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="AbstractRpcClient.html#getMapper()">getMapper</a></code></div>
-<div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
 <code><a href="AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JacksonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></h3>
-<code><a href="JacksonRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="JacksonRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)">send</a>, <a href="JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)">send</a>, <a href="JacksonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="JacksonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponse</a>, <a href="JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponse</a>, <a href="JacksonRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></h3>
-<code><a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="JsonRpcClient.html#close()">close</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a></code></div>
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcTransport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></h3>
+<code><a href="JsonRpcTransport.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponse</a>, <a href="JsonRpcTransport.html#syncGet(java.util.concurrent.CompletableFuture)">syncGet</a></code></div>
 </section>
 </li>
 </ul>
@@ -195,32 +189,24 @@ <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Metho
 <h2>Constructor Details</h2>
 <ul class="member-list">
 <li>
-<section class="detail" id="&lt;init&gt;(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)">
+<section class="detail" id="&lt;init&gt;(com.fasterxml.jackson.databind.ObjectMapper,java.net.URI,java.lang.String,java.lang.String)">
 <h3>JsonRpcClientJavaNet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-31">JsonRpcClientJavaNet</a></span><wbr><span class="parameters">(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-36">JsonRpcClientJavaNet</a></span><wbr><span class="parameters">(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a>&nbsp;mapper,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
 </section>
 </li>
 <li>
-<section class="detail" id="&lt;init&gt;(javax.net.ssl.SSLContext,org.consensusj.jsonrpc.JsonRpcMessage.Version,java.net.URI,java.lang.String,java.lang.String)">
+<section class="detail" id="&lt;init&gt;(com.fasterxml.jackson.databind.ObjectMapper,javax.net.ssl.SSLContext,java.net.URI,java.lang.String,java.lang.String)">
 <h3>JsonRpcClientJavaNet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-35">JsonRpcClientJavaNet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
- <a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-40">JsonRpcClientJavaNet</a></span><wbr><span class="parameters">(<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/ObjectMapper.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">ObjectMapper</a>&nbsp;mapper,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
 </section>
 </li>
-<li>
-<section class="detail" id="&lt;init&gt;(java.net.URI,java.lang.String,java.lang.String)">
-<h3>JsonRpcClientJavaNet</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-47">JsonRpcClientJavaNet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;server,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcUser,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;rpcPassword)</span></div>
-</section>
-</li>
 </ul>
 </section>
 </li>
@@ -232,10 +218,12 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">
 <h3>sendRequestForResponseAsync</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-54">sendRequestForResponseAsync</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-55">sendRequestForResponseAsync</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
  <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&nbsp;responseType)</span></div>
 <div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
 <dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcTransport.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponseAsync</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 <dt>Type Parameters:</dt>
 <dd><code>R</code> - Type of result object</dd>
 <dt>Parameters:</dt>
@@ -249,9 +237,11 @@ <h3>sendRequestForResponseAsync</h3>
 <li>
 <section class="detail" id="getServerURI()">
 <h3>getServerURI</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-68">getServerURI</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html#line-69">getServerURI</a></span>()</div>
 <div class="block">Get the URI of the remote server</div>
 <dl class="notes">
+<dt>Specified by:</dt>
+<dd><code><a href="JsonRpcTransport.html#getServerURI()">getServerURI</a></code>&nbsp;in interface&nbsp;<code><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 <dt>Returns:</dt>
 <dd>URI of remote server</dd>
 </dl>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcError.Error.html b/apidoc/org/consensusj/jsonrpc/JsonRpcError.Error.html
index 2e82d8c38..28dcf7516 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcError.Error.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcError.Error.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcError.Error (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcError.Error (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcError, enum: Error">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#enum-constant-summary">Enum Constants</a></li>
+<li>Field</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#enum-constant-detail">Enum Constants</a></li>
+<li>Field</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -83,7 +97,7 @@ <h1 title="Enum Class JsonRpcError.Error" class="title">Enum Class JsonRpcError.
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="JsonRpcError.html" title="class in org.consensusj.jsonrpc">JsonRpcError</a></dd>
+<dd><code><a href="JsonRpcError.html" title="class in org.consensusj.jsonrpc">JsonRpcError</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static enum </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcError.html#line-56">JsonRpcError.Error</a></span>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcError.html b/apidoc/org/consensusj/jsonrpc/JsonRpcError.html
index d5f924650..0c878b77f 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcError.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcError.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcError (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcError (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcError">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcErrorException.html b/apidoc/org/consensusj/jsonrpc/JsonRpcErrorException.html
index 2f2400d2a..c3c1b4150 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcErrorException.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcErrorException.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcErrorException (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcErrorException (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcErrorException">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -97,7 +111,7 @@ <h1 title="Class JsonRpcErrorException" class="title">Class JsonRpcErrorExceptio
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="JsonRpcException.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcException</code></a></li>
 <li><a href="../../../serialized-form.html#org.consensusj.jsonrpc.JsonRpcErrorException">Serialized Form</a></li>
 </ul>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcException.html b/apidoc/org/consensusj/jsonrpc/JsonRpcException.html
index 5e9bdcdba..9effb4a2e 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcException.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcException.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcException (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcException (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcException">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -99,12 +117,12 @@ <h1 title="Class JsonRpcException" class="title">Class JsonRpcException</h1>
  <p>
  TODO: Rethink the differences between the two subclasses in light of Bitcoin (and possibly other)
  implementations returning HTTP status codes along with JsonRpcError responses. Bitcoin even incorrectly
- returns a 500 for invalid parameters. I think I originally assume that their would be either an
+ returns a 500 for invalid parameters. I think I originally assumed that there would be either an
  HTTP status error or a JSON-RPC error, but in reality responses can probably have neither, either, or both.</div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="https://github.com/bitcoin/bitcoin/issues/2960">Bitcoin Core Issue #2960</a></li>
 <li><a href="../../../serialized-form.html#org.consensusj.jsonrpc.JsonRpcException">Serialized Form</a></li>
 </ul>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcMessage.Version.html b/apidoc/org/consensusj/jsonrpc/JsonRpcMessage.Version.html
index f0145f2a8..83a551cc5 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcMessage.Version.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcMessage.Version.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcMessage.Version (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcMessage.Version (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcMessage, enum: Version">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#enum-constant-summary">Enum Constants</a></li>
+<li>Field</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#enum-constant-detail">Enum Constants</a></li>
+<li>Field</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -83,7 +97,7 @@ <h1 title="Enum Class JsonRpcMessage.Version" class="title">Enum Class JsonRpcMe
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="JsonRpcMessage.html" title="class in org.consensusj.jsonrpc">JsonRpcMessage</a></dd>
+<dd><code><a href="JsonRpcMessage.html" title="class in org.consensusj.jsonrpc">JsonRpcMessage</a></code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public static enum </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcMessage.html#line-8">JsonRpcMessage.Version</a></span>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcMessage.html b/apidoc/org/consensusj/jsonrpc/JsonRpcMessage.html
index 363ff7666..74f7d7db6 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcMessage.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcMessage.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcMessage (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcMessage (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcMessage">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcRequest.html b/apidoc/org/consensusj/jsonrpc/JsonRpcRequest.html
index d2881c652..6d1774ac2 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcRequest.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcRequest.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcRequest (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcRequest (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcRequest">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -76,7 +90,7 @@ <h1 title="Class JsonRpcRequest" class="title">Class JsonRpcRequest</h1>
 </div>
 <section class="class-description" id="class-description">
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-17">JsonRpcRequest</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-19">JsonRpcRequest</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
 <div class="block">JSON-RPC Request POJO</div>
 </section>
@@ -102,7 +116,7 @@ <h2>Constructor Summary</h2>
 <div class="block">Constructor for use by Jackson deserialization.</div>
 </div>
 <div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String,java.util.List)" class="member-name-link">JsonRpcRequest</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;?&gt;&nbsp;params)</code></div>
 <div class="col-last even-row-color">
 <div class="block">Create a JSON RPC request (for serialization.) To create a request on the client side, it
  is generally recommended to use the methods in <a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc"><code>JsonRpcClient</code></a>.</div>
@@ -117,7 +131,7 @@ <h2>Constructor Summary</h2>
 </div>
 <div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.lang.String,java.util.List)" class="member-name-link">JsonRpcRequest</a><wbr>(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</code></div>
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;?&gt;&nbsp;params)</code></div>
 <div class="col-last even-row-color">
 <div class="block">Create a JSON RPC request (for serialization.)
  Can be used to override default JSON RPC version.</div>
@@ -145,7 +159,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getMethod()" class="member-name-link">getMethod</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getParams()" class="member-name-link">getParams</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
@@ -168,7 +182,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(java.lang.String,java.lang.String,java.lang.String,java.util.List)">
 <h3>JsonRpcRequest</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-38">JsonRpcRequest</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;jsonrpc,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-40">JsonRpcRequest</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;jsonrpc,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;id,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span></div>
@@ -183,7 +197,7 @@ <h3>JsonRpcRequest</h3>
 <dd><code>params</code> - filled from the JSON object</dd>
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list-long">
+<ul class="tag-list-long">
 <li><a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)"><code>JsonRpcClient.buildJsonRequest(String, List)</code></a></li>
 <li><a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)"><code>JsonRpcClient.buildJsonRequest(String, Object...)</code></a></li>
 </ul>
@@ -194,7 +208,7 @@ <h3>JsonRpcRequest</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(org.consensusj.jsonrpc.JsonRpcMessage.Version,long,java.lang.String,java.util.List)">
 <h3>JsonRpcRequest</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-59">JsonRpcRequest</a></span><wbr><span class="parameters">(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-61">JsonRpcRequest</a></span><wbr><span class="parameters">(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
  long&nbsp;id,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span></div>
@@ -213,9 +227,9 @@ <h3>JsonRpcRequest</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(org.consensusj.jsonrpc.JsonRpcMessage.Version,java.lang.String,java.util.List)">
 <h3>JsonRpcRequest</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-78">JsonRpcRequest</a></span><wbr><span class="parameters">(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-77">JsonRpcRequest</a></span><wbr><span class="parameters">(<a href="JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a>&nbsp;jsonRpcVersion,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span></div>
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;?&gt;&nbsp;params)</span></div>
 <div class="block">Create a JSON RPC request (for serialization.)
  Can be used to override default JSON RPC version. To create a request on the client side, it
  is generally recommended to use the methods in the <a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc"><code>JsonRpcClient</code></a> you are using.</div>
@@ -230,8 +244,8 @@ <h3>JsonRpcRequest</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(java.lang.String,java.util.List)">
 <h3>JsonRpcRequest</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-91">JsonRpcRequest</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&nbsp;params)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-90">JsonRpcRequest</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;?&gt;&nbsp;params)</span></div>
 <div class="block">Create a JSON RPC request (for serialization.) To create a request on the client side, it
  is generally recommended to use the methods in <a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc"><code>JsonRpcClient</code></a>.</div>
 <dl class="notes">
@@ -240,7 +254,7 @@ <h3>JsonRpcRequest</h3>
 <dd><code>params</code> - Parameters to serialize</dd>
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list-long">
+<ul class="tag-list-long">
 <li><a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)"><code>JsonRpcClient.buildJsonRequest(String, List)</code></a></li>
 <li><a href="JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)"><code>JsonRpcClient.buildJsonRequest(String, Object...)</code></a></li>
 </ul>
@@ -251,7 +265,7 @@ <h3>JsonRpcRequest</h3>
 <li>
 <section class="detail" id="&lt;init&gt;(java.lang.String)">
 <h3>JsonRpcRequest</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-99">JsonRpcRequest</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-98">JsonRpcRequest</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;method)</span></div>
 <div class="block">Convenience constructor for requests with empty parameter list</div>
 <dl class="notes">
 <dt>Parameters:</dt>
@@ -270,25 +284,25 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="getJsonrpc()">
 <h3>getJsonrpc</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-103">getJsonrpc</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-102">getJsonrpc</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getMethod()">
 <h3>getMethod</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-107">getMethod</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-106">getMethod</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getId()">
 <h3>getId</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-111">getId</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-110">getId</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="getParams()">
 <h3>getParams</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-116">getParams</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcRequest.html#line-115">getParams</a></span>()</div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcResponse.html b/apidoc/org/consensusj/jsonrpc/JsonRpcResponse.html
index 6f47ceced..03088f301 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcResponse.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcResponse.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcResponse (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcResponse (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcResponse">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcService.html b/apidoc/org/consensusj/jsonrpc/JsonRpcService.html
index 3509ee107..0590f55f9 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcService.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, interface: JsonRpcService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -100,7 +114,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;RSLT&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;RSLT&gt;&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;RSLT&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;RSLT&gt;&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#call(org.consensusj.jsonrpc.JsonRpcRequest)" class="member-name-link">call</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;req)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Handle a JSON-RPC <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> and return a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> POJO</div>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcStatusException.html b/apidoc/org/consensusj/jsonrpc/JsonRpcStatusException.html
index de2746ce8..172ffcc13 100644
--- a/apidoc/org/consensusj/jsonrpc/JsonRpcStatusException.html
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcStatusException.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcStatusException (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcStatusException (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc, class: JsonRpcStatusException">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -86,13 +104,13 @@ <h1 title="Class JsonRpcStatusException" class="title">Class JsonRpcStatusExcept
 <hr>
 <div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html#line-9">JsonRpcStatusException</a></span>
 <span class="extends-implements">extends <a href="JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></span></div>
-<div class="block">JSON-RPC returned HTTP status other than 200
+<div class="block">JSON-RPC returned HTTP status other than 200 (and unfortunately also sometimes when their is response.error)
  Additional information is usually in JSON-RPC response
  TODO: See TODO in parent class <a href="JsonRpcException.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcException</code></a></div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="JsonRpcException.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcException</code></a></li>
 <li><a href="../../../serialized-form.html#org.consensusj.jsonrpc.JsonRpcStatusException">Serialized Form</a></li>
 </ul>
@@ -121,10 +139,14 @@ <h2>Field Summary</h2>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second odd-row-color"><code><a href="#response" class="member-name-link">response</a></code></div>
-<div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>final <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;</code></div>
+<div class="col-last odd-row-color">
+<div class="block">Http response body as a string.</div>
+</div>
+<div class="col-first even-row-color"><code>final <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a><wbr>&lt;?&gt;</code></div>
 <div class="col-second even-row-color"><code><a href="#responseJson" class="member-name-link">responseJson</a></code></div>
-<div class="col-last even-row-color">&nbsp;</div>
+<div class="col-last even-row-color">
+<div class="block">Deserialized response message, if available.</div>
+</div>
 </div>
 </section>
 </li>
@@ -136,14 +158,32 @@ <h2>Constructor Summary</h2>
 <div class="summary-table two-column-summary">
 <div class="table-header col-first">Constructor</div>
 <div class="table-header col-last">Description</div>
-<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int,java.lang.String,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)" class="member-name-link">JsonRpcStatusException</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message,
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(int,java.lang.String)" class="member-name-link">JsonRpcStatusException</a><wbr>(int&nbsp;httpCode,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;responseBody)</code></div>
+<div class="col-last even-row-color">
+<div class="block">Constructor for when we were unable to deserialize a JSON response</div>
+</div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(int,org.consensusj.jsonrpc.JsonRpcResponse)" class="member-name-link">JsonRpcStatusException</a><wbr>(int&nbsp;httpCode,
+ <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;&nbsp;responseBodyJson)</code></div>
+<div class="col-last odd-row-color">
+<div class="block">Constructor for when we were able to deserialize a JSON response</div>
+</div>
+<div class="col-constructor-name even-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)" class="member-name-link">JsonRpcStatusException</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message,
  int&nbsp;httpCode,
- <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;httpMessage,
  int&nbsp;jsonRPCCode,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;responseBody,
  <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;&nbsp;responseBodyJson)</code></div>
 <div class="col-last even-row-color">
-<div class="block">Default Constructor</div>
+<div class="block">Same as canonical, but without the <code>httpCode</code> parameter.</div>
+</div>
+<div class="col-constructor-name odd-row-color"><code><a href="#%3Cinit%3E(java.lang.String,int,java.lang.String,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)" class="member-name-link">JsonRpcStatusException</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message,
+ int&nbsp;httpCode,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;httpMessage,
+ int&nbsp;jsonRPCCode,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;responseBody,
+ <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;&nbsp;responseBodyJson)</code></div>
+<div class="col-last odd-row-color">
+<div class="block">Canonical Constructor</div>
 </div>
 </div>
 </section>
@@ -190,13 +230,19 @@ <h3>jsonRpcCode</h3>
 <li>
 <section class="detail" id="response">
 <h3>response</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html#line-13">response</a></span></div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html#line-17">response</a></span></div>
+<div class="block">Http response body as a string. Null if not-available (check deserialized JSON in this case)</div>
 </section>
 </li>
 <li>
 <section class="detail" id="responseJson">
 <h3>responseJson</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type"><a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html#line-14">responseJson</a></span></div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type"><a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html#line-26">responseJson</a></span></div>
+<div class="block">Deserialized response message, if available. Null if not-available.
+ Result is usually null when an error occurs, but the type of the result is
+ unspecified and could be either <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link"><code>Map</code></a>, <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link"><code>JsonNode</code></a>,
+ or the result type of the failed request depending upon where and how the exception was
+ created.</div>
 </section>
 </li>
 </ul>
@@ -210,21 +256,58 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(java.lang.String,int,java.lang.String,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)">
 <h3>JsonRpcStatusException</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html#line-26">JsonRpcStatusException</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html#line-38">JsonRpcStatusException</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message,
  int&nbsp;httpCode,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;httpMessage,
  int&nbsp;jsonRPCCode,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;responseBody,
  <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;&nbsp;responseBodyJson)</span></div>
-<div class="block">Default Constructor</div>
+<div class="block">Canonical Constructor</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>message</code> - Error message from Json if available, else http status message</dd>
 <dd><code>httpCode</code> - HTTP status code, e.g. 404</dd>
-<dd><code>httpMessage</code> - HTTP status message, e.g. "Not found"</dd>
+<dd><code>httpMessage</code> - HTTP status message, e.g. "Not found" (removed from HTTP/2 and HTTP/3)</dd>
 <dd><code>jsonRPCCode</code> - Integer error code in JSON response, if any</dd>
-<dd><code>responseBody</code> - responseBody body as string</dd>
-<dd><code>responseBodyJson</code> - responseBody body as Json Map</dd>
+<dd><code>responseBody</code> - responseBody body as string (null if JSON available)</dd>
+<dd><code>responseBodyJson</code> - responseBody body as Json Map (null if JSON not-available)</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="&lt;init&gt;(java.lang.String,int,int,java.lang.String,org.consensusj.jsonrpc.JsonRpcResponse)">
+<h3>JsonRpcStatusException</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html#line-50">JsonRpcStatusException</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message,
+ int&nbsp;httpCode,
+ int&nbsp;jsonRPCCode,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;responseBody,
+ <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;&nbsp;responseBodyJson)</span></div>
+<div class="block">Same as canonical, but without the <code>httpCode</code> parameter. (which is not present in java.net.http, HTTP/2, etc.)</div>
+</section>
+</li>
+<li>
+<section class="detail" id="&lt;init&gt;(int,org.consensusj.jsonrpc.JsonRpcResponse)">
+<h3>JsonRpcStatusException</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html#line-59">JsonRpcStatusException</a></span><wbr><span class="parameters">(int&nbsp;httpCode,
+ <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt;&nbsp;responseBodyJson)</span></div>
+<div class="block">Constructor for when we were able to deserialize a JSON response</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>httpCode</code> - http status code</dd>
+<dd><code>responseBodyJson</code> - deserialized JSON</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="&lt;init&gt;(int,java.lang.String)">
+<h3>JsonRpcStatusException</h3>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html#line-72">JsonRpcStatusException</a></span><wbr><span class="parameters">(int&nbsp;httpCode,
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;responseBody)</span></div>
+<div class="block">Constructor for when we were unable to deserialize a JSON response</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>httpCode</code> - http status code</dd>
+<dd><code>responseBody</code> - response body as a string</dd>
 </dl>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/jsonrpc/JsonRpcTransport.html b/apidoc/org/consensusj/jsonrpc/JsonRpcTransport.html
new file mode 100644
index 000000000..56dc86819
--- /dev/null
+++ b/apidoc/org/consensusj/jsonrpc/JsonRpcTransport.html
@@ -0,0 +1,289 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcTransport (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="declaration: package: org.consensusj.jsonrpc, interface: JsonRpcTransport">
+<meta name="generator" content="javadoc/ClassWriterImpl">
+<link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="../../../script.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="class-declaration-page">
+<script type="text/javascript">var pathtoroot = "../../../";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="../../../index.html">Overview</a></li>
+<li><a href="package-summary.html">Package</a></li>
+<li class="nav-bar-cell1-rev">Class</li>
+<li><a href="package-tree.html">Tree</a></li>
+<li><a href="../../../deprecated-list.html">Deprecated</a></li>
+<li><a href="../../../index-all.html">Index</a></li>
+<li><a href="../../../help-doc.html#class">Help</a></li>
+</ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list">
+<ul class="sub-nav-list">
+<li>Summary:&nbsp;</li>
+<li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+<ul class="sub-nav-list">
+<li>Detail:&nbsp;</li>
+<li>Field&nbsp;|&nbsp;</li>
+<li>Constr&nbsp;|&nbsp;</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
+</div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<!-- ======== START OF CLASS DATA ======== -->
+<div class="header">
+<div class="sub-title"><span class="package-label-in-type">Package</span>&nbsp;<a href="package-summary.html">org.consensusj.jsonrpc</a></div>
+<h1 title="Interface JsonRpcTransport" class="title">Interface JsonRpcTransport&lt;T extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Type.html" title="class or interface in java.lang.reflect" class="external-link">Type</a>&gt;</h1>
+</div>
+<section class="class-description" id="class-description">
+<dl class="notes">
+<dt>All Superinterfaces:</dt>
+<dd><code><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code></dd>
+</dl>
+<dl class="notes">
+<dt>All Known Subinterfaces:</dt>
+<dd><code><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt;</code></dd>
+</dl>
+<dl class="notes">
+<dt>All Known Implementing Classes:</dt>
+<dd><code><a href="../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></code>, <code><a href="../bitcoin/jsonrpc/BitcoinExtendedClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a></code>, <code><a href="DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></code>, <code><a href="../ethereum/jsonrpc/EthereumClient.html" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></code>, <code><a href="JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></code>, <code><a href="JsonRpcClientJavaNet.html" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></code>, <code><a href="../namecoin/jsonrpc/NamecoinClient.html" title="class in org.consensusj.namecoin.jsonrpc">NamecoinClient</a></code>, <code><a href="../bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></dd>
+</dl>
+<hr>
+<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcTransport.html#line-16">JsonRpcTransport</a>&lt;T extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Type.html" title="class or interface in java.lang.reflect" class="external-link">Type</a>&gt;</span><span class="extends-implements">
+extends <a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></span></div>
+<div class="block">Defines the interface for a network-layer implementation of a JSON-RPC client.</div>
+</section>
+<section class="summary">
+<ul class="summary-list">
+<!-- ======== NESTED CLASS SUMMARY ======== -->
+<li>
+<section class="nested-class-summary" id="nested-class-summary">
+<h2>Nested Class Summary</h2>
+<div class="inherited-list">
+<h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
+<code><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
+</section>
+</li>
+<!-- ========== METHOD SUMMARY =========== -->
+<li>
+<section class="method-summary" id="method-summary">
+<h2>Method Summary</h2>
+<div id="method-summary-table">
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab3" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab3', 3)" class="table-tab">Abstract Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button></div>
+<div id="method-summary-table.tabpanel" role="tabpanel">
+<div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
+<div class="table-header col-first">Modifier and Type</div>
+<div class="table-header col-second">Method</div>
+<div class="table-header col-last">Description</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1"><code><a href="#base64Encode(java.lang.String)" class="member-name-link">base64Encode</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;authString)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1">
+<div class="block">Encode username password as Base64 for basic authentication</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab1"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab1"><code><a href="#getDefaultSSLContext()" class="member-name-link">getDefaultSSLContext</a>()</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab1">
+<div class="block">Return the default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link"><code>SSLContext</code></a> without declaring a checked exception</div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#getServerURI()" class="member-name-link">getServerURI</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
+<div class="block">Get the URI of the remote server</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a><wbr>&lt;R&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)" class="member-name-link">sendRequestForResponse</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="JsonRpcTransport.html" title="type parameter in JsonRpcTransport">T</a>&nbsp;responseType)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
+<div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a></div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code>&lt;R&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)" class="member-name-link">sendRequestForResponseAsync</a><wbr>(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="JsonRpcTransport.html" title="type parameter in JsonRpcTransport">T</a>&nbsp;responseType)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
+<div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;R&gt;&nbsp;R</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#syncGet(java.util.concurrent.CompletableFuture)" class="member-name-link">syncGet</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;R&gt;&nbsp;future)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
+<div class="block">Synchronously complete a JSON-RPC request by calling <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html#get()" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture.get()</code></a>, unwrapping nested
+ <a href="JsonRpcException.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcException</code></a> or <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> from <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ExecutionException.html" title="class or interface in java.util.concurrent" class="external-link"><code>ExecutionException</code></a>.</div>
+</div>
+</div>
+</div>
+</div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
+<code><a href="AsyncSupport.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
+</section>
+</li>
+</ul>
+</section>
+<section class="details">
+<ul class="details-list">
+<!-- ============ METHOD DETAIL ========== -->
+<li>
+<section class="method-details" id="method-detail">
+<h2>Method Details</h2>
+<ul class="member-list">
+<li>
+<section class="detail" id="getServerURI()">
+<h3>getServerURI</h3>
+<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcTransport.html#line-21">getServerURI</a></span>()</div>
+<div class="block">Get the URI of the remote server</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>URI of remote server</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)">
+<h3 id="sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.reflect.Type)">sendRequestForResponse</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcTransport.html#line-35">sendRequestForResponse</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="JsonRpcTransport.html" title="type parameter in JsonRpcTransport">T</a>&nbsp;responseType)</span>
+                                               throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
+<a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></span></div>
+<div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a>
+ <p>Synchronous subclasses should override this method to prevent <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html#supplyAsync(java.util.function.Supplier)" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture.supplyAsync(Supplier)</code></a> from
+ being called twice when <a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc"><code>AsyncSupport</code></a> is being used. Eventually we'll migrate more of the codebase to native
+ async, and then we won't have to worry about calling <code>supplyAsync</code> twice.</div>
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>R</code> - Type of result object</dd>
+<dt>Parameters:</dt>
+<dd><code>request</code> - The request to send</dd>
+<dd><code>responseType</code> - The response type expected (used by Jackson for conversion)</dd>
+<dt>Returns:</dt>
+<dd>A JSON RPC Response with `result` of type `R`</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - network error</dd>
+<dd><code><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></code> - JSON RPC status error</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,T)">
+<h3 id="sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.reflect.Type)">sendRequestForResponseAsync</h3>
+<div class="member-signature"><span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;R&gt;&gt;</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcTransport.html#line-46">sendRequestForResponseAsync</a></span><wbr><span class="parameters">(<a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request,
+ <a href="JsonRpcTransport.html" title="type parameter in JsonRpcTransport">T</a>&nbsp;responseType)</span></div>
+<div class="block">Send a <a href="JsonRpcRequest.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcRequest</code></a> for a <a href="JsonRpcResponse.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcResponse</code></a> asynchronously.</div>
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>R</code> - Type of result object</dd>
+<dt>Parameters:</dt>
+<dd><code>request</code> - The request to send</dd>
+<dd><code>responseType</code> - The response type expected (used by Jackson for conversion)</dd>
+<dt>Returns:</dt>
+<dd>A future JSON RPC Response with `result` of type `R`</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="syncGet(java.util.concurrent.CompletableFuture)">
+<h3>syncGet</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;R&gt;</span>&nbsp;<span class="return-type">R</span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcTransport.html#line-58">syncGet</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;R&gt;&nbsp;future)</span>
+               throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a>,
+<a href="JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></span></div>
+<div class="block">Synchronously complete a JSON-RPC request by calling <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html#get()" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture.get()</code></a>, unwrapping nested
+ <a href="JsonRpcException.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcException</code></a> or <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a> from <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ExecutionException.html" title="class or interface in java.util.concurrent" class="external-link"><code>ExecutionException</code></a>.</div>
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>R</code> - The expected result type</dd>
+<dt>Parameters:</dt>
+<dd><code>future</code> - The <code>CompletableFuture</code> (result of JSON-RPC request) to unwrap</dd>
+<dt>Returns:</dt>
+<dd>A JSON-RPC result</dd>
+<dt>Throws:</dt>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a></code> - If <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html#get()" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture.get()</code></a> threw  <code>ExecutionException</code> caused by <code>IOException</code></dd>
+<dd><code><a href="JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a></code> - If <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html#get()" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture.get()</code></a> threw  <code>ExecutionException</code> caused by <code>JsonRpcException</code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" title="class or interface in java.lang" class="external-link">RuntimeException</a></code> - If <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html#get()" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture.get()</code></a> threw <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/InterruptedException.html" title="class or interface in java.lang" class="external-link"><code>InterruptedException</code></a> or other <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ExecutionException.html" title="class or interface in java.util.concurrent" class="external-link"><code>ExecutionException</code></a>.</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="base64Encode(java.lang.String)">
+<h3>base64Encode</h3>
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcTransport.html#line-83">base64Encode</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;authString)</span></div>
+<div class="block">Encode username password as Base64 for basic authentication
+ <p>
+ We're using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Base64.html" title="class or interface in java.util" class="external-link"><code>Base64</code></a>, which requires Android 8.0 or later.</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>authString</code> - An authorization string of the form `username:password`</dd>
+<dt>Returns:</dt>
+<dd>A compliant Base64 encoding of `authString`</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="getDefaultSSLContext()">
+<h3>getDefaultSSLContext</h3>
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a></span>&nbsp;<span class="element-name"><a href="../../../src-html/org/consensusj/jsonrpc/JsonRpcTransport.html#line-92">getDefaultSSLContext</a></span>()</div>
+<div class="block">Return the default <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link"><code>SSLContext</code></a> without declaring a checked exception</div>
+<dl class="notes">
+<dt>Returns:</dt>
+<dd>The default <code>SSLContext</code></dd>
+</dl>
+</section>
+</li>
+</ul>
+</section>
+</li>
+</ul>
+</section>
+<!-- ========= END OF CLASS DATA ========= -->
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html b/apidoc/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html
index 44e83557b..33353cc6c 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BaseJsonRpcTool.CommonsCLICall (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BaseJsonRpcTool.CommonsCLICall (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli, class: BaseJsonRpcTool, class: CommonsCLICall">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -83,10 +97,10 @@ <h1 title="Class BaseJsonRpcTool.CommonsCLICall" class="title">Class BaseJsonRpc
 </dl>
 <dl class="notes">
 <dt>Enclosing class:</dt>
-<dd><a href="BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></dd>
+<dd><code><a href="BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-178">BaseJsonRpcTool.CommonsCLICall</a></span>
+<div class="type-signature"><span class="modifiers">public static class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-162">BaseJsonRpcTool.CommonsCLICall</a></span>
 <span class="extends-implements">extends org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call</span></div>
 </section>
 <section class="summary">
@@ -142,10 +156,10 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#rpcClient()" class="member-name-link">rpcClient</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="../DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#rpcClient(javax.net.ssl.SSLContext)" class="member-name-link">rpcClient</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
@@ -168,19 +182,19 @@ <h2>Field Details</h2>
 <li>
 <section class="detail" id="rpcTool">
 <h3>rpcTool</h3>
-<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-179">rpcTool</a></span></div>
+<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-163">rpcTool</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="line">
 <h3>line</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">org.apache.commons.cli.CommandLine</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-180">line</a></span></div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">org.apache.commons.cli.CommandLine</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-164">line</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="verbose">
 <h3>verbose</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-181">verbose</a></span></div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-165">verbose</a></span></div>
 </section>
 </li>
 </ul>
@@ -194,7 +208,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(org.consensusj.jsonrpc.cli.BaseJsonRpcTool,java.io.PrintWriter,java.io.PrintWriter,java.lang.String[])">
 <h3>CommonsCLICall</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-184">CommonsCLICall</a></span><wbr><span class="parameters">(<a href="BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a>&nbsp;parentTool,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-168">CommonsCLICall</a></span><wbr><span class="parameters">(<a href="BaseJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool</a>&nbsp;parentTool,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/PrintWriter.html" title="class or interface in java.io" class="external-link">PrintWriter</a>&nbsp;out,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/PrintWriter.html" title="class or interface in java.io" class="external-link">PrintWriter</a>&nbsp;err,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</span></div>
@@ -211,7 +225,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="rpcClient(javax.net.ssl.SSLContext)">
 <h3>rpcClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-206">rpcClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-204">rpcClient</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/SSLContext.html" title="class or interface in javax.net.ssl" class="external-link">SSLContext</a>&nbsp;sslContext)</span></div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code>rpcClient</code>&nbsp;in class&nbsp;<code>org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call</code></dd>
@@ -221,7 +235,7 @@ <h3>rpcClient</h3>
 <li>
 <section class="detail" id="rpcClient()">
 <h3>rpcClient</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-233">rpcClient</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="../DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html#line-231">rpcClient</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code>rpcClient</code>&nbsp;in class&nbsp;<code>org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call</code></dd>
diff --git a/apidoc/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html b/apidoc/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html
index aed64751e..f38fddcae 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>BaseJsonRpcTool (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>BaseJsonRpcTool (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli, class: BaseJsonRpcTool">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -84,7 +98,7 @@ <h1 title="Class BaseJsonRpcTool" class="title">Class BaseJsonRpcTool</h1>
 <dd><code><a href="../../bitcoin/cli/BitcoinCLITool.html" title="class in org.consensusj.bitcoin.cli">BitcoinCLITool</a></code>, <code><a href="GenericJsonRpcTool.html" title="class in org.consensusj.jsonrpc.cli">GenericJsonRpcTool</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public abstract class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-38">BaseJsonRpcTool</a></span>
+<div class="type-signature"><span class="modifiers">public abstract class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-39">BaseJsonRpcTool</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
 <div class="block">An abstract base class for JsonRpcClientTool that uses Apache Commons CLI</div>
 </section>
@@ -126,7 +140,7 @@ <h2>Field Summary</h2>
 <div class="col-first odd-row-color"><code>protected org.consensusj.jsonrpc.cli.JsonRpcClientTool.OutputObject</code></div>
 <div class="col-second odd-row-color"><code><a href="#outputObject" class="member-name-link">outputObject</a></code></div>
 <div class="col-last odd-row-color">&nbsp;</div>
-<div class="col-first even-row-color"><code>protected org.consensusj.jsonrpc.cli.JsonRpcClientTool.OutputStyle</code></div>
+<div class="col-first even-row-color"><code>protected final org.consensusj.jsonrpc.cli.JsonRpcClientTool.OutputStyle</code></div>
 <div class="col-second even-row-color"><code><a href="#outputStyle" class="member-name-link">outputStyle</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 <div class="col-first odd-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
@@ -208,7 +222,7 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.spi.ToolProvider">Methods inherited from interface&nbsp;java.util.spi.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html" title="class or interface in java.util.spi" class="external-link">ToolProvider</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#run(java.io.PrintStream,java.io.PrintStream,java.lang.String...)" title="class or interface in java.util.spi" class="external-link">run</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#description()" title="class or interface in java.util.spi" class="external-link">description</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#run(java.io.PrintStream,java.io.PrintStream,java.lang.String...)" title="class or interface in java.util.spi" class="external-link">run</a></code></div>
 </section>
 </li>
 </ul>
@@ -223,17 +237,17 @@ <h2>Field Details</h2>
 <li>
 <section class="detail" id="defaultUri">
 <h3>defaultUri</h3>
-<div class="member-signature"><span class="modifiers">protected static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-41">defaultUri</a></span></div>
+<div class="member-signature"><span class="modifiers">protected static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-42">defaultUri</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="usage">
 <h3>usage</h3>
-<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-42">usage</a></span></div>
+<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-43">usage</a></span></div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.jsonrpc.cli.BaseJsonRpcTool.usage">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -243,25 +257,25 @@ <h3>usage</h3>
 <li>
 <section class="detail" id="formatter">
 <h3>formatter</h3>
-<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type">org.apache.commons.cli.HelpFormatter</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-43">formatter</a></span></div>
+<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type">org.apache.commons.cli.HelpFormatter</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-44">formatter</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="jsonRpcVersion">
 <h3>jsonRpcVersion</h3>
-<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type"><a href="../JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-44">jsonRpcVersion</a></span></div>
+<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type"><a href="../JsonRpcMessage.Version.html" title="enum class in org.consensusj.jsonrpc">JsonRpcMessage.Version</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-45">jsonRpcVersion</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="outputObject">
 <h3>outputObject</h3>
-<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type">org.consensusj.jsonrpc.cli.JsonRpcClientTool.OutputObject</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-45">outputObject</a></span></div>
+<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type">org.consensusj.jsonrpc.cli.JsonRpcClientTool.OutputObject</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-46">outputObject</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="outputStyle">
 <h3>outputStyle</h3>
-<div class="member-signature"><span class="modifiers">protected</span>&nbsp;<span class="return-type">org.consensusj.jsonrpc.cli.JsonRpcClientTool.OutputStyle</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-47">outputStyle</a></span></div>
+<div class="member-signature"><span class="modifiers">protected final</span>&nbsp;<span class="return-type">org.consensusj.jsonrpc.cli.JsonRpcClientTool.OutputStyle</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-48">outputStyle</a></span></div>
 </section>
 </li>
 </ul>
@@ -275,7 +289,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;()">
 <h3>BaseJsonRpcTool</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-49">BaseJsonRpcTool</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-50">BaseJsonRpcTool</a></span>()</div>
 </section>
 </li>
 </ul>
@@ -289,7 +303,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="name()">
 <h3>name</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-53">name</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-54">name</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#name()" title="class or interface in java.util.spi" class="external-link">name</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html" title="class or interface in java.util.spi" class="external-link">ToolProvider</a></code></dd>
@@ -299,19 +313,19 @@ <h3>name</h3>
 <li>
 <section class="detail" id="usage()">
 <h3>usage</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-58">usage</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-59">usage</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="options()">
 <h3>options</h3>
-<div class="member-signature"><span class="modifiers">public abstract</span>&nbsp;<span class="return-type">org.apache.commons.cli.Options</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-62">options</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public abstract</span>&nbsp;<span class="return-type">org.apache.commons.cli.Options</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-63">options</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="createCall(java.io.PrintWriter,java.io.PrintWriter,java.lang.String...)">
 <h3>createCall</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="BaseJsonRpcTool.CommonsCLICall.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool.CommonsCLICall</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-64">createCall</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/PrintWriter.html" title="class or interface in java.io" class="external-link">PrintWriter</a>&nbsp;out,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="BaseJsonRpcTool.CommonsCLICall.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool.CommonsCLICall</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-65">createCall</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/PrintWriter.html" title="class or interface in java.io" class="external-link">PrintWriter</a>&nbsp;out,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/PrintWriter.html" title="class or interface in java.io" class="external-link">PrintWriter</a>&nbsp;err,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>...&nbsp;args)</span></div>
 </section>
@@ -319,26 +333,26 @@ <h3>createCall</h3>
 <li>
 <section class="detail" id="run(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call)">
 <h3>run</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-69">run</a></span><wbr><span class="parameters">(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call&nbsp;call)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-70">run</a></span><wbr><span class="parameters">(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call&nbsp;call)</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="run(org.consensusj.jsonrpc.cli.BaseJsonRpcTool.CommonsCLICall)">
 <h3>run</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-74">run</a></span><wbr><span class="parameters">(<a href="BaseJsonRpcTool.CommonsCLICall.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool.CommonsCLICall</a>&nbsp;call)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-75">run</a></span><wbr><span class="parameters">(<a href="BaseJsonRpcTool.CommonsCLICall.html" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool.CommonsCLICall</a>&nbsp;call)</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="printHelp(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call,java.lang.String)">
 <h3>printHelp</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-165">printHelp</a></span><wbr><span class="parameters">(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call&nbsp;call,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-149">printHelp</a></span><wbr><span class="parameters">(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call&nbsp;call,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;usage)</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="printError(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call,java.lang.String)">
 <h3>printError</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-174">printError</a></span><wbr><span class="parameters">(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call&nbsp;call,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html#line-158">printError</a></span><wbr><span class="parameters">(org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call&nbsp;call,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;str)</span></div>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html b/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html
index ff682a5b6..bb8db5f1d 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CliParameter.Invalid (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CliParameter.Invalid (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli, interface: CliParameter, record: Invalid">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -88,10 +102,10 @@ <h1 title="Record Class CliParameter.Invalid" class="title">Record Class CliPara
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></dd>
+<dd><code><a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public static record </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-80">CliParameter.Invalid</a></span>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a>&nbsp;error)
+<div class="type-signature"><span class="modifiers">public static record </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-83">CliParameter.Invalid</a></span>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a>&nbsp;error)
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Record.html" title="class or interface in java.lang" class="external-link">Record</a>
 implements <a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></span></div>
 <div class="block">Implementation for Invalid source strings</div>
@@ -154,7 +168,7 @@ <h2>Method Summary</h2>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns the value of the <a href="#param-source"><code>source</code></a> record component.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#stream()" class="member-name-link">stream</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Stream zero or 1 valid objects.</div>
@@ -187,7 +201,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(java.lang.String,java.lang.Exception)">
 <h3>Invalid</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-80">Invalid</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-83">Invalid</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a>&nbsp;error)</span></div>
 <div class="block">Creates an instance of a <code>Invalid</code> record class.</div>
 <dl class="notes">
@@ -208,8 +222,8 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="stream()">
 <h3>stream</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-81">stream</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="CliParameter.html#stream()">CliParameter</a></code></span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-84">stream</a></span>()</div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="CliParameter.html#stream()">CliParameter</a></code></span></div>
 <div class="block">Stream zero or 1 valid objects.
  <p>This allows <code>.flatMap(CliParameter::stream)</code> to filter invalid and unwrap valid objects.</div>
 <dl class="notes">
@@ -223,7 +237,7 @@ <h3>stream</h3>
 <li>
 <section class="detail" id="toString()">
 <h3>toString</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-80">toString</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-83">toString</a></span>()</div>
 <div class="block">Returns a string representation of this record class. The representation contains the name of the class, followed by the name and value of each of the record components.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -236,7 +250,7 @@ <h3>toString</h3>
 <li>
 <section class="detail" id="hashCode()">
 <h3>hashCode</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-80">hashCode</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-83">hashCode</a></span>()</div>
 <div class="block">Returns a hash code value for this object. The value is derived from the hash code of each of the record components.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -249,7 +263,7 @@ <h3>hashCode</h3>
 <li>
 <section class="detail" id="equals(java.lang.Object)">
 <h3>equals</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-80">equals</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;o)</span></div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-83">equals</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;o)</span></div>
 <div class="block">Indicates whether some other object is "equal to" this one. The objects are equal if the other object is of the same class and if all the record components are equal. All components in this record class are compared with <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Objects.html#equals(java.lang.Object,java.lang.Object)" title="class or interface in java.util" class="external-link"><code>Objects::equals(Object,Object)</code></a>.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -264,7 +278,7 @@ <h3>equals</h3>
 <li>
 <section class="detail" id="source()">
 <h3>source</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-80">source</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-83">source</a></span>()</div>
 <div class="block">Returns the value of the <a href="#param-source"><code>source</code></a> record component.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -277,7 +291,7 @@ <h3>source</h3>
 <li>
 <section class="detail" id="error()">
 <h3>error</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-80">error</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html#line-83">error</a></span>()</div>
 <div class="block">Returns the value of the <a href="#param-error"><code>error</code></a> record component.</div>
 <dl class="notes">
 <dt>Returns:</dt>
diff --git a/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Parser.html b/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Parser.html
index cfc69d38e..bac5a2724 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Parser.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Parser.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CliParameter.Parser (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CliParameter.Parser (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli, interface: CliParameter, interface: Parser">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -74,7 +88,7 @@ <h1 title="Interface CliParameter.Parser" class="title">Interface CliParameter.P
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></dd>
+<dd><code><a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></code></dd>
 </dl>
 <dl class="notes">
 <dt>Functional Interface:</dt>
@@ -82,7 +96,7 @@ <h1 title="Interface CliParameter.Parser" class="title">Interface CliParameter.P
 </dl>
 <hr>
 <div class="type-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/FunctionalInterface.html" title="class or interface in java.lang" class="external-link">@FunctionalInterface</a>
-</span><span class="modifiers">public static interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-88">CliParameter.Parser</a></span></div>
+</span><span class="modifiers">public static interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-91">CliParameter.Parser</a></span></div>
 <div class="block">Functional interface for parsing a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link"><code>String</code></a> to an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link"><code>Object</code></a> possibly
  throwing an <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link"><code>Exception</code></a>.</div>
 </section>
@@ -99,7 +113,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#apply(java.lang.String)" class="member-name-link">apply</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;s)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">&nbsp;</div>
 </div>
@@ -119,11 +133,11 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="apply(java.lang.String)">
 <h3>apply</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Parser.html#line-90">apply</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;s)</span>
-      throws <span class="exceptions"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a></span></div>
+<div class="member-signature"><span class="return-type"><a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JsonNode</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Parser.html#line-93">apply</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;s)</span>
+        throws <span class="exceptions"><a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonProcessingException.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonProcessingException</a></span></div>
 <dl class="notes">
 <dt>Throws:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a></code></dd>
+<dd><code><a href="https://fasterxml.github.io/jackson-core/javadoc/2.14/com/fasterxml/jackson/core/JsonProcessingException.html" title="class or interface in com.fasterxml.jackson.core" class="external-link">JsonProcessingException</a></code></dd>
 </dl>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Valid.html b/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Valid.html
index 9b93e395b..b1ad8068d 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Valid.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/CliParameter.Valid.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CliParameter.Valid (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CliParameter.Valid (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli, interface: CliParameter, record: Valid">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -88,10 +102,10 @@ <h1 title="Record Class CliParameter.Valid" class="title">Record Class CliParame
 </dl>
 <dl class="notes">
 <dt>Enclosing interface:</dt>
-<dd><a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></dd>
+<dd><code><a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public static record </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-71">CliParameter.Valid</a></span>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;object)
+<div class="type-signature"><span class="modifiers">public static record </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-74">CliParameter.Valid</a></span>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;object)
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Record.html" title="class or interface in java.lang" class="external-link">Record</a>
 implements <a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></span></div>
 <div class="block">Implementation for Valid objects</div>
@@ -154,7 +168,7 @@ <h2>Method Summary</h2>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Returns the value of the <a href="#param-source"><code>source</code></a> record component.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#stream()" class="member-name-link">stream</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Stream zero or 1 valid objects.</div>
@@ -187,7 +201,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(java.lang.String,java.lang.Object)">
 <h3>Valid</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-71">Valid</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-74">Valid</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;object)</span></div>
 <div class="block">Creates an instance of a <code>Valid</code> record class.</div>
 <dl class="notes">
@@ -208,8 +222,8 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="stream()">
 <h3>stream</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-72">stream</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="CliParameter.html#stream()">CliParameter</a></code></span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-75">stream</a></span>()</div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="CliParameter.html#stream()">CliParameter</a></code></span></div>
 <div class="block">Stream zero or 1 valid objects.
  <p>This allows <code>.flatMap(CliParameter::stream)</code> to filter invalid and unwrap valid objects.</div>
 <dl class="notes">
@@ -223,7 +237,7 @@ <h3>stream</h3>
 <li>
 <section class="detail" id="toString()">
 <h3>toString</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-71">toString</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-74">toString</a></span>()</div>
 <div class="block">Returns a string representation of this record class. The representation contains the name of the class, followed by the name and value of each of the record components.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -236,7 +250,7 @@ <h3>toString</h3>
 <li>
 <section class="detail" id="hashCode()">
 <h3>hashCode</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-71">hashCode</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-74">hashCode</a></span>()</div>
 <div class="block">Returns a hash code value for this object. The value is derived from the hash code of each of the record components.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -249,7 +263,7 @@ <h3>hashCode</h3>
 <li>
 <section class="detail" id="equals(java.lang.Object)">
 <h3>equals</h3>
-<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-71">equals</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;o)</span></div>
+<div class="member-signature"><span class="modifiers">public final</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-74">equals</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;o)</span></div>
 <div class="block">Indicates whether some other object is "equal to" this one. The objects are equal if the other object is of the same class and if all the record components are equal. All components in this record class are compared with <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Objects.html#equals(java.lang.Object,java.lang.Object)" title="class or interface in java.util" class="external-link"><code>Objects::equals(Object,Object)</code></a>.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -264,7 +278,7 @@ <h3>equals</h3>
 <li>
 <section class="detail" id="source()">
 <h3>source</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-71">source</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-74">source</a></span>()</div>
 <div class="block">Returns the value of the <a href="#param-source"><code>source</code></a> record component.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -277,7 +291,7 @@ <h3>source</h3>
 <li>
 <section class="detail" id="object()">
 <h3>object</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-71">object</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html#line-74">object</a></span>()</div>
 <div class="block">Returns the value of the <a href="#param-object"><code>object</code></a> record component.</div>
 <dl class="notes">
 <dt>Returns:</dt>
diff --git a/apidoc/org/consensusj/jsonrpc/cli/CliParameter.html b/apidoc/org/consensusj/jsonrpc/cli/CliParameter.html
index 1b8eb6fa2..5139e663f 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/CliParameter.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/CliParameter.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CliParameter (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CliParameter (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli, interface: CliParameter">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -77,7 +91,7 @@ <h1 title="Interface CliParameter" class="title">Interface CliParameter</h1>
 <dd><code><a href="CliParameter.Invalid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Invalid</a></code>, <code><a href="CliParameter.Valid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public sealed interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-10">CliParameter</a></span>
+<div class="type-signature"><span class="modifiers">public sealed interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-13">CliParameter</a></span>
 <span class="permits">permits <a href="CliParameter.Valid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a>, <a href="CliParameter.Invalid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Invalid</a></span></div>
 <div class="block">JSON-RPC method parameter, parsed from the command-line. There are two implementations: <a href="CliParameter.Valid.html" title="class in org.consensusj.jsonrpc.cli"><code>CliParameter.Valid</code></a> and <a href="CliParameter.Invalid.html" title="class in org.consensusj.jsonrpc.cli"><code>CliParameter.Invalid</code></a>.
  A <code>Valid</code> contains an object that can be serialized to JSON via a converter/mapper like Jackson. An <code>Invalid</code>
@@ -144,7 +158,7 @@ <h2>Method Summary</h2>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Return the source (pre-deserialization) JSON string</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3"><code><a href="#stream()" class="member-name-link">stream</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Stream zero or 1 valid objects.</div>
@@ -175,7 +189,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="source()">
 <h3>source</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-15">source</a></span>()</div>
+<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-18">source</a></span>()</div>
 <div class="block">Return the source (pre-deserialization) JSON string</div>
 <dl class="notes">
 <dt>Returns:</dt>
@@ -186,19 +200,19 @@ <h3>source</h3>
 <li>
 <section class="detail" id="valid()">
 <h3>valid</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-17">valid</a></span>()</div>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-20">valid</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="invalid()">
 <h3>invalid</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-21">invalid</a></span>()</div>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-24">invalid</a></span>()</div>
 </section>
 </li>
 <li>
 <section class="detail" id="stream()">
 <h3>stream</h3>
-<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-30">stream</a></span>()</div>
+<div class="member-signature"><span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/stream/Stream.html" title="class or interface in java.util.stream" class="external-link">Stream</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-33">stream</a></span>()</div>
 <div class="block">Stream zero or 1 valid objects.
  <p>This allows <code>.flatMap(CliParameter::stream)</code> to filter invalid and unwrap valid objects.</div>
 <dl class="notes">
@@ -210,7 +224,7 @@ <h3>stream</h3>
 <li>
 <section class="detail" id="valid(java.lang.String,java.lang.Object)">
 <h3>valid</h3>
-<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="CliParameter.Valid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-38">valid</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source,
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="CliParameter.Valid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-41">valid</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&nbsp;object)</span></div>
 <div class="block">Create a <code>Valid</code> object</div>
 <dl class="notes">
@@ -225,7 +239,7 @@ <h3>valid</h3>
 <li>
 <section class="detail" id="invalid(java.lang.String,java.lang.Exception)">
 <h3>invalid</h3>
-<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="CliParameter.Invalid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Invalid</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-48">invalid</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source,
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="CliParameter.Invalid.html" title="class in org.consensusj.jsonrpc.cli">CliParameter.Invalid</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-51">invalid</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Exception.html" title="class or interface in java.lang" class="external-link">Exception</a>&nbsp;error)</span></div>
 <div class="block">Create a <code>Invalid</code> object</div>
 <dl class="notes">
@@ -240,7 +254,7 @@ <h3>invalid</h3>
 <li>
 <section class="detail" id="parse(java.lang.String,org.consensusj.jsonrpc.cli.CliParameter.Parser)">
 <h3>parse</h3>
-<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-58">parse</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source,
+<div class="member-signature"><span class="modifiers">static</span>&nbsp;<span class="return-type"><a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/CliParameter.html#line-61">parse</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;source,
  <a href="CliParameter.Parser.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter.Parser</a>&nbsp;parseFunction)</span></div>
 <div class="block">Parse a string returning either a valid or invalid <code>CliParameter</code></div>
 <dl class="notes">
diff --git a/apidoc/org/consensusj/jsonrpc/cli/CliParameterParser.html b/apidoc/org/consensusj/jsonrpc/cli/CliParameterParser.html
index 00461725d..9c698fdeb 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/CliParameterParser.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/CliParameterParser.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CliParameterParser (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CliParameterParser (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli, class: CliParameterParser">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html b/apidoc/org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html
index 74992cc42..2011e5760 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>GenericJsonRpcTool (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>GenericJsonRpcTool (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli, class: GenericJsonRpcTool">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -174,7 +188,7 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.util.spi.ToolProvider">Methods inherited from interface&nbsp;java.util.spi.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html" title="class or interface in java.util.spi" class="external-link">ToolProvider</a></h3>
-<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#run(java.io.PrintStream,java.io.PrintStream,java.lang.String...)" title="class or interface in java.util.spi" class="external-link">run</a></code></div>
+<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#description()" title="class or interface in java.util.spi" class="external-link">description</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/spi/ToolProvider.html#run(java.io.PrintStream,java.io.PrintStream,java.lang.String...)" title="class or interface in java.util.spi" class="external-link">run</a></code></div>
 </section>
 </li>
 </ul>
@@ -193,7 +207,7 @@ <h3>commandName</h3>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../constant-values.html#org.consensusj.jsonrpc.cli.GenericJsonRpcTool.commandName">Constant Field Values</a></li>
 </ul>
 </dd>
diff --git a/apidoc/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html b/apidoc/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html
index 1bbd46606..85418146a 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JavaLoggingSupport (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JavaLoggingSupport (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli, class: JavaLoggingSupport">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -118,10 +132,15 @@ <h2>Method Summary</h2>
 <div class="block">Configure logging.</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static void</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#setVerbose()" class="member-name-link">setVerbose</a>()</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#setLogLevel(java.util.logging.Level)" class="member-name-link">setLogLevel</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.logging/java/util/logging/Level.html" title="class or interface in java.util.logging" class="external-link">Level</a>&nbsp;level)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
 <div class="block">Change log level (eg.</div>
 </div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static void</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#setVerbose()" class="member-name-link">setVerbose</a>()</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
+<div class="block">Change log level (eg.</div>
+</div>
 </div>
 </div>
 </div>
@@ -164,8 +183,20 @@ <h3>configure</h3>
 <li>
 <section class="detail" id="setVerbose()">
 <h3>setVerbose</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html#line-45">setVerbose</a></span>()</div>
-<div class="block">Change log level (eg. as a result of `-v` command-line option)</div>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html#line-46">setVerbose</a></span>()</div>
+<div class="block">Change log level (eg. as a result of `-v` command-line option)
+ This sets the level to <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.logging/java/util/logging/Level.html#FINE" title="class or interface in java.util.logging" class="external-link"><code>Level.FINE</code></a></div>
+</section>
+</li>
+<li>
+<section class="detail" id="setLogLevel(java.util.logging.Level)">
+<h3>setLogLevel</h3>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html#line-54">setLogLevel</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.logging/java/util/logging/Level.html" title="class or interface in java.util.logging" class="external-link">Level</a>&nbsp;level)</span></div>
+<div class="block">Change log level (eg. as a result of `-log=level` command-line option)</div>
+<dl class="notes">
+<dt>Parameters:</dt>
+<dd><code>level</code> - j.u.logging log level</dd>
+</dl>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html b/apidoc/org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html
index c70b2bbfe..95ab75887 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcToolOptions (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcToolOptions (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli, class: JsonRpcToolOptions">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -84,7 +102,7 @@ <h1 title="Class JsonRpcToolOptions" class="title">Class JsonRpcToolOptions</h1>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../serialized-form.html#org.consensusj.jsonrpc.cli.JsonRpcToolOptions">Serialized Form</a></li>
 </ul>
 </dd>
diff --git a/apidoc/org/consensusj/jsonrpc/cli/package-summary.html b/apidoc/org/consensusj/jsonrpc/cli/package-summary.html
index 9a8957eb3..74192ef20 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/package-summary.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.cli (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.cli (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/cli/package-tree.html b/apidoc/org/consensusj/jsonrpc/cli/package-tree.html
index 61d603a64..5537fe04a 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/package-tree.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.cli Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.cli Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.jsonrpc.cli">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.jsonrpc.cli</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
@@ -76,12 +76,6 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li class="circle">org.consensusj.jsonrpc.cli.<a href="JsonRpcToolOptions.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">JsonRpcToolOptions</a></li>
 </ul>
 </li>
-<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Record.html" class="type-name-link external-link" title="class or interface in java.lang">Record</a>
-<ul>
-<li class="circle">org.consensusj.jsonrpc.cli.<a href="CliParameter.Invalid.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">CliParameter.Invalid</a> (implements org.consensusj.jsonrpc.cli.<a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a>)</li>
-<li class="circle">org.consensusj.jsonrpc.cli.<a href="CliParameter.Valid.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a> (implements org.consensusj.jsonrpc.cli.<a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a>)</li>
-</ul>
-</li>
 </ul>
 </li>
 </ul>
@@ -93,6 +87,21 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li class="circle">org.consensusj.jsonrpc.cli.<a href="CliParameter.Parser.html" class="type-name-link" title="interface in org.consensusj.jsonrpc.cli">CliParameter.Parser</a></li>
 </ul>
 </section>
+<section class="hierarchy">
+<h2 title="Record Class Hierarchy">Record Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Record.html" class="type-name-link external-link" title="class or interface in java.lang">Record</a>
+<ul>
+<li class="circle">org.consensusj.jsonrpc.cli.<a href="CliParameter.Invalid.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">CliParameter.Invalid</a> (implements org.consensusj.jsonrpc.cli.<a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a>)</li>
+<li class="circle">org.consensusj.jsonrpc.cli.<a href="CliParameter.Valid.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a> (implements org.consensusj.jsonrpc.cli.<a href="CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a>)</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</section>
 </main>
 </div>
 </div>
diff --git a/apidoc/org/consensusj/jsonrpc/cli/test/CLICommandResult.html b/apidoc/org/consensusj/jsonrpc/cli/test/CLICommandResult.html
index a7b3391e4..29af07fed 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/test/CLICommandResult.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/test/CLICommandResult.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CLICommandResult (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CLICommandResult (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli.test, class: CLICommandResult">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/cli/test/CLITestSupport.html b/apidoc/org/consensusj/jsonrpc/cli/test/CLITestSupport.html
index a198d3124..1b51828bf 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/test/CLITestSupport.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/test/CLITestSupport.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>CLITestSupport (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>CLITestSupport (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli.test, interface: CLITestSupport">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/cli/test/package-summary.html b/apidoc/org/consensusj/jsonrpc/cli/test/package-summary.html
index 38d26c1ac..e0a7e7700 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/test/package-summary.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/test/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.cli.test (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.cli.test (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.cli.test">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/cli/test/package-tree.html b/apidoc/org/consensusj/jsonrpc/cli/test/package-tree.html
index c7dfbbd35..ba459797d 100644
--- a/apidoc/org/consensusj/jsonrpc/cli/test/package-tree.html
+++ b/apidoc/org/consensusj/jsonrpc/cli/test/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.cli.test Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.cli.test Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.jsonrpc.cli.test">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.jsonrpc.cli.test</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/jsonrpc/daemon/Application.html b/apidoc/org/consensusj/jsonrpc/daemon/Application.html
index b423bcc3e..526359561 100644
--- a/apidoc/org/consensusj/jsonrpc/daemon/Application.html
+++ b/apidoc/org/consensusj/jsonrpc/daemon/Application.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Application (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Application (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.daemon, class: Application">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/daemon/EchoJsonRpcService.html b/apidoc/org/consensusj/jsonrpc/daemon/EchoJsonRpcService.html
index a94897c5c..539800da1 100644
--- a/apidoc/org/consensusj/jsonrpc/daemon/EchoJsonRpcService.html
+++ b/apidoc/org/consensusj/jsonrpc/daemon/EchoJsonRpcService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>EchoJsonRpcService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>EchoJsonRpcService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.daemon, class: EchoJsonRpcService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -117,10 +131,10 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#close()" class="member-name-link">close</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#echo(java.lang.String)" class="member-name-link">echo</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;message)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#help()" class="member-name-link">help</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
@@ -129,7 +143,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#onStartup(io.micronaut.runtime.server.event.ServerStartupEvent)" class="member-name-link">onStartup</a><wbr>(io.micronaut.runtime.server.event.ServerStartupEvent&nbsp;event)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#stop()" class="member-name-link">stop</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Initiate server shutdown.</div>
diff --git a/apidoc/org/consensusj/jsonrpc/daemon/JsonRpcController.html b/apidoc/org/consensusj/jsonrpc/daemon/JsonRpcController.html
index 08b29179a..5a556e965 100644
--- a/apidoc/org/consensusj/jsonrpc/daemon/JsonRpcController.html
+++ b/apidoc/org/consensusj/jsonrpc/daemon/JsonRpcController.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcController (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcController (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.daemon, class: JsonRpcController">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -109,7 +123,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#index(org.consensusj.jsonrpc.JsonRpcRequest)" class="member-name-link">index</a><wbr>(<a href="../JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;request)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/jsonrpc/daemon/package-summary.html b/apidoc/org/consensusj/jsonrpc/daemon/package-summary.html
index 6d4097233..8f15d3787 100644
--- a/apidoc/org/consensusj/jsonrpc/daemon/package-summary.html
+++ b/apidoc/org/consensusj/jsonrpc/daemon/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.daemon (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.daemon (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.daemon">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/daemon/package-tree.html b/apidoc/org/consensusj/jsonrpc/daemon/package-tree.html
index 776647378..d0a632c7d 100644
--- a/apidoc/org/consensusj/jsonrpc/daemon/package-tree.html
+++ b/apidoc/org/consensusj/jsonrpc/daemon/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.daemon Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.daemon Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.jsonrpc.daemon">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.jsonrpc.daemon</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/jsonrpc/groovy/Dummy.html b/apidoc/org/consensusj/jsonrpc/groovy/Dummy.html
index 9e9e3446e..d1419d5fb 100644
--- a/apidoc/org/consensusj/jsonrpc/groovy/Dummy.html
+++ b/apidoc/org/consensusj/jsonrpc/groovy/Dummy.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Dummy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Dummy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.groovy, class: Dummy">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/groovy/package-summary.html b/apidoc/org/consensusj/jsonrpc/groovy/package-summary.html
index 6c55342b4..76372290b 100644
--- a/apidoc/org/consensusj/jsonrpc/groovy/package-summary.html
+++ b/apidoc/org/consensusj/jsonrpc/groovy/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.groovy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.groovy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.groovy">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/groovy/package-tree.html b/apidoc/org/consensusj/jsonrpc/groovy/package-tree.html
index c5432d82c..c3d4c1b75 100644
--- a/apidoc/org/consensusj/jsonrpc/groovy/package-tree.html
+++ b/apidoc/org/consensusj/jsonrpc/groovy/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.groovy Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.groovy Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.jsonrpc.groovy">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.jsonrpc.groovy</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/jsonrpc/internal/NumberStringSerializer.html b/apidoc/org/consensusj/jsonrpc/internal/NumberStringSerializer.html
index dcf3c4a26..d5eb8250c 100644
--- a/apidoc/org/consensusj/jsonrpc/internal/NumberStringSerializer.html
+++ b/apidoc/org/consensusj/jsonrpc/internal/NumberStringSerializer.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>NumberStringSerializer (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>NumberStringSerializer (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.internal, class: NumberStringSerializer">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/internal/package-summary.html b/apidoc/org/consensusj/jsonrpc/internal/package-summary.html
index c175fcc38..442aa6093 100644
--- a/apidoc/org/consensusj/jsonrpc/internal/package-summary.html
+++ b/apidoc/org/consensusj/jsonrpc/internal/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.internal (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.internal (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.internal">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/internal/package-tree.html b/apidoc/org/consensusj/jsonrpc/internal/package-tree.html
index 16f3b8c21..b3e5cb83d 100644
--- a/apidoc/org/consensusj/jsonrpc/internal/package-tree.html
+++ b/apidoc/org/consensusj/jsonrpc/internal/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.internal Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.internal Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.jsonrpc.internal">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.jsonrpc.internal</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html b/apidoc/org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html
index c8de9eb31..09b4522d3 100644
--- a/apidoc/org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html
+++ b/apidoc/org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>AbstractJsonRpcService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>AbstractJsonRpcService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.introspection, class: AbstractJsonRpcService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -103,7 +117,7 @@ <h2>Field Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Field</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link">Method</a>&gt;</code></div>
+<div class="col-first even-row-color"><code>protected final <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link">Method</a>&gt;</code></div>
 <div class="col-second even-row-color"><code><a href="#methods" class="member-name-link">methods</a></code></div>
 <div class="col-last even-row-color">&nbsp;</div>
 </div>
@@ -136,7 +150,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected &lt;RSLT&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;RSLT&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected &lt;RSLT&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;RSLT&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#exception(java.lang.Throwable)" class="member-name-link">exception</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" title="class or interface in java.lang" class="external-link">Throwable</a>&nbsp;exception)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link">Method</a></code></div>
@@ -149,7 +163,7 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
 <div class="block">Get the service object.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected &lt;RSLT&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;RSLT&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>protected &lt;RSLT&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;RSLT&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#result(RSLT)" class="member-name-link">result</a><wbr>(RSLT&nbsp;result)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
@@ -204,7 +218,7 @@ <h2>Method Details</h2>
 <section class="detail" id="getServiceObject()">
 <h3>getServiceObject</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html#line-22">getServiceObject</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcServiceWrapper.html#getServiceObject()">JsonRpcServiceWrapper</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcServiceWrapper.html#getServiceObject()">JsonRpcServiceWrapper</a></code></span></div>
 <div class="block">Get the service object.
  <p>Implementations will return their configured service object here.</div>
 <dl class="notes">
@@ -219,7 +233,7 @@ <h3>getServiceObject</h3>
 <section class="detail" id="getMethod(java.lang.String)">
 <h3>getMethod</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link">Method</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html#line-27">getMethod</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;methodName)</span></div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcServiceWrapper.html#getMethod(java.lang.String)">JsonRpcServiceWrapper</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcServiceWrapper.html#getMethod(java.lang.String)">JsonRpcServiceWrapper</a></code></span></div>
 <div class="block">Get a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link"><code>Method</code></a> object for a named JSON-RPC method</div>
 <dl class="notes">
 <dt>Specified by:</dt>
diff --git a/apidoc/org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html b/apidoc/org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html
index 7b61726fa..5ca3b0214 100644
--- a/apidoc/org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html
+++ b/apidoc/org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>DelegatingJsonRpcService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>DelegatingJsonRpcService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.introspection, class: DelegatingJsonRpcService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -192,8 +206,8 @@ <h3>DelegatingJsonRpcService</h3>
  was statically initialized.</div>
 <dl class="notes">
 <dt>Parameters:</dt>
-<dd><code>serviceObject</code> - The service object to wrap</dd>
 <dd><code>methods</code> - A map that maps method-name strings to <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link"><code>Method</code></a> objects.</dd>
+<dd><code>serviceObject</code> - The service object to wrap</dd>
 </dl>
 </section>
 </li>
@@ -209,7 +223,7 @@ <h2>Method Details</h2>
 <section class="detail" id="getServiceObject()">
 <h3>getServiceObject</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html#line-35">getServiceObject</a></span>()</div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcServiceWrapper.html#getServiceObject()">JsonRpcServiceWrapper</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcServiceWrapper.html#getServiceObject()">JsonRpcServiceWrapper</a></code></span></div>
 <div class="block">Get the service object.
  <p>Implementations will return their configured service object here.</div>
 <dl class="notes">
@@ -226,7 +240,7 @@ <h3>getServiceObject</h3>
 <section class="detail" id="getMethod(java.lang.String)">
 <h3>getMethod</h3>
 <div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link">Method</a></span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html#line-40">getMethod</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;methodName)</span></div>
-<div class="block"><span class="descfrm-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcServiceWrapper.html#getMethod(java.lang.String)">JsonRpcServiceWrapper</a></code></span></div>
+<div class="block"><span class="description-from-type-label">Description copied from interface:&nbsp;<code><a href="JsonRpcServiceWrapper.html#getMethod(java.lang.String)">JsonRpcServiceWrapper</a></code></span></div>
 <div class="block">Get a <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link"><code>Method</code></a> object for a named JSON-RPC method</div>
 <dl class="notes">
 <dt>Specified by:</dt>
diff --git a/apidoc/org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html b/apidoc/org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html
index bdfbc0e29..c719eb0e4 100644
--- a/apidoc/org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html
+++ b/apidoc/org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>JsonRpcServiceWrapper (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>JsonRpcServiceWrapper (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.introspection, interface: JsonRpcServiceWrapper">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -130,7 +144,7 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;RSLT&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="../JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;RSLT&gt;&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;RSLT&gt;&nbsp;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="../JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;RSLT&gt;&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#call(org.consensusj.jsonrpc.JsonRpcRequest)" class="member-name-link">call</a><wbr>(<a href="../JsonRpcRequest.html" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a>&nbsp;req)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
 <div class="block">Handle a request by calling method, getting a result, and embedding it in a response.</div>
@@ -145,7 +159,7 @@ <h2>Method Summary</h2>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab3">
 <div class="block">Get the service object.</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab1"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link">Method</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab1"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Method.html" title="class or interface in java.lang.reflect" class="external-link">Method</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab1"><code><a href="#reflect(java.lang.Class)" class="member-name-link">reflect</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Class.html" title="class or interface in java.lang" class="external-link">Class</a>&lt;?&gt;&nbsp;apiClass)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1">
 <div class="block">Use reflection/introspection to generate a map of methods.</div>
diff --git a/apidoc/org/consensusj/jsonrpc/introspection/package-summary.html b/apidoc/org/consensusj/jsonrpc/introspection/package-summary.html
index c690fc106..e20f3bbc2 100644
--- a/apidoc/org/consensusj/jsonrpc/introspection/package-summary.html
+++ b/apidoc/org/consensusj/jsonrpc/introspection/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.introspection (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.introspection (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.introspection">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/introspection/package-tree.html b/apidoc/org/consensusj/jsonrpc/introspection/package-tree.html
index e91545219..8825f49d7 100644
--- a/apidoc/org/consensusj/jsonrpc/introspection/package-tree.html
+++ b/apidoc/org/consensusj/jsonrpc/introspection/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.introspection Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.introspection Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.jsonrpc.introspection">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.jsonrpc.introspection</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/jsonrpc/introspection/sample/MathService.html b/apidoc/org/consensusj/jsonrpc/introspection/sample/MathService.html
index 2e3b3ef26..d8adea7b1 100644
--- a/apidoc/org/consensusj/jsonrpc/introspection/sample/MathService.html
+++ b/apidoc/org/consensusj/jsonrpc/introspection/sample/MathService.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>MathService (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>MathService (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.introspection.sample, class: MathService">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -117,14 +131,14 @@ <h2>Method Summary</h2>
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#add(java.lang.Integer,java.lang.Integer)" class="member-name-link">add</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;a,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;b)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static void</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#main(java.lang.String%5B%5D)" class="member-name-link">main</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>[]&nbsp;args)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link">CompletableFuture</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#subtract(java.lang.Integer,java.lang.Integer)" class="member-name-link">subtract</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;a,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Integer.html" title="class or interface in java.lang" class="external-link">Integer</a>&nbsp;b)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
diff --git a/apidoc/org/consensusj/jsonrpc/introspection/sample/package-summary.html b/apidoc/org/consensusj/jsonrpc/introspection/sample/package-summary.html
index 8d655a374..aebc87d67 100644
--- a/apidoc/org/consensusj/jsonrpc/introspection/sample/package-summary.html
+++ b/apidoc/org/consensusj/jsonrpc/introspection/sample/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.introspection.sample (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.introspection.sample (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc.introspection.sample">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/jsonrpc/introspection/sample/package-tree.html b/apidoc/org/consensusj/jsonrpc/introspection/sample/package-tree.html
index 387a0b7aa..d2beec9d5 100644
--- a/apidoc/org/consensusj/jsonrpc/introspection/sample/package-tree.html
+++ b/apidoc/org/consensusj/jsonrpc/introspection/sample/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc.introspection.sample Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc.introspection.sample Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.jsonrpc.introspection.sample">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.jsonrpc.introspection.sample</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/jsonrpc/package-summary.html b/apidoc/org/consensusj/jsonrpc/package-summary.html
index 0d952416b..d0a058fff 100644
--- a/apidoc/org/consensusj/jsonrpc/package-summary.html
+++ b/apidoc/org/consensusj/jsonrpc/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.jsonrpc">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../";
+<script type="text/javascript">var pathtoroot = "../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../index-all.html">Index</a></li>
 <li><a href="../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -92,32 +97,40 @@ <h1 title="Package org.consensusj.jsonrpc" class="title">Package org.consensusj.
 </li>
 <li>
 <div id="class-summary">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="class-summary-tab0" role="tab" aria-selected="true" aria-controls="class-summary.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="class-summary-tab1" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab1', 2)" class="table-tab">Interfaces</button><button id="class-summary-tab2" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab2', 2)" class="table-tab">Classes</button><button id="class-summary-tab3" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab3', 2)" class="table-tab">Enum Classes</button><button id="class-summary-tab5" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab5', 2)" class="table-tab">Exceptions</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="class-summary-tab0" role="tab" aria-selected="true" aria-controls="class-summary.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary', 2)" class="active-table-tab">All Classes and Interfaces</button><button id="class-summary-tab1" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab1', 2)" class="table-tab">Interfaces</button><button id="class-summary-tab2" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab2', 2)" class="table-tab">Classes</button><button id="class-summary-tab3" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab3', 2)" class="table-tab">Enum Classes</button><button id="class-summary-tab5" role="tab" aria-selected="false" aria-controls="class-summary.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('class-summary', 'class-summary-tab5', 2)" class="table-tab">Exception Classes</button></div>
 <div id="class-summary.tabpanel" role="tabpanel">
 <div class="summary-table two-column-summary" aria-labelledby="class-summary-tab0">
 <div class="table-header col-first">Class</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color class-summary class-summary-tab2"><a href="AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></div>
-<div class="col-last even-row-color class-summary class-summary-tab2">
-<div class="block">Abstract Base class for a strongly-typed, Jackson-based JSON-RPC client.</div>
+<div class="col-first even-row-color class-summary class-summary-tab1"><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab1">
+<div class="block">Helper methods for creating asynchronous calls using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture</code></a>.</div>
 </div>
-<div class="col-first odd-row-color class-summary class-summary-tab1"><a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></div>
+<div class="col-first odd-row-color class-summary class-summary-tab1"><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;T&gt;</div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
-<div class="block">Helper methods for creating asynchronous calls using <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletableFuture.html" title="class or interface in java.util.concurrent" class="external-link"><code>CompletableFuture</code></a>.</div>
+<div class="block">Subinterface of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link"><code>Supplier</code></a> for Lambdas which throw <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a>.</div>
 </div>
-<div class="col-first even-row-color class-summary class-summary-tab1"><a href="AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;T&gt;</div>
+<div class="col-first even-row-color class-summary class-summary-tab1"><a href="AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Subinterface of <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link"><code>Supplier</code></a> for Lambdas which throw <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link"><code>IOException</code></a>.</div>
+<div class="block">Error filter for resilient polling.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab2"><a href="CompositeTrustManager.html" title="class in org.consensusj.jsonrpc">CompositeTrustManager</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab2">
 <div class="block">A Trust Manager that adds a second trust store (key store) to the default trust store.</div>
 </div>
-<div class="col-first even-row-color class-summary class-summary-tab1"><a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></div>
+<div class="col-first even-row-color class-summary class-summary-tab2"><a href="DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></div>
+<div class="col-last even-row-color class-summary class-summary-tab2">
+<div class="block">A strongly-typed, Jackson-based JSON-RPC client.</div>
+</div>
+<div class="col-first odd-row-color class-summary class-summary-tab1"><a href="DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;T&gt;</div>
+<div class="col-last odd-row-color class-summary class-summary-tab1">
+<div class="block">Functional interface for ignoring what are considered "transient" errors.</div>
+</div>
+<div class="col-first even-row-color class-summary class-summary-tab1"><a href="DefaultRpcClient.TransportFactory.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab1">
-<div class="block">Interface with default methods for a strongly-typed JSON-RPC client that uses Jackson to map from JSON to Java Objects.</div>
+<div class="block">Functional interface for creating JsonRpcTransport instances.</div>
 </div>
-<div class="col-first odd-row-color class-summary class-summary-tab1"><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></div>
+<div class="col-first odd-row-color class-summary class-summary-tab1"><a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Type.html" title="class or interface in java.lang.reflect" class="external-link">Type</a>&gt;</div>
 <div class="col-last odd-row-color class-summary class-summary-tab1">
 <div class="block">JSON-RPC client interface.</div>
 </div>
@@ -172,10 +185,14 @@ <h1 title="Package org.consensusj.jsonrpc" class="title">Package org.consensusj.
 </div>
 <div class="col-first even-row-color class-summary class-summary-tab5"><a href="JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">JsonRpcStatusException</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab5">
-<div class="block">JSON-RPC returned HTTP status other than 200
+<div class="block">JSON-RPC returned HTTP status other than 200 (and unfortunately also sometimes when their is response.error)
  Additional information is usually in JSON-RPC response
  TODO: See TODO in parent class <a href="JsonRpcException.html" title="class in org.consensusj.jsonrpc"><code>JsonRpcException</code></a></div>
 </div>
+<div class="col-first odd-row-color class-summary class-summary-tab1"><a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/reflect/Type.html" title="class or interface in java.lang.reflect" class="external-link">Type</a>&gt;</div>
+<div class="col-last odd-row-color class-summary class-summary-tab1">
+<div class="block">Defines the interface for a network-layer implementation of a JSON-RPC client.</div>
+</div>
 </div>
 </div>
 </div>
diff --git a/apidoc/org/consensusj/jsonrpc/package-tree.html b/apidoc/org/consensusj/jsonrpc/package-tree.html
index 67e3ce06c..fadb951c3 100644
--- a/apidoc/org/consensusj/jsonrpc/package-tree.html
+++ b/apidoc/org/consensusj/jsonrpc/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.jsonrpc">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../script.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,23 +49,20 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.jsonrpc</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
 <ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="AbstractRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a> (implements org.consensusj.jsonrpc.<a href="JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a>)
-<ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcClientHttpUrlConnection.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></li>
-<li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcClientJavaNet.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></li>
-</ul>
-</li>
 <li class="circle">org.consensusj.jsonrpc.<a href="CompositeTrustManager.html" class="type-name-link" title="class in org.consensusj.jsonrpc">CompositeTrustManager</a> (implements javax.net.ssl.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/X509TrustManager.html" title="class or interface in javax.net.ssl" class="external-link">X509TrustManager</a>)</li>
+<li class="circle">org.consensusj.jsonrpc.<a href="DefaultRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a> (implements org.consensusj.jsonrpc.<a href="JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt;)</li>
+<li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcClientHttpUrlConnection.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a> (implements org.consensusj.jsonrpc.<a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;)</li>
+<li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcClientJavaNet.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a> (implements org.consensusj.jsonrpc.<a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;)</li>
 <li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcError.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcError</a></li>
 <li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcMessage.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcMessage</a></li>
 <li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcRequest.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcRequest</a></li>
@@ -97,22 +94,21 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
 <li class="circle">org.consensusj.jsonrpc.<a href="AsyncSupport.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">AsyncSupport</a>
 <ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a> (also extends java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a>)
+<li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcTransport.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;
 <ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="JacksonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></li>
+<li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt; (also extends java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a>)</li>
 </ul>
 </li>
 </ul>
 </li>
+<li class="circle">org.consensusj.jsonrpc.<a href="AsyncSupport.TransientErrorFilter.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></li>
 <li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" class="type-name-link external-link" title="class or interface in java.lang">AutoCloseable</a>
 <ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a> (also extends org.consensusj.jsonrpc.<a href="AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a>)
-<ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="JacksonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></li>
-</ul>
-</li>
+<li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt; (also extends org.consensusj.jsonrpc.<a href="JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;)</li>
 </ul>
 </li>
+<li class="circle">org.consensusj.jsonrpc.<a href="DefaultRpcClient.TransientErrorMapper.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;T&gt;</li>
+<li class="circle">org.consensusj.jsonrpc.<a href="DefaultRpcClient.TransportFactory.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></li>
 <li class="circle">java.util.function.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Function.html" class="type-name-link external-link" title="class or interface in java.util.function">Function</a>&lt;T,<wbr>R&gt;
 <ul>
 <li class="circle">org.consensusj.jsonrpc.<a href="JsonRpcClientJavaNet.MappingFunction.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClientJavaNet.MappingFunction</a>&lt;R&gt;</li>
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/NamecoinClient.html b/apidoc/org/consensusj/namecoin/jsonrpc/NamecoinClient.html
index c72e1f897..fd1328849 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/NamecoinClient.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/NamecoinClient.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>NamecoinClient (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>NamecoinClient (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.namecoin.jsonrpc, class: NamecoinClient">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,18 +86,16 @@
 <h1 title="Class NamecoinClient" class="title">Class NamecoinClient</h1>
 </div>
 <div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance"><a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.AbstractRpcClient</a>
-<div class="inheritance"><a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection</a>
+<div class="inheritance"><a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.DefaultRpcClient</a>
 <div class="inheritance"><a href="../../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">org.consensusj.bitcoin.jsonrpc.BitcoinClient</a>
 <div class="inheritance">org.consensusj.namecoin.jsonrpc.NamecoinClient</div>
 </div>
 </div>
 </div>
-</div>
 <section class="class-description" id="class-description">
 <dl class="notes">
 <dt>All Implemented Interfaces:</dt>
-<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="../../bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></code>, <code><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></code></dd>
+<dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code>, <code><a href="../../bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a></code>, <code><a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></code>, <code><a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code>, <code><a href="../../jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;<a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JavaType.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link">JavaType</a>&gt;</code></dd>
 </dl>
 <hr>
 <div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/namecoin/jsonrpc/NamecoinClient.html#line-21">NamecoinClient</a></span>
@@ -98,8 +110,11 @@ <h1 title="Class NamecoinClient" class="title">Class NamecoinClient</h1>
 <section class="nested-class-summary" id="nested-class-summary">
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
+<h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Nested classes/interfaces inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h2>
+<code><a href="../../jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;<a href="../../jsonrpc/DefaultRpcClient.TransientErrorMapper.html" title="type parameter in DefaultRpcClient.TransientErrorMapper">T</a>&gt;, <a href="../../jsonrpc/DefaultRpcClient.TransportFactory.html" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></code></div>
+<div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
+<code><a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- =========== FIELD SUMMARY =========== -->
@@ -110,8 +125,8 @@ <h2>Field Summary</h2>
 <h3 id="fields-inherited-from-class-org.consensusj.bitcoin.jsonrpc.BitcoinClient">Fields inherited from class&nbsp;org.consensusj.bitcoin.jsonrpc.<a href="../../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></h3>
 <code><a href="../../bitcoin/jsonrpc/BitcoinClient.html#BITCOIN_CORE_VERSION_DESC_DEFAULT">BITCOIN_CORE_VERSION_DESC_DEFAULT</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#BITCOIN_CORE_VERSION_MIN">BITCOIN_CORE_VERSION_MIN</a></code></div>
 <div class="inherited-list">
-<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="../../jsonrpc/AbstractRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="../../jsonrpc/AbstractRpcClient.html#mapper">mapper</a></code></div>
+<h3 id="fields-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Fields inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h3>
+<code><a href="../../jsonrpc/DefaultRpcClient.html#jsonRpcVersion">jsonRpcVersion</a>, <a href="../../jsonrpc/DefaultRpcClient.html#mapper">mapper</a></code></div>
 </section>
 </li>
 <!-- ======== CONSTRUCTOR SUMMARY ======== -->
@@ -158,13 +173,10 @@ <h2>Method Summary</h2>
 </div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.bitcoin.jsonrpc.BitcoinClient">Methods inherited from class&nbsp;org.consensusj.bitcoin.jsonrpc.<a href="../../bitcoin/jsonrpc/BitcoinClient.html" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a></h3>
-<code><a href="../../bitcoin/jsonrpc/BitcoinClient.html#addNode(java.lang.String,java.lang.String)">addNode</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#close()">close</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#commandExists(java.lang.String)">commandExists</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#createRawTransaction(java.util.List,java.util.Map)">createRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)">createWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#dumpPrivKey(org.bitcoinj.base.Address)">dumpPrivKey</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address)">generateToAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)">generateToAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddedNodeInfo(boolean)">getAddedNodeInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddedNodeInfo(boolean,java.lang.String)">getAddedNodeInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddressBalance(java.util.List)">getAddressBalance</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddressBalance(org.bitcoinj.base.Address)">getAddressBalance</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddressInfo(org.bitcoinj.base.Address)">getAddressInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddressUtxos(java.util.List)">getAddressUtxos</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddressUtxos(org.bitcoinj.base.Address)">getAddressUtxos</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBalance()">getBalance</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBalance(java.lang.String)">getBalance</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBalance(java.lang.String,java.lang.Integer)">getBalance</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlock(org.bitcoinj.base.Sha256Hash)">getBlock</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlockChainInfo()">getBlockChainInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlockCount()">getBlockCount</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlockHash(java.lang.Integer)">getBlockHash</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlockInfo(org.bitcoinj.base.Sha256Hash)">getBlockInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getChainTips()">getChainTips</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getCommands()">getCommands</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getNetParams()">getNetParams</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getNetwork()">getNetwork</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getNetworkInfo()">getNetworkInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getNewAddress()">getNewAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getNewAddress(java.lang.String)">getNewAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getRawTransaction(org.bitcoinj.base.Sha256Hash)">getRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getRawTransactionInfo(org.bitcoinj.base.Sha256Hash)">getRawTransactionInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address)">getReceivedByAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address,java.lang.Integer)">getReceivedByAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash)">getTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash,java.lang.Boolean,java.lang.Boolean)">getTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer)">getTxOut</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer,java.lang.Boolean)">getTxOut</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getTxOutSetInfo()">getTxOutSetInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getZmqNotifications()">getZmqNotifications</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#help()">help</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#help(java.lang.String)">help</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#helpAsLines()">helpAsLines</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#helpAsMethodEntries()">helpAsMethodEntries</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#helpAsStream()">helpAsStream</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)">importPrivKey</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#invalidateBlock(org.bitcoinj.base.Sha256Hash)">invalidateBlock</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#isAddressIndexEnabled()">isAddressIndexEnabled</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listAddressGroupings()">listAddressGroupings</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listReceivedByAddress(java.lang.Integer,java.lang.Boolean)">listReceivedByAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listTransactions()">listTransactions</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer)">listTransactions</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)">listTransactions</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listUnspent()">listUnspent</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer)">listUnspent</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)">listUnspent</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)">listUnspent</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)">listUnspent</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listWallets()">listWallets</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#reconsiderBlock(org.bitcoinj.base.Sha256Hash)">reconsiderBlock</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendFrom(java.lang.String,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendFrom</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendMany(java.lang.String,java.util.Map)">sendMany</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendRawTransaction(java.lang.String)">sendRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendRawTransaction(java.lang.String,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction)">sendRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendToAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String,java.lang.String)">sendToAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#setTxFee(org.bitcoinj.base.Coin)">setTxFee</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#signRawTransactionWithWallet(java.lang.String)">signRawTransactionWithWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#stop()">stop</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#unloadWallet()">unloadWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#unloadWallet(java.lang.String,java.lang.Boolean)">unloadWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#waitForBlock(int,int)">waitForBlock</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#waitForServer(int)">waitForServer</a></code></div>
+<code><a href="../../bitcoin/jsonrpc/BitcoinClient.html#addNode(java.lang.String,java.lang.String)">addNode</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#close()">close</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#commandExists(java.lang.String)">commandExists</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#connectToServer(java.time.Duration)">connectToServer</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#createRawTransaction(java.util.List,java.util.Map)">createRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean)">createWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#createWallet(java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.String,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean,java.lang.Boolean)">createWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#dumpPrivKey(org.bitcoinj.base.Address)">dumpPrivKey</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address)">generateToAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#generateToAddress(int,org.bitcoinj.base.Address,java.lang.Integer)">generateToAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddedNodeInfo(boolean)">getAddedNodeInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddedNodeInfo(boolean,java.lang.String)">getAddedNodeInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddressBalance(java.util.List)">getAddressBalance</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddressBalance(org.bitcoinj.base.Address)">getAddressBalance</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddressInfo(org.bitcoinj.base.Address)">getAddressInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddressUtxos(java.util.List)">getAddressUtxos</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getAddressUtxos(org.bitcoinj.base.Address)">getAddressUtxos</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBalance()">getBalance</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBalance(java.lang.String)">getBalance</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBalance(java.lang.String,java.lang.Integer)">getBalance</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBestBlock()">getBestBlock</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlock(org.bitcoinj.base.Sha256Hash)">getBlock</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlockAsync(org.bitcoinj.base.Sha256Hash)">getBlockAsync</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlockChainInfo()">getBlockChainInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlockChainInfoAsync()">getBlockChainInfoAsync</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlockCount()">getBlockCount</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlockHash(java.lang.Integer)">getBlockHash</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getBlockInfo(org.bitcoinj.base.Sha256Hash)">getBlockInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getChainTips()">getChainTips</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getChainTipsAsync()">getChainTipsAsync</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getCommands()">getCommands</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getDefaultAsyncExecutor()">getDefaultAsyncExecutor</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getNetwork()">getNetwork</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getNetworkInfo()">getNetworkInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getNewAddress()">getNewAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getNewAddress(java.lang.String)">getNewAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getRawTransaction(org.bitcoinj.base.Sha256Hash)">getRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getRawTransactionInfo(org.bitcoinj.base.Sha256Hash)">getRawTransactionInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address)">getReceivedByAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getReceivedByAddress(org.bitcoinj.base.Address,java.lang.Integer)">getReceivedByAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash)">getTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getTransaction(org.bitcoinj.base.Sha256Hash,java.lang.Boolean,java.lang.Boolean)">getTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer)">getTxOut</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getTxOut(org.bitcoinj.base.Sha256Hash,java.lang.Integer,java.lang.Boolean)">getTxOut</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getTxOutSetInfo()">getTxOutSetInfo</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getZmqNotifications()">getZmqNotifications</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#getZmqNotificationsAsync()">getZmqNotificationsAsync</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#help()">help</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#help(java.lang.String)">help</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#helpAsLines()">helpAsLines</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#helpAsMethodEntries()">helpAsMethodEntries</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#helpAsStream()">helpAsStream</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#importPrivKey(org.bitcoinj.crypto.ECKey,java.lang.String,boolean)">importPrivKey</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#invalidateBlock(org.bitcoinj.base.Sha256Hash)">invalidateBlock</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#isAddressIndexEnabled()">isAddressIndexEnabled</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listAddressGroupings()">listAddressGroupings</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listReceivedByAddress(java.lang.Integer,java.lang.Boolean)">listReceivedByAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listTransactions()">listTransactions</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer)">listTransactions</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listTransactions(java.lang.String,java.lang.Integer,java.lang.Integer,java.lang.Boolean)">listTransactions</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listUnspent()">listUnspent</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer)">listUnspent</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List)">listUnspent</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,java.util.List,java.lang.Boolean)">listUnspent</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listUnspent(java.lang.Integer,java.lang.Integer,org.bitcoinj.base.Address)">listUnspent</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#listWallets()">listWallets</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#mapBitcoinTransientErrors(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">mapBitcoinTransientErrors</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#reconsiderBlock(org.bitcoinj.base.Sha256Hash)">reconsiderBlock</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendFrom(java.lang.String,org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendFrom</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendMany(java.lang.String,java.util.Map)">sendMany</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendRawTransaction(java.lang.String)">sendRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendRawTransaction(java.lang.String,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction)">sendRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendRawTransaction(org.bitcoinj.core.Transaction,org.bitcoinj.base.Coin)">sendRawTransaction</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin)">sendToAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#sendToAddress(org.bitcoinj.base.Address,org.bitcoinj.base.Coin,java.lang.String,java.lang.String)">sendToAddress</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#setTxFee(org.bitcoinj.base.Coin)">setTxFee</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#signRawTransactionWithWallet(java.lang.String)">signRawTransactionWithWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#stop()">stop</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#unloadWallet()">unloadWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#unloadWallet(java.lang.String,java.lang.Boolean)">unloadWallet</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#waitForBlock(int,int)">waitForBlock</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#waitForBlockchainInfoAsync(java.time.Duration,java.time.Duration)">waitForBlockchainInfoAsync</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#waitForConnected()">waitForConnected</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#waitForConnected(java.time.Duration)">waitForConnected</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#waitForServer(int)">waitForServer</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#waitForServer(java.time.Duration)">waitForServer</a>, <a href="../../bitcoin/jsonrpc/BitcoinClient.html#waitForServerAsync(java.time.Duration,java.time.Duration)">waitForServerAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a></h3>
-<code><a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#getServerURI()">getServerURI</a>, <a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponse</a>, <a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a></code></div>
-<div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AbstractRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a></h3>
-<code><a href="../../jsonrpc/AbstractRpcClient.html#base64Encode(java.lang.String)">base64Encode</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getDefaultSSLContext()">getDefaultSSLContext</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getDefaultType()">getDefaultType</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="../../jsonrpc/AbstractRpcClient.html#getMapper()">getMapper</a></code></div>
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.DefaultRpcClient">Methods inherited from class&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a></h3>
+<code><a href="../../jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,com.fasterxml.jackson.databind.JavaType)">collectionTypeForClasses</a>, <a href="../../jsonrpc/DefaultRpcClient.html#collectionTypeForClasses(java.lang.Class,java.lang.Class)">collectionTypeForClasses</a>, <a href="../../jsonrpc/DefaultRpcClient.html#defaultType()">defaultType</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getJsonRpcVersion()">getJsonRpcVersion</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getMapper()">getMapper</a>, <a href="../../jsonrpc/DefaultRpcClient.html#getServerURI()">getServerURI</a>, <a href="../../jsonrpc/DefaultRpcClient.html#identityTransientErrorMapper(org.consensusj.jsonrpc.JsonRpcRequest,org.consensusj.jsonrpc.JsonRpcResponse,java.lang.Throwable)">identityTransientErrorMapper</a>, <a href="../../jsonrpc/DefaultRpcClient.html#pollOnce(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">pollOnce</a>, <a href="../../jsonrpc/DefaultRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="../../jsonrpc/DefaultRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="../../jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponseAsync</a>, <a href="../../jsonrpc/DefaultRpcClient.html#sendRequestForResponseAsync(org.consensusj.jsonrpc.JsonRpcRequest,com.fasterxml.jackson.databind.JavaType)">sendRequestForResponseAsync</a>, <a href="../../jsonrpc/DefaultRpcClient.html#statusFromErrorResponse(org.consensusj.jsonrpc.JsonRpcResponse)">statusFromErrorResponse</a>, <a href="../../jsonrpc/DefaultRpcClient.html#temporarilyUnavailableResponse(org.consensusj.jsonrpc.JsonRpcRequest,java.lang.Throwable)">temporarilyUnavailableResponse</a>, <a href="../../jsonrpc/DefaultRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a>, <a href="../../jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,com.fasterxml.jackson.databind.JavaType,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">waitForServer</a>, <a href="../../jsonrpc/DefaultRpcClient.html#waitForServer(java.time.Duration,java.time.Duration,java.util.function.Supplier,org.consensusj.jsonrpc.DefaultRpcClient.TransientErrorMapper)">waitForServer</a></code></div>
 <div class="inherited-list">
 <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from class&nbsp;java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></h3>
 <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#clone()" title="class or interface in java.lang" class="external-link">clone</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#equals(java.lang.Object)" title="class or interface in java.lang" class="external-link">equals</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#finalize()" title="class or interface in java.lang" class="external-link">finalize</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#getClass()" title="class or interface in java.lang" class="external-link">getClass</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#hashCode()" title="class or interface in java.lang" class="external-link">hashCode</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notify()" title="class or interface in java.lang" class="external-link">notify</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#notifyAll()" title="class or interface in java.lang" class="external-link">notifyAll</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#toString()" title="class or interface in java.lang" class="external-link">toString</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait()" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long)" title="class or interface in java.lang" class="external-link">wait</a>, <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html#wait(long,int)" title="class or interface in java.lang" class="external-link">wait</a></code></div>
@@ -172,11 +184,11 @@ <h3 id="methods-inherited-from-class-java.lang.Object">Methods inherited from cl
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h3>
 <code><a href="../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">supplyAsync</a>, <a href="../../jsonrpc/AsyncSupport.html#supplyAsync(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier,java.util.concurrent.Executor)">supplyAsync</a></code></div>
 <div class="inherited-list">
-<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JacksonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></h3>
-<code><a href="../../jsonrpc/JacksonRpcClient.html#responseTypeFor(com.fasterxml.jackson.databind.JavaType)">responseTypeFor</a>, <a href="../../jsonrpc/JacksonRpcClient.html#responseTypeFor(java.lang.Class)">responseTypeFor</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,com.fasterxml.jackson.databind.JavaType,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="../../jsonrpc/JacksonRpcClient.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest)">sendRequestForResponse</a>, <a href="../../jsonrpc/JacksonRpcClient.html#typeForClass(java.lang.Class)">typeForClass</a></code></div>
-<div class="inherited-list">
 <h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcClient">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a></h3>
-<code><a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a></code></div>
+<code><a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.lang.Object...)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#buildJsonRequest(java.lang.String,java.util.List)">buildJsonRequest</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Class,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.lang.Object...)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#send(java.lang.String,T,java.util.List)">send</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.lang.Object...)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.lang.Class,java.util.List)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,java.util.List)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.lang.Object...)">sendAsync</a>, <a href="../../jsonrpc/JsonRpcClient.html#sendAsync(java.lang.String,T,java.util.List)">sendAsync</a></code></div>
+<div class="inherited-list">
+<h3 id="methods-inherited-from-class-org.consensusj.jsonrpc.JsonRpcTransport">Methods inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a></h3>
+<code><a href="../../jsonrpc/JsonRpcTransport.html#sendRequestForResponse(org.consensusj.jsonrpc.JsonRpcRequest,T)">sendRequestForResponse</a>, <a href="../../jsonrpc/JsonRpcTransport.html#syncGet(java.util.concurrent.CompletableFuture)">syncGet</a></code></div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/cli/NmcLookup.html b/apidoc/org/consensusj/namecoin/jsonrpc/cli/NmcLookup.html
index 910bab343..71e15def0 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/cli/NmcLookup.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/cli/NmcLookup.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>NmcLookup (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>NmcLookup (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.namecoin.jsonrpc.cli, class: NmcLookup">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/cli/package-summary.html b/apidoc/org/consensusj/namecoin/jsonrpc/cli/package-summary.html
index c6dde66e2..d5e0270bb 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/cli/package-summary.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/cli/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.namecoin.jsonrpc.cli (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.namecoin.jsonrpc.cli (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.namecoin.jsonrpc.cli">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/cli/package-tree.html b/apidoc/org/consensusj/namecoin/jsonrpc/cli/package-tree.html
index 468cdb335..66ba7823d 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/cli/package-tree.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/cli/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.namecoin.jsonrpc.cli Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.namecoin.jsonrpc.cli Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.namecoin.jsonrpc.cli">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.namecoin.jsonrpc.cli</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/core/NMCMainNetParams.html b/apidoc/org/consensusj/namecoin/jsonrpc/core/NMCMainNetParams.html
index 9aad3af5e..dd4a982d7 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/core/NMCMainNetParams.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/core/NMCMainNetParams.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>NMCMainNetParams (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>NMCMainNetParams (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.namecoin.jsonrpc.core, class: NMCMainNetParams">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html b/apidoc/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html
index 1804e34e3..6aa01c5b5 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>NameCoinNetwork (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>NameCoinNetwork (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.namecoin.jsonrpc.core, enum: NameCoinNetwork">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#enum-constant-summary">Enum Constants</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#enum-constant-detail">Enum Constants</a></li>
+<li><a href="#field-detail">Field</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -82,7 +96,7 @@ <h1 title="Enum Class NameCoinNetwork" class="title">Enum Class NameCoinNetwork<
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;<a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>&gt;</code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/constant/Constable.html" title="class or interface in java.lang.constant" class="external-link">Constable</a></code>, <code>org.bitcoinj.base.Network</code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public enum </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-24">NameCoinNetwork</a></span>
+<div class="type-signature"><span class="modifiers">public enum </span><span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-23">NameCoinNetwork</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Enum.html" title="class or interface in java.lang" class="external-link">Enum</a>&lt;<a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>&gt;
 implements org.bitcoinj.base.Network</span></div>
 </section>
@@ -177,12 +191,12 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>boolean</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#exceedsMaxMoney(org.bitcoinj.base.Monetary)" class="member-name-link">exceedsMaxMoney</a><wbr>(org.bitcoinj.base.Monetary&nbsp;amount)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;<a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#fromIdString(java.lang.String)" class="member-name-link">fromIdString</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;idString)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
 <div class="block">Find the <code>BitcoinNetwork</code> from an ID String</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code>static <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a><wbr>&lt;<a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4"><code><a href="#fromString(java.lang.String)" class="member-name-link">fromString</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;nameString)</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab4">
 <div class="block">Find the <code>BitcoinNetwork</code> from a name string, e.g.</div>
@@ -193,7 +207,7 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#id()" class="member-name-link">id</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Return the network ID string (previously specified in <code>NetworkParameters</code>)</div>
+<div class="block">Return the network ID string (specified by a <code>Network</code>)</div>
 </div>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>int</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#legacyAddressHeader()" class="member-name-link">legacyAddressHeader</a>()</code></div>
@@ -258,25 +272,25 @@ <h2>Enum Constant Details</h2>
 <li>
 <section class="detail" id="MAINNET">
 <h3>MAINNET</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-25">MAINNET</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-24">MAINNET</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="TESTNET">
 <h3>TESTNET</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-26">TESTNET</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-25">TESTNET</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="SIGNET">
 <h3>SIGNET</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-27">SIGNET</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-26">SIGNET</a></span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="REGTEST">
 <h3>REGTEST</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-28">REGTEST</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-27">REGTEST</a></span></div>
 </section>
 </li>
 </ul>
@@ -290,12 +304,12 @@ <h2>Field Details</h2>
 <li>
 <section class="detail" id="BITCOIN_SCHEME">
 <h3>BITCOIN_SCHEME</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-33">BITCOIN_SCHEME</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-32">BITCOIN_SCHEME</a></span></div>
 <div class="block">Scheme part for Bitcoin URIs.</div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../constant-values.html#org.consensusj.namecoin.jsonrpc.core.NameCoinNetwork.BITCOIN_SCHEME">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -305,47 +319,47 @@ <h3>BITCOIN_SCHEME</h3>
 <li>
 <section class="detail" id="MAX_MONEY">
 <h3>MAX_MONEY</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-43">MAX_MONEY</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-42">MAX_MONEY</a></span></div>
 <div class="block">The maximum money to be generated</div>
 </section>
 </li>
 <li>
 <section class="detail" id="ID_MAINNET">
 <h3>ID_MAINNET</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-46">ID_MAINNET</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-45">ID_MAINNET</a></span></div>
 <div class="block">The ID string for the main, production network where people trade things.</div>
 </section>
 </li>
 <li>
 <section class="detail" id="ID_TESTNET">
 <h3>ID_TESTNET</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-48">ID_TESTNET</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-47">ID_TESTNET</a></span></div>
 <div class="block">The ID string for the testnet.</div>
 </section>
 </li>
 <li>
 <section class="detail" id="ID_SIGNET">
 <h3>ID_SIGNET</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-50">ID_SIGNET</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-49">ID_SIGNET</a></span></div>
 <div class="block">The ID string for the signet.</div>
 </section>
 </li>
 <li>
 <section class="detail" id="ID_REGTEST">
 <h3>ID_REGTEST</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-52">ID_REGTEST</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-51">ID_REGTEST</a></span></div>
 <div class="block">The ID string for regtest mode.</div>
 </section>
 </li>
 <li>
 <section class="detail" id="ID_UNITTESTNET">
 <h3>ID_UNITTESTNET</h3>
-<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-54">ID_UNITTESTNET</a></span></div>
+<div class="member-signature"><span class="modifiers">public static final</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-53">ID_UNITTESTNET</a></span></div>
 <div class="block">The ID string for the Unit test network -- there is no corresponding <code>enum</code>.</div>
 <dl class="notes">
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="../../../../../constant-values.html#org.consensusj.namecoin.jsonrpc.core.NameCoinNetwork.ID_UNITTESTNET">Constant Field Values</a></li>
 </ul>
 </dd>
@@ -363,7 +377,7 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="values()">
 <h3>values</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>[]</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-24">values</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>[]</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-23">values</a></span>()</div>
 <div class="block">Returns an array containing the constants of this enum class, in
 the order they are declared.</div>
 <dl class="notes">
@@ -375,7 +389,7 @@ <h3>values</h3>
 <li>
 <section class="detail" id="valueOf(java.lang.String)">
 <h3>valueOf</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-24">valueOf</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-23">valueOf</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;name)</span></div>
 <div class="block">Returns the enum constant of this class with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this class.  (Extraneous whitespace characters are 
@@ -394,7 +408,7 @@ <h3>valueOf</h3>
 <li>
 <section class="detail" id="toString()">
 <h3>toString</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-73">toString</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-72">toString</a></span>()</div>
 <div class="block">Return the canonical, lowercase, user-facing <code>String</code> for an <code>enum</code></div>
 <dl class="notes">
 <dt>Overrides:</dt>
@@ -407,8 +421,8 @@ <h3>toString</h3>
 <li>
 <section class="detail" id="id()">
 <h3>id</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-83">id</a></span>()</div>
-<div class="block">Return the network ID string (previously specified in <code>NetworkParameters</code>)</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-82">id</a></span>()</div>
+<div class="block">Return the network ID string (specified by a <code>Network</code>)</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code>id</code>&nbsp;in interface&nbsp;<code>org.bitcoinj.base.Network</code></dd>
@@ -420,7 +434,7 @@ <h3>id</h3>
 <li>
 <section class="detail" id="legacyAddressHeader()">
 <h3>legacyAddressHeader</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-93">legacyAddressHeader</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-92">legacyAddressHeader</a></span>()</div>
 <div class="block">Header byte of base58 encoded legacy P2PKH addresses for this network.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -429,7 +443,7 @@ <h3>legacyAddressHeader</h3>
 <dd>header byte as an <code>int</code>.</dd>
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><code>LegacyAddress.AddressHeader</code></li>
 </ul>
 </dd>
@@ -439,7 +453,7 @@ <h3>legacyAddressHeader</h3>
 <li>
 <section class="detail" id="legacyP2SHHeader()">
 <h3>legacyP2SHHeader</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-103">legacyP2SHHeader</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">int</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-102">legacyP2SHHeader</a></span>()</div>
 <div class="block">Header byte of base58 encoded legacy P2SH addresses for this network.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -448,7 +462,7 @@ <h3>legacyP2SHHeader</h3>
 <dd>header byte as an <code>int</code>.</dd>
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><code>LegacyAddress.P2SHHeader</code></li>
 </ul>
 </dd>
@@ -458,7 +472,7 @@ <h3>legacyP2SHHeader</h3>
 <li>
 <section class="detail" id="segwitAddressHrp()">
 <h3>segwitAddressHrp</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-113">segwitAddressHrp</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-112">segwitAddressHrp</a></span>()</div>
 <div class="block">Return the standard Bech32 <code>SegwitAddress.SegwitHrp</code> (as a <code>String</code>) for
  this network.</div>
 <dl class="notes">
@@ -472,7 +486,7 @@ <h3>segwitAddressHrp</h3>
 <li>
 <section class="detail" id="uriScheme()">
 <h3>uriScheme</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-123">uriScheme</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a></span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-122">uriScheme</a></span>()</div>
 <div class="block">The URI scheme for Bitcoin.</div>
 <dl class="notes">
 <dt>Specified by:</dt>
@@ -481,7 +495,7 @@ <h3>uriScheme</h3>
 <dd>string containing the URI scheme</dd>
 <dt>See Also:</dt>
 <dd>
-<ul class="see-list">
+<ul class="tag-list">
 <li><a href="https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki">BIP 0021</a></li>
 </ul>
 </dd>
@@ -491,7 +505,7 @@ <h3>uriScheme</h3>
 <li>
 <section class="detail" id="hasMaxMoney()">
 <h3>hasMaxMoney</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-128">hasMaxMoney</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-127">hasMaxMoney</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code>hasMaxMoney</code>&nbsp;in interface&nbsp;<code>org.bitcoinj.base.Network</code></dd>
@@ -501,7 +515,7 @@ <h3>hasMaxMoney</h3>
 <li>
 <section class="detail" id="maxMoney()">
 <h3>maxMoney</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-133">maxMoney</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.bitcoinj.base.Coin</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-132">maxMoney</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code>maxMoney</code>&nbsp;in interface&nbsp;<code>org.bitcoinj.base.Network</code></dd>
@@ -511,7 +525,7 @@ <h3>maxMoney</h3>
 <li>
 <section class="detail" id="exceedsMaxMoney(org.bitcoinj.base.Monetary)">
 <h3>exceedsMaxMoney</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-138">exceedsMaxMoney</a></span><wbr><span class="parameters">(org.bitcoinj.base.Monetary&nbsp;amount)</span></div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">boolean</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-137">exceedsMaxMoney</a></span><wbr><span class="parameters">(org.bitcoinj.base.Monetary&nbsp;amount)</span></div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code>exceedsMaxMoney</code>&nbsp;in interface&nbsp;<code>org.bitcoinj.base.Network</code></dd>
@@ -521,7 +535,7 @@ <h3>exceedsMaxMoney</h3>
 <li>
 <section class="detail" id="fromString(java.lang.String)">
 <h3>fromString</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-153">fromString</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;nameString)</span></div>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-152">fromString</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;nameString)</span></div>
 <div class="block">Find the <code>BitcoinNetwork</code> from a name string, e.g. "mainnet", "testnet" or "signet".
  A number of common alternate names are allowed too, e.g. "main" or "prod".</div>
 <dl class="notes">
@@ -535,7 +549,7 @@ <h3>fromString</h3>
 <li>
 <section class="detail" id="fromIdString(java.lang.String)">
 <h3>fromIdString</h3>
-<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-164">fromIdString</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;idString)</span></div>
+<div class="member-signature"><span class="modifiers">public static</span>&nbsp;<span class="return-type"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Optional.html" title="class or interface in java.util" class="external-link">Optional</a>&lt;<a href="NameCoinNetwork.html" title="enum class in org.consensusj.namecoin.jsonrpc.core">NameCoinNetwork</a>&gt;</span>&nbsp;<span class="element-name"><a href="../../../../../src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html#line-163">fromIdString</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;idString)</span></div>
 <div class="block">Find the <code>BitcoinNetwork</code> from an ID String
  <p>
  Note: <a href="#ID_UNITTESTNET"><code>ID_UNITTESTNET</code></a> is not supported as an enum</div>
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/core/package-summary.html b/apidoc/org/consensusj/namecoin/jsonrpc/core/package-summary.html
index 8bcc2e646..e22db8bcd 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/core/package-summary.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/core/package-summary.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.namecoin.jsonrpc.core (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.namecoin.jsonrpc.core (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.namecoin.jsonrpc.core">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="package-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -49,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/core/package-tree.html b/apidoc/org/consensusj/namecoin/jsonrpc/core/package-tree.html
index 14c913a39..fe5774808 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/core/package-tree.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/core/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.namecoin.jsonrpc.core Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.namecoin.jsonrpc.core Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.namecoin.jsonrpc.core">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.namecoin.jsonrpc.core</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/package-summary.html b/apidoc/org/consensusj/namecoin/jsonrpc/package-summary.html
index 892c5aafe..0045bb8c2 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/package-summary.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.namecoin.jsonrpc (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.namecoin.jsonrpc (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.namecoin.jsonrpc">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/package-tree.html b/apidoc/org/consensusj/namecoin/jsonrpc/package-tree.html
index c7cb878ae..7de994d21 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/package-tree.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.namecoin.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.namecoin.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.namecoin.jsonrpc">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,19 +49,17 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.namecoin.jsonrpc</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
 <li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
 <ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="../../jsonrpc/AbstractRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a> (implements org.consensusj.jsonrpc.<a href="../../jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a>)
-<ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClientHttpUrlConnection.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a>
+<li class="circle">org.consensusj.jsonrpc.<a href="../../jsonrpc/DefaultRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a> (implements org.consensusj.jsonrpc.<a href="../../jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt;)
 <ul>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="../../bitcoin/jsonrpc/BitcoinClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a> (implements org.consensusj.bitcoin.jsonrpc.<a href="../../bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>)
 <ul>
@@ -73,8 +71,6 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </ul>
 </li>
 </ul>
-</li>
-</ul>
 </section>
 </main>
 </div>
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/pojo/NameData.html b/apidoc/org/consensusj/namecoin/jsonrpc/pojo/NameData.html
index c4fdde7a2..852253086 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/pojo/NameData.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/pojo/NameData.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>NameData (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>NameData (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.namecoin.jsonrpc.pojo, class: NameData">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -129,7 +143,7 @@ <h2>Method Summary</h2>
 <div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.bitcoinj.base.Sha256Hash</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getTxid()" class="member-name-link">getTxid</a>()</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link">Map</a><wbr>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>,<wbr><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>&gt;</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#getValue()" class="member-name-link">getValue</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
 </div>
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/pojo/package-summary.html b/apidoc/org/consensusj/namecoin/jsonrpc/pojo/package-summary.html
index 21e237f4c..7358a8300 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/pojo/package-summary.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/pojo/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.namecoin.jsonrpc.pojo (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.namecoin.jsonrpc.pojo (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.namecoin.jsonrpc.pojo">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../../index-all.html">Index</a></li>
 <li><a href="../../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li>Description</li>
+<li><a href="#related-package-summary">Related Packages</a></li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li>Description&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/namecoin/jsonrpc/pojo/package-tree.html b/apidoc/org/consensusj/namecoin/jsonrpc/pojo/package-tree.html
index 8ef191441..222158e6e 100644
--- a/apidoc/org/consensusj/namecoin/jsonrpc/pojo/package-tree.html
+++ b/apidoc/org/consensusj/namecoin/jsonrpc/pojo/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.namecoin.jsonrpc.pojo Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.namecoin.jsonrpc.pojo Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.namecoin.jsonrpc.pojo">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.namecoin.jsonrpc.pojo</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html b/apidoc/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html
index 19eb47e7e..be0114110 100644
--- a/apidoc/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html
+++ b/apidoc/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RxJsonRpcClient (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RxJsonRpcClient (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.rx.jsonrpc, interface: RxJsonRpcClient">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li><a href="#nested-class-summary">Nested</a></li>
+<li><a href="#field-summary">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li><a href="#field-detail">Field</a></li>
+<li>Constr</li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li><a href="#nested-class-summary">Nested</a>&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -85,10 +99,10 @@ <h1 title="Interface RxJsonRpcClient" class="title">Interface RxJsonRpcClient</h
 <dd><code><a href="../../bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a></code>, <code><a href="../../bitcoin/rx/jsonrpc/RxBitcoinClient.html" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-17">RxJsonRpcClient</a></span><span class="extends-implements">
+<div class="type-signature"><span class="modifiers">public interface </span><span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-23">RxJsonRpcClient</a></span><span class="extends-implements">
 extends <a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></span></div>
 <div class="block">RxJava support for calling JSON-RPC clients. Extend/implement this interface to inherit <code>default</code> methods
- <a href="#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)"><code>call(ThrowingSupplier)</code></a>, <a href="#defer(java.util.function.Supplier)"><code>defer(Supplier)</code></a>, and <a href="#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)"><code>pollOnce(ThrowingSupplier)</code></a>.</div>
+ such as <a href="#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)"><code>pollOnceAsPublisher(Supplier, DefaultRpcClient.TransientErrorFilter)</code></a>.</div>
 </section>
 <section class="summary">
 <ul class="summary-list">
@@ -98,7 +112,7 @@ <h1 title="Interface RxJsonRpcClient" class="title">Interface RxJsonRpcClient</h
 <h2>Nested Class Summary</h2>
 <div class="inherited-list">
 <h2 id="nested-classes-inherited-from-class-org.consensusj.jsonrpc.AsyncSupport">Nested classes/interfaces inherited from interface&nbsp;org.consensusj.jsonrpc.<a href="../../jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a></h2>
-<code><a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;</code></div>
+<code><a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="type parameter in AsyncSupport.ThrowingSupplier">T</a>&gt;, <a href="../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></code></div>
 </section>
 </li>
 <!-- =========== FIELD SUMMARY =========== -->
@@ -121,26 +135,47 @@ <h2>Field Summary</h2>
 <section class="method-summary" id="method-summary">
 <h2>Method Summary</h2>
 <div id="method-summary-table">
-<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button></div>
+<div class="table-tabs" role="tablist" aria-orientation="horizontal"><button id="method-summary-table-tab0" role="tab" aria-selected="true" aria-controls="method-summary-table.tabpanel" tabindex="0" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table', 3)" class="active-table-tab">All Methods</button><button id="method-summary-table-tab1" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab1', 3)" class="table-tab">Static Methods</button><button id="method-summary-table-tab2" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab2', 3)" class="table-tab">Instance Methods</button><button id="method-summary-table-tab5" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab5', 3)" class="table-tab">Default Methods</button><button id="method-summary-table-tab6" role="tab" aria-selected="false" aria-controls="method-summary-table.tabpanel" tabindex="-1" onkeydown="switchTab(event)" onclick="show('method-summary-table', 'method-summary-table-tab6', 3)" class="table-tab">Deprecated Methods</button></div>
 <div id="method-summary-table.tabpanel" role="tabpanel">
 <div class="summary-table three-column-summary" aria-labelledby="method-summary-table-tab0">
 <div class="table-header col-first">Modifier and Type</div>
 <div class="table-header col-second">Method</div>
 <div class="table-header col-last">Description</div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;RSLT&gt;&nbsp;io.reactivex.rxjava3.core.Single&lt;RSLT&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)" class="member-name-link">call</a><wbr>(<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Return a <i>cold</i> <code>Single</code> for calling a provided <b>synchronous</b> JSON-RPC method.</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code>default &lt;RSLT&gt;&nbsp;io.reactivex.rxjava3.core.Single<wbr>&lt;RSLT&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code><a href="#call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)" class="member-name-link">call</a><wbr>(<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code>default &lt;RSLT&gt;&nbsp;io.reactivex.rxjava3.core.Single<wbr>&lt;RSLT&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code><a href="#callAsync(java.util.function.Supplier)" class="member-name-link">callAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab6"><code>static &lt;RSLT&gt;&nbsp;io.reactivex.rxjava3.core.Single<wbr>&lt;RSLT&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab6"><code><a href="#defer(java.util.function.Supplier)" class="member-name-link">defer</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab1 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
+</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code>default &lt;RSLT&gt;&nbsp;io.reactivex.rxjava3.core.Maybe<wbr>&lt;RSLT&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code><a href="#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)" class="member-name-link">pollOnce</a><wbr>(<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</code></div>
+<div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use <a href="#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)"><code>pollOnceAsPublisher(Supplier, TransientErrorFilter)</code></a> (Supplier)}</div>
 </div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;RSLT&gt;&nbsp;io.reactivex.rxjava3.core.Single&lt;RSLT&gt;</code></div>
-<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#defer(java.util.function.Supplier)" class="member-name-link">defer</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</code></div>
+</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;T&gt;&nbsp;org.reactivestreams.Publisher<wbr>&lt;T&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#pollOnceAsPublisher(java.util.function.Supplier)" class="member-name-link">pollOnceAsPublisher</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;T&gt;&gt;&nbsp;supplier)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">&nbsp;</div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;T&gt;&nbsp;org.reactivestreams.Publisher<wbr>&lt;T&gt;</code></div>
+<div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)" class="member-name-link">pollOnceAsPublisher</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;T&gt;&gt;&nbsp;supplier,
+ <a href="../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a>&nbsp;filter)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Return a <i>cold</i> <code>Single</code> for calling a provided <b>asynchronous</b> JSON-RPC method.</div>
+<div class="block">Takes a supplier of computable futures and returns a publisher that when subscribed to returns 0 or 1 items.</div>
 </div>
-<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code>default &lt;RSLT&gt;&nbsp;io.reactivex.rxjava3.core.Maybe&lt;RSLT&gt;</code></div>
-<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5"><code><a href="#pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)" class="member-name-link">pollOnce</a><wbr>(<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</code></div>
-<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5">
-<div class="block">Poll a method, ignoring <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOError.html" title="class or interface in java.io" class="external-link"><code>IOError</code></a>.</div>
+<div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code>default &lt;RSLT&gt;&nbsp;io.reactivex.rxjava3.core.Maybe<wbr>&lt;RSLT&gt;</code></div>
+<div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6"><code><a href="#pollOnceAsync(java.util.function.Supplier)" class="member-name-link">pollOnceAsync</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</code></div>
+<div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab5 method-summary-table-tab6">
+<div class="block"><span class="deprecated-label">Deprecated.</span></div>
 </div>
 </div>
 </div>
@@ -162,7 +197,7 @@ <h2>Field Details</h2>
 <li>
 <section class="detail" id="log">
 <h3>log</h3>
-<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.slf4j.Logger</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-18">log</a></span></div>
+<div class="member-signature"><span class="modifiers">static final</span>&nbsp;<span class="return-type">org.slf4j.Logger</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-24">log</a></span></div>
 </section>
 </li>
 </ul>
@@ -176,8 +211,10 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="call(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">
 <h3>call</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>
-<span class="return-type">io.reactivex.rxjava3.core.Single&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-28">call</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</span></div>
+<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>
+<span class="return-type">io.reactivex.rxjava3.core.Single&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-34">call</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Return a <i>cold</i> <code>Single</code> for calling a provided <b>synchronous</b> JSON-RPC method.
  <p>
   A  <i>cold</i> stream does not begin processing until someone subscribes to it.</div>
@@ -192,10 +229,21 @@ <h3>call</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="callAsync(java.util.function.Supplier)">
+<h3>callAsync</h3>
+<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>
+<span class="return-type">io.reactivex.rxjava3.core.Single&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-39">callAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+</section>
+</li>
+<li>
 <section class="detail" id="defer(java.util.function.Supplier)">
 <h3>defer</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>
-<span class="return-type">io.reactivex.rxjava3.core.Single&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-41">defer</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</span></div>
+<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="modifiers">static</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>
+<span class="return-type">io.reactivex.rxjava3.core.Single&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-53">defer</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
 <div class="block">Return a <i>cold</i> <code>Single</code> for calling a provided <b>asynchronous</b> JSON-RPC method.
  (Uses a supplier to make sure the async call isn't made until subscription time)
  <p>
@@ -211,10 +259,37 @@ <h3>defer</h3>
 </section>
 </li>
 <li>
+<section class="detail" id="pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)">
+<h3>pollOnceAsPublisher</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-65">pollOnceAsPublisher</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;T&gt;&gt;&nbsp;supplier,
+ <a href="../../jsonrpc/AsyncSupport.TransientErrorFilter.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a>&nbsp;filter)</span></div>
+<div class="block">Takes a supplier of computable futures and returns a publisher that when subscribed to returns 0 or 1 items.</div>
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>T</code> - result type</dd>
+<dt>Parameters:</dt>
+<dd><code>supplier</code> - supplier for delaying invocation of "hot" futures so they can be "cold" publishers.</dd>
+<dd><code>filter</code> - Filters and logs transient errors</dd>
+<dt>Returns:</dt>
+<dd>A publisher of a "cold" stream of items (temporarily Flowable, but will change to Publisher, then Flow.Publisher)</dd>
+</dl>
+</section>
+</li>
+<li>
+<section class="detail" id="pollOnceAsPublisher(java.util.function.Supplier)">
+<h3>pollOnceAsPublisher</h3>
+<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;T&gt;</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;T&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-73">pollOnceAsPublisher</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;T&gt;&gt;&nbsp;supplier)</span></div>
+</section>
+</li>
+<li>
 <section class="detail" id="pollOnce(org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier)">
 <h3>pollOnce</h3>
-<div class="member-signature"><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>
-<span class="return-type">io.reactivex.rxjava3.core.Maybe&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-58">pollOnce</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</span></div>
+<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>
+<span class="return-type">io.reactivex.rxjava3.core.Maybe&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-91">pollOnce</a></span><wbr><span class="parameters">(<a href="../../jsonrpc/AsyncSupport.ThrowingSupplier.html" title="interface in org.consensusj.jsonrpc">AsyncSupport.ThrowingSupplier</a>&lt;RSLT&gt;&nbsp;method)</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span>
+<div class="deprecation-comment">Use <a href="#pollOnceAsPublisher(java.util.function.Supplier,org.consensusj.jsonrpc.AsyncSupport.TransientErrorFilter)"><code>pollOnceAsPublisher(Supplier, TransientErrorFilter)</code></a> (Supplier)}</div>
+</div>
 <div class="block">Poll a method, ignoring <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOError.html" title="class or interface in java.io" class="external-link"><code>IOError</code></a>.
  The returned <code>Maybe</code> will:
  <ol>
@@ -232,6 +307,30 @@ <h3>pollOnce</h3>
 </dl>
 </section>
 </li>
+<li>
+<section class="detail" id="pollOnceAsync(java.util.function.Supplier)">
+<h3>pollOnceAsync</h3>
+<div class="member-signature"><span class="annotations"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Deprecated.html" title="class or interface in java.lang" class="external-link">@Deprecated</a>
+</span><span class="modifiers">default</span>&nbsp;<span class="type-parameters">&lt;RSLT&gt;</span>
+<span class="return-type">io.reactivex.rxjava3.core.Maybe&lt;RSLT&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html#line-113">pollOnceAsync</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/function/Supplier.html" title="class or interface in java.util.function" class="external-link">Supplier</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/CompletionStage.html" title="class or interface in java.util.concurrent" class="external-link">CompletionStage</a>&lt;RSLT&gt;&gt;&nbsp;supplier)</span></div>
+<div class="deprecation-block"><span class="deprecated-label">Deprecated.</span></div>
+<div class="block">Poll a method, ignoring <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOError.html" title="class or interface in java.io" class="external-link"><code>IOError</code></a>.
+ The returned <code>Maybe</code> will:
+ <ol>
+     <li>Emit a value if successful</li>
+     <li>Empty Complete on IOError</li>
+     <li>Error out if any other Exception occurs</li>
+ </ol></div>
+<dl class="notes">
+<dt>Type Parameters:</dt>
+<dd><code>RSLT</code> - The type of the expected result</dd>
+<dt>Parameters:</dt>
+<dd><code>supplier</code> - A supplier (should call an async RPC Method and return a <code>CompletableFuture</code>).</dd>
+<dt>Returns:</dt>
+<dd>A Maybe for the expected result type</dd>
+</dl>
+</section>
+</li>
 </ul>
 </section>
 </li>
diff --git a/apidoc/org/consensusj/rx/jsonrpc/package-summary.html b/apidoc/org/consensusj/rx/jsonrpc/package-summary.html
index 4bb24a8f5..0f71b7eef 100644
--- a/apidoc/org/consensusj/rx/jsonrpc/package-summary.html
+++ b/apidoc/org/consensusj/rx/jsonrpc/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.rx.jsonrpc (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.rx.jsonrpc (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.rx.jsonrpc">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
diff --git a/apidoc/org/consensusj/rx/jsonrpc/package-tree.html b/apidoc/org/consensusj/rx/jsonrpc/package-tree.html
index 8e235be01..155299988 100644
--- a/apidoc/org/consensusj/rx/jsonrpc/package-tree.html
+++ b/apidoc/org/consensusj/rx/jsonrpc/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.rx.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.rx.jsonrpc Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.rx.jsonrpc">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.rx.jsonrpc</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
diff --git a/apidoc/org/consensusj/rx/zeromq/RxZmqContext.html b/apidoc/org/consensusj/rx/zeromq/RxZmqContext.html
index c22d4ac94..532844bb9 100644
--- a/apidoc/org/consensusj/rx/zeromq/RxZmqContext.html
+++ b/apidoc/org/consensusj/rx/zeromq/RxZmqContext.html
@@ -1,25 +1,20 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>RxZmqContext (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>RxZmqContext (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.rx.zeromq, class: RxZmqContext">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
 </head>
 <body class="class-declaration-page">
-<script type="text/javascript">var evenRowColor = "even-row-color";
-var oddRowColor = "odd-row-color";
-var tableTab = "table-tab";
-var activeTableTab = "active-table-tab";
-var pathtoroot = "../../../../";
+<script type="text/javascript">var pathtoroot = "../../../../";
 loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
@@ -28,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -39,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li><a href="#method-detail">Method</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -56,9 +70,9 @@
 <li><a href="#method-detail">Method</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -80,14 +94,14 @@ <h1 title="Class RxZmqContext" class="title">Class RxZmqContext</h1>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></code>, <code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
 </dl>
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/RxZmqContext.html#line-34">RxZmqContext</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/RxZmqContext.html#line-35">RxZmqContext</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a>
 implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a></span></div>
-<div class="block">ZMQ Context with a single socket and one <code>FlowableProcessor&lt;ZMsg&gt;</code> per topic.
+<div class="block">ZMQ Context with a single socket and one <code>Processor&lt;ZMsg&gt;</code> per topic.
  It subscribes <code>SUB</code> to one or more topics using ZMQ and receives a multiplexed
  stream of <code>ZMsg</code> from the <a href="ZMsgSocketFlowable.html" title="class in org.consensusj.rx.zeromq"><code>ZMsgSocketFlowable</code></a>. In <code>onNext(org.zeromq.ZMsg)</code> the <code>ZMsg</code>
  are de-multiplexed by the <code>topic</code> <code>String</code> and placed in a per-topic
- <code>FlowableProcessor&lt;ZMsg&gt;</code>.
+ <code>Processor&lt;ZMsg&gt;</code>.
  <p>
  Topics (at least for now) must be passed to the constructor.
  It would be nice to be able to subscribe to topics at the ZMQ level when we first get
@@ -127,10 +141,10 @@ <h2>Method Summary</h2>
 <div class="col-first even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>void</code></div>
 <div class="col-second even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#close()" class="member-name-link">close</a>()</code></div>
 <div class="col-last even-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">&nbsp;</div>
-<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>io.reactivex.rxjava3.core.Flowable&lt;org.zeromq.ZMsg&gt;</code></div>
+<div class="col-first odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code>org.reactivestreams.Publisher<wbr>&lt;org.zeromq.ZMsg&gt;</code></div>
 <div class="col-second odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4"><code><a href="#topicPublisher(java.lang.String)" class="member-name-link">topicPublisher</a><wbr>(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;topic)</code></div>
 <div class="col-last odd-row-color method-summary-table method-summary-table-tab2 method-summary-table-tab4">
-<div class="block">Get a Publisher (Flowable) for a given topic</div>
+<div class="block">Get a Publisher (internally is an RxJava3 Flowable) for a given topic</div>
 </div>
 </div>
 </div>
@@ -152,21 +166,21 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;(java.net.URI,java.util.List)">
 <h3>RxZmqContext</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/RxZmqContext.html#line-42">RxZmqContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;tcpAddress,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/RxZmqContext.html#line-43">RxZmqContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;tcpAddress,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;&nbsp;topics)</span></div>
 </section>
 </li>
 <li>
 <section class="detail" id="&lt;init&gt;(java.net.URI,java.util.List,java.util.concurrent.ThreadFactory)">
 <h3>RxZmqContext</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/RxZmqContext.html#line-51">RxZmqContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;tcpAddress,
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/RxZmqContext.html#line-52">RxZmqContext</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/net/URI.html" title="class or interface in java.net" class="external-link">URI</a>&nbsp;tcpAddress,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/List.html" title="class or interface in java.util" class="external-link">List</a>&lt;<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&gt;&nbsp;topics,
  <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/ThreadFactory.html" title="class or interface in java.util.concurrent" class="external-link">ThreadFactory</a>&nbsp;threadFactory)</span></div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>tcpAddress</code> - Address of ZMQ server to connect to</dd>
 <dd><code>topics</code> - a list of topics to subscribe to</dd>
-<dd><code>threadFactory</code> - factory to create a thread for the receive loop (see <code>ZMsgSocketFlowable.createFromSocket(ZMQ.Socket, BackpressureStrategy, ThreadFactory)</code>)</dd>
+<dd><code>threadFactory</code> - factory to create a thread for the receive loop (see <code>ZMsgSocketFlowable.createFromSocket(ZMQ.Socket, ThreadFactory)</code>)</dd>
 </dl>
 </section>
 </li>
@@ -181,13 +195,13 @@ <h2>Method Details</h2>
 <li>
 <section class="detail" id="topicPublisher(java.lang.String)">
 <h3>topicPublisher</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">io.reactivex.rxjava3.core.Flowable&lt;org.zeromq.ZMsg&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/RxZmqContext.html#line-77">topicPublisher</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;topic)</span></div>
-<div class="block">Get a Publisher (Flowable) for a given topic</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">org.reactivestreams.Publisher&lt;org.zeromq.ZMsg&gt;</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/RxZmqContext.html#line-78">topicPublisher</a></span><wbr><span class="parameters">(<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a>&nbsp;topic)</span></div>
+<div class="block">Get a Publisher (internally is an RxJava3 Flowable) for a given topic</div>
 <dl class="notes">
 <dt>Parameters:</dt>
 <dd><code>topic</code> - a valid topic as passed to the constructor</dd>
 <dt>Returns:</dt>
-<dd>A Publisher (Flowable) for the topic</dd>
+<dd>A Publisher for the topic</dd>
 <dt>Throws:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/IllegalArgumentException.html" title="class or interface in java.lang" class="external-link">IllegalArgumentException</a></code> - if topic wasn't configured in the constructor</dd>
 </dl>
@@ -196,7 +210,7 @@ <h3>topicPublisher</h3>
 <li>
 <section class="detail" id="close()">
 <h3>close</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/RxZmqContext.html#line-85">close</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="return-type">void</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/RxZmqContext.html#line-86">close</a></span>()</div>
 <dl class="notes">
 <dt>Specified by:</dt>
 <dd><code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html#close()" title="class or interface in java.lang" class="external-link">close</a></code>&nbsp;in interface&nbsp;<code><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a></code></dd>
diff --git a/apidoc/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html b/apidoc/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html
index 4733149e2..197fc83c2 100644
--- a/apidoc/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html
+++ b/apidoc/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>ZMsgSocketFlowable (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>ZMsgSocketFlowable (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.rx.zeromq, class: ZMsgSocketFlowable">
 <meta name="generator" content="javadoc/ClassWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,28 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#class">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Summary:</p>
+<ul>
+<li>Nested</li>
+<li>Field</li>
+<li><a href="#constructor-summary">Constr</a></li>
+<li><a href="#method-summary">Method</a></li>
+</ul>
+</li>
+<li>
+<p>Detail:</p>
+<ul>
+<li>Field</li>
+<li><a href="#constructor-detail">Constr</a></li>
+<li>Method</li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Summary:&nbsp;</li>
 <li>Nested&nbsp;|&nbsp;</li>
@@ -52,9 +70,9 @@
 <li>Method</li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -72,11 +90,11 @@ <h1 title="Class ZMsgSocketFlowable" class="title">Class ZMsgSocketFlowable</h1>
 </div>
 <section class="class-description" id="class-description">
 <hr>
-<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html#line-22">ZMsgSocketFlowable</a></span>
+<div class="type-signature"><span class="modifiers">public class </span><span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html#line-24">ZMsgSocketFlowable</a></span>
 <span class="extends-implements">extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">Object</a></span></div>
-<div class="block">Factory class for creating <code>Flowable&lt;ZMsg&gt;</code> from a <code>ZMQ.Socket</code>. The created <code>Flowable</code>
+<div class="block">Factory class for creating <code>Publisher&lt;ZMsg&gt;</code> from a <code>ZMQ.Socket</code>. The created <code>Publisher</code>
   will receive a multiplexed stream of <code>ZMsg</code> (i.e. <code>ZMsg</code> for all topics.) Typically
-  these multiplexed <code>Flowable&lt;ZMsg&gt;</code> are created by a <a href="RxZmqContext.html" title="class in org.consensusj.rx.zeromq"><code>RxZmqContext</code></a> which also de-multiplexes them.
+  these multiplexed <code>Publisher&lt;ZMsg&gt;</code> are created by a <a href="RxZmqContext.html" title="class in org.consensusj.rx.zeromq"><code>RxZmqContext</code></a> which also de-multiplexes them.
   <p>
   TODO: Write some tests!!</div>
 </section>
@@ -116,7 +134,7 @@ <h2>Constructor Details</h2>
 <li>
 <section class="detail" id="&lt;init&gt;()">
 <h3>ZMsgSocketFlowable</h3>
-<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html#line-22">ZMsgSocketFlowable</a></span>()</div>
+<div class="member-signature"><span class="modifiers">public</span>&nbsp;<span class="element-name"><a href="../../../../src-html/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html#line-24">ZMsgSocketFlowable</a></span>()</div>
 </section>
 </li>
 </ul>
diff --git a/apidoc/org/consensusj/rx/zeromq/package-summary.html b/apidoc/org/consensusj/rx/zeromq/package-summary.html
index 94075e390..cff13a306 100644
--- a/apidoc/org/consensusj/rx/zeromq/package-summary.html
+++ b/apidoc/org/consensusj/rx/zeromq/package-summary.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.rx.zeromq (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.rx.zeromq (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="declaration: package: org.consensusj.rx.zeromq">
 <meta name="generator" content="javadoc/PackageWriterImpl">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -35,9 +34,19 @@
 <li><a href="../../../../index-all.html">Index</a></li>
 <li><a href="../../../../help-doc.html#package">Help</a></li>
 </ul>
+<ul class="sub-nav-list-small">
+<li>
+<p>Package:</p>
+<ul>
+<li><a href="#package-description">Description</a></li>
+<li>Related Packages</li>
+<li><a href="#class-summary">Classes and Interfaces</a></li>
+</ul>
+</li>
+</ul>
 </div>
 <div class="sub-nav">
-<div>
+<div id="navbar-sub-list">
 <ul class="sub-nav-list">
 <li>Package:&nbsp;</li>
 <li><a href="#package-description">Description</a>&nbsp;|&nbsp;</li>
@@ -45,9 +54,9 @@
 <li><a href="#class-summary">Classes and Interfaces</a></li>
 </ul>
 </div>
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -61,8 +70,10 @@ <h1 title="Package org.consensusj.rx.zeromq" class="title">Package org.consensus
 <hr>
 <div class="package-signature">package <span class="element-name">org.consensusj.rx.zeromq</span></div>
 <section class="package-description" id="package-description">
-<div class="block">Reactive interface to <a href="https://zeromq.org">ZeroMQ</a> using <a href="https://github.com/zeromq/jeromq">JeroMQ</a> library
- and <a href="https://github.com/ReactiveX/RxJava">RxJava 3</a>.
+<div class="block">Reactive interface to <a href="https://zeromq.org">ZeroMQ</a> using <a href="https://github.com/zeromq/jeromq">JeroMQ</a> library.
+ Reactive streams are available via the <code>Publisher</code> interface, but this will change to
+ <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/concurrent/Flow.Publisher.html" title="class or interface in java.util.concurrent" class="external-link"><code>Flow.Publisher</code></a> before the 1.0 release.
+ It is currently implemented internally with <a href="https://github.com/ReactiveX/RxJava">RxJava 3</a>.
  Use <a href="RxZmqContext.html" title="class in org.consensusj.rx.zeromq"><code>RxZmqContext</code></a> to connect to a server and subscribe to a <code>List</code> of topics.</div>
 </section>
 <section class="summary">
@@ -75,11 +86,11 @@ <h1 title="Package org.consensusj.rx.zeromq" class="title">Package org.consensus
 <div class="table-header col-last">Description</div>
 <div class="col-first even-row-color class-summary class-summary-tab2"><a href="RxZmqContext.html" title="class in org.consensusj.rx.zeromq">RxZmqContext</a></div>
 <div class="col-last even-row-color class-summary class-summary-tab2">
-<div class="block">ZMQ Context with a single socket and one <code>FlowableProcessor&lt;ZMsg&gt;</code> per topic.</div>
+<div class="block">ZMQ Context with a single socket and one <code>Processor&lt;ZMsg&gt;</code> per topic.</div>
 </div>
 <div class="col-first odd-row-color class-summary class-summary-tab2"><a href="ZMsgSocketFlowable.html" title="class in org.consensusj.rx.zeromq">ZMsgSocketFlowable</a></div>
 <div class="col-last odd-row-color class-summary class-summary-tab2">
-<div class="block">Factory class for creating <code>Flowable&lt;ZMsg&gt;</code> from a <code>ZMQ.Socket</code>.</div>
+<div class="block">Factory class for creating <code>Publisher&lt;ZMsg&gt;</code> from a <code>ZMQ.Socket</code>.</div>
 </div>
 </div>
 </div>
diff --git a/apidoc/org/consensusj/rx/zeromq/package-tree.html b/apidoc/org/consensusj/rx/zeromq/package-tree.html
index c546da73b..be85bfcad 100644
--- a/apidoc/org/consensusj/rx/zeromq/package-tree.html
+++ b/apidoc/org/consensusj/rx/zeromq/package-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>org.consensusj.rx.zeromq Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>org.consensusj.rx.zeromq Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="tree: package: org.consensusj.rx.zeromq">
 <meta name="generator" content="javadoc/PackageTreeWriter">
 <link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="../../../../script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="../../../../jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="../../../../script.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="../../../../script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="../../../../index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="../../../../search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,11 +49,11 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For Package org.consensusj.rx.zeromq</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="../../../../overview-tree.html">All Packages</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
diff --git a/apidoc/overview-summary.html b/apidoc/overview-summary.html
index a5e94ce36..6a47a4eb4 100644
--- a/apidoc/overview-summary.html
+++ b/apidoc/overview-summary.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>consensusj 0.7.0-alpha2 API</title>
+<!-- Generated by javadoc (21) -->
+<title>consensusj 0.7.0-alpha3 API</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="index redirect">
diff --git a/apidoc/overview-tree.html b/apidoc/overview-tree.html
index 475de6b9f..93b48080b 100644
--- a/apidoc/overview-tree.html
+++ b/apidoc/overview-tree.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Class Hierarchy (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Class Hierarchy (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="class tree">
 <meta name="generator" content="javadoc/TreeWriter">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -49,8 +49,9 @@
 <main role="main">
 <div class="header">
 <h1 class="title">Hierarchy For All Packages</h1>
+</div>
 <span class="package-hierarchy-label">Package Hierarchies:</span>
-<ul class="horizontal">
+<ul class="horizontal contents-list">
 <li><a href="org/consensusj/analytics/service/package-tree.html">org.consensusj.analytics.service</a>, </li>
 <li><a href="org/consensusj/analytics/util/collector/package-tree.html">org.consensusj.analytics.util.collector</a>, </li>
 <li><a href="org/consensusj/bitcoin/cli/package-tree.html">org.consensusj.bitcoin.cli</a>, </li>
@@ -65,6 +66,7 @@ <h1 class="title">Hierarchy For All Packages</h1>
 <li><a href="org/consensusj/bitcoin/rx/package-tree.html">org.consensusj.bitcoin.rx</a>, </li>
 <li><a href="org/consensusj/bitcoin/rx/jsonrpc/package-tree.html">org.consensusj.bitcoin.rx.jsonrpc</a>, </li>
 <li><a href="org/consensusj/bitcoin/rx/jsonrpc/service/package-tree.html">org.consensusj.bitcoin.rx.jsonrpc.service</a>, </li>
+<li><a href="org/consensusj/bitcoin/rx/jsonrpc/test/package-tree.html">org.consensusj.bitcoin.rx.jsonrpc.test</a>, </li>
 <li><a href="org/consensusj/bitcoin/rx/peergroup/package-tree.html">org.consensusj.bitcoin.rx.peergroup</a>, </li>
 <li><a href="org/consensusj/bitcoin/rx/zeromq/package-tree.html">org.consensusj.bitcoin.rx.zeromq</a>, </li>
 <li><a href="org/consensusj/bitcoin/services/package-tree.html">org.consensusj.bitcoin.services</a>, </li>
@@ -96,7 +98,6 @@ <h1 class="title">Hierarchy For All Packages</h1>
 <li><a href="org/consensusj/rx/jsonrpc/package-tree.html">org.consensusj.rx.jsonrpc</a>, </li>
 <li><a href="org/consensusj/rx/zeromq/package-tree.html">org.consensusj.rx.zeromq</a></li>
 </ul>
-</div>
 <section class="hierarchy">
 <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <ul>
@@ -139,26 +140,6 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </li>
 </ul>
 </li>
-<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AbstractRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">AbstractRpcClient</a> (implements org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a>)
-<ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a>
-<ul>
-<li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a> (implements org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>)
-<ul>
-<li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a>
-<ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a> (implements org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a>)</li>
-</ul>
-</li>
-<li class="circle">org.consensusj.namecoin.jsonrpc.<a href="org/consensusj/namecoin/jsonrpc/NamecoinClient.html" class="type-name-link" title="class in org.consensusj.namecoin.jsonrpc">NamecoinClient</a></li>
-</ul>
-</li>
-<li class="circle">org.consensusj.ethereum.jsonrpc.<a href="org/consensusj/ethereum/jsonrpc/EthereumClient.html" class="type-name-link" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></li>
-</ul>
-</li>
-<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a></li>
-</ul>
-</li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.bitcore.<a href="org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo.bitcore">AddressBalanceInfo</a></li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">AddressGroupingItem</a></li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/AddressInfo.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">AddressInfo</a></li>
@@ -185,10 +166,26 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/BlockInfo.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">BlockInfo</a></li>
 <li class="circle">org.consensusj.bitcoinj.util.<a href="org/consensusj/bitcoinj/util/BlockUtil.html" class="type-name-link" title="class in org.consensusj.bitcoinj.util">BlockUtil</a></li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ChainTip.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">ChainTip</a></li>
+<li class="circle">org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx">ChainTipPublisher.Wrapper</a> (implements org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipPublisher.html" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a>)</li>
 <li class="circle">org.consensusj.jsonrpc.cli.test.<a href="org/consensusj/jsonrpc/cli/test/CLICommandResult.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli.test">CLICommandResult</a></li>
 <li class="circle">org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameterParser.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">CliParameterParser</a></li>
 <li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/CompositeTrustManager.html" class="type-name-link" title="class in org.consensusj.jsonrpc">CompositeTrustManager</a> (implements javax.net.ssl.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/javax/net/ssl/X509TrustManager.html" title="class or interface in javax.net.ssl" class="external-link">X509TrustManager</a>)</li>
 <li class="circle">org.consensusj.exchange.<a href="org/consensusj/exchange/CurrencyUnitPair.html" class="type-name-link" title="class in org.consensusj.exchange">CurrencyUnitPair</a> (implements java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Comparable.html" title="class or interface in java.lang" class="external-link">Comparable</a>&lt;T&gt;)</li>
+<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.html" class="type-name-link" title="class in org.consensusj.jsonrpc">DefaultRpcClient</a> (implements org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt;)
+<ul>
+<li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinClient</a> (implements org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>)
+<ul>
+<li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc">BitcoinExtendedClient</a>
+<ul>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">RxBitcoinClient</a> (implements org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)</li>
+</ul>
+</li>
+<li class="circle">org.consensusj.namecoin.jsonrpc.<a href="org/consensusj/namecoin/jsonrpc/NamecoinClient.html" class="type-name-link" title="class in org.consensusj.namecoin.jsonrpc">NamecoinClient</a></li>
+</ul>
+</li>
+<li class="circle">org.consensusj.ethereum.jsonrpc.<a href="org/consensusj/ethereum/jsonrpc/EthereumClient.html" class="type-name-link" title="class in org.consensusj.ethereum.jsonrpc">EthereumClient</a></li>
+</ul>
+</li>
 <li class="circle">org.consensusj.bitcoinj.signing.<a href="org/consensusj/bitcoinj/signing/DefaultSigningRequest.html" class="type-name-link" title="class in org.consensusj.bitcoinj.signing">DefaultSigningRequest</a> (implements org.consensusj.bitcoinj.signing.<a href="org/consensusj/bitcoinj/signing/SigningRequest.html" title="interface in org.consensusj.bitcoinj.signing">SigningRequest</a>)</li>
 <li class="circle">org.consensusj.bitcoinj.dsl.js.<a href="org/consensusj/bitcoinj/dsl/js/Demo.html" class="type-name-link" title="class in org.consensusj.bitcoinj.dsl.js">Demo</a></li>
 <li class="circle">org.bitcoinj.wallet.DeterministicKeyChain (implements org.bitcoinj.wallet.EncryptableKeyChain)
@@ -219,6 +216,8 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li class="circle">org.consensusj.bitcoin.json.conversion.<a href="org/consensusj/bitcoin/json/conversion/Sha256HashDeserializer.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.conversion">Sha256HashDeserializer</a></li>
 </ul>
 </li>
+<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientHttpUrlConnection</a> (implements org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;)</li>
+<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClientJavaNet.html" class="type-name-link" title="class in org.consensusj.jsonrpc">JsonRpcClientJavaNet</a> (implements org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;)</li>
 <li class="circle">org.consensusj.jsonrpc.cli.JsonRpcClientTool.Call
 <ul>
 <li class="circle">org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">BaseJsonRpcTool.CommonsCLICall</a>
@@ -301,7 +300,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 </ul>
 </li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/Outpoint.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">Outpoint</a></li>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a> (implements java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a>, org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a>)</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipServiceImpl</a> (implements org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" title="class or interface in java.io" class="external-link">Closeable</a>, org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)</li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">PrevTxOutInfo</a> (implements org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/UtxoInfo.html" title="interface in org.consensusj.bitcoin.json.pojo">UtxoInfo</a>)</li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo</a></li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/RawTransactionInfo.ScriptPubKeyInfo.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">RawTransactionInfo.ScriptPubKeyInfo</a></li>
@@ -312,13 +311,6 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li class="circle">org.consensusj.exchange.knowm.<a href="org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.html" class="type-name-link" title="class in org.consensusj.exchange.knowm">ReactiveKnowmExchangeProvider</a> (implements org.consensusj.exchange.rx.<a href="org/consensusj/exchange/rx/ReactiveExchange.html" title="interface in org.consensusj.exchange.rx">ReactiveExchange</a>)</li>
 <li class="circle">org.consensusj.exchange.knowm.<a href="org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.MonitoredCurrency.html" class="type-name-link" title="class in org.consensusj.exchange.knowm">ReactiveKnowmExchangeProvider.MonitoredCurrency</a></li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">ReceivedByAddressInfo</a></li>
-<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Record.html" class="type-name-link external-link" title="class or interface in java.lang">Record</a>
-<ul>
-<li class="circle">org.consensusj.daemon.micronaut.<a href="org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">BitcoinDaemonConfig</a></li>
-<li class="circle">org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.Invalid.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">CliParameter.Invalid</a> (implements org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a>)</li>
-<li class="circle">org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.Valid.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a> (implements org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a>)</li>
-</ul>
-</li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc.test">RegTestEnvironment</a> (implements org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">BlockChainEnvironment</a>)</li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/RegTestFundingSource.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc.test">RegTestFundingSource</a> (implements org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/FundingSource.html" title="interface in org.consensusj.bitcoin.jsonrpc.test">FundingSource</a>)</li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcConfig.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc">RpcConfig</a></li>
@@ -334,6 +326,7 @@ <h2 title="Class Hierarchy">Class Hierarchy</h2>
 <li class="circle">org.consensusj.bitcoinj.dsl.js.<a href="org/consensusj/bitcoinj/dsl/js/ScriptRunner.html" class="type-name-link" title="class in org.consensusj.bitcoinj.dsl.js">ScriptRunner</a></li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/ServerInfo.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">ServerInfo</a></li>
 <li class="circle">org.consensusj.bitcoin.json.pojo.<a href="org/consensusj/bitcoin/json/pojo/SignedRawTransaction.html" class="type-name-link" title="class in org.consensusj.bitcoin.json.pojo">SignedRawTransaction</a></li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.test.<a href="org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html" class="type-name-link" title="class in org.consensusj.bitcoin.rx.jsonrpc.test">TestChainTipPublishers</a></li>
 <li class="circle">org.consensusj.bitcoinj.signing.<a href="org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html" class="type-name-link" title="class in org.consensusj.bitcoinj.signing">TestnetFeeCalculator</a> (implements org.consensusj.bitcoinj.signing.<a href="org/consensusj/bitcoinj/signing/FeeCalculator.html" title="interface in org.consensusj.bitcoinj.signing">FeeCalculator</a>)</li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/TestServers.html" class="type-name-link" title="class in org.consensusj.bitcoin.jsonrpc.test">TestServers</a></li>
 <li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Throwable.html" class="type-name-link external-link" title="class or interface in java.lang">Throwable</a> (implements java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a>)
@@ -391,22 +384,20 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <ul>
 <li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AsyncSupport.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">AsyncSupport</a>
 <ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a> (also extends java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a>)
+<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcTransport.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;
 <ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></li>
+<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt; (also extends java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" title="class or interface in java.lang" class="external-link">AutoCloseable</a>)</li>
 </ul>
 </li>
 <li class="circle">org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>
 <ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> (also extends org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>)
-<ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></li>
-</ul>
-</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a> (also extends org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>)</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> (also extends org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>)</li>
 </ul>
 </li>
 </ul>
 </li>
+<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">AsyncSupport.TransientErrorFilter</a></li>
 <li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/AutoCloseable.html" class="type-name-link external-link" title="class or interface in java.lang">AutoCloseable</a>
 <ul>
 <li class="circle">java.io.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Closeable.html" class="type-name-link external-link" title="class or interface in java.io">Closeable</a>
@@ -415,39 +406,34 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li class="circle">org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/RxBlockchainService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx">RxBlockchainService</a></li>
 </ul>
 </li>
-<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a> (also extends org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/AsyncSupport.html" title="interface in org.consensusj.jsonrpc">AsyncSupport</a>)
-<ul>
-<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JacksonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JacksonRpcClient</a></li>
+<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcClient.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">JsonRpcClient</a>&lt;T&gt; (also extends org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/JsonRpcTransport.html" title="interface in org.consensusj.jsonrpc">JsonRpcTransport</a>&lt;T&gt;)</li>
 </ul>
 </li>
+<li class="circle">org.consensusj.bitcoinj.wallet.<a href="org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html" class="type-name-link" title="interface in org.consensusj.bitcoinj.wallet">BipStandardKeyChainGroupStructure</a></li>
+<li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BitcoinClientAccessor</a>
+<ul>
+<li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BTCTestSupport</a></li>
 </ul>
 </li>
-<li class="circle">org.consensusj.bitcoinj.wallet.<a href="org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html" class="type-name-link" title="interface in org.consensusj.bitcoinj.wallet">BipStandardKeyChainGroupStructure</a></li>
-<li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BitcoinClientAccessor</a></li>
 <li class="circle">org.consensusj.bitcoin.json.rpc.<a href="org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html" class="type-name-link" title="interface in org.consensusj.bitcoin.json.rpc">BitcoinJsonRpc</a></li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BlockChainEnvironment</a></li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.test.<a href="org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc.test">BlockchainSyncing</a></li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>
 <ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> (also extends org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)
-<ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></li>
-</ul>
-</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a> (also extends org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipService.html" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>, org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)</li>
 </ul>
 </li>
 <li class="circle">org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx">ChainTipService</a>
 <ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> (also extends org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)
-<ul>
-<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a></li>
-</ul>
-</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">PollingChainTipService</a> (also extends org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/ChainTipClient.html" title="interface in org.consensusj.bitcoin.jsonrpc">ChainTipClient</a>, org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)</li>
+<li class="circle">org.consensusj.bitcoin.rx.jsonrpc.<a href="org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx.jsonrpc">RxJsonChainTipClient</a> (also extends org.consensusj.rx.jsonrpc.<a href="org/consensusj/rx/jsonrpc/RxJsonRpcClient.html" title="interface in org.consensusj.rx.jsonrpc">RxJsonRpcClient</a>)</li>
 </ul>
 </li>
 <li class="circle">org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.html" class="type-name-link" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a></li>
 <li class="circle">org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.Parser.html" class="type-name-link" title="interface in org.consensusj.jsonrpc.cli">CliParameter.Parser</a></li>
 <li class="circle">org.consensusj.jsonrpc.cli.test.<a href="org/consensusj/jsonrpc/cli/test/CLITestSupport.html" class="type-name-link" title="interface in org.consensusj.jsonrpc.cli.test">CLITestSupport</a></li>
+<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransientErrorMapper</a>&lt;T&gt;</li>
+<li class="circle">org.consensusj.jsonrpc.<a href="org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html" class="type-name-link" title="interface in org.consensusj.jsonrpc">DefaultRpcClient.TransportFactory</a></li>
 <li class="circle">org.consensusj.exchange.<a href="org/consensusj/exchange/ExchangeRateObserver.html" class="type-name-link" title="interface in org.consensusj.exchange">ExchangeRateObserver</a></li>
 <li class="circle">javax.money.convert.ExchangeRateProvider
 <ul>
@@ -474,6 +460,11 @@ <h2 title="Interface Hierarchy">Interface Hierarchy</h2>
 <li class="circle">org.consensusj.exchange.rx.<a href="org/consensusj/exchange/rx/ObservablePair.html" class="type-name-link" title="interface in org.consensusj.exchange.rx">ObservablePair</a></li>
 </ul>
 </li>
+<li class="circle">org.reactivestreams.Publisher&lt;T&gt;
+<ul>
+<li class="circle">org.consensusj.bitcoin.rx.<a href="org/consensusj/bitcoin/rx/ChainTipPublisher.html" class="type-name-link" title="interface in org.consensusj.bitcoin.rx">ChainTipPublisher</a></li>
+</ul>
+</li>
 <li class="circle">org.consensusj.exchange.rx.<a href="org/consensusj/exchange/rx/ReactiveExchange.html" class="type-name-link" title="interface in org.consensusj.exchange.rx">ReactiveExchange</a></li>
 <li class="circle">org.consensusj.analytics.service.<a href="org/consensusj/analytics/service/RichListService.html" class="type-name-link" title="interface in org.consensusj.analytics.service">RichListService</a>&lt;N,<wbr>ID&gt;</li>
 <li class="circle">org.consensusj.bitcoin.jsonrpc.<a href="org/consensusj/bitcoin/jsonrpc/RpcURI.html" class="type-name-link" title="interface in org.consensusj.bitcoin.jsonrpc">RpcURI</a></li>
@@ -515,6 +506,22 @@ <h2 title="Enum Class Hierarchy">Enum Class Hierarchy</h2>
 </li>
 </ul>
 </section>
+<section class="hierarchy">
+<h2 title="Record Class Hierarchy">Record Class Hierarchy</h2>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" class="type-name-link external-link" title="class or interface in java.lang">Object</a>
+<ul>
+<li class="circle">java.lang.<a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Record.html" class="type-name-link external-link" title="class or interface in java.lang">Record</a>
+<ul>
+<li class="circle">org.consensusj.daemon.micronaut.<a href="org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html" class="type-name-link" title="class in org.consensusj.daemon.micronaut">BitcoinDaemonConfig</a></li>
+<li class="circle">org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.Invalid.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">CliParameter.Invalid</a> (implements org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a>)</li>
+<li class="circle">org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.Valid.html" class="type-name-link" title="class in org.consensusj.jsonrpc.cli">CliParameter.Valid</a> (implements org.consensusj.jsonrpc.cli.<a href="org/consensusj/jsonrpc/cli/CliParameter.html" title="interface in org.consensusj.jsonrpc.cli">CliParameter</a>)</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</section>
 </main>
 </div>
 </div>
diff --git a/apidoc/package-search-index.js b/apidoc/package-search-index.js
index 24964980e..b8be3b567 100644
--- a/apidoc/package-search-index.js
+++ b/apidoc/package-search-index.js
@@ -1 +1 @@
-packageSearchIndex = [{"l":"All Packages","u":"allpackages-index.html"},{"l":"org.consensusj.analytics.service"},{"l":"org.consensusj.analytics.util.collector"},{"l":"org.consensusj.bitcoin.cli"},{"l":"org.consensusj.bitcoin.json.conversion"},{"l":"org.consensusj.bitcoin.json.pojo"},{"l":"org.consensusj.bitcoin.json.pojo.bitcore"},{"l":"org.consensusj.bitcoin.json.rpc"},{"l":"org.consensusj.bitcoin.jsonrpc"},{"l":"org.consensusj.bitcoin.jsonrpc.bitcoind"},{"l":"org.consensusj.bitcoin.jsonrpc.internal"},{"l":"org.consensusj.bitcoin.jsonrpc.test"},{"l":"org.consensusj.bitcoin.rx"},{"l":"org.consensusj.bitcoin.rx.jsonrpc"},{"l":"org.consensusj.bitcoin.rx.jsonrpc.service"},{"l":"org.consensusj.bitcoin.rx.peergroup"},{"l":"org.consensusj.bitcoin.rx.zeromq"},{"l":"org.consensusj.bitcoin.services"},{"l":"org.consensusj.bitcoinj.dsl.js"},{"l":"org.consensusj.bitcoinj.service"},{"l":"org.consensusj.bitcoinj.signing"},{"l":"org.consensusj.bitcoinj.util"},{"l":"org.consensusj.bitcoinj.wallet"},{"l":"org.consensusj.currency"},{"l":"org.consensusj.daemon.micronaut"},{"l":"org.consensusj.decentralizedid"},{"l":"org.consensusj.decentralizedid.btcr"},{"l":"org.consensusj.ethereum.jsonrpc"},{"l":"org.consensusj.exchange"},{"l":"org.consensusj.exchange.knowm"},{"l":"org.consensusj.exchange.rx"},{"l":"org.consensusj.jsonrpc"},{"l":"org.consensusj.jsonrpc.cli"},{"l":"org.consensusj.jsonrpc.cli.test"},{"l":"org.consensusj.jsonrpc.daemon"},{"l":"org.consensusj.jsonrpc.groovy"},{"l":"org.consensusj.jsonrpc.internal"},{"l":"org.consensusj.jsonrpc.introspection"},{"l":"org.consensusj.jsonrpc.introspection.sample"},{"l":"org.consensusj.namecoin.jsonrpc"},{"l":"org.consensusj.namecoin.jsonrpc.cli"},{"l":"org.consensusj.namecoin.jsonrpc.core"},{"l":"org.consensusj.namecoin.jsonrpc.pojo"},{"l":"org.consensusj.rx.jsonrpc"},{"l":"org.consensusj.rx.zeromq"}];updateSearchResults();
\ No newline at end of file
+packageSearchIndex = [{"l":"All Packages","u":"allpackages-index.html"},{"l":"org.consensusj.analytics.service"},{"l":"org.consensusj.analytics.util.collector"},{"l":"org.consensusj.bitcoin.cli"},{"l":"org.consensusj.bitcoin.json.conversion"},{"l":"org.consensusj.bitcoin.json.pojo"},{"l":"org.consensusj.bitcoin.json.pojo.bitcore"},{"l":"org.consensusj.bitcoin.json.rpc"},{"l":"org.consensusj.bitcoin.jsonrpc"},{"l":"org.consensusj.bitcoin.jsonrpc.bitcoind"},{"l":"org.consensusj.bitcoin.jsonrpc.internal"},{"l":"org.consensusj.bitcoin.jsonrpc.test"},{"l":"org.consensusj.bitcoin.rx"},{"l":"org.consensusj.bitcoin.rx.jsonrpc"},{"l":"org.consensusj.bitcoin.rx.jsonrpc.service"},{"l":"org.consensusj.bitcoin.rx.jsonrpc.test"},{"l":"org.consensusj.bitcoin.rx.peergroup"},{"l":"org.consensusj.bitcoin.rx.zeromq"},{"l":"org.consensusj.bitcoin.services"},{"l":"org.consensusj.bitcoinj.dsl.js"},{"l":"org.consensusj.bitcoinj.service"},{"l":"org.consensusj.bitcoinj.signing"},{"l":"org.consensusj.bitcoinj.util"},{"l":"org.consensusj.bitcoinj.wallet"},{"l":"org.consensusj.currency"},{"l":"org.consensusj.daemon.micronaut"},{"l":"org.consensusj.decentralizedid"},{"l":"org.consensusj.decentralizedid.btcr"},{"l":"org.consensusj.ethereum.jsonrpc"},{"l":"org.consensusj.exchange"},{"l":"org.consensusj.exchange.knowm"},{"l":"org.consensusj.exchange.rx"},{"l":"org.consensusj.jsonrpc"},{"l":"org.consensusj.jsonrpc.cli"},{"l":"org.consensusj.jsonrpc.cli.test"},{"l":"org.consensusj.jsonrpc.daemon"},{"l":"org.consensusj.jsonrpc.groovy"},{"l":"org.consensusj.jsonrpc.internal"},{"l":"org.consensusj.jsonrpc.introspection"},{"l":"org.consensusj.jsonrpc.introspection.sample"},{"l":"org.consensusj.namecoin.jsonrpc"},{"l":"org.consensusj.namecoin.jsonrpc.cli"},{"l":"org.consensusj.namecoin.jsonrpc.core"},{"l":"org.consensusj.namecoin.jsonrpc.pojo"},{"l":"org.consensusj.rx.jsonrpc"},{"l":"org.consensusj.rx.zeromq"}];updateSearchResults();
\ No newline at end of file
diff --git a/apidoc/script-dir/jquery-ui.min.css b/apidoc/script-dir/jquery-ui.min.css
index d64539cb3..693327f01 100644
--- a/apidoc/script-dir/jquery-ui.min.css
+++ b/apidoc/script-dir/jquery-ui.min.css
@@ -1,4 +1,4 @@
-/*! jQuery UI - v1.13.1 - 2022-05-12
+/*! jQuery UI - v1.13.2 - 2023-02-27
 * http://jqueryui.com
 * Includes: core.css, autocomplete.css, menu.css
 * Copyright jQuery Foundation and other contributors; Licensed MIT */
diff --git a/apidoc/script-dir/jquery-ui.min.js b/apidoc/script-dir/jquery-ui.min.js
index 55c283294..8166a15ee 100644
--- a/apidoc/script-dir/jquery-ui.min.js
+++ b/apidoc/script-dir/jquery-ui.min.js
@@ -1,6 +1,6 @@
-/*! jQuery UI - v1.13.1 - 2022-05-12
+/*! jQuery UI - v1.13.2 - 2023-02-27
 * http://jqueryui.com
 * Includes: widget.js, position.js, keycode.js, unique-id.js, widgets/autocomplete.js, widgets/menu.js
 * Copyright jQuery Foundation and other contributors; Licensed MIT */
 
-!function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)}(function(x){"use strict";x.ui=x.ui||{};x.ui.version="1.13.1";var n,i=0,l=Array.prototype.hasOwnProperty,a=Array.prototype.slice;x.cleanData=(n=x.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)(e=x._data(i,"events"))&&e.remove&&x(i).triggerHandler("remove");n(t)}),x.widget=function(t,i,e){var s,n,o,l={},a=t.split(".")[0],r=a+"-"+(t=t.split(".")[1]);return e||(e=i,i=x.Widget),Array.isArray(e)&&(e=x.extend.apply(null,[{}].concat(e))),x.expr.pseudos[r.toLowerCase()]=function(t){return!!x.data(t,r)},x[a]=x[a]||{},s=x[a][t],n=x[a][t]=function(t,e){if(!this||!this._createWidget)return new n(t,e);arguments.length&&this._createWidget(t,e)},x.extend(n,s,{version:e.version,_proto:x.extend({},e),_childConstructors:[]}),(o=new i).options=x.widget.extend({},o.options),x.each(e,function(e,s){function n(){return i.prototype[e].apply(this,arguments)}function o(t){return i.prototype[e].apply(this,t)}l[e]="function"==typeof s?function(){var t,e=this._super,i=this._superApply;return this._super=n,this._superApply=o,t=s.apply(this,arguments),this._super=e,this._superApply=i,t}:s}),n.prototype=x.widget.extend(o,{widgetEventPrefix:s&&o.widgetEventPrefix||t},l,{constructor:n,namespace:a,widgetName:t,widgetFullName:r}),s?(x.each(s._childConstructors,function(t,e){var i=e.prototype;x.widget(i.namespace+"."+i.widgetName,n,e._proto)}),delete s._childConstructors):i._childConstructors.push(n),x.widget.bridge(t,n),n},x.widget.extend=function(t){for(var e,i,s=a.call(arguments,1),n=0,o=s.length;n<o;n++)for(e in s[n])i=s[n][e],l.call(s[n],e)&&void 0!==i&&(x.isPlainObject(i)?t[e]=x.isPlainObject(t[e])?x.widget.extend({},t[e],i):x.widget.extend({},i):t[e]=i);return t},x.widget.bridge=function(o,e){var l=e.prototype.widgetFullName||o;x.fn[o]=function(i){var t="string"==typeof i,s=a.call(arguments,1),n=this;return t?this.length||"instance"!==i?this.each(function(){var t,e=x.data(this,l);return"instance"===i?(n=e,!1):e?"function"!=typeof e[i]||"_"===i.charAt(0)?x.error("no such method '"+i+"' for "+o+" widget instance"):(t=e[i].apply(e,s))!==e&&void 0!==t?(n=t&&t.jquery?n.pushStack(t.get()):t,!1):void 0:x.error("cannot call methods on "+o+" prior to initialization; attempted to call method '"+i+"'")}):n=void 0:(s.length&&(i=x.widget.extend.apply(null,[i].concat(s))),this.each(function(){var t=x.data(this,l);t?(t.option(i||{}),t._init&&t._init()):x.data(this,l,new e(i,this))})),n}},x.Widget=function(){},x.Widget._childConstructors=[],x.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(t,e){e=x(e||this.defaultElement||this)[0],this.element=x(e),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=x(),this.hoverable=x(),this.focusable=x(),this.classesElementLookup={},e!==this&&(x.data(e,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===e&&this.destroy()}}),this.document=x(e.style?e.ownerDocument:e.document||e),this.window=x(this.document[0].defaultView||this.document[0].parentWindow)),this.options=x.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:x.noop,_create:x.noop,_init:x.noop,destroy:function(){var i=this;this._destroy(),x.each(this.classesElementLookup,function(t,e){i._removeClass(e,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:x.noop,widget:function(){return this.element},option:function(t,e){var i,s,n,o=t;if(0===arguments.length)return x.widget.extend({},this.options);if("string"==typeof t)if(o={},t=(i=t.split(".")).shift(),i.length){for(s=o[t]=x.widget.extend({},this.options[t]),n=0;n<i.length-1;n++)s[i[n]]=s[i[n]]||{},s=s[i[n]];if(t=i.pop(),1===arguments.length)return void 0===s[t]?null:s[t];s[t]=e}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=e}return this._setOptions(o),this},_setOptions:function(t){for(var e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(t){var e,i,s;for(e in t)s=this.classesElementLookup[e],t[e]!==this.options.classes[e]&&s&&s.length&&(i=x(s.get()),this._removeClass(s,e),i.addClass(this._classes({element:i,keys:e,classes:t,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(n){var o=[],l=this;function t(t,e){for(var i,s=0;s<t.length;s++)i=l.classesElementLookup[t[s]]||x(),i=n.add?(function(){var i=[];n.element.each(function(t,e){x.map(l.classesElementLookup,function(t){return t}).some(function(t){return t.is(e)})||i.push(e)}),l._on(x(i),{remove:"_untrackClassesElement"})}(),x(x.uniqueSort(i.get().concat(n.element.get())))):x(i.not(n.element).get()),l.classesElementLookup[t[s]]=i,o.push(t[s]),e&&n.classes[t[s]]&&o.push(n.classes[t[s]])}return(n=x.extend({element:this.element,classes:this.options.classes||{}},n)).keys&&t(n.keys.match(/\S+/g)||[],!0),n.extra&&t(n.extra.match(/\S+/g)||[]),o.join(" ")},_untrackClassesElement:function(i){var s=this;x.each(s.classesElementLookup,function(t,e){-1!==x.inArray(i.target,e)&&(s.classesElementLookup[t]=x(e.not(i.target).get()))}),this._off(x(i.target))},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){var n="string"==typeof t||null===t,i={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s="boolean"==typeof s?s:i};return i.element.toggleClass(this._classes(i),s),this},_on:function(n,o,t){var l,a=this;"boolean"!=typeof n&&(t=o,o=n,n=!1),t?(o=l=x(o),this.bindings=this.bindings.add(o)):(t=o,o=this.element,l=this.widget()),x.each(t,function(t,e){function i(){if(n||!0!==a.options.disabled&&!x(this).hasClass("ui-state-disabled"))return("string"==typeof e?a[e]:e).apply(a,arguments)}"string"!=typeof e&&(i.guid=e.guid=e.guid||i.guid||x.guid++);var s=t.match(/^([\w:-]*)\s*(.*)$/),t=s[1]+a.eventNamespace,s=s[2];s?l.on(t,s,i):o.on(t,i)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.off(e),this.bindings=x(this.bindings.not(t).get()),this.focusable=x(this.focusable.not(t).get()),this.hoverable=x(this.hoverable.not(t).get())},_delay:function(t,e){var i=this;return setTimeout(function(){return("string"==typeof t?i[t]:t).apply(i,arguments)},e||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){this._addClass(x(t.currentTarget),null,"ui-state-hover")},mouseleave:function(t){this._removeClass(x(t.currentTarget),null,"ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){this._addClass(x(t.currentTarget),null,"ui-state-focus")},focusout:function(t){this._removeClass(x(t.currentTarget),null,"ui-state-focus")}})},_trigger:function(t,e,i){var s,n,o=this.options[t];if(i=i||{},(e=x.Event(e)).type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),e.target=this.element[0],n=e.originalEvent)for(s in n)s in e||(e[s]=n[s]);return this.element.trigger(e,i),!("function"==typeof o&&!1===o.apply(this.element[0],[e].concat(i))||e.isDefaultPrevented())}},x.each({show:"fadeIn",hide:"fadeOut"},function(o,l){x.Widget.prototype["_"+o]=function(e,t,i){var s,n=(t="string"==typeof t?{effect:t}:t)?!0!==t&&"number"!=typeof t&&t.effect||l:o;"number"==typeof(t=t||{})?t={duration:t}:!0===t&&(t={}),s=!x.isEmptyObject(t),t.complete=i,t.delay&&e.delay(t.delay),s&&x.effects&&x.effects.effect[n]?e[o](t):n!==o&&e[n]?e[n](t.duration,t.easing,i):e.queue(function(t){x(this)[o](),i&&i.call(e[0]),t()})}});var s,C,E,o,r,u,h,c,k;x.widget;function T(t,e,i){return[parseFloat(t[0])*(c.test(t[0])?e/100:1),parseFloat(t[1])*(c.test(t[1])?i/100:1)]}function A(t,e){return parseInt(x.css(t,e),10)||0}function W(t){return null!=t&&t===t.window}C=Math.max,E=Math.abs,o=/left|center|right/,r=/top|center|bottom/,u=/[\+\-]\d+(\.[\d]+)?%?/,h=/^\w+/,c=/%$/,k=x.fn.position,x.position={scrollbarWidth:function(){if(void 0!==s)return s;var t,e=x("<div style='display:block;position:absolute;width:200px;height:200px;overflow:hidden;'><div style='height:300px;width:auto;'></div></div>"),i=e.children()[0];return x("body").append(e),t=i.offsetWidth,e.css("overflow","scroll"),t===(i=i.offsetWidth)&&(i=e[0].clientWidth),e.remove(),s=t-i},getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),e="scroll"===e||"auto"===e&&t.width<t.element[0].scrollWidth;return{width:"scroll"===i||"auto"===i&&t.height<t.element[0].scrollHeight?x.position.scrollbarWidth():0,height:e?x.position.scrollbarWidth():0}},getWithinInfo:function(t){var e=x(t||window),i=W(e[0]),s=!!e[0]&&9===e[0].nodeType;return{element:e,isWindow:i,isDocument:s,offset:!i&&!s?x(t).offset():{left:0,top:0},scrollLeft:e.scrollLeft(),scrollTop:e.scrollTop(),width:e.outerWidth(),height:e.outerHeight()}}},x.fn.position=function(c){if(!c||!c.of)return k.apply(this,arguments);var d,f,m,p,v,t,g="string"==typeof(c=x.extend({},c)).of?x(document).find(c.of):x(c.of),_=x.position.getWithinInfo(c.within),y=x.position.getScrollInfo(_),b=(c.collision||"flip").split(" "),w={},e=9===(t=(e=g)[0]).nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:W(t)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:t.preventDefault?{width:0,height:0,offset:{top:t.pageY,left:t.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()};return g[0].preventDefault&&(c.at="left top"),f=e.width,m=e.height,v=x.extend({},p=e.offset),x.each(["my","at"],function(){var t,e,i=(c[this]||"").split(" ");(i=1===i.length?o.test(i[0])?i.concat(["center"]):r.test(i[0])?["center"].concat(i):["center","center"]:i)[0]=o.test(i[0])?i[0]:"center",i[1]=r.test(i[1])?i[1]:"center",t=u.exec(i[0]),e=u.exec(i[1]),w[this]=[t?t[0]:0,e?e[0]:0],c[this]=[h.exec(i[0])[0],h.exec(i[1])[0]]}),1===b.length&&(b[1]=b[0]),"right"===c.at[0]?v.left+=f:"center"===c.at[0]&&(v.left+=f/2),"bottom"===c.at[1]?v.top+=m:"center"===c.at[1]&&(v.top+=m/2),d=T(w.at,f,m),v.left+=d[0],v.top+=d[1],this.each(function(){var i,t,l=x(this),a=l.outerWidth(),r=l.outerHeight(),e=A(this,"marginLeft"),s=A(this,"marginTop"),n=a+e+A(this,"marginRight")+y.width,o=r+s+A(this,"marginBottom")+y.height,u=x.extend({},v),h=T(w.my,l.outerWidth(),l.outerHeight());"right"===c.my[0]?u.left-=a:"center"===c.my[0]&&(u.left-=a/2),"bottom"===c.my[1]?u.top-=r:"center"===c.my[1]&&(u.top-=r/2),u.left+=h[0],u.top+=h[1],i={marginLeft:e,marginTop:s},x.each(["left","top"],function(t,e){x.ui.position[b[t]]&&x.ui.position[b[t]][e](u,{targetWidth:f,targetHeight:m,elemWidth:a,elemHeight:r,collisionPosition:i,collisionWidth:n,collisionHeight:o,offset:[d[0]+h[0],d[1]+h[1]],my:c.my,at:c.at,within:_,elem:l})}),c.using&&(t=function(t){var e=p.left-u.left,i=e+f-a,s=p.top-u.top,n=s+m-r,o={target:{element:g,left:p.left,top:p.top,width:f,height:m},element:{element:l,left:u.left,top:u.top,width:a,height:r},horizontal:i<0?"left":0<e?"right":"center",vertical:n<0?"top":0<s?"bottom":"middle"};f<a&&E(e+i)<f&&(o.horizontal="center"),m<r&&E(s+n)<m&&(o.vertical="middle"),C(E(e),E(i))>C(E(s),E(n))?o.important="horizontal":o.important="vertical",c.using.call(this,t,o)}),l.offset(x.extend(u,{using:t}))})},x.ui.position={fit:{left:function(t,e){var i=e.within,s=i.isWindow?i.scrollLeft:i.offset.left,n=i.width,o=t.left-e.collisionPosition.marginLeft,l=s-o,a=o+e.collisionWidth-n-s;e.collisionWidth>n?0<l&&a<=0?(i=t.left+l+e.collisionWidth-n-s,t.left+=l-i):t.left=!(0<a&&l<=0)&&a<l?s+n-e.collisionWidth:s:0<l?t.left+=l:0<a?t.left-=a:t.left=C(t.left-o,t.left)},top:function(t,e){var i=e.within,s=i.isWindow?i.scrollTop:i.offset.top,n=e.within.height,o=t.top-e.collisionPosition.marginTop,l=s-o,a=o+e.collisionHeight-n-s;e.collisionHeight>n?0<l&&a<=0?(i=t.top+l+e.collisionHeight-n-s,t.top+=l-i):t.top=!(0<a&&l<=0)&&a<l?s+n-e.collisionHeight:s:0<l?t.top+=l:0<a?t.top-=a:t.top=C(t.top-o,t.top)}},flip:{left:function(t,e){var i=e.within,s=i.offset.left+i.scrollLeft,n=i.width,o=i.isWindow?i.scrollLeft:i.offset.left,l=t.left-e.collisionPosition.marginLeft,a=l-o,r=l+e.collisionWidth-n-o,u="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,i="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,l=-2*e.offset[0];a<0?((s=t.left+u+i+l+e.collisionWidth-n-s)<0||s<E(a))&&(t.left+=u+i+l):0<r&&(0<(o=t.left-e.collisionPosition.marginLeft+u+i+l-o)||E(o)<r)&&(t.left+=u+i+l)},top:function(t,e){var i=e.within,s=i.offset.top+i.scrollTop,n=i.height,o=i.isWindow?i.scrollTop:i.offset.top,l=t.top-e.collisionPosition.marginTop,a=l-o,r=l+e.collisionHeight-n-o,u="top"===e.my[1]?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,i="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,l=-2*e.offset[1];a<0?((s=t.top+u+i+l+e.collisionHeight-n-s)<0||s<E(a))&&(t.top+=u+i+l):0<r&&(0<(o=t.top-e.collisionPosition.marginTop+u+i+l-o)||E(o)<r)&&(t.top+=u+i+l)}},flipfit:{left:function(){x.ui.position.flip.left.apply(this,arguments),x.ui.position.fit.left.apply(this,arguments)},top:function(){x.ui.position.flip.top.apply(this,arguments),x.ui.position.fit.top.apply(this,arguments)}}};var t;x.ui.position,x.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},x.fn.extend({uniqueId:(t=0,function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&x(this).removeAttr("id")})}}),x.ui.safeActiveElement=function(e){var i;try{i=e.activeElement}catch(t){i=e.body}return i=!(i=i||e.body).nodeName?e.body:i},x.widget("ui.menu",{version:"1.13.1",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault(),this._activateItem(t)},"click .ui-menu-item":function(t){var e=x(t.target),i=x(x.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&e.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),e.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&i.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this._menuItems().first();e||this.focus(t,i)},blur:function(t){this._delay(function(){x.contains(this.element[0],x.ui.safeActiveElement(this.document[0]))||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t,!0),this.mouseHandled=!1}})},_activateItem:function(t){var e,i;this.previousFilter||t.clientX===this.lastMousePosition.x&&t.clientY===this.lastMousePosition.y||(this.lastMousePosition={x:t.clientX,y:t.clientY},e=x(t.target).closest(".ui-menu-item"),i=x(t.currentTarget),e[0]===i[0]&&(i.is(".ui-state-active")||(this._removeClass(i.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(t,i))))},_destroy:function(){var t=this.element.find(".ui-menu-item").removeAttr("role aria-disabled").children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),t.children().each(function(){var t=x(this);t.data("ui-menu-submenu-caret")&&t.remove()})},_keydown:function(t){var e,i,s,n=!0;switch(t.keyCode){case x.ui.keyCode.PAGE_UP:this.previousPage(t);break;case x.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case x.ui.keyCode.HOME:this._move("first","first",t);break;case x.ui.keyCode.END:this._move("last","last",t);break;case x.ui.keyCode.UP:this.previous(t);break;case x.ui.keyCode.DOWN:this.next(t);break;case x.ui.keyCode.LEFT:this.collapse(t);break;case x.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case x.ui.keyCode.ENTER:case x.ui.keyCode.SPACE:this._activate(t);break;case x.ui.keyCode.ESCAPE:this.collapse(t);break;default:e=this.previousFilter||"",s=n=!1,i=96<=t.keyCode&&t.keyCode<=105?(t.keyCode-96).toString():String.fromCharCode(t.keyCode),clearTimeout(this.filterTimer),i===e?s=!0:i=e+i,e=this._filterMenuItems(i),(e=s&&-1!==e.index(this.active.next())?this.active.nextAll(".ui-menu-item"):e).length||(i=String.fromCharCode(t.keyCode),e=this._filterMenuItems(i)),e.length?(this.focus(t,e),this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}n&&t.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var t,e,s=this,n=this.options.icons.submenu,i=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),e=i.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=x(this),e=t.prev(),i=x("<span>").data("ui-menu-submenu-caret",!0);s._addClass(i,"ui-menu-icon","ui-icon "+n),e.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",e.attr("id"))}),this._addClass(e,"ui-menu","ui-widget ui-widget-content ui-front"),(t=i.add(this.element).find(this.options.items)).not(".ui-menu-item").each(function(){var t=x(this);s._isDivider(t)&&s._addClass(t,"ui-menu-divider","ui-widget-content")}),i=(e=t.not(".ui-menu-item, .ui-menu-divider")).children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(e,"ui-menu-item")._addClass(i,"ui-menu-item-wrapper"),t.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!x.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){var i;"icons"===t&&(i=this.element.find(".ui-menu-icon"),this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",String(t)),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),i=this.active.children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",i.attr("id")),i=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),(i=e.children(".ui-menu")).length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(t){var e,i,s;this._hasScroll()&&(i=parseFloat(x.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(x.css(this.activeMenu[0],"paddingTop"))||0,e=t.offset().top-this.activeMenu.offset().top-i-s,i=this.activeMenu.scrollTop(),s=this.activeMenu.height(),t=t.outerHeight(),e<0?this.activeMenu.scrollTop(i+e):s<e+t&&this.activeMenu.scrollTop(i+e-s+t))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(t){var e=x.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(e)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var t=i?this.element:x(e&&e.target).closest(this.element.find(".ui-menu"));t.length||(t=this.element),this._close(t),this.blur(e),this._removeClass(t.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=t},i?0:this.delay)},_close:function(t){(t=t||(this.active?this.active.parent():this.element)).find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(t){return!x(t.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this._menuItems(this.active.children(".ui-menu")).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_menuItems:function(t){return(t||this.element).find(this.options.items).filter(".ui-menu-item")},_move:function(t,e,i){var s;(s=this.active?"first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").last():this.active[t+"All"](".ui-menu-item").first():s)&&s.length&&this.active||(s=this._menuItems(this.activeMenu)[e]()),this.focus(i,s)},nextPage:function(t){var e,i,s;this.active?this.isLastItem()||(this._hasScroll()?(i=this.active.offset().top,s=this.element.innerHeight(),0===x.fn.jquery.indexOf("3.2.")&&(s+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.nextAll(".ui-menu-item").each(function(){return(e=x(this)).offset().top-i-s<0}),this.focus(t,e)):this.focus(t,this._menuItems(this.activeMenu)[this.active?"last":"first"]())):this.next(t)},previousPage:function(t){var e,i,s;this.active?this.isFirstItem()||(this._hasScroll()?(i=this.active.offset().top,s=this.element.innerHeight(),0===x.fn.jquery.indexOf("3.2.")&&(s+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.prevAll(".ui-menu-item").each(function(){return 0<(e=x(this)).offset().top-i+s}),this.focus(t,e)):this.focus(t,this._menuItems(this.activeMenu).first())):this.next(t)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||x(t.target).closest(".ui-menu-item");var e={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,e)},_filterMenuItems:function(t){var t=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),e=new RegExp("^"+t,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return e.test(String.prototype.trim.call(x(this).children(".ui-menu-item-wrapper").text()))})}});x.widget("ui.autocomplete",{version:"1.13.1",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var i,s,n,t=this.element[0].nodeName.toLowerCase(),e="textarea"===t,t="input"===t;this.isMultiLine=e||!t&&this._isContentEditable(this.element),this.valueMethod=this.element[e||t?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(t){if(this.element.prop("readOnly"))s=n=i=!0;else{s=n=i=!1;var e=x.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:i=!0,this._move("previousPage",t);break;case e.PAGE_DOWN:i=!0,this._move("nextPage",t);break;case e.UP:i=!0,this._keyEvent("previous",t);break;case e.DOWN:i=!0,this._keyEvent("next",t);break;case e.ENTER:this.menu.active&&(i=!0,t.preventDefault(),this.menu.select(t));break;case e.TAB:this.menu.active&&this.menu.select(t);break;case e.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(t),t.preventDefault());break;default:s=!0,this._searchTimeout(t)}}},keypress:function(t){if(i)return i=!1,void(this.isMultiLine&&!this.menu.element.is(":visible")||t.preventDefault());if(!s){var e=x.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:this._move("previousPage",t);break;case e.PAGE_DOWN:this._move("nextPage",t);break;case e.UP:this._keyEvent("previous",t);break;case e.DOWN:this._keyEvent("next",t)}}},input:function(t){if(n)return n=!1,void t.preventDefault();this._searchTimeout(t)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){clearTimeout(this.searching),this.close(t),this._change(t)}}),this._initSource(),this.menu=x("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().attr({unselectable:"on"}).menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault()},menufocus:function(t,e){var i,s;if(this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type)))return this.menu.blur(),void this.document.one("mousemove",function(){x(t.target).trigger(t.originalEvent)});s=e.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:s})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(s.value),(i=e.item.attr("aria-label")||s.value)&&String.prototype.trim.call(i).length&&(clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(x("<div>").text(i))},100))},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==x.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=x("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(t){var e=this.menu.element[0];return t.target===this.element[0]||t.target===e||x.contains(e,t.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var t=this.options.appendTo;return t=!(t=!(t=t&&(t.jquery||t.nodeType?x(t):this.document.find(t).eq(0)))||!t[0]?this.element.closest(".ui-front, dialog"):t).length?this.document[0].body:t},_initSource:function(){var i,s,n=this;Array.isArray(this.options.source)?(i=this.options.source,this.source=function(t,e){e(x.ui.autocomplete.filter(i,t.term))}):"string"==typeof this.options.source?(s=this.options.source,this.source=function(t,e){n.xhr&&n.xhr.abort(),n.xhr=x.ajax({url:s,data:t,dataType:"json",success:function(t){e(t)},error:function(){e([])}})}):this.source=this.options.source},_searchTimeout:function(s){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),e=this.menu.element.is(":visible"),i=s.altKey||s.ctrlKey||s.metaKey||s.shiftKey;t&&(e||i)||(this.selectedItem=null,this.search(null,s))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):!1!==this._trigger("search",e)?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")}.bind(this)},__response:function(t){t=t&&this._normalize(t),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:x.map(t,function(t){return"string"==typeof t?{label:t,value:t}:x.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var e=this.menu.element.empty();this._renderMenu(e,t),this.isNewMenu=!0,this.menu.refresh(),e.show(),this._resizeMenu(),e.position(x.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(i,t){var s=this;x.each(t,function(t,e){s._renderItemData(i,e)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(t,e){return x("<li>").append(x("<div>").text(e.label)).appendTo(t)},_move:function(t,e){if(this.menu.element.is(":visible"))return this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),void this.menu.blur()):void this.menu[t](e);this.search(null,e)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){this.isMultiLine&&!this.menu.element.is(":visible")||(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),x.extend(x.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,e){var i=new RegExp(x.ui.autocomplete.escapeRegex(e),"i");return x.grep(t,function(t){return i.test(t.label||t.value||t)})}}),x.widget("ui.autocomplete",x.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(1<t?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var e;this._superApply(arguments),this.options.disabled||this.cancelSearch||(e=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(x("<div>").text(e))},100))}});x.ui.autocomplete});
\ No newline at end of file
+!function(t){"use strict";"function"==typeof define&&define.amd?define(["jquery"],t):t(jQuery)}(function(x){"use strict";x.ui=x.ui||{};x.ui.version="1.13.2";var n,i=0,l=Array.prototype.hasOwnProperty,a=Array.prototype.slice;x.cleanData=(n=x.cleanData,function(t){for(var e,i,s=0;null!=(i=t[s]);s++)(e=x._data(i,"events"))&&e.remove&&x(i).triggerHandler("remove");n(t)}),x.widget=function(t,i,e){var s,n,o,l={},a=t.split(".")[0],r=a+"-"+(t=t.split(".")[1]);return e||(e=i,i=x.Widget),Array.isArray(e)&&(e=x.extend.apply(null,[{}].concat(e))),x.expr.pseudos[r.toLowerCase()]=function(t){return!!x.data(t,r)},x[a]=x[a]||{},s=x[a][t],n=x[a][t]=function(t,e){if(!this||!this._createWidget)return new n(t,e);arguments.length&&this._createWidget(t,e)},x.extend(n,s,{version:e.version,_proto:x.extend({},e),_childConstructors:[]}),(o=new i).options=x.widget.extend({},o.options),x.each(e,function(e,s){function n(){return i.prototype[e].apply(this,arguments)}function o(t){return i.prototype[e].apply(this,t)}l[e]="function"==typeof s?function(){var t,e=this._super,i=this._superApply;return this._super=n,this._superApply=o,t=s.apply(this,arguments),this._super=e,this._superApply=i,t}:s}),n.prototype=x.widget.extend(o,{widgetEventPrefix:s&&o.widgetEventPrefix||t},l,{constructor:n,namespace:a,widgetName:t,widgetFullName:r}),s?(x.each(s._childConstructors,function(t,e){var i=e.prototype;x.widget(i.namespace+"."+i.widgetName,n,e._proto)}),delete s._childConstructors):i._childConstructors.push(n),x.widget.bridge(t,n),n},x.widget.extend=function(t){for(var e,i,s=a.call(arguments,1),n=0,o=s.length;n<o;n++)for(e in s[n])i=s[n][e],l.call(s[n],e)&&void 0!==i&&(x.isPlainObject(i)?t[e]=x.isPlainObject(t[e])?x.widget.extend({},t[e],i):x.widget.extend({},i):t[e]=i);return t},x.widget.bridge=function(o,e){var l=e.prototype.widgetFullName||o;x.fn[o]=function(i){var t="string"==typeof i,s=a.call(arguments,1),n=this;return t?this.length||"instance"!==i?this.each(function(){var t,e=x.data(this,l);return"instance"===i?(n=e,!1):e?"function"!=typeof e[i]||"_"===i.charAt(0)?x.error("no such method '"+i+"' for "+o+" widget instance"):(t=e[i].apply(e,s))!==e&&void 0!==t?(n=t&&t.jquery?n.pushStack(t.get()):t,!1):void 0:x.error("cannot call methods on "+o+" prior to initialization; attempted to call method '"+i+"'")}):n=void 0:(s.length&&(i=x.widget.extend.apply(null,[i].concat(s))),this.each(function(){var t=x.data(this,l);t?(t.option(i||{}),t._init&&t._init()):x.data(this,l,new e(i,this))})),n}},x.Widget=function(){},x.Widget._childConstructors=[],x.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{classes:{},disabled:!1,create:null},_createWidget:function(t,e){e=x(e||this.defaultElement||this)[0],this.element=x(e),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.bindings=x(),this.hoverable=x(),this.focusable=x(),this.classesElementLookup={},e!==this&&(x.data(e,this.widgetFullName,this),this._on(!0,this.element,{remove:function(t){t.target===e&&this.destroy()}}),this.document=x(e.style?e.ownerDocument:e.document||e),this.window=x(this.document[0].defaultView||this.document[0].parentWindow)),this.options=x.widget.extend({},this.options,this._getCreateOptions(),t),this._create(),this.options.disabled&&this._setOptionDisabled(this.options.disabled),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:function(){return{}},_getCreateEventData:x.noop,_create:x.noop,_init:x.noop,destroy:function(){var i=this;this._destroy(),x.each(this.classesElementLookup,function(t,e){i._removeClass(e,t)}),this.element.off(this.eventNamespace).removeData(this.widgetFullName),this.widget().off(this.eventNamespace).removeAttr("aria-disabled"),this.bindings.off(this.eventNamespace)},_destroy:x.noop,widget:function(){return this.element},option:function(t,e){var i,s,n,o=t;if(0===arguments.length)return x.widget.extend({},this.options);if("string"==typeof t)if(o={},t=(i=t.split(".")).shift(),i.length){for(s=o[t]=x.widget.extend({},this.options[t]),n=0;n<i.length-1;n++)s[i[n]]=s[i[n]]||{},s=s[i[n]];if(t=i.pop(),1===arguments.length)return void 0===s[t]?null:s[t];s[t]=e}else{if(1===arguments.length)return void 0===this.options[t]?null:this.options[t];o[t]=e}return this._setOptions(o),this},_setOptions:function(t){for(var e in t)this._setOption(e,t[e]);return this},_setOption:function(t,e){return"classes"===t&&this._setOptionClasses(e),this.options[t]=e,"disabled"===t&&this._setOptionDisabled(e),this},_setOptionClasses:function(t){var e,i,s;for(e in t)s=this.classesElementLookup[e],t[e]!==this.options.classes[e]&&s&&s.length&&(i=x(s.get()),this._removeClass(s,e),i.addClass(this._classes({element:i,keys:e,classes:t,add:!0})))},_setOptionDisabled:function(t){this._toggleClass(this.widget(),this.widgetFullName+"-disabled",null,!!t),t&&(this._removeClass(this.hoverable,null,"ui-state-hover"),this._removeClass(this.focusable,null,"ui-state-focus"))},enable:function(){return this._setOptions({disabled:!1})},disable:function(){return this._setOptions({disabled:!0})},_classes:function(n){var o=[],l=this;function t(t,e){for(var i,s=0;s<t.length;s++)i=l.classesElementLookup[t[s]]||x(),i=n.add?(function(){var i=[];n.element.each(function(t,e){x.map(l.classesElementLookup,function(t){return t}).some(function(t){return t.is(e)})||i.push(e)}),l._on(x(i),{remove:"_untrackClassesElement"})}(),x(x.uniqueSort(i.get().concat(n.element.get())))):x(i.not(n.element).get()),l.classesElementLookup[t[s]]=i,o.push(t[s]),e&&n.classes[t[s]]&&o.push(n.classes[t[s]])}return(n=x.extend({element:this.element,classes:this.options.classes||{}},n)).keys&&t(n.keys.match(/\S+/g)||[],!0),n.extra&&t(n.extra.match(/\S+/g)||[]),o.join(" ")},_untrackClassesElement:function(i){var s=this;x.each(s.classesElementLookup,function(t,e){-1!==x.inArray(i.target,e)&&(s.classesElementLookup[t]=x(e.not(i.target).get()))}),this._off(x(i.target))},_removeClass:function(t,e,i){return this._toggleClass(t,e,i,!1)},_addClass:function(t,e,i){return this._toggleClass(t,e,i,!0)},_toggleClass:function(t,e,i,s){var n="string"==typeof t||null===t,i={extra:n?e:i,keys:n?t:e,element:n?this.element:t,add:s="boolean"==typeof s?s:i};return i.element.toggleClass(this._classes(i),s),this},_on:function(n,o,t){var l,a=this;"boolean"!=typeof n&&(t=o,o=n,n=!1),t?(o=l=x(o),this.bindings=this.bindings.add(o)):(t=o,o=this.element,l=this.widget()),x.each(t,function(t,e){function i(){if(n||!0!==a.options.disabled&&!x(this).hasClass("ui-state-disabled"))return("string"==typeof e?a[e]:e).apply(a,arguments)}"string"!=typeof e&&(i.guid=e.guid=e.guid||i.guid||x.guid++);var s=t.match(/^([\w:-]*)\s*(.*)$/),t=s[1]+a.eventNamespace,s=s[2];s?l.on(t,s,i):o.on(t,i)})},_off:function(t,e){e=(e||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,t.off(e),this.bindings=x(this.bindings.not(t).get()),this.focusable=x(this.focusable.not(t).get()),this.hoverable=x(this.hoverable.not(t).get())},_delay:function(t,e){var i=this;return setTimeout(function(){return("string"==typeof t?i[t]:t).apply(i,arguments)},e||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){this._addClass(x(t.currentTarget),null,"ui-state-hover")},mouseleave:function(t){this._removeClass(x(t.currentTarget),null,"ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){this._addClass(x(t.currentTarget),null,"ui-state-focus")},focusout:function(t){this._removeClass(x(t.currentTarget),null,"ui-state-focus")}})},_trigger:function(t,e,i){var s,n,o=this.options[t];if(i=i||{},(e=x.Event(e)).type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),e.target=this.element[0],n=e.originalEvent)for(s in n)s in e||(e[s]=n[s]);return this.element.trigger(e,i),!("function"==typeof o&&!1===o.apply(this.element[0],[e].concat(i))||e.isDefaultPrevented())}},x.each({show:"fadeIn",hide:"fadeOut"},function(o,l){x.Widget.prototype["_"+o]=function(e,t,i){var s,n=(t="string"==typeof t?{effect:t}:t)?!0!==t&&"number"!=typeof t&&t.effect||l:o;"number"==typeof(t=t||{})?t={duration:t}:!0===t&&(t={}),s=!x.isEmptyObject(t),t.complete=i,t.delay&&e.delay(t.delay),s&&x.effects&&x.effects.effect[n]?e[o](t):n!==o&&e[n]?e[n](t.duration,t.easing,i):e.queue(function(t){x(this)[o](),i&&i.call(e[0]),t()})}});var s,C,E,o,r,u,h,c,k;x.widget;function T(t,e,i){return[parseFloat(t[0])*(c.test(t[0])?e/100:1),parseFloat(t[1])*(c.test(t[1])?i/100:1)]}function A(t,e){return parseInt(x.css(t,e),10)||0}function W(t){return null!=t&&t===t.window}C=Math.max,E=Math.abs,o=/left|center|right/,r=/top|center|bottom/,u=/[\+\-]\d+(\.[\d]+)?%?/,h=/^\w+/,c=/%$/,k=x.fn.position,x.position={scrollbarWidth:function(){if(void 0!==s)return s;var t,e=x("<div style='display:block;position:absolute;width:200px;height:200px;overflow:hidden;'><div style='height:300px;width:auto;'></div></div>"),i=e.children()[0];return x("body").append(e),t=i.offsetWidth,e.css("overflow","scroll"),t===(i=i.offsetWidth)&&(i=e[0].clientWidth),e.remove(),s=t-i},getScrollInfo:function(t){var e=t.isWindow||t.isDocument?"":t.element.css("overflow-x"),i=t.isWindow||t.isDocument?"":t.element.css("overflow-y"),e="scroll"===e||"auto"===e&&t.width<t.element[0].scrollWidth;return{width:"scroll"===i||"auto"===i&&t.height<t.element[0].scrollHeight?x.position.scrollbarWidth():0,height:e?x.position.scrollbarWidth():0}},getWithinInfo:function(t){var e=x(t||window),i=W(e[0]),s=!!e[0]&&9===e[0].nodeType;return{element:e,isWindow:i,isDocument:s,offset:!i&&!s?x(t).offset():{left:0,top:0},scrollLeft:e.scrollLeft(),scrollTop:e.scrollTop(),width:e.outerWidth(),height:e.outerHeight()}}},x.fn.position=function(c){if(!c||!c.of)return k.apply(this,arguments);var d,f,m,p,v,t,g="string"==typeof(c=x.extend({},c)).of?x(document).find(c.of):x(c.of),_=x.position.getWithinInfo(c.within),y=x.position.getScrollInfo(_),b=(c.collision||"flip").split(" "),w={},e=9===(t=(e=g)[0]).nodeType?{width:e.width(),height:e.height(),offset:{top:0,left:0}}:W(t)?{width:e.width(),height:e.height(),offset:{top:e.scrollTop(),left:e.scrollLeft()}}:t.preventDefault?{width:0,height:0,offset:{top:t.pageY,left:t.pageX}}:{width:e.outerWidth(),height:e.outerHeight(),offset:e.offset()};return g[0].preventDefault&&(c.at="left top"),f=e.width,m=e.height,v=x.extend({},p=e.offset),x.each(["my","at"],function(){var t,e,i=(c[this]||"").split(" ");(i=1===i.length?o.test(i[0])?i.concat(["center"]):r.test(i[0])?["center"].concat(i):["center","center"]:i)[0]=o.test(i[0])?i[0]:"center",i[1]=r.test(i[1])?i[1]:"center",t=u.exec(i[0]),e=u.exec(i[1]),w[this]=[t?t[0]:0,e?e[0]:0],c[this]=[h.exec(i[0])[0],h.exec(i[1])[0]]}),1===b.length&&(b[1]=b[0]),"right"===c.at[0]?v.left+=f:"center"===c.at[0]&&(v.left+=f/2),"bottom"===c.at[1]?v.top+=m:"center"===c.at[1]&&(v.top+=m/2),d=T(w.at,f,m),v.left+=d[0],v.top+=d[1],this.each(function(){var i,t,l=x(this),a=l.outerWidth(),r=l.outerHeight(),e=A(this,"marginLeft"),s=A(this,"marginTop"),n=a+e+A(this,"marginRight")+y.width,o=r+s+A(this,"marginBottom")+y.height,u=x.extend({},v),h=T(w.my,l.outerWidth(),l.outerHeight());"right"===c.my[0]?u.left-=a:"center"===c.my[0]&&(u.left-=a/2),"bottom"===c.my[1]?u.top-=r:"center"===c.my[1]&&(u.top-=r/2),u.left+=h[0],u.top+=h[1],i={marginLeft:e,marginTop:s},x.each(["left","top"],function(t,e){x.ui.position[b[t]]&&x.ui.position[b[t]][e](u,{targetWidth:f,targetHeight:m,elemWidth:a,elemHeight:r,collisionPosition:i,collisionWidth:n,collisionHeight:o,offset:[d[0]+h[0],d[1]+h[1]],my:c.my,at:c.at,within:_,elem:l})}),c.using&&(t=function(t){var e=p.left-u.left,i=e+f-a,s=p.top-u.top,n=s+m-r,o={target:{element:g,left:p.left,top:p.top,width:f,height:m},element:{element:l,left:u.left,top:u.top,width:a,height:r},horizontal:i<0?"left":0<e?"right":"center",vertical:n<0?"top":0<s?"bottom":"middle"};f<a&&E(e+i)<f&&(o.horizontal="center"),m<r&&E(s+n)<m&&(o.vertical="middle"),C(E(e),E(i))>C(E(s),E(n))?o.important="horizontal":o.important="vertical",c.using.call(this,t,o)}),l.offset(x.extend(u,{using:t}))})},x.ui.position={fit:{left:function(t,e){var i=e.within,s=i.isWindow?i.scrollLeft:i.offset.left,n=i.width,o=t.left-e.collisionPosition.marginLeft,l=s-o,a=o+e.collisionWidth-n-s;e.collisionWidth>n?0<l&&a<=0?(i=t.left+l+e.collisionWidth-n-s,t.left+=l-i):t.left=!(0<a&&l<=0)&&a<l?s+n-e.collisionWidth:s:0<l?t.left+=l:0<a?t.left-=a:t.left=C(t.left-o,t.left)},top:function(t,e){var i=e.within,s=i.isWindow?i.scrollTop:i.offset.top,n=e.within.height,o=t.top-e.collisionPosition.marginTop,l=s-o,a=o+e.collisionHeight-n-s;e.collisionHeight>n?0<l&&a<=0?(i=t.top+l+e.collisionHeight-n-s,t.top+=l-i):t.top=!(0<a&&l<=0)&&a<l?s+n-e.collisionHeight:s:0<l?t.top+=l:0<a?t.top-=a:t.top=C(t.top-o,t.top)}},flip:{left:function(t,e){var i=e.within,s=i.offset.left+i.scrollLeft,n=i.width,o=i.isWindow?i.scrollLeft:i.offset.left,l=t.left-e.collisionPosition.marginLeft,a=l-o,r=l+e.collisionWidth-n-o,u="left"===e.my[0]?-e.elemWidth:"right"===e.my[0]?e.elemWidth:0,i="left"===e.at[0]?e.targetWidth:"right"===e.at[0]?-e.targetWidth:0,l=-2*e.offset[0];a<0?((s=t.left+u+i+l+e.collisionWidth-n-s)<0||s<E(a))&&(t.left+=u+i+l):0<r&&(0<(o=t.left-e.collisionPosition.marginLeft+u+i+l-o)||E(o)<r)&&(t.left+=u+i+l)},top:function(t,e){var i=e.within,s=i.offset.top+i.scrollTop,n=i.height,o=i.isWindow?i.scrollTop:i.offset.top,l=t.top-e.collisionPosition.marginTop,a=l-o,r=l+e.collisionHeight-n-o,u="top"===e.my[1]?-e.elemHeight:"bottom"===e.my[1]?e.elemHeight:0,i="top"===e.at[1]?e.targetHeight:"bottom"===e.at[1]?-e.targetHeight:0,l=-2*e.offset[1];a<0?((s=t.top+u+i+l+e.collisionHeight-n-s)<0||s<E(a))&&(t.top+=u+i+l):0<r&&(0<(o=t.top-e.collisionPosition.marginTop+u+i+l-o)||E(o)<r)&&(t.top+=u+i+l)}},flipfit:{left:function(){x.ui.position.flip.left.apply(this,arguments),x.ui.position.fit.left.apply(this,arguments)},top:function(){x.ui.position.flip.top.apply(this,arguments),x.ui.position.fit.top.apply(this,arguments)}}};var t;x.ui.position,x.ui.keyCode={BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38},x.fn.extend({uniqueId:(t=0,function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++t)})}),removeUniqueId:function(){return this.each(function(){/^ui-id-\d+$/.test(this.id)&&x(this).removeAttr("id")})}}),x.ui.safeActiveElement=function(e){var i;try{i=e.activeElement}catch(t){i=e.body}return i=!(i=i||e.body).nodeName?e.body:i},x.widget("ui.menu",{version:"1.13.2",defaultElement:"<ul>",delay:300,options:{icons:{submenu:"ui-icon-caret-1-e"},items:"> *",menus:"ul",position:{my:"left top",at:"right top"},role:"menu",blur:null,focus:null,select:null},_create:function(){this.activeMenu=this.element,this.mouseHandled=!1,this.lastMousePosition={x:null,y:null},this.element.uniqueId().attr({role:this.options.role,tabIndex:0}),this._addClass("ui-menu","ui-widget ui-widget-content"),this._on({"mousedown .ui-menu-item":function(t){t.preventDefault(),this._activateItem(t)},"click .ui-menu-item":function(t){var e=x(t.target),i=x(x.ui.safeActiveElement(this.document[0]));!this.mouseHandled&&e.not(".ui-state-disabled").length&&(this.select(t),t.isPropagationStopped()||(this.mouseHandled=!0),e.has(".ui-menu").length?this.expand(t):!this.element.is(":focus")&&i.closest(".ui-menu").length&&(this.element.trigger("focus",[!0]),this.active&&1===this.active.parents(".ui-menu").length&&clearTimeout(this.timer)))},"mouseenter .ui-menu-item":"_activateItem","mousemove .ui-menu-item":"_activateItem",mouseleave:"collapseAll","mouseleave .ui-menu":"collapseAll",focus:function(t,e){var i=this.active||this._menuItems().first();e||this.focus(t,i)},blur:function(t){this._delay(function(){x.contains(this.element[0],x.ui.safeActiveElement(this.document[0]))||this.collapseAll(t)})},keydown:"_keydown"}),this.refresh(),this._on(this.document,{click:function(t){this._closeOnDocumentClick(t)&&this.collapseAll(t,!0),this.mouseHandled=!1}})},_activateItem:function(t){var e,i;this.previousFilter||t.clientX===this.lastMousePosition.x&&t.clientY===this.lastMousePosition.y||(this.lastMousePosition={x:t.clientX,y:t.clientY},e=x(t.target).closest(".ui-menu-item"),i=x(t.currentTarget),e[0]===i[0]&&(i.is(".ui-state-active")||(this._removeClass(i.siblings().children(".ui-state-active"),null,"ui-state-active"),this.focus(t,i))))},_destroy:function(){var t=this.element.find(".ui-menu-item").removeAttr("role aria-disabled").children(".ui-menu-item-wrapper").removeUniqueId().removeAttr("tabIndex role aria-haspopup");this.element.removeAttr("aria-activedescendant").find(".ui-menu").addBack().removeAttr("role aria-labelledby aria-expanded aria-hidden aria-disabled tabIndex").removeUniqueId().show(),t.children().each(function(){var t=x(this);t.data("ui-menu-submenu-caret")&&t.remove()})},_keydown:function(t){var e,i,s,n=!0;switch(t.keyCode){case x.ui.keyCode.PAGE_UP:this.previousPage(t);break;case x.ui.keyCode.PAGE_DOWN:this.nextPage(t);break;case x.ui.keyCode.HOME:this._move("first","first",t);break;case x.ui.keyCode.END:this._move("last","last",t);break;case x.ui.keyCode.UP:this.previous(t);break;case x.ui.keyCode.DOWN:this.next(t);break;case x.ui.keyCode.LEFT:this.collapse(t);break;case x.ui.keyCode.RIGHT:this.active&&!this.active.is(".ui-state-disabled")&&this.expand(t);break;case x.ui.keyCode.ENTER:case x.ui.keyCode.SPACE:this._activate(t);break;case x.ui.keyCode.ESCAPE:this.collapse(t);break;default:e=this.previousFilter||"",s=n=!1,i=96<=t.keyCode&&t.keyCode<=105?(t.keyCode-96).toString():String.fromCharCode(t.keyCode),clearTimeout(this.filterTimer),i===e?s=!0:i=e+i,e=this._filterMenuItems(i),(e=s&&-1!==e.index(this.active.next())?this.active.nextAll(".ui-menu-item"):e).length||(i=String.fromCharCode(t.keyCode),e=this._filterMenuItems(i)),e.length?(this.focus(t,e),this.previousFilter=i,this.filterTimer=this._delay(function(){delete this.previousFilter},1e3)):delete this.previousFilter}n&&t.preventDefault()},_activate:function(t){this.active&&!this.active.is(".ui-state-disabled")&&(this.active.children("[aria-haspopup='true']").length?this.expand(t):this.select(t))},refresh:function(){var t,e,s=this,n=this.options.icons.submenu,i=this.element.find(this.options.menus);this._toggleClass("ui-menu-icons",null,!!this.element.find(".ui-icon").length),e=i.filter(":not(.ui-menu)").hide().attr({role:this.options.role,"aria-hidden":"true","aria-expanded":"false"}).each(function(){var t=x(this),e=t.prev(),i=x("<span>").data("ui-menu-submenu-caret",!0);s._addClass(i,"ui-menu-icon","ui-icon "+n),e.attr("aria-haspopup","true").prepend(i),t.attr("aria-labelledby",e.attr("id"))}),this._addClass(e,"ui-menu","ui-widget ui-widget-content ui-front"),(t=i.add(this.element).find(this.options.items)).not(".ui-menu-item").each(function(){var t=x(this);s._isDivider(t)&&s._addClass(t,"ui-menu-divider","ui-widget-content")}),i=(e=t.not(".ui-menu-item, .ui-menu-divider")).children().not(".ui-menu").uniqueId().attr({tabIndex:-1,role:this._itemRole()}),this._addClass(e,"ui-menu-item")._addClass(i,"ui-menu-item-wrapper"),t.filter(".ui-state-disabled").attr("aria-disabled","true"),this.active&&!x.contains(this.element[0],this.active[0])&&this.blur()},_itemRole:function(){return{menu:"menuitem",listbox:"option"}[this.options.role]},_setOption:function(t,e){var i;"icons"===t&&(i=this.element.find(".ui-menu-icon"),this._removeClass(i,null,this.options.icons.submenu)._addClass(i,null,e.submenu)),this._super(t,e)},_setOptionDisabled:function(t){this._super(t),this.element.attr("aria-disabled",String(t)),this._toggleClass(null,"ui-state-disabled",!!t)},focus:function(t,e){var i;this.blur(t,t&&"focus"===t.type),this._scrollIntoView(e),this.active=e.first(),i=this.active.children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),this.options.role&&this.element.attr("aria-activedescendant",i.attr("id")),i=this.active.parent().closest(".ui-menu-item").children(".ui-menu-item-wrapper"),this._addClass(i,null,"ui-state-active"),t&&"keydown"===t.type?this._close():this.timer=this._delay(function(){this._close()},this.delay),(i=e.children(".ui-menu")).length&&t&&/^mouse/.test(t.type)&&this._startOpening(i),this.activeMenu=e.parent(),this._trigger("focus",t,{item:e})},_scrollIntoView:function(t){var e,i,s;this._hasScroll()&&(i=parseFloat(x.css(this.activeMenu[0],"borderTopWidth"))||0,s=parseFloat(x.css(this.activeMenu[0],"paddingTop"))||0,e=t.offset().top-this.activeMenu.offset().top-i-s,i=this.activeMenu.scrollTop(),s=this.activeMenu.height(),t=t.outerHeight(),e<0?this.activeMenu.scrollTop(i+e):s<e+t&&this.activeMenu.scrollTop(i+e-s+t))},blur:function(t,e){e||clearTimeout(this.timer),this.active&&(this._removeClass(this.active.children(".ui-menu-item-wrapper"),null,"ui-state-active"),this._trigger("blur",t,{item:this.active}),this.active=null)},_startOpening:function(t){clearTimeout(this.timer),"true"===t.attr("aria-hidden")&&(this.timer=this._delay(function(){this._close(),this._open(t)},this.delay))},_open:function(t){var e=x.extend({of:this.active},this.options.position);clearTimeout(this.timer),this.element.find(".ui-menu").not(t.parents(".ui-menu")).hide().attr("aria-hidden","true"),t.show().removeAttr("aria-hidden").attr("aria-expanded","true").position(e)},collapseAll:function(e,i){clearTimeout(this.timer),this.timer=this._delay(function(){var t=i?this.element:x(e&&e.target).closest(this.element.find(".ui-menu"));t.length||(t=this.element),this._close(t),this.blur(e),this._removeClass(t.find(".ui-state-active"),null,"ui-state-active"),this.activeMenu=t},i?0:this.delay)},_close:function(t){(t=t||(this.active?this.active.parent():this.element)).find(".ui-menu").hide().attr("aria-hidden","true").attr("aria-expanded","false")},_closeOnDocumentClick:function(t){return!x(t.target).closest(".ui-menu").length},_isDivider:function(t){return!/[^\-\u2014\u2013\s]/.test(t.text())},collapse:function(t){var e=this.active&&this.active.parent().closest(".ui-menu-item",this.element);e&&e.length&&(this._close(),this.focus(t,e))},expand:function(t){var e=this.active&&this._menuItems(this.active.children(".ui-menu")).first();e&&e.length&&(this._open(e.parent()),this._delay(function(){this.focus(t,e)}))},next:function(t){this._move("next","first",t)},previous:function(t){this._move("prev","last",t)},isFirstItem:function(){return this.active&&!this.active.prevAll(".ui-menu-item").length},isLastItem:function(){return this.active&&!this.active.nextAll(".ui-menu-item").length},_menuItems:function(t){return(t||this.element).find(this.options.items).filter(".ui-menu-item")},_move:function(t,e,i){var s;(s=this.active?"first"===t||"last"===t?this.active["first"===t?"prevAll":"nextAll"](".ui-menu-item").last():this.active[t+"All"](".ui-menu-item").first():s)&&s.length&&this.active||(s=this._menuItems(this.activeMenu)[e]()),this.focus(i,s)},nextPage:function(t){var e,i,s;this.active?this.isLastItem()||(this._hasScroll()?(i=this.active.offset().top,s=this.element.innerHeight(),0===x.fn.jquery.indexOf("3.2.")&&(s+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.nextAll(".ui-menu-item").each(function(){return(e=x(this)).offset().top-i-s<0}),this.focus(t,e)):this.focus(t,this._menuItems(this.activeMenu)[this.active?"last":"first"]())):this.next(t)},previousPage:function(t){var e,i,s;this.active?this.isFirstItem()||(this._hasScroll()?(i=this.active.offset().top,s=this.element.innerHeight(),0===x.fn.jquery.indexOf("3.2.")&&(s+=this.element[0].offsetHeight-this.element.outerHeight()),this.active.prevAll(".ui-menu-item").each(function(){return 0<(e=x(this)).offset().top-i+s}),this.focus(t,e)):this.focus(t,this._menuItems(this.activeMenu).first())):this.next(t)},_hasScroll:function(){return this.element.outerHeight()<this.element.prop("scrollHeight")},select:function(t){this.active=this.active||x(t.target).closest(".ui-menu-item");var e={item:this.active};this.active.has(".ui-menu").length||this.collapseAll(t,!0),this._trigger("select",t,e)},_filterMenuItems:function(t){var t=t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&"),e=new RegExp("^"+t,"i");return this.activeMenu.find(this.options.items).filter(".ui-menu-item").filter(function(){return e.test(String.prototype.trim.call(x(this).children(".ui-menu-item-wrapper").text()))})}});x.widget("ui.autocomplete",{version:"1.13.2",defaultElement:"<input>",options:{appendTo:null,autoFocus:!1,delay:300,minLength:1,position:{my:"left top",at:"left bottom",collision:"none"},source:null,change:null,close:null,focus:null,open:null,response:null,search:null,select:null},requestIndex:0,pending:0,liveRegionTimer:null,_create:function(){var i,s,n,t=this.element[0].nodeName.toLowerCase(),e="textarea"===t,t="input"===t;this.isMultiLine=e||!t&&this._isContentEditable(this.element),this.valueMethod=this.element[e||t?"val":"text"],this.isNewMenu=!0,this._addClass("ui-autocomplete-input"),this.element.attr("autocomplete","off"),this._on(this.element,{keydown:function(t){if(this.element.prop("readOnly"))s=n=i=!0;else{s=n=i=!1;var e=x.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:i=!0,this._move("previousPage",t);break;case e.PAGE_DOWN:i=!0,this._move("nextPage",t);break;case e.UP:i=!0,this._keyEvent("previous",t);break;case e.DOWN:i=!0,this._keyEvent("next",t);break;case e.ENTER:this.menu.active&&(i=!0,t.preventDefault(),this.menu.select(t));break;case e.TAB:this.menu.active&&this.menu.select(t);break;case e.ESCAPE:this.menu.element.is(":visible")&&(this.isMultiLine||this._value(this.term),this.close(t),t.preventDefault());break;default:s=!0,this._searchTimeout(t)}}},keypress:function(t){if(i)return i=!1,void(this.isMultiLine&&!this.menu.element.is(":visible")||t.preventDefault());if(!s){var e=x.ui.keyCode;switch(t.keyCode){case e.PAGE_UP:this._move("previousPage",t);break;case e.PAGE_DOWN:this._move("nextPage",t);break;case e.UP:this._keyEvent("previous",t);break;case e.DOWN:this._keyEvent("next",t)}}},input:function(t){if(n)return n=!1,void t.preventDefault();this._searchTimeout(t)},focus:function(){this.selectedItem=null,this.previous=this._value()},blur:function(t){clearTimeout(this.searching),this.close(t),this._change(t)}}),this._initSource(),this.menu=x("<ul>").appendTo(this._appendTo()).menu({role:null}).hide().attr({unselectable:"on"}).menu("instance"),this._addClass(this.menu.element,"ui-autocomplete","ui-front"),this._on(this.menu.element,{mousedown:function(t){t.preventDefault()},menufocus:function(t,e){var i,s;if(this.isNewMenu&&(this.isNewMenu=!1,t.originalEvent&&/^mouse/.test(t.originalEvent.type)))return this.menu.blur(),void this.document.one("mousemove",function(){x(t.target).trigger(t.originalEvent)});s=e.item.data("ui-autocomplete-item"),!1!==this._trigger("focus",t,{item:s})&&t.originalEvent&&/^key/.test(t.originalEvent.type)&&this._value(s.value),(i=e.item.attr("aria-label")||s.value)&&String.prototype.trim.call(i).length&&(clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(x("<div>").text(i))},100))},menuselect:function(t,e){var i=e.item.data("ui-autocomplete-item"),s=this.previous;this.element[0]!==x.ui.safeActiveElement(this.document[0])&&(this.element.trigger("focus"),this.previous=s,this._delay(function(){this.previous=s,this.selectedItem=i})),!1!==this._trigger("select",t,{item:i})&&this._value(i.value),this.term=this._value(),this.close(t),this.selectedItem=i}}),this.liveRegion=x("<div>",{role:"status","aria-live":"assertive","aria-relevant":"additions"}).appendTo(this.document[0].body),this._addClass(this.liveRegion,null,"ui-helper-hidden-accessible"),this._on(this.window,{beforeunload:function(){this.element.removeAttr("autocomplete")}})},_destroy:function(){clearTimeout(this.searching),this.element.removeAttr("autocomplete"),this.menu.element.remove(),this.liveRegion.remove()},_setOption:function(t,e){this._super(t,e),"source"===t&&this._initSource(),"appendTo"===t&&this.menu.element.appendTo(this._appendTo()),"disabled"===t&&e&&this.xhr&&this.xhr.abort()},_isEventTargetInWidget:function(t){var e=this.menu.element[0];return t.target===this.element[0]||t.target===e||x.contains(e,t.target)},_closeOnClickOutside:function(t){this._isEventTargetInWidget(t)||this.close()},_appendTo:function(){var t=this.options.appendTo;return t=!(t=!(t=t&&(t.jquery||t.nodeType?x(t):this.document.find(t).eq(0)))||!t[0]?this.element.closest(".ui-front, dialog"):t).length?this.document[0].body:t},_initSource:function(){var i,s,n=this;Array.isArray(this.options.source)?(i=this.options.source,this.source=function(t,e){e(x.ui.autocomplete.filter(i,t.term))}):"string"==typeof this.options.source?(s=this.options.source,this.source=function(t,e){n.xhr&&n.xhr.abort(),n.xhr=x.ajax({url:s,data:t,dataType:"json",success:function(t){e(t)},error:function(){e([])}})}):this.source=this.options.source},_searchTimeout:function(s){clearTimeout(this.searching),this.searching=this._delay(function(){var t=this.term===this._value(),e=this.menu.element.is(":visible"),i=s.altKey||s.ctrlKey||s.metaKey||s.shiftKey;t&&(e||i)||(this.selectedItem=null,this.search(null,s))},this.options.delay)},search:function(t,e){return t=null!=t?t:this._value(),this.term=this._value(),t.length<this.options.minLength?this.close(e):!1!==this._trigger("search",e)?this._search(t):void 0},_search:function(t){this.pending++,this._addClass("ui-autocomplete-loading"),this.cancelSearch=!1,this.source({term:t},this._response())},_response:function(){var e=++this.requestIndex;return function(t){e===this.requestIndex&&this.__response(t),this.pending--,this.pending||this._removeClass("ui-autocomplete-loading")}.bind(this)},__response:function(t){t=t&&this._normalize(t),this._trigger("response",null,{content:t}),!this.options.disabled&&t&&t.length&&!this.cancelSearch?(this._suggest(t),this._trigger("open")):this._close()},close:function(t){this.cancelSearch=!0,this._close(t)},_close:function(t){this._off(this.document,"mousedown"),this.menu.element.is(":visible")&&(this.menu.element.hide(),this.menu.blur(),this.isNewMenu=!0,this._trigger("close",t))},_change:function(t){this.previous!==this._value()&&this._trigger("change",t,{item:this.selectedItem})},_normalize:function(t){return t.length&&t[0].label&&t[0].value?t:x.map(t,function(t){return"string"==typeof t?{label:t,value:t}:x.extend({},t,{label:t.label||t.value,value:t.value||t.label})})},_suggest:function(t){var e=this.menu.element.empty();this._renderMenu(e,t),this.isNewMenu=!0,this.menu.refresh(),e.show(),this._resizeMenu(),e.position(x.extend({of:this.element},this.options.position)),this.options.autoFocus&&this.menu.next(),this._on(this.document,{mousedown:"_closeOnClickOutside"})},_resizeMenu:function(){var t=this.menu.element;t.outerWidth(Math.max(t.width("").outerWidth()+1,this.element.outerWidth()))},_renderMenu:function(i,t){var s=this;x.each(t,function(t,e){s._renderItemData(i,e)})},_renderItemData:function(t,e){return this._renderItem(t,e).data("ui-autocomplete-item",e)},_renderItem:function(t,e){return x("<li>").append(x("<div>").text(e.label)).appendTo(t)},_move:function(t,e){if(this.menu.element.is(":visible"))return this.menu.isFirstItem()&&/^previous/.test(t)||this.menu.isLastItem()&&/^next/.test(t)?(this.isMultiLine||this._value(this.term),void this.menu.blur()):void this.menu[t](e);this.search(null,e)},widget:function(){return this.menu.element},_value:function(){return this.valueMethod.apply(this.element,arguments)},_keyEvent:function(t,e){this.isMultiLine&&!this.menu.element.is(":visible")||(this._move(t,e),e.preventDefault())},_isContentEditable:function(t){if(!t.length)return!1;var e=t.prop("contentEditable");return"inherit"===e?this._isContentEditable(t.parent()):"true"===e}}),x.extend(x.ui.autocomplete,{escapeRegex:function(t){return t.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g,"\\$&")},filter:function(t,e){var i=new RegExp(x.ui.autocomplete.escapeRegex(e),"i");return x.grep(t,function(t){return i.test(t.label||t.value||t)})}}),x.widget("ui.autocomplete",x.ui.autocomplete,{options:{messages:{noResults:"No search results.",results:function(t){return t+(1<t?" results are":" result is")+" available, use up and down arrow keys to navigate."}}},__response:function(t){var e;this._superApply(arguments),this.options.disabled||this.cancelSearch||(e=t&&t.length?this.options.messages.results(t.length):this.options.messages.noResults,clearTimeout(this.liveRegionTimer),this.liveRegionTimer=this._delay(function(){this.liveRegion.html(x("<div>").text(e))},100))}});x.ui.autocomplete});
\ No newline at end of file
diff --git a/apidoc/script.js b/apidoc/script.js
index 864989cf4..8b9691a16 100644
--- a/apidoc/script.js
+++ b/apidoc/script.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,6 +28,14 @@ var packageSearchIndex;
 var typeSearchIndex;
 var memberSearchIndex;
 var tagSearchIndex;
+
+var oddRowColor = "odd-row-color";
+var evenRowColor = "even-row-color";
+var sortAsc = "sort-asc";
+var sortDesc = "sort-desc";
+var tableTab = "table-tab";
+var activeTableTab = "active-table-tab";
+
 function loadScripts(doc, tag) {
     createElem(doc, tag, 'search.js');
 
@@ -45,6 +53,93 @@ function createElem(doc, tag, path) {
     scriptElement.parentNode.insertBefore(script, scriptElement);
 }
 
+// Helper for  making content containing release names comparable lexicographically
+function makeComparable(s) {
+    return s.toLowerCase().replace(/(\d+)/g,
+        function(n, m) {
+            return ("000" + m).slice(-4);
+        });
+}
+
+// Switches between two styles depending on a condition
+function toggleStyle(classList, condition, trueStyle, falseStyle) {
+    if (condition) {
+        classList.remove(falseStyle);
+        classList.add(trueStyle);
+    } else {
+        classList.remove(trueStyle);
+        classList.add(falseStyle);
+    }
+}
+
+// Sorts the rows in a table lexicographically by the content of a specific column
+function sortTable(header, columnIndex, columns) {
+    var container = header.parentElement;
+    var descending = header.classList.contains(sortAsc);
+    container.querySelectorAll("div.table-header").forEach(
+        function(header) {
+            header.classList.remove(sortAsc);
+            header.classList.remove(sortDesc);
+        }
+    )
+    var cells = container.children;
+    var rows = [];
+    for (var i = columns; i < cells.length; i += columns) {
+        rows.push(Array.prototype.slice.call(cells, i, i + columns));
+    }
+    var comparator = function(a, b) {
+        var ka = makeComparable(a[columnIndex].textContent);
+        var kb = makeComparable(b[columnIndex].textContent);
+        if (ka < kb)
+            return descending ? 1 : -1;
+        if (ka > kb)
+            return descending ? -1 : 1;
+        return 0;
+    };
+    var sorted = rows.sort(comparator);
+    var visible = 0;
+    sorted.forEach(function(row) {
+        if (row[0].style.display !== 'none') {
+            var isEvenRow = visible++ % 2 === 0;
+        }
+        row.forEach(function(cell) {
+            toggleStyle(cell.classList, isEvenRow, evenRowColor, oddRowColor);
+            container.appendChild(cell);
+        })
+    });
+    toggleStyle(header.classList, descending, sortDesc, sortAsc);
+}
+
+// Toggles the visibility of a table category in all tables in a page
+function toggleGlobal(checkbox, selected, columns) {
+    var display = checkbox.checked ? '' : 'none';
+    document.querySelectorAll("div.table-tabs").forEach(function(t) {
+        var id = t.parentElement.getAttribute("id");
+        var selectedClass = id + "-tab" + selected;
+        // if selected is empty string it selects all uncategorized entries
+        var selectUncategorized = !Boolean(selected);
+        var visible = 0;
+        document.querySelectorAll('div.' + id)
+            .forEach(function(elem) {
+                if (selectUncategorized) {
+                    if (elem.className.indexOf(selectedClass) === -1) {
+                        elem.style.display = display;
+                    }
+                } else if (elem.classList.contains(selectedClass)) {
+                    elem.style.display = display;
+                }
+                if (elem.style.display === '') {
+                    var isEvenRow = visible++ % (columns * 2) < columns;
+                    toggleStyle(elem.classList, isEvenRow, evenRowColor, oddRowColor);
+                }
+            });
+        var displaySection = visible === 0 ? 'none' : '';
+        t.parentElement.style.display = displaySection;
+        document.querySelector("li#contents-" + id).style.display = displaySection;
+    })
+}
+
+// Shows the elements of a table belonging to a specific category
 function show(tableId, selected, columns) {
     if (tableId !== selected) {
         document.querySelectorAll('div.' + tableId + ':not(.' + selected + ')')
@@ -56,8 +151,7 @@ function show(tableId, selected, columns) {
         .forEach(function(elem, index) {
             elem.style.display = '';
             var isEvenRow = index % (columns * 2) < columns;
-            elem.classList.remove(isEvenRow ? oddRowColor : evenRowColor);
-            elem.classList.add(isEvenRow ? evenRowColor : oddRowColor);
+            toggleStyle(elem.classList, isEvenRow, evenRowColor, oddRowColor);
         });
     updateTabs(tableId, selected);
 }
@@ -105,7 +199,34 @@ function indexFilesLoaded() {
         && memberSearchIndex
         && tagSearchIndex;
 }
-
+// Copy the contents of the local snippet to the clipboard
+function copySnippet(button) {
+    copyToClipboard(button.nextElementSibling.innerText);
+    switchCopyLabel(button, button.firstElementChild);
+}
+function copyToClipboard(content) {
+    var textarea = document.createElement("textarea");
+    textarea.style.height = 0;
+    document.body.appendChild(textarea);
+    textarea.value = content;
+    textarea.select();
+    document.execCommand("copy");
+    document.body.removeChild(textarea);
+}
+function switchCopyLabel(button, span) {
+    var copied = span.getAttribute("data-copied");
+    button.classList.add("visible");
+    var initialLabel = span.innerHTML;
+    span.innerHTML = copied;
+    setTimeout(function() {
+        button.classList.remove("visible");
+        setTimeout(function() {
+            if (initialLabel !== copied) {
+                span.innerHTML = initialLabel;
+            }
+        }, 100);
+    }, 1900);
+}
 // Workaround for scroll position not being included in browser history (8249133)
 document.addEventListener("DOMContentLoaded", function(e) {
     var contentDiv = document.querySelector("div.flex-content");
@@ -117,14 +238,14 @@ document.addEventListener("DOMContentLoaded", function(e) {
     window.addEventListener("hashchange", function(e) {
         history.replaceState(contentDiv.scrollTop, document.title);
     });
+    var timeoutId;
     contentDiv.addEventListener("scroll", function(e) {
-        var timeoutID;
-        if (!timeoutID) {
-            timeoutID = setTimeout(function() {
-                history.replaceState(contentDiv.scrollTop, document.title);
-                timeoutID = null;
-            }, 100);
+        if (timeoutId) {
+            clearTimeout(timeoutId);
         }
+        timeoutId = setTimeout(function() {
+            history.replaceState(contentDiv.scrollTop, document.title);
+        }, 100);
     });
     if (!location.hash) {
         history.replaceState(contentDiv.scrollTop, document.title);
diff --git a/apidoc/search-page.js b/apidoc/search-page.js
new file mode 100644
index 000000000..540c90f57
--- /dev/null
+++ b/apidoc/search-page.js
@@ -0,0 +1,284 @@
+/*
+ * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+"use strict";
+$(function() {
+    var copy = $("#page-search-copy");
+    var expand = $("#page-search-expand");
+    var searchLink = $("span#page-search-link");
+    var redirect = $("input#search-redirect");
+    function setSearchUrlTemplate() {
+        var href = document.location.href.split(/[#?]/)[0];
+        href += "?q=" + "%s";
+        if (redirect.is(":checked")) {
+            href += "&r=1";
+        }
+        searchLink.html(href);
+        copy[0].onmouseenter();
+    }
+    function copyLink(e) {
+        copyToClipboard(this.previousSibling.innerText);
+        switchCopyLabel(this, this.lastElementChild);
+    }
+    copy.click(copyLink);
+    copy[0].onmouseenter = function() {};
+    redirect.click(setSearchUrlTemplate);
+    setSearchUrlTemplate();
+    copy.prop("disabled", false);
+    redirect.prop("disabled", false);
+    expand.click(function (e) {
+        var searchInfo = $("div.page-search-info");
+        if(this.parentElement.hasAttribute("open")) {
+            searchInfo.attr("style", "border-width: 0;");
+        } else {
+            searchInfo.attr("style", "border-width: 1px;").height(searchInfo.prop("scrollHeight"));
+        }
+    });
+});
+$(window).on("load", function() {
+    var input = $("#page-search-input");
+    var reset = $("#page-search-reset");
+    var notify = $("#page-search-notify");
+    var resultSection = $("div#result-section");
+    var resultContainer = $("div#result-container");
+    var searchTerm = "";
+    var activeTab = "";
+    var fixedTab = false;
+    var visibleTabs = [];
+    var feelingLucky = false;
+    function renderResults(result) {
+        if (!result.length) {
+            notify.html(messages.noResult);
+        } else if (result.length === 1) {
+            notify.html(messages.oneResult);
+        } else {
+            notify.html(messages.manyResults.replace("{0}", result.length));
+        }
+        resultContainer.empty();
+        var r = {
+            "types": [],
+            "members": [],
+            "packages": [],
+            "modules": [],
+            "searchTags": []
+        };
+        for (var i in result) {
+            var item = result[i];
+            var arr = r[item.category];
+            arr.push(item);
+        }
+        if (!activeTab || r[activeTab].length === 0 || !fixedTab) {
+            Object.keys(r).reduce(function(prev, curr) {
+                if (r[curr].length > 0 && r[curr][0].score > prev) {
+                    activeTab = curr;
+                    return r[curr][0].score;
+                }
+                return prev;
+            }, 0);
+        }
+        if (feelingLucky && activeTab) {
+            notify.html(messages.redirecting)
+            var firstItem = r[activeTab][0];
+            window.location = getURL(firstItem.indexItem, firstItem.category);
+            return;
+        }
+        if (result.length > 20) {
+            if (searchTerm[searchTerm.length - 1] === ".") {
+                if (activeTab === "types" && r["members"].length > r["types"].length) {
+                    activeTab = "members";
+                } else if (activeTab === "packages" && r["types"].length > r["packages"].length) {
+                    activeTab = "types";
+                }
+            }
+        }
+        var categoryCount = Object.keys(r).reduce(function(prev, curr) {
+            return prev + (r[curr].length > 0 ? 1 : 0);
+        }, 0);
+        visibleTabs = [];
+        var tabContainer = $("<div class='table-tabs'></div>").appendTo(resultContainer);
+        for (var key in r) {
+            var id = "#result-tab-" + key.replace("searchTags", "search_tags");
+            if (r[key].length) {
+                var count = r[key].length >= 1000 ? "999+" : r[key].length;
+                if (result.length > 20 && categoryCount > 1) {
+                    var button = $("<button id='result-tab-" + key
+                        + "' class='page-search-header'><span>" + categories[key] + "</span>"
+                        + "<span style='font-weight: normal'> (" + count + ")</span></button>").appendTo(tabContainer);
+                    button.click(key, function(e) {
+                        fixedTab = true;
+                        renderResult(e.data, $(this));
+                    });
+                    visibleTabs.push(key);
+                } else {
+                    $("<span class='page-search-header active-table-tab'>" + categories[key]
+                        + "<span style='font-weight: normal'> (" + count + ")</span></span>").appendTo(tabContainer);
+                    renderTable(key, r[key]).appendTo(resultContainer);
+                    tabContainer = $("<div class='table-tabs'></div>").appendTo(resultContainer);
+
+                }
+            }
+        }
+        if (activeTab && result.length > 20 && categoryCount > 1) {
+            $("button#result-tab-" + activeTab).addClass("active-table-tab");
+            renderTable(activeTab, r[activeTab]).appendTo(resultContainer);
+        }
+        resultSection.show();
+        function renderResult(category, button) {
+            activeTab = category;
+            setSearchUrl();
+            resultContainer.find("div.summary-table").remove();
+            renderTable(activeTab, r[activeTab]).appendTo(resultContainer);
+            button.siblings().removeClass("active-table-tab");
+            button.addClass("active-table-tab");
+        }
+    }
+    function selectTab(category) {
+        $("button#result-tab-" + category).click();
+    }
+    function renderTable(category, items) {
+        var table = $("<div class='summary-table'>")
+            .addClass(category === "modules"
+                ? "one-column-search-results"
+                : "two-column-search-results");
+        var col1, col2;
+        if (category === "modules") {
+            col1 = "Module";
+        } else if (category === "packages") {
+            col1 = "Module";
+            col2 = "Package";
+        } else if (category === "types") {
+            col1 = "Package";
+            col2 = "Class"
+        } else if (category === "members") {
+            col1 = "Class";
+            col2 = "Member";
+        } else if (category === "searchTags") {
+            col1 = "Location";
+            col2 = "Name";
+        }
+        $("<div class='table-header col-plain'>" + col1 + "</div>").appendTo(table);
+        if (category !== "modules") {
+            $("<div class='table-header col-plain'>" + col2 + "</div>").appendTo(table);
+        }
+        $.each(items, function(index, item) {
+            var rowColor = index % 2 ? "odd-row-color" : "even-row-color";
+            renderItem(item, table, rowColor);
+        });
+        return table;
+    }
+    function renderItem(item, table, rowColor) {
+        var label = getHighlightedText(item.input, item.boundaries, item.prefix.length, item.input.length);
+        var link = $("<a/>")
+            .attr("href",  getURL(item.indexItem, item.category))
+            .attr("tabindex", "0")
+            .addClass("search-result-link")
+            .html(label);
+        var container = getHighlightedText(item.input, item.boundaries, 0, item.prefix.length - 1);
+        if (item.category === "searchTags") {
+            container = item.indexItem.h || "";
+        }
+        if (item.category !== "modules") {
+            $("<div/>").html(container).addClass("col-plain").addClass(rowColor).appendTo(table);
+        }
+        $("<div/>").html(link).addClass("col-last").addClass(rowColor).appendTo(table);
+    }
+    var timeout;
+    function schedulePageSearch() {
+        if (timeout) {
+            clearTimeout(timeout);
+        }
+        timeout = setTimeout(function () {
+            doPageSearch()
+        }, 100);
+    }
+    function doPageSearch() {
+        setSearchUrl();
+        var term = searchTerm = input.val().trim();
+        if (term === "") {
+            notify.html(messages.enterTerm);
+            activeTab = "";
+            fixedTab = false;
+            resultContainer.empty();
+            resultSection.hide();
+        } else {
+            notify.html(messages.searching);
+            doSearch({ term: term, maxResults: 1200 }, renderResults);
+        }
+    }
+    function setSearchUrl() {
+        var query = input.val().trim();
+        var url = document.location.pathname;
+        if (query) {
+            url += "?q=" + encodeURI(query);
+            if (activeTab && fixedTab) {
+                url += "&c=" + activeTab;
+            }
+        }
+        history.replaceState({query: query}, "", url);
+    }
+    input.on("input", function(e) {
+        feelingLucky = false;
+        schedulePageSearch();
+    });
+    $(document).keydown(function(e) {
+        if ((e.ctrlKey || e.metaKey) && (e.key === "ArrowLeft" || e.key === "ArrowRight")) {
+            if (activeTab && visibleTabs.length > 1) {
+                var idx = visibleTabs.indexOf(activeTab);
+                idx += e.key === "ArrowLeft" ? visibleTabs.length - 1 : 1;
+                selectTab(visibleTabs[idx % visibleTabs.length]);
+                return false;
+            }
+        }
+    });
+    reset.click(function() {
+        notify.html(messages.enterTerm);
+        resultSection.hide();
+        activeTab = "";
+        fixedTab = false;
+        resultContainer.empty();
+        input.val('').focus();
+        setSearchUrl();
+    });
+    input.prop("disabled", false);
+    reset.prop("disabled", false);
+
+    var urlParams = new URLSearchParams(window.location.search);
+    if (urlParams.has("q")) {
+        input.val(urlParams.get("q"))
+    }
+    if (urlParams.has("c")) {
+        activeTab = urlParams.get("c");
+        fixedTab = true;
+    }
+    if (urlParams.get("r")) {
+        feelingLucky = true;
+    }
+    if (input.val()) {
+        doPageSearch();
+    } else {
+        notify.html(messages.enterTerm);
+    }
+    input.select().focus();
+});
diff --git a/apidoc/search.html b/apidoc/search.html
new file mode 100644
index 000000000..49d7d27a0
--- /dev/null
+++ b/apidoc/search.html
@@ -0,0 +1,72 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Search (consensusj 0.7.0-alpha3 API)</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="description" content="search">
+<meta name="generator" content="javadoc/SearchWriter">
+<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
+<link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
+<script type="text/javascript" src="script.js"></script>
+<script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
+<script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
+</head>
+<body class="search-page">
+<script type="text/javascript">var pathtoroot = "./";
+loadScripts(document, 'script');</script>
+<noscript>
+<div>JavaScript is disabled on your browser.</div>
+</noscript>
+<div class="flex-box">
+<header role="banner" class="flex-header">
+<nav role="navigation">
+<!-- ========= START OF TOP NAVBAR ======= -->
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
+<div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
+<ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
+<li><a href="index.html">Overview</a></li>
+<li>Package</li>
+<li>Class</li>
+<li><a href="overview-tree.html">Tree</a></li>
+<li><a href="deprecated-list.html">Deprecated</a></li>
+<li><a href="index-all.html">Index</a></li>
+<li><a href="help-doc.html#search">Help</a></li>
+</ul>
+</div>
+<div class="sub-nav">
+<div id="navbar-sub-list"></div>
+</div>
+<!-- ========= END OF TOP NAVBAR ========= -->
+<span class="skip-nav" id="skip-navbar-top"></span></nav>
+</header>
+<div class="flex-content">
+<main role="main">
+<h1 class="title">Search</h1>
+<div>
+<input type="text" id="page-search-input" disabled placeholder="Search">
+<input type="reset" id="page-search-reset" disabled value="Reset" style="margin: 6px;">
+<details class="page-search-details">
+<summary id="page-search-expand">Additional resources</summary>
+</details>
+</div>
+<div class="page-search-info">
+<p>The <a href="help-doc.html#search">help page</a> provides an introduction to the scope and syntax of JavaDoc search.</p>
+<p>You can use the &lt;ctrl&gt; or &lt;cmd&gt; keys in combination with the left and right arrow keys to switch between result tabs in this page.</p>
+<p>The URL template below may be used to configure this page as a search engine in browsers that support this feature. It has been tested to work in Google Chrome and Mozilla Firefox. Note that other browsers may not support this feature or require a different URL format.</p>
+<span id="page-search-link">link</span><button class="copy" aria-label="Copy URL" id="page-search-copy"><img src="copy.svg" alt="Copy URL"><span data-copied="Copied!">Copy</span></button>
+<p>
+<input type="checkbox" id="search-redirect" disabled>
+<label for="search-redirect">Redirect to first result</label></p>
+</div>
+<p id="page-search-notify">Loading search index...</p>
+<div id="result-section" style="display: none;">
+<div id="result-container"></div>
+<script type="text/javascript" src="search-page.js"></script>
+</div>
+</main>
+</div>
+</div>
+</body>
+</html>
diff --git a/apidoc/search.js b/apidoc/search.js
index db3b2f4a6..d3986705e 100644
--- a/apidoc/search.js
+++ b/apidoc/search.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2020, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -22,282 +22,413 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-
-var noResult = {l: "No results found"};
-var loading = {l: "Loading search index..."};
-var catModules = "Modules";
-var catPackages = "Packages";
-var catTypes = "Classes and Interfaces";
-var catMembers = "Members";
-var catSearchTags = "Search Tags";
-var highlight = "<span class=\"result-highlight\">$&</span>";
-var searchPattern = "";
-var fallbackPattern = "";
-var RANKING_THRESHOLD = 2;
-var NO_MATCH = 0xffff;
-var MIN_RESULTS = 3;
-var MAX_RESULTS = 500;
-var UNNAMED = "<Unnamed>";
+"use strict";
+const messages = {
+    enterTerm: "Enter a search term",
+    noResult: "No results found",
+    oneResult: "Found one result",
+    manyResults: "Found {0} results",
+    loading: "Loading search index...",
+    searching: "Searching...",
+    redirecting: "Redirecting to first result...",
+    linkIcon: "Link icon",
+    linkToSection: "Link to this section"
+}
+const categories = {
+    modules: "Modules",
+    packages: "Packages",
+    types: "Classes and Interfaces",
+    members: "Members",
+    searchTags: "Search Tags"
+};
+const highlight = "<span class='result-highlight'>$&</span>";
+const NO_MATCH = {};
+const MAX_RESULTS = 300;
+function checkUnnamed(name, separator) {
+    return name === "<Unnamed>" || !name ? "" : name + separator;
+}
 function escapeHtml(str) {
     return str.replace(/</g, "&lt;").replace(/>/g, "&gt;");
 }
-function getHighlightedText(item, matcher, fallbackMatcher) {
-    var escapedItem = escapeHtml(item);
-    var highlighted = escapedItem.replace(matcher, highlight);
-    if (highlighted === escapedItem) {
-        highlighted = escapedItem.replace(fallbackMatcher, highlight)
+function getHighlightedText(str, boundaries, from, to) {
+    var start = from;
+    var text = "";
+    for (var i = 0; i < boundaries.length; i += 2) {
+        var b0 = boundaries[i];
+        var b1 = boundaries[i + 1];
+        if (b0 >= to || b1 <= from) {
+            continue;
+        }
+        text += escapeHtml(str.slice(start, Math.max(start, b0)));
+        text += "<span class='result-highlight'>";
+        text += escapeHtml(str.slice(Math.max(start, b0), Math.min(to, b1)));
+        text += "</span>";
+        start = Math.min(to, b1);
     }
-    return highlighted;
+    text += escapeHtml(str.slice(start, to));
+    return text;
 }
-function getURLPrefix(ui) {
-    var urlPrefix="";
+function getURLPrefix(item, category) {
+    var urlPrefix = "";
     var slash = "/";
-    if (ui.item.category === catModules) {
-        return ui.item.l + slash;
-    } else if (ui.item.category === catPackages && ui.item.m) {
-        return ui.item.m + slash;
-    } else if (ui.item.category === catTypes || ui.item.category === catMembers) {
-        if (ui.item.m) {
-            urlPrefix = ui.item.m + slash;
+    if (category === "modules") {
+        return item.l + slash;
+    } else if (category === "packages" && item.m) {
+        return item.m + slash;
+    } else if (category === "types" || category === "members") {
+        if (item.m) {
+            urlPrefix = item.m + slash;
         } else {
-            $.each(packageSearchIndex, function(index, item) {
-                if (item.m && ui.item.p === item.l) {
-                    urlPrefix = item.m + slash;
+            $.each(packageSearchIndex, function(index, it) {
+                if (it.m && item.p === it.l) {
+                    urlPrefix = it.m + slash;
                 }
             });
         }
     }
     return urlPrefix;
 }
-function createSearchPattern(term) {
-    var pattern = "";
-    var isWordToken = false;
-    term.replace(/,\s*/g, ", ").trim().split(/\s+/).forEach(function(w, index) {
-        if (index > 0) {
-            // whitespace between identifiers is significant
-            pattern += (isWordToken && /^\w/.test(w)) ? "\\s+" : "\\s*";
+function getURL(item, category) {
+    if (item.url) {
+        return item.url;
+    }
+    var url = getURLPrefix(item, category);
+    if (category === "modules") {
+        url += "module-summary.html";
+    } else if (category === "packages") {
+        if (item.u) {
+            url = item.u;
+        } else {
+            url += item.l.replace(/\./g, '/') + "/package-summary.html";
+        }
+    } else if (category === "types") {
+        if (item.u) {
+            url = item.u;
+        } else {
+            url += checkUnnamed(item.p, "/").replace(/\./g, '/') + item.l + ".html";
+        }
+    } else if (category === "members") {
+        url += checkUnnamed(item.p, "/").replace(/\./g, '/') + item.c + ".html" + "#";
+        if (item.u) {
+            url += item.u;
+        } else {
+            url += item.l;
         }
-        var tokens = w.split(/(?=[A-Z,.()<>[\/])/);
+    } else if (category === "searchTags") {
+        url += item.u;
+    }
+    item.url = url;
+    return url;
+}
+function createMatcher(term, camelCase) {
+    if (camelCase && !isUpperCase(term)) {
+        return null;  // no need for camel-case matcher for lower case query
+    }
+    var pattern = "";
+    var upperCase = [];
+    term.trim().split(/\s+/).forEach(function(w, index, array) {
+        var tokens = w.split(/(?=[A-Z,.()<>?[\/])/);
         for (var i = 0; i < tokens.length; i++) {
             var s = tokens[i];
-            if (s === "") {
-                continue;
-            }
-            pattern += $.ui.autocomplete.escapeRegex(s);
-            isWordToken =  /\w$/.test(s);
+            // ',' and '?' are the only delimiters commonly followed by space in java signatures
+            pattern += "(" + $.ui.autocomplete.escapeRegex(s).replace(/[,?]/g, "$&\\s*?") + ")";
+            upperCase.push(false);
+            var isWordToken =  /\w$/.test(s);
             if (isWordToken) {
-                pattern += "([a-z0-9_$<>\\[\\]]*?)";
+                if (i === tokens.length - 1 && index < array.length - 1) {
+                    // space in query string matches all delimiters
+                    pattern += "(.*?)";
+                    upperCase.push(isUpperCase(s[0]));
+                } else {
+                    if (!camelCase && isUpperCase(s) && s.length === 1) {
+                        pattern += "()";
+                    } else {
+                        pattern += "([a-z0-9$<>?[\\]]*?)";
+                    }
+                    upperCase.push(isUpperCase(s[0]));
+                }
+            } else {
+                pattern += "()";
+                upperCase.push(false);
             }
         }
     });
-    return pattern;
+    var re = new RegExp(pattern, "gi");
+    re.upperCase = upperCase;
+    return re;
+}
+function findMatch(matcher, input, startOfName, endOfName) {
+    var from = startOfName;
+    matcher.lastIndex = from;
+    var match = matcher.exec(input);
+    // Expand search area until we get a valid result or reach the beginning of the string
+    while (!match || match.index + match[0].length < startOfName || endOfName < match.index) {
+        if (from === 0) {
+            return NO_MATCH;
+        }
+        from = input.lastIndexOf(".", from - 2) + 1;
+        matcher.lastIndex = from;
+        match = matcher.exec(input);
+    }
+    var boundaries = [];
+    var matchEnd = match.index + match[0].length;
+    var score = 5;
+    var start = match.index;
+    var prevEnd = -1;
+    for (var i = 1; i < match.length; i += 2) {
+        var isUpper = isUpperCase(input[start]);
+        var isMatcherUpper = matcher.upperCase[i];
+        // capturing groups come in pairs, match and non-match
+        boundaries.push(start, start + match[i].length);
+        // make sure groups are anchored on a left word boundary
+        var prevChar = input[start - 1] || "";
+        var nextChar = input[start + 1] || "";
+        if (start !== 0 && !/[\W_]/.test(prevChar) && !/[\W_]/.test(input[start])) {
+            if (isUpper && (isLowerCase(prevChar) || isLowerCase(nextChar))) {
+                score -= 0.1;
+            } else if (isMatcherUpper && start === prevEnd) {
+                score -= isUpper ? 0.1 : 1.0;
+            } else {
+                return NO_MATCH;
+            }
+        }
+        prevEnd = start + match[i].length;
+        start += match[i].length + match[i + 1].length;
+
+        // lower score for parts of the name that are missing
+        if (match[i + 1] && prevEnd < endOfName) {
+            score -= rateNoise(match[i + 1]);
+        }
+    }
+    // lower score if a type name contains unmatched camel-case parts
+    if (input[matchEnd - 1] !== "." && endOfName > matchEnd)
+        score -= rateNoise(input.slice(matchEnd, endOfName));
+    score -= rateNoise(input.slice(0, Math.max(startOfName, match.index)));
+
+    if (score <= 0) {
+        return NO_MATCH;
+    }
+    return {
+        input: input,
+        score: score,
+        boundaries: boundaries
+    };
 }
-function createMatcher(pattern, flags) {
-    var isCamelCase = /[A-Z]/.test(pattern);
-    return new RegExp(pattern, flags + (isCamelCase ? "" : "i"));
+function isUpperCase(s) {
+    return s !== s.toLowerCase();
 }
-var watermark = 'Search';
-$(function() {
-    var search = $("#search-input");
-    var reset = $("#reset-button");
-    search.val('');
-    search.prop("disabled", false);
-    reset.prop("disabled", false);
-    search.val(watermark).addClass('watermark');
-    search.blur(function() {
-        if ($(this).val().length === 0) {
-            $(this).val(watermark).addClass('watermark');
+function isLowerCase(s) {
+    return s !== s.toUpperCase();
+}
+function rateNoise(str) {
+    return (str.match(/([.(])/g) || []).length / 5
+         + (str.match(/([A-Z]+)/g) || []).length / 10
+         +  str.length / 20;
+}
+function doSearch(request, response) {
+    var term = request.term.trim();
+    var maxResults = request.maxResults || MAX_RESULTS;
+    if (term.length === 0) {
+        return this.close();
+    }
+    var matcher = {
+        plainMatcher: createMatcher(term, false),
+        camelCaseMatcher: createMatcher(term, true)
+    }
+    var indexLoaded = indexFilesLoaded();
+
+    function getPrefix(item, category) {
+        switch (category) {
+            case "packages":
+                return checkUnnamed(item.m, "/");
+            case "types":
+                return checkUnnamed(item.p, ".");
+            case "members":
+                return checkUnnamed(item.p, ".") + item.c + ".";
+            default:
+                return "";
         }
-    });
-    search.on('click keydown paste', function() {
-        if ($(this).val() === watermark) {
-            $(this).val('').removeClass('watermark');
+    }
+    function useQualifiedName(category) {
+        switch (category) {
+            case "packages":
+                return /[\s/]/.test(term);
+            case "types":
+            case "members":
+                return /[\s.]/.test(term);
+            default:
+                return false;
         }
-    });
-    reset.click(function() {
-        search.val('').focus();
-    });
-    search.focus()[0].setSelectionRange(0, 0);
-});
+    }
+    function searchIndex(indexArray, category) {
+        var matches = [];
+        if (!indexArray) {
+            if (!indexLoaded) {
+                matches.push({ l: messages.loading, category: category });
+            }
+            return matches;
+        }
+        $.each(indexArray, function (i, item) {
+            var prefix = getPrefix(item, category);
+            var simpleName = item.l;
+            var qualifiedName = prefix + simpleName;
+            var useQualified = useQualifiedName(category);
+            var input = useQualified ? qualifiedName : simpleName;
+            var startOfName = useQualified ? prefix.length : 0;
+            var endOfName = category === "members" && input.indexOf("(", startOfName) > -1
+                ? input.indexOf("(", startOfName) : input.length;
+            var m = findMatch(matcher.plainMatcher, input, startOfName, endOfName);
+            if (m === NO_MATCH && matcher.camelCaseMatcher) {
+                m = findMatch(matcher.camelCaseMatcher, input, startOfName, endOfName);
+            }
+            if (m !== NO_MATCH) {
+                m.indexItem = item;
+                m.prefix = prefix;
+                m.category = category;
+                if (!useQualified) {
+                    m.input = qualifiedName;
+                    m.boundaries = m.boundaries.map(function(b) {
+                        return b + prefix.length;
+                    });
+                }
+                matches.push(m);
+            }
+            return true;
+        });
+        return matches.sort(function(e1, e2) {
+            return e2.score - e1.score;
+        }).slice(0, maxResults);
+    }
+
+    var result = searchIndex(moduleSearchIndex, "modules")
+         .concat(searchIndex(packageSearchIndex, "packages"))
+         .concat(searchIndex(typeSearchIndex, "types"))
+         .concat(searchIndex(memberSearchIndex, "members"))
+         .concat(searchIndex(tagSearchIndex, "searchTags"));
+
+    if (!indexLoaded) {
+        updateSearchResults = function() {
+            doSearch(request, response);
+        }
+    } else {
+        updateSearchResults = function() {};
+    }
+    response(result);
+}
+// JQuery search menu implementation
 $.widget("custom.catcomplete", $.ui.autocomplete, {
     _create: function() {
         this._super();
-        this.widget().menu("option", "items", "> :not(.ui-autocomplete-category)");
+        this.widget().menu("option", "items", "> .result-item");
+        // workaround for search result scrolling
+        this.menu._scrollIntoView = function _scrollIntoView( item ) {
+            var borderTop, paddingTop, offset, scroll, elementHeight, itemHeight;
+            if ( this._hasScroll() ) {
+                borderTop = parseFloat( $.css( this.activeMenu[ 0 ], "borderTopWidth" ) ) || 0;
+                paddingTop = parseFloat( $.css( this.activeMenu[ 0 ], "paddingTop" ) ) || 0;
+                offset = item.offset().top - this.activeMenu.offset().top - borderTop - paddingTop;
+                scroll = this.activeMenu.scrollTop();
+                elementHeight = this.activeMenu.height() - 26;
+                itemHeight = item.outerHeight();
+
+                if ( offset < 0 ) {
+                    this.activeMenu.scrollTop( scroll + offset );
+                } else if ( offset + itemHeight > elementHeight ) {
+                    this.activeMenu.scrollTop( scroll + offset - elementHeight + itemHeight );
+                }
+            }
+        };
     },
     _renderMenu: function(ul, items) {
-        var rMenu = this;
         var currentCategory = "";
-        rMenu.menu.bindings = $();
+        var widget = this;
+        widget.menu.bindings = $();
         $.each(items, function(index, item) {
-            var li;
             if (item.category && item.category !== currentCategory) {
-                ul.append("<li class=\"ui-autocomplete-category\">" + item.category + "</li>");
+                ul.append("<li class='ui-autocomplete-category'>" + categories[item.category] + "</li>");
                 currentCategory = item.category;
             }
-            li = rMenu._renderItemData(ul, item);
+            var li = widget._renderItemData(ul, item);
             if (item.category) {
-                li.attr("aria-label", item.category + " : " + item.l);
-                li.attr("class", "result-item");
+                li.attr("aria-label", categories[item.category] + " : " + item.l);
             } else {
                 li.attr("aria-label", item.l);
-                li.attr("class", "result-item");
             }
+            li.attr("class", "result-item");
         });
+        ul.append("<li class='ui-static-link'><a href='" + pathtoroot + "search.html?q="
+            + encodeURI(widget.term) + "'>Go to search page</a></li>");
     },
     _renderItem: function(ul, item) {
-        var label = "";
-        var matcher = createMatcher(escapeHtml(searchPattern), "g");
-        var fallbackMatcher = new RegExp(fallbackPattern, "gi")
-        if (item.category === catModules) {
-            label = getHighlightedText(item.l, matcher, fallbackMatcher);
-        } else if (item.category === catPackages) {
-            label = getHighlightedText(item.l, matcher, fallbackMatcher);
-        } else if (item.category === catTypes) {
-            label = (item.p && item.p !== UNNAMED)
-                    ? getHighlightedText(item.p + "." + item.l, matcher, fallbackMatcher)
-                    : getHighlightedText(item.l, matcher, fallbackMatcher);
-        } else if (item.category === catMembers) {
-            label = (item.p && item.p !== UNNAMED)
-                    ? getHighlightedText(item.p + "." + item.c + "." + item.l, matcher, fallbackMatcher)
-                    : getHighlightedText(item.c + "." + item.l, matcher, fallbackMatcher);
-        } else if (item.category === catSearchTags) {
-            label = getHighlightedText(item.l, matcher, fallbackMatcher);
-        } else {
-            label = item.l;
-        }
         var li = $("<li/>").appendTo(ul);
         var div = $("<div/>").appendTo(li);
-        if (item.category === catSearchTags && item.h) {
-            if (item.d) {
-                div.html(label + "<span class=\"search-tag-holder-result\"> (" + item.h + ")</span><br><span class=\"search-tag-desc-result\">"
-                                + item.d + "</span><br>");
+        var label = item.l
+            ? item.l
+            : getHighlightedText(item.input, item.boundaries, 0, item.input.length);
+        var idx = item.indexItem;
+        if (item.category === "searchTags" && idx && idx.h) {
+            if (idx.d) {
+                div.html(label + "<span class='search-tag-holder-result'> (" + idx.h + ")</span><br><span class='search-tag-desc-result'>"
+                    + idx.d + "</span><br>");
             } else {
-                div.html(label + "<span class=\"search-tag-holder-result\"> (" + item.h + ")</span>");
+                div.html(label + "<span class='search-tag-holder-result'> (" + idx.h + ")</span>");
             }
         } else {
-            if (item.m) {
-                div.html(item.m + "/" + label);
-            } else {
-                div.html(label);
-            }
+            div.html(label);
         }
         return li;
     }
 });
-function rankMatch(match, category) {
-    if (!match) {
-        return NO_MATCH;
-    }
-    var index = match.index;
-    var input = match.input;
-    var leftBoundaryMatch = 2;
-    var periferalMatch = 0;
-    // make sure match is anchored on a left word boundary
-    if (index === 0 || /\W/.test(input[index - 1]) || "_" === input[index]) {
-        leftBoundaryMatch = 0;
-    } else if ("_" === input[index - 1] || (input[index] === input[index].toUpperCase() && !/^[A-Z0-9_$]+$/.test(input))) {
-        leftBoundaryMatch = 1;
-    }
-    var matchEnd = index + match[0].length;
-    var leftParen = input.indexOf("(");
-    var endOfName = leftParen > -1 ? leftParen : input.length;
-    // exclude peripheral matches
-    if (category !== catModules && category !== catSearchTags) {
-        var delim = category === catPackages ? "/" : ".";
-        if (leftParen > -1 && leftParen < index) {
-            periferalMatch += 2;
-        } else if (input.lastIndexOf(delim, endOfName) >= matchEnd) {
-            periferalMatch += 2;
-        }
-    }
-    var delta = match[0].length === endOfName ? 0 : 1; // rank full match higher than partial match
-    for (var i = 1; i < match.length; i++) {
-        // lower ranking if parts of the name are missing
-        if (match[i])
-            delta += match[i].length;
-    }
-    if (category === catTypes) {
-        // lower ranking if a type name contains unmatched camel-case parts
-        if (/[A-Z]/.test(input.substring(matchEnd)))
-            delta += 5;
-        if (/[A-Z]/.test(input.substring(0, index)))
-            delta += 5;
-    }
-    return leftBoundaryMatch + periferalMatch + (delta / 200);
-
-}
-function doSearch(request, response) {
-    var result = [];
-    searchPattern = createSearchPattern(request.term);
-    fallbackPattern = createSearchPattern(request.term.toLowerCase());
-    if (searchPattern === "") {
-        return this.close();
-    }
-    var camelCaseMatcher = createMatcher(searchPattern, "");
-    var fallbackMatcher = new RegExp(fallbackPattern, "i");
-
-    function searchIndexWithMatcher(indexArray, matcher, category, nameFunc) {
-        if (indexArray) {
-            var newResults = [];
-            $.each(indexArray, function (i, item) {
-                item.category = category;
-                var ranking = rankMatch(matcher.exec(nameFunc(item)), category);
-                if (ranking < RANKING_THRESHOLD) {
-                    newResults.push({ranking: ranking, item: item});
-                }
-                return newResults.length <= MAX_RESULTS;
-            });
-            return newResults.sort(function(e1, e2) {
-                return e1.ranking - e2.ranking;
-            }).map(function(e) {
-                return e.item;
-            });
+$(function() {
+    var expanded = false;
+    var windowWidth;
+    function collapse() {
+        if (expanded) {
+            $("div#navbar-top").removeAttr("style");
+            $("button#navbar-toggle-button")
+                .removeClass("expanded")
+                .attr("aria-expanded", "false");
+            expanded = false;
         }
-        return [];
     }
-    function searchIndex(indexArray, category, nameFunc) {
-        var primaryResults = searchIndexWithMatcher(indexArray, camelCaseMatcher, category, nameFunc);
-        result = result.concat(primaryResults);
-        if (primaryResults.length <= MIN_RESULTS && !camelCaseMatcher.ignoreCase) {
-            var secondaryResults = searchIndexWithMatcher(indexArray, fallbackMatcher, category, nameFunc);
-            result = result.concat(secondaryResults.filter(function (item) {
-                return primaryResults.indexOf(item) === -1;
-            }));
+    $("button#navbar-toggle-button").click(function (e) {
+        if (expanded) {
+            collapse();
+        } else {
+            var navbar = $("div#navbar-top");
+            navbar.height(navbar.prop("scrollHeight"));
+            $("button#navbar-toggle-button")
+                .addClass("expanded")
+                .attr("aria-expanded", "true");
+            expanded = true;
+            windowWidth = window.innerWidth;
         }
-    }
-
-    searchIndex(moduleSearchIndex, catModules, function(item) { return item.l; });
-    searchIndex(packageSearchIndex, catPackages, function(item) {
-        return (item.m && request.term.indexOf("/") > -1)
-            ? (item.m + "/" + item.l) : item.l;
     });
-    searchIndex(typeSearchIndex, catTypes, function(item) {
-        return request.term.indexOf(".") > -1 ? item.p + "." + item.l : item.l;
+    $("ul.sub-nav-list-small li a").click(collapse);
+    $("input#search-input").focus(collapse);
+    $("main").click(collapse);
+    $("section[id] > :header, :header[id], :header:has(a[id])").each(function(idx, el) {
+        // Create anchor links for headers with an associated id attribute
+        var hdr = $(el);
+        var id = hdr.attr("id") || hdr.parent("section").attr("id") || hdr.children("a").attr("id");
+        if (id) {
+            hdr.append(" <a href='#" + id + "' class='anchor-link' aria-label='" + messages.linkToSection
+                + "'><img src='" + pathtoroot + "link.svg' alt='" + messages.linkIcon +"' tabindex='0'"
+                + " width='16' height='16'></a>");
+        }
     });
-    searchIndex(memberSearchIndex, catMembers, function(item) {
-        return request.term.indexOf(".") > -1
-            ? item.p + "." + item.c + "." + item.l : item.l;
+    $(window).on("orientationchange", collapse).on("resize", function(e) {
+        if (expanded && windowWidth !== window.innerWidth) collapse();
     });
-    searchIndex(tagSearchIndex, catSearchTags, function(item) { return item.l; });
-
-    if (!indexFilesLoaded()) {
-        updateSearchResults = function() {
-            doSearch(request, response);
-        }
-        result.unshift(loading);
-    } else {
-        updateSearchResults = function() {};
-    }
-    response(result);
-}
-$(function() {
-    $("#search-input").catcomplete({
+    var search = $("#search-input");
+    var reset = $("#reset-button");
+    search.catcomplete({
         minLength: 1,
-        delay: 300,
+        delay: 200,
         source: doSearch,
         response: function(event, ui) {
             if (!ui.content.length) {
-                ui.content.push(noResult);
+                ui.content.push({ l: messages.noResult });
             } else {
                 $("#search-input").empty();
             }
@@ -310,45 +441,18 @@ $(function() {
             collision: "flip"
         },
         select: function(event, ui) {
-            if (ui.item.category) {
-                var url = getURLPrefix(ui);
-                if (ui.item.category === catModules) {
-                    url += "module-summary.html";
-                } else if (ui.item.category === catPackages) {
-                    if (ui.item.u) {
-                        url = ui.item.u;
-                    } else {
-                        url += ui.item.l.replace(/\./g, '/') + "/package-summary.html";
-                    }
-                } else if (ui.item.category === catTypes) {
-                    if (ui.item.u) {
-                        url = ui.item.u;
-                    } else if (ui.item.p === UNNAMED) {
-                        url += ui.item.l + ".html";
-                    } else {
-                        url += ui.item.p.replace(/\./g, '/') + "/" + ui.item.l + ".html";
-                    }
-                } else if (ui.item.category === catMembers) {
-                    if (ui.item.p === UNNAMED) {
-                        url += ui.item.c + ".html" + "#";
-                    } else {
-                        url += ui.item.p.replace(/\./g, '/') + "/" + ui.item.c + ".html" + "#";
-                    }
-                    if (ui.item.u) {
-                        url += ui.item.u;
-                    } else {
-                        url += ui.item.l;
-                    }
-                } else if (ui.item.category === catSearchTags) {
-                    url += ui.item.u;
-                }
-                if (top !== window) {
-                    parent.classFrame.location = pathtoroot + url;
-                } else {
-                    window.location.href = pathtoroot + url;
-                }
+            if (ui.item.indexItem) {
+                var url = getURL(ui.item.indexItem, ui.item.category);
+                window.location.href = pathtoroot + url;
                 $("#search-input").focus();
             }
         }
     });
+    search.val('');
+    search.prop("disabled", false);
+    reset.prop("disabled", false);
+    reset.click(function() {
+        search.val('').focus();
+    });
+    search.focus();
 });
diff --git a/apidoc/serialized-form.html b/apidoc/serialized-form.html
index 5cb09d064..9590c3b79 100644
--- a/apidoc/serialized-form.html
+++ b/apidoc/serialized-form.html
@@ -1,15 +1,14 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
-<title>Serialized Form (consensusj 0.7.0-alpha2 API)</title>
+<!-- Generated by javadoc (21) -->
+<title>Serialized Form (consensusj 0.7.0-alpha3 API)</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="description" content="serialized forms">
 <meta name="generator" content="javadoc/SerializedFormWriterImpl">
 <link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">
 <link rel="stylesheet" type="text/css" href="script-dir/jquery-ui.min.css" title="Style">
-<link rel="stylesheet" type="text/css" href="jquery-ui.overrides.css" title="Style">
 <script type="text/javascript" src="script.js"></script>
 <script type="text/javascript" src="script-dir/jquery-3.6.1.min.js"></script>
 <script type="text/javascript" src="script-dir/jquery-ui.min.js"></script>
@@ -24,7 +23,7 @@
 <header role="banner" class="flex-header">
 <nav role="navigation">
 <!-- ========= START OF TOP NAVBAR ======= -->
-<div class="top-nav" id="navbar-top">
+<div class="top-nav" id="navbar-top"><button id="navbar-toggle-button" aria-controls="navbar-top" aria-expanded="false" aria-label="Toggle navigation links"><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span><span class="nav-bar-toggle-icon">&nbsp;</span></button>
 <div class="skip-nav"><a href="#skip-navbar-top" title="Skip navigation links">Skip navigation links</a></div>
 <ul id="navbar-top-firstrow" class="nav-list" title="Navigation">
 <li><a href="index.html">Overview</a></li>
@@ -37,9 +36,10 @@
 </ul>
 </div>
 <div class="sub-nav">
-<div class="nav-list-search"><label for="search-input">SEARCH:</label>
-<input type="text" id="search-input" value="search" disabled="disabled">
-<input type="reset" id="reset-button" value="reset" disabled="disabled">
+<div id="navbar-sub-list"></div>
+<div class="nav-list-search"><a href="search.html">SEARCH</a>
+<input type="text" id="search-input" disabled placeholder="Search">
+<input type="reset" id="reset-button" disabled value="reset">
 </div>
 </div>
 <!-- ========= END OF TOP NAVBAR ========= -->
@@ -164,7 +164,7 @@ <h2 title="Package">Package&nbsp;<a href="org/consensusj/jsonrpc/package-summary
 <ul class="block-list">
 <li>
 <section class="serialized-class-details" id="org.consensusj.jsonrpc.JsonRpcErrorException">
-<h3>Exception&nbsp;<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcErrorException</a></h3>
+<h3>Exception Class&nbsp;<a href="org/consensusj/jsonrpc/JsonRpcErrorException.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcErrorException</a></h3>
 <div class="type-signature">class JsonRpcErrorException extends <a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a> implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></div>
 <ul class="block-list">
 <li>
@@ -183,13 +183,13 @@ <h5>error</h5>
 </li>
 <li>
 <section class="serialized-class-details" id="org.consensusj.jsonrpc.JsonRpcException">
-<h3>Exception&nbsp;<a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcException</a></h3>
+<h3>Exception Class&nbsp;<a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcException</a></h3>
 <div class="type-signature">class JsonRpcException extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/IOException.html" title="class or interface in java.io" class="external-link">IOException</a> implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></div>
 </section>
 </li>
 <li>
 <section class="serialized-class-details" id="org.consensusj.jsonrpc.JsonRpcStatusException">
-<h3>Exception&nbsp;<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcStatusException</a></h3>
+<h3>Exception Class&nbsp;<a href="org/consensusj/jsonrpc/JsonRpcStatusException.html" title="class in org.consensusj.jsonrpc">org.consensusj.jsonrpc.JsonRpcStatusException</a></h3>
 <div class="type-signature">class JsonRpcStatusException extends <a href="org/consensusj/jsonrpc/JsonRpcException.html" title="class in org.consensusj.jsonrpc">JsonRpcException</a> implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></div>
 <ul class="block-list">
 <li>
@@ -211,10 +211,16 @@ <h5>jsonRpcCode</h5>
 <li class="block-list">
 <h5>response</h5>
 <pre><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/String.html" title="class or interface in java.lang" class="external-link">String</a> response</pre>
+<div class="block">Http response body as a string. Null if not-available (check deserialized JSON in this case)</div>
 </li>
 <li class="block-list">
 <h5>responseJson</h5>
 <pre><a href="org/consensusj/jsonrpc/JsonRpcResponse.html" title="class in org.consensusj.jsonrpc">JsonRpcResponse</a>&lt;?&gt; responseJson</pre>
+<div class="block">Deserialized response message, if available. Null if not-available.
+ Result is usually null when an error occurs, but the type of the result is
+ unspecified and could be either <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/util/Map.html" title="class or interface in java.util" class="external-link"><code>Map</code></a>, <a href="https://fasterxml.github.io/jackson-databind/javadoc/2.14/com/fasterxml/jackson/databind/JsonNode.html" title="class or interface in com.fasterxml.jackson.databind" class="external-link"><code>JsonNode</code></a>,
+ or the result type of the failed request depending upon where and how the exception was
+ created.</div>
 </li>
 </ul>
 </section>
@@ -231,7 +237,7 @@ <h2 title="Package">Package&nbsp;<a href="org/consensusj/jsonrpc/cli/package-sum
 <ul class="block-list">
 <li>
 <section class="serialized-class-details" id="org.consensusj.jsonrpc.cli.JsonRpcClientTool.ToolException">
-<h3>Exception&nbsp;org.consensusj.jsonrpc.cli.JsonRpcClientTool.ToolException</h3>
+<h3>Exception Class&nbsp;org.consensusj.jsonrpc.cli.JsonRpcClientTool.ToolException</h3>
 <div class="type-signature">class ToolException extends <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/RuntimeException.html" title="class or interface in java.lang" class="external-link">RuntimeException</a> implements <a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/io/Serializable.html" title="class or interface in java.io" class="external-link">Serializable</a></div>
 <ul class="block-list">
 <li>
diff --git a/apidoc/src-html/org/consensusj/analytics/service/RichListService.html b/apidoc/src-html/org/consensusj/analytics/service/RichListService.html
index 025231652..b9843a753 100644
--- a/apidoc/src-html/org/consensusj/analytics/service/RichListService.html
+++ b/apidoc/src-html/org/consensusj/analytics/service/RichListService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.analytics.service, interface: RichListService">
@@ -24,24 +24,25 @@
 <span class="source-line-no">011</span><span id="line-11"> */</span>
 <span class="source-line-no">012</span><span id="line-12">public interface RichListService&lt;N extends Number &amp; Comparable&lt;? super N&gt;, ID&gt; {</span>
 <span class="source-line-no">013</span><span id="line-13"></span>
-<span class="source-line-no">014</span><span id="line-14">    /**</span>
-<span class="source-line-no">015</span><span id="line-15">     * Return a single rich list</span>
-<span class="source-line-no">016</span><span id="line-16">     *</span>
-<span class="source-line-no">017</span><span id="line-17">     * @param currencyID The currency ID</span>
-<span class="source-line-no">018</span><span id="line-18">     * @param numEntries The requested number of entries in the list</span>
-<span class="source-line-no">019</span><span id="line-19">     * @return An RxJava Single for lazy access to the response</span>
-<span class="source-line-no">020</span><span id="line-20">     */</span>
-<span class="source-line-no">021</span><span id="line-21">    Single&lt;TokenRichList&lt;N, ID&gt;&gt; richList(ID currencyID, int numEntries);</span>
-<span class="source-line-no">022</span><span id="line-22"></span>
-<span class="source-line-no">023</span><span id="line-23">    /**</span>
-<span class="source-line-no">024</span><span id="line-24">     * Get a continuous stream of rich list updates</span>
-<span class="source-line-no">025</span><span id="line-25">     *</span>
-<span class="source-line-no">026</span><span id="line-26">     * @param currencyID The currency ID</span>
-<span class="source-line-no">027</span><span id="line-27">     * @param numEntries The requested number of entries in each list</span>
-<span class="source-line-no">028</span><span id="line-28">     * @return A Publisher for lazy access to the stream</span>
-<span class="source-line-no">029</span><span id="line-29">     */</span>
-<span class="source-line-no">030</span><span id="line-30">    Publisher&lt;TokenRichList&lt;N, ID&gt;&gt; richListUpdates(ID currencyID, int numEntries);</span>
-<span class="source-line-no">031</span><span id="line-31">}</span>
+<span class="source-line-no">014</span><span id="line-14">    // TODO: Convert Single to CompletableFuture</span>
+<span class="source-line-no">015</span><span id="line-15">    /**</span>
+<span class="source-line-no">016</span><span id="line-16">     * Return a single rich list</span>
+<span class="source-line-no">017</span><span id="line-17">     *</span>
+<span class="source-line-no">018</span><span id="line-18">     * @param currencyID The currency ID</span>
+<span class="source-line-no">019</span><span id="line-19">     * @param numEntries The requested number of entries in the list</span>
+<span class="source-line-no">020</span><span id="line-20">     * @return An RxJava Single for lazy access to the response</span>
+<span class="source-line-no">021</span><span id="line-21">     */</span>
+<span class="source-line-no">022</span><span id="line-22">    Single&lt;TokenRichList&lt;N, ID&gt;&gt; richList(ID currencyID, int numEntries);</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">    /**</span>
+<span class="source-line-no">025</span><span id="line-25">     * Get a continuous stream of rich list updates</span>
+<span class="source-line-no">026</span><span id="line-26">     *</span>
+<span class="source-line-no">027</span><span id="line-27">     * @param currencyID The currency ID</span>
+<span class="source-line-no">028</span><span id="line-28">     * @param numEntries The requested number of entries in each list</span>
+<span class="source-line-no">029</span><span id="line-29">     * @return A Publisher for lazy access to the stream</span>
+<span class="source-line-no">030</span><span id="line-30">     */</span>
+<span class="source-line-no">031</span><span id="line-31">    Publisher&lt;TokenRichList&lt;N, ID&gt;&gt; richListUpdates(ID currencyID, int numEntries);</span>
+<span class="source-line-no">032</span><span id="line-32">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html b/apidoc/src-html/org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html
index 1e64889e1..077ba6164 100644
--- a/apidoc/src-html/org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html
+++ b/apidoc/src-html/org/consensusj/analytics/service/TokenRichList.TokenBalancePair.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.analytics.service, class: TokenRichList, class: TokenBalancePair">
diff --git a/apidoc/src-html/org/consensusj/analytics/service/TokenRichList.html b/apidoc/src-html/org/consensusj/analytics/service/TokenRichList.html
index 0dfad6416..caecf64ee 100644
--- a/apidoc/src-html/org/consensusj/analytics/service/TokenRichList.html
+++ b/apidoc/src-html/org/consensusj/analytics/service/TokenRichList.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.analytics.service, class: TokenRichList">
diff --git a/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceAccumulator.html b/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceAccumulator.html
index 439a3d40f..747fe47fe 100644
--- a/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceAccumulator.html
+++ b/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceAccumulator.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.analytics.util.collector, class: LargestSliceAccumulator">
diff --git a/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceCollector.html b/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceCollector.html
index 5d9f64c4d..209534d49 100644
--- a/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceCollector.html
+++ b/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceCollector.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.analytics.util.collector, class: LargestSliceCollector">
diff --git a/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceList.html b/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceList.html
index 4a4f276c4..1c1ea3e4d 100644
--- a/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceList.html
+++ b/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceList.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.analytics.util.collector, interface: LargestSliceList">
diff --git a/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceListImpl.html b/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceListImpl.html
index 7b43c345b..35d9be4b3 100644
--- a/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceListImpl.html
+++ b/apidoc/src-html/org/consensusj/analytics/util/collector/LargestSliceListImpl.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.analytics.util.collector, class: LargestSliceListImpl">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html b/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html
index 8185ac5a9..0960a63de 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.BitcoinCLICall.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.cli, class: BitcoinCLITool, class: BitcoinCLICall">
@@ -27,163 +27,164 @@
 <span class="source-line-no">014</span><span id="line-14">import java.net.URI;</span>
 <span class="source-line-no">015</span><span id="line-15">import java.net.URISyntaxException;</span>
 <span class="source-line-no">016</span><span id="line-16">import java.security.NoSuchAlgorithmException;</span>
-<span class="source-line-no">017</span><span id="line-17"></span>
-<span class="source-line-no">018</span><span id="line-18">import static org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_REGTEST;</span>
-<span class="source-line-no">019</span><span id="line-19">import static org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_TESTNET;</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">/**</span>
-<span class="source-line-no">022</span><span id="line-22"> * An attempt at cloning the {@code bitcoin-cli} tool, but using Java and &lt;b&gt;bitcoinj&lt;/b&gt;.</span>
-<span class="source-line-no">023</span><span id="line-23"> * The generic JSON-RPC client in {@code consensusj-jsonrpc-cli} is better-maintained.</span>
-<span class="source-line-no">024</span><span id="line-24"> */</span>
-<span class="source-line-no">025</span><span id="line-25">public class BitcoinCLITool extends BaseJsonRpcTool {</span>
-<span class="source-line-no">026</span><span id="line-26">    public final static String commandName = "cj-bitcoin-cli";</span>
-<span class="source-line-no">027</span><span id="line-27">    private final Options options;</span>
-<span class="source-line-no">028</span><span id="line-28"></span>
-<span class="source-line-no">029</span><span id="line-29">    public BitcoinCLITool() {</span>
-<span class="source-line-no">030</span><span id="line-30">        this.options = new BitcoinRpcCliOptions();</span>
-<span class="source-line-no">031</span><span id="line-31">    }</span>
-<span class="source-line-no">032</span><span id="line-32"></span>
-<span class="source-line-no">033</span><span id="line-33">    @Override</span>
-<span class="source-line-no">034</span><span id="line-34">    public String name() {</span>
-<span class="source-line-no">035</span><span id="line-35">        return commandName;</span>
-<span class="source-line-no">036</span><span id="line-36">    }</span>
-<span class="source-line-no">037</span><span id="line-37"></span>
-<span class="source-line-no">038</span><span id="line-38">    @Override</span>
-<span class="source-line-no">039</span><span id="line-39">    public Options options() {</span>
-<span class="source-line-no">040</span><span id="line-40">        return options;</span>
-<span class="source-line-no">041</span><span id="line-41">    }</span>
-<span class="source-line-no">042</span><span id="line-42"></span>
-<span class="source-line-no">043</span><span id="line-43">    /**</span>
-<span class="source-line-no">044</span><span id="line-44">     * main method for bitcoinj-cli tool.</span>
-<span class="source-line-no">045</span><span id="line-45">     * &lt;p&gt;</span>
-<span class="source-line-no">046</span><span id="line-46">     * See {@link BitcoinRpcCliOptions} for options and &lt;a href="https://bitcoin.org/en/developer-reference#bitcoin-core-apis"&gt;Bitcoin Core JSON-RPC API&lt;/a&gt;</span>
-<span class="source-line-no">047</span><span id="line-47">     * for the methods and parameters. Users can use {@code -?} to get general help or {@code help &lt;command&gt;} to get help</span>
-<span class="source-line-no">048</span><span id="line-48">     * on a specific command.</span>
-<span class="source-line-no">049</span><span id="line-49">     *</span>
-<span class="source-line-no">050</span><span id="line-50">     * @param args options, JSON-RPC method, JSON-RPC parameters</span>
-<span class="source-line-no">051</span><span id="line-51">     */</span>
-<span class="source-line-no">052</span><span id="line-52">    public static void main(String[] args) {</span>
-<span class="source-line-no">053</span><span id="line-53">        BitcoinCLITool command = new BitcoinCLITool();</span>
-<span class="source-line-no">054</span><span id="line-54">        int status = command.run(System.out, System.err, args);</span>
-<span class="source-line-no">055</span><span id="line-55">        System.exit(status);</span>
-<span class="source-line-no">056</span><span id="line-56">    }</span>
-<span class="source-line-no">057</span><span id="line-57"></span>
-<span class="source-line-no">058</span><span id="line-58">    @Override</span>
-<span class="source-line-no">059</span><span id="line-59">    public BitcoinCLICall createCall(PrintWriter out, PrintWriter err, String... args) {</span>
-<span class="source-line-no">060</span><span id="line-60">        return new BitcoinCLICall(this, out, err, args);</span>
-<span class="source-line-no">061</span><span id="line-61">    }</span>
-<span class="source-line-no">062</span><span id="line-62"></span>
-<span class="source-line-no">063</span><span id="line-63">    public static class BitcoinCLICall extends BaseJsonRpcTool.CommonsCLICall {</span>
-<span class="source-line-no">064</span><span id="line-64">        private BitcoinClient client;</span>
-<span class="source-line-no">065</span><span id="line-65">        private final boolean rpcWait;</span>
-<span class="source-line-no">066</span><span id="line-66"></span>
-<span class="source-line-no">067</span><span id="line-67">        public BitcoinCLICall(BitcoinCLITool tool, PrintWriter out, PrintWriter err, String[] args) {</span>
-<span class="source-line-no">068</span><span id="line-68">            super(tool, out, err, args);</span>
-<span class="source-line-no">069</span><span id="line-69">            rpcWait = line.hasOption("rpcwait");</span>
-<span class="source-line-no">070</span><span id="line-70">        }</span>
-<span class="source-line-no">071</span><span id="line-71"></span>
-<span class="source-line-no">072</span><span id="line-72">        @Override</span>
-<span class="source-line-no">073</span><span id="line-73">        public BitcoinClient rpcClient(SSLContext sslContext) {</span>
-<span class="source-line-no">074</span><span id="line-74">            // Not threadsafe</span>
-<span class="source-line-no">075</span><span id="line-75">            // This needs work if there are ever going to be multiple clients calling this method</span>
-<span class="source-line-no">076</span><span id="line-76">            if (client == null) {</span>
-<span class="source-line-no">077</span><span id="line-77">                RpcConfig config = getRPCConfig();</span>
-<span class="source-line-no">078</span><span id="line-78">                client = createClient(sslContext, config);</span>
-<span class="source-line-no">079</span><span id="line-79">                if (rpcWait) {</span>
-<span class="source-line-no">080</span><span id="line-80">                    // TODO: Add logging here to replace the System.out.println</span>
-<span class="source-line-no">081</span><span id="line-81">                    //System.out.println("Connecting to: " + getRPCConfig().getURI() + " with -rpcWait");</span>
-<span class="source-line-no">082</span><span id="line-82">                    boolean available = false;   // Wait up to 1 hour</span>
-<span class="source-line-no">083</span><span id="line-83">                    try {</span>
-<span class="source-line-no">084</span><span id="line-84">                        available = client.waitForServer(60*60);</span>
-<span class="source-line-no">085</span><span id="line-85">                    } catch (JsonRpcException e) {</span>
-<span class="source-line-no">086</span><span id="line-86">                        rpcTool.printError(this, "JSON-RPC Exception: " + e.getMessage());</span>
-<span class="source-line-no">087</span><span id="line-87">                        throw new ToolException(1, e.getMessage());</span>
-<span class="source-line-no">088</span><span id="line-88">                    }</span>
-<span class="source-line-no">089</span><span id="line-89">                    if (!available) {</span>
-<span class="source-line-no">090</span><span id="line-90">                        rpcTool.printError(this,"Timeout error.");</span>
-<span class="source-line-no">091</span><span id="line-91">                        throw new ToolException(1, "Timeout error.");</span>
-<span class="source-line-no">092</span><span id="line-92">                    }</span>
-<span class="source-line-no">093</span><span id="line-93">                }</span>
-<span class="source-line-no">094</span><span id="line-94">            }</span>
-<span class="source-line-no">095</span><span id="line-95">            return client;</span>
-<span class="source-line-no">096</span><span id="line-96">        }</span>
-<span class="source-line-no">097</span><span id="line-97"></span>
-<span class="source-line-no">098</span><span id="line-98">        @Override</span>
-<span class="source-line-no">099</span><span id="line-99">        public BitcoinClient rpcClient() {</span>
-<span class="source-line-no">100</span><span id="line-100">            SSLContext sslContext;</span>
-<span class="source-line-no">101</span><span id="line-101">            try {</span>
-<span class="source-line-no">102</span><span id="line-102">                sslContext = SSLContext.getDefault();</span>
-<span class="source-line-no">103</span><span id="line-103">            } catch (NoSuchAlgorithmException e) {</span>
-<span class="source-line-no">104</span><span id="line-104">                throw new RuntimeException(e);</span>
-<span class="source-line-no">105</span><span id="line-105">            }</span>
-<span class="source-line-no">106</span><span id="line-106">            return rpcClient(sslContext);</span>
-<span class="source-line-no">107</span><span id="line-107">        }</span>
-<span class="source-line-no">108</span><span id="line-108"></span>
-<span class="source-line-no">109</span><span id="line-109">        /**</span>
-<span class="source-line-no">110</span><span id="line-110">         * Override this method to customize the client implementation subclass</span>
-<span class="source-line-no">111</span><span id="line-111">         * @param config Configuration information for connecting to server</span>
-<span class="source-line-no">112</span><span id="line-112">         * @return a newly constructed BitcoinClient with specified config</span>
-<span class="source-line-no">113</span><span id="line-113">         */</span>
-<span class="source-line-no">114</span><span id="line-114">        protected BitcoinClient createClient(SSLContext sslContext, RpcConfig config) {</span>
-<span class="source-line-no">115</span><span id="line-115">            return new BitcoinClient( sslContext, config.network(),</span>
-<span class="source-line-no">116</span><span id="line-116">                    config.getURI(),</span>
-<span class="source-line-no">117</span><span id="line-117">                    config.getUsername(),</span>
-<span class="source-line-no">118</span><span id="line-118">                    config.getPassword());</span>
-<span class="source-line-no">119</span><span id="line-119">        }</span>
-<span class="source-line-no">120</span><span id="line-120"></span>
-<span class="source-line-no">121</span><span id="line-121">        public RpcConfig getRPCConfig() {</span>
-<span class="source-line-no">122</span><span id="line-122">            RpcConfig confFileConfig = BitcoinConfFile.readDefaultConfig().getRPCConfig();</span>
-<span class="source-line-no">123</span><span id="line-123">            URI uri = getServerURI(confFileConfig.getURI());</span>
-<span class="source-line-no">124</span><span id="line-124">            String user = line.getOptionValue("rpcuser", confFileConfig.getUsername());</span>
-<span class="source-line-no">125</span><span id="line-125">            String pass = line.getOptionValue("rpcpassword", confFileConfig.getPassword());</span>
-<span class="source-line-no">126</span><span id="line-126">            Network network;</span>
-<span class="source-line-no">127</span><span id="line-127">            if (line.hasOption("regtest")) {</span>
-<span class="source-line-no">128</span><span id="line-128">                network = BitcoinNetwork.REGTEST;</span>
-<span class="source-line-no">129</span><span id="line-129">            } else if (line.hasOption(("testnet"))) {</span>
-<span class="source-line-no">130</span><span id="line-130">                network = BitcoinNetwork.TESTNET;</span>
-<span class="source-line-no">131</span><span id="line-131">            } else {</span>
-<span class="source-line-no">132</span><span id="line-132">                // TODO: Use network params from BitcoinConfFile, before falling back</span>
-<span class="source-line-no">133</span><span id="line-133">                network =BitcoinNetwork.MAINNET;</span>
-<span class="source-line-no">134</span><span id="line-134">            }</span>
-<span class="source-line-no">135</span><span id="line-135">            return new RpcConfig(network, uri, user, pass);</span>
-<span class="source-line-no">136</span><span id="line-136">        }</span>
-<span class="source-line-no">137</span><span id="line-137"></span>
-<span class="source-line-no">138</span><span id="line-138">        private URI getServerURI(URI confFileURI) {</span>
-<span class="source-line-no">139</span><span id="line-139">            String scheme = confFileURI.getScheme();</span>
-<span class="source-line-no">140</span><span id="line-140">            String host = confFileURI.getHost();</span>
-<span class="source-line-no">141</span><span id="line-141">            int port = confFileURI.getPort();</span>
-<span class="source-line-no">142</span><span id="line-142">            String file = confFileURI.getPath();</span>
-<span class="source-line-no">143</span><span id="line-143"></span>
-<span class="source-line-no">144</span><span id="line-144">            if (line.hasOption("rpcssl")) {</span>
-<span class="source-line-no">145</span><span id="line-145">                scheme = "https";</span>
-<span class="source-line-no">146</span><span id="line-146">            }</span>
-<span class="source-line-no">147</span><span id="line-147">            if (line.hasOption("rpcconnect")) {</span>
-<span class="source-line-no">148</span><span id="line-148">                host = line.getOptionValue("rpcconnect", host);</span>
-<span class="source-line-no">149</span><span id="line-149">            }</span>
-<span class="source-line-no">150</span><span id="line-150">            if (line.hasOption("regtest"))  {</span>
-<span class="source-line-no">151</span><span id="line-151">                port = RPCPORT_REGTEST;</span>
-<span class="source-line-no">152</span><span id="line-152">            } else if (line.hasOption("testnet")) {</span>
-<span class="source-line-no">153</span><span id="line-153">                port = RPCPORT_TESTNET;</span>
-<span class="source-line-no">154</span><span id="line-154">            }</span>
-<span class="source-line-no">155</span><span id="line-155">            if (line.hasOption("rpcport")) {</span>
-<span class="source-line-no">156</span><span id="line-156">                String portString = line.getOptionValue("rpcport");</span>
-<span class="source-line-no">157</span><span id="line-157">                port = Integer.parseInt(portString);</span>
-<span class="source-line-no">158</span><span id="line-158">            }</span>
-<span class="source-line-no">159</span><span id="line-159">            URI rpcServerURI = null;</span>
-<span class="source-line-no">160</span><span id="line-160">            try {</span>
-<span class="source-line-no">161</span><span id="line-161">                rpcServerURI = new URI(scheme, null, host, port, file, null, null);</span>
-<span class="source-line-no">162</span><span id="line-162">            } catch (URISyntaxException e) {</span>
-<span class="source-line-no">163</span><span id="line-163">                // We should be careful that this never happens</span>
-<span class="source-line-no">164</span><span id="line-164">                e.printStackTrace();</span>
-<span class="source-line-no">165</span><span id="line-165">                // But if it does, throw an unchecked exception</span>
-<span class="source-line-no">166</span><span id="line-166">                throw new RuntimeException(e);</span>
-<span class="source-line-no">167</span><span id="line-167">            }</span>
-<span class="source-line-no">168</span><span id="line-168">            return rpcServerURI;</span>
-<span class="source-line-no">169</span><span id="line-169">        }</span>
-<span class="source-line-no">170</span><span id="line-170"></span>
+<span class="source-line-no">017</span><span id="line-17">import java.time.Duration;</span>
+<span class="source-line-no">018</span><span id="line-18"></span>
+<span class="source-line-no">019</span><span id="line-19">import static org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_REGTEST;</span>
+<span class="source-line-no">020</span><span id="line-20">import static org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_TESTNET;</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">/**</span>
+<span class="source-line-no">023</span><span id="line-23"> * An attempt at cloning the {@code bitcoin-cli} tool, but using Java and &lt;b&gt;bitcoinj&lt;/b&gt;.</span>
+<span class="source-line-no">024</span><span id="line-24"> * The generic JSON-RPC client in {@code consensusj-jsonrpc-cli} is better-maintained.</span>
+<span class="source-line-no">025</span><span id="line-25"> */</span>
+<span class="source-line-no">026</span><span id="line-26">public class BitcoinCLITool extends BaseJsonRpcTool {</span>
+<span class="source-line-no">027</span><span id="line-27">    public final static String commandName = "cj-bitcoin-cli";</span>
+<span class="source-line-no">028</span><span id="line-28">    private final Options options;</span>
+<span class="source-line-no">029</span><span id="line-29"></span>
+<span class="source-line-no">030</span><span id="line-30">    public BitcoinCLITool() {</span>
+<span class="source-line-no">031</span><span id="line-31">        this.options = new BitcoinRpcCliOptions();</span>
+<span class="source-line-no">032</span><span id="line-32">    }</span>
+<span class="source-line-no">033</span><span id="line-33"></span>
+<span class="source-line-no">034</span><span id="line-34">    @Override</span>
+<span class="source-line-no">035</span><span id="line-35">    public String name() {</span>
+<span class="source-line-no">036</span><span id="line-36">        return commandName;</span>
+<span class="source-line-no">037</span><span id="line-37">    }</span>
+<span class="source-line-no">038</span><span id="line-38"></span>
+<span class="source-line-no">039</span><span id="line-39">    @Override</span>
+<span class="source-line-no">040</span><span id="line-40">    public Options options() {</span>
+<span class="source-line-no">041</span><span id="line-41">        return options;</span>
+<span class="source-line-no">042</span><span id="line-42">    }</span>
+<span class="source-line-no">043</span><span id="line-43"></span>
+<span class="source-line-no">044</span><span id="line-44">    /**</span>
+<span class="source-line-no">045</span><span id="line-45">     * main method for bitcoinj-cli tool.</span>
+<span class="source-line-no">046</span><span id="line-46">     * &lt;p&gt;</span>
+<span class="source-line-no">047</span><span id="line-47">     * See {@link BitcoinRpcCliOptions} for options and &lt;a href="https://bitcoin.org/en/developer-reference#bitcoin-core-apis"&gt;Bitcoin Core JSON-RPC API&lt;/a&gt;</span>
+<span class="source-line-no">048</span><span id="line-48">     * for the methods and parameters. Users can use {@code -?} to get general help or {@code help &lt;command&gt;} to get help</span>
+<span class="source-line-no">049</span><span id="line-49">     * on a specific command.</span>
+<span class="source-line-no">050</span><span id="line-50">     *</span>
+<span class="source-line-no">051</span><span id="line-51">     * @param args options, JSON-RPC method, JSON-RPC parameters</span>
+<span class="source-line-no">052</span><span id="line-52">     */</span>
+<span class="source-line-no">053</span><span id="line-53">    public static void main(String[] args) {</span>
+<span class="source-line-no">054</span><span id="line-54">        BitcoinCLITool command = new BitcoinCLITool();</span>
+<span class="source-line-no">055</span><span id="line-55">        int status = command.run(System.out, System.err, args);</span>
+<span class="source-line-no">056</span><span id="line-56">        System.exit(status);</span>
+<span class="source-line-no">057</span><span id="line-57">    }</span>
+<span class="source-line-no">058</span><span id="line-58"></span>
+<span class="source-line-no">059</span><span id="line-59">    @Override</span>
+<span class="source-line-no">060</span><span id="line-60">    public BitcoinCLICall createCall(PrintWriter out, PrintWriter err, String... args) {</span>
+<span class="source-line-no">061</span><span id="line-61">        return new BitcoinCLICall(this, out, err, args);</span>
+<span class="source-line-no">062</span><span id="line-62">    }</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64">    public static class BitcoinCLICall extends BaseJsonRpcTool.CommonsCLICall {</span>
+<span class="source-line-no">065</span><span id="line-65">        private BitcoinClient client;</span>
+<span class="source-line-no">066</span><span id="line-66">        private final boolean rpcWait;</span>
+<span class="source-line-no">067</span><span id="line-67"></span>
+<span class="source-line-no">068</span><span id="line-68">        public BitcoinCLICall(BitcoinCLITool tool, PrintWriter out, PrintWriter err, String[] args) {</span>
+<span class="source-line-no">069</span><span id="line-69">            super(tool, out, err, args);</span>
+<span class="source-line-no">070</span><span id="line-70">            rpcWait = line.hasOption("rpcwait");</span>
+<span class="source-line-no">071</span><span id="line-71">        }</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73">        @Override</span>
+<span class="source-line-no">074</span><span id="line-74">        public BitcoinClient rpcClient(SSLContext sslContext) {</span>
+<span class="source-line-no">075</span><span id="line-75">            // Not threadsafe</span>
+<span class="source-line-no">076</span><span id="line-76">            // This needs work if there are ever going to be multiple clients calling this method</span>
+<span class="source-line-no">077</span><span id="line-77">            if (client == null) {</span>
+<span class="source-line-no">078</span><span id="line-78">                RpcConfig config = getRPCConfig();</span>
+<span class="source-line-no">079</span><span id="line-79">                client = createClient(sslContext, config);</span>
+<span class="source-line-no">080</span><span id="line-80">                if (rpcWait) {</span>
+<span class="source-line-no">081</span><span id="line-81">                    // TODO: Add logging here to replace the System.out.println</span>
+<span class="source-line-no">082</span><span id="line-82">                    //System.out.println("Connecting to: " + getRPCConfig().getURI() + " with -rpcWait");</span>
+<span class="source-line-no">083</span><span id="line-83">                    boolean available = false;   // Wait up to 1 hour</span>
+<span class="source-line-no">084</span><span id="line-84">                    try {</span>
+<span class="source-line-no">085</span><span id="line-85">                        available = client.waitForServer(Duration.ofMinutes(60));</span>
+<span class="source-line-no">086</span><span id="line-86">                    } catch (JsonRpcException e) {</span>
+<span class="source-line-no">087</span><span id="line-87">                        rpcTool.printError(this, "JSON-RPC Exception: " + e.getMessage());</span>
+<span class="source-line-no">088</span><span id="line-88">                        throw new ToolException(1, e.getMessage());</span>
+<span class="source-line-no">089</span><span id="line-89">                    }</span>
+<span class="source-line-no">090</span><span id="line-90">                    if (!available) {</span>
+<span class="source-line-no">091</span><span id="line-91">                        rpcTool.printError(this,"Timeout error.");</span>
+<span class="source-line-no">092</span><span id="line-92">                        throw new ToolException(1, "Timeout error.");</span>
+<span class="source-line-no">093</span><span id="line-93">                    }</span>
+<span class="source-line-no">094</span><span id="line-94">                }</span>
+<span class="source-line-no">095</span><span id="line-95">            }</span>
+<span class="source-line-no">096</span><span id="line-96">            return client;</span>
+<span class="source-line-no">097</span><span id="line-97">        }</span>
+<span class="source-line-no">098</span><span id="line-98"></span>
+<span class="source-line-no">099</span><span id="line-99">        @Override</span>
+<span class="source-line-no">100</span><span id="line-100">        public BitcoinClient rpcClient() {</span>
+<span class="source-line-no">101</span><span id="line-101">            SSLContext sslContext;</span>
+<span class="source-line-no">102</span><span id="line-102">            try {</span>
+<span class="source-line-no">103</span><span id="line-103">                sslContext = SSLContext.getDefault();</span>
+<span class="source-line-no">104</span><span id="line-104">            } catch (NoSuchAlgorithmException e) {</span>
+<span class="source-line-no">105</span><span id="line-105">                throw new RuntimeException(e);</span>
+<span class="source-line-no">106</span><span id="line-106">            }</span>
+<span class="source-line-no">107</span><span id="line-107">            return rpcClient(sslContext);</span>
+<span class="source-line-no">108</span><span id="line-108">        }</span>
+<span class="source-line-no">109</span><span id="line-109"></span>
+<span class="source-line-no">110</span><span id="line-110">        /**</span>
+<span class="source-line-no">111</span><span id="line-111">         * Override this method to customize the client implementation subclass</span>
+<span class="source-line-no">112</span><span id="line-112">         * @param config Configuration information for connecting to server</span>
+<span class="source-line-no">113</span><span id="line-113">         * @return a newly constructed BitcoinClient with specified config</span>
+<span class="source-line-no">114</span><span id="line-114">         */</span>
+<span class="source-line-no">115</span><span id="line-115">        protected BitcoinClient createClient(SSLContext sslContext, RpcConfig config) {</span>
+<span class="source-line-no">116</span><span id="line-116">            return new BitcoinClient( sslContext, config.network(),</span>
+<span class="source-line-no">117</span><span id="line-117">                    config.getURI(),</span>
+<span class="source-line-no">118</span><span id="line-118">                    config.getUsername(),</span>
+<span class="source-line-no">119</span><span id="line-119">                    config.getPassword());</span>
+<span class="source-line-no">120</span><span id="line-120">        }</span>
+<span class="source-line-no">121</span><span id="line-121"></span>
+<span class="source-line-no">122</span><span id="line-122">        public RpcConfig getRPCConfig() {</span>
+<span class="source-line-no">123</span><span id="line-123">            RpcConfig confFileConfig = BitcoinConfFile.readDefaultConfig().getRPCConfig();</span>
+<span class="source-line-no">124</span><span id="line-124">            URI uri = getServerURI(confFileConfig.getURI());</span>
+<span class="source-line-no">125</span><span id="line-125">            String user = line.getOptionValue("rpcuser", confFileConfig.getUsername());</span>
+<span class="source-line-no">126</span><span id="line-126">            String pass = line.getOptionValue("rpcpassword", confFileConfig.getPassword());</span>
+<span class="source-line-no">127</span><span id="line-127">            Network network;</span>
+<span class="source-line-no">128</span><span id="line-128">            if (line.hasOption("regtest")) {</span>
+<span class="source-line-no">129</span><span id="line-129">                network = BitcoinNetwork.REGTEST;</span>
+<span class="source-line-no">130</span><span id="line-130">            } else if (line.hasOption(("testnet"))) {</span>
+<span class="source-line-no">131</span><span id="line-131">                network = BitcoinNetwork.TESTNET;</span>
+<span class="source-line-no">132</span><span id="line-132">            } else {</span>
+<span class="source-line-no">133</span><span id="line-133">                // TODO: Use network params from BitcoinConfFile, before falling back</span>
+<span class="source-line-no">134</span><span id="line-134">                network =BitcoinNetwork.MAINNET;</span>
+<span class="source-line-no">135</span><span id="line-135">            }</span>
+<span class="source-line-no">136</span><span id="line-136">            return new RpcConfig(network, uri, user, pass);</span>
+<span class="source-line-no">137</span><span id="line-137">        }</span>
+<span class="source-line-no">138</span><span id="line-138"></span>
+<span class="source-line-no">139</span><span id="line-139">        private URI getServerURI(URI confFileURI) {</span>
+<span class="source-line-no">140</span><span id="line-140">            String scheme = confFileURI.getScheme();</span>
+<span class="source-line-no">141</span><span id="line-141">            String host = confFileURI.getHost();</span>
+<span class="source-line-no">142</span><span id="line-142">            int port = confFileURI.getPort();</span>
+<span class="source-line-no">143</span><span id="line-143">            String file = confFileURI.getPath();</span>
+<span class="source-line-no">144</span><span id="line-144"></span>
+<span class="source-line-no">145</span><span id="line-145">            if (line.hasOption("rpcssl")) {</span>
+<span class="source-line-no">146</span><span id="line-146">                scheme = "https";</span>
+<span class="source-line-no">147</span><span id="line-147">            }</span>
+<span class="source-line-no">148</span><span id="line-148">            if (line.hasOption("rpcconnect")) {</span>
+<span class="source-line-no">149</span><span id="line-149">                host = line.getOptionValue("rpcconnect", host);</span>
+<span class="source-line-no">150</span><span id="line-150">            }</span>
+<span class="source-line-no">151</span><span id="line-151">            if (line.hasOption("regtest"))  {</span>
+<span class="source-line-no">152</span><span id="line-152">                port = RPCPORT_REGTEST;</span>
+<span class="source-line-no">153</span><span id="line-153">            } else if (line.hasOption("testnet")) {</span>
+<span class="source-line-no">154</span><span id="line-154">                port = RPCPORT_TESTNET;</span>
+<span class="source-line-no">155</span><span id="line-155">            }</span>
+<span class="source-line-no">156</span><span id="line-156">            if (line.hasOption("rpcport")) {</span>
+<span class="source-line-no">157</span><span id="line-157">                String portString = line.getOptionValue("rpcport");</span>
+<span class="source-line-no">158</span><span id="line-158">                port = Integer.parseInt(portString);</span>
+<span class="source-line-no">159</span><span id="line-159">            }</span>
+<span class="source-line-no">160</span><span id="line-160">            URI rpcServerURI = null;</span>
+<span class="source-line-no">161</span><span id="line-161">            try {</span>
+<span class="source-line-no">162</span><span id="line-162">                rpcServerURI = new URI(scheme, null, host, port, file, null, null);</span>
+<span class="source-line-no">163</span><span id="line-163">            } catch (URISyntaxException e) {</span>
+<span class="source-line-no">164</span><span id="line-164">                // We should be careful that this never happens</span>
+<span class="source-line-no">165</span><span id="line-165">                e.printStackTrace();</span>
+<span class="source-line-no">166</span><span id="line-166">                // But if it does, throw an unchecked exception</span>
+<span class="source-line-no">167</span><span id="line-167">                throw new RuntimeException(e);</span>
+<span class="source-line-no">168</span><span id="line-168">            }</span>
+<span class="source-line-no">169</span><span id="line-169">            return rpcServerURI;</span>
+<span class="source-line-no">170</span><span id="line-170">        }</span>
 <span class="source-line-no">171</span><span id="line-171"></span>
-<span class="source-line-no">172</span><span id="line-172">    }</span>
-<span class="source-line-no">173</span><span id="line-173">}</span>
+<span class="source-line-no">172</span><span id="line-172"></span>
+<span class="source-line-no">173</span><span id="line-173">    }</span>
+<span class="source-line-no">174</span><span id="line-174">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html b/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html
index 85830af73..76e154f6b 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinCLITool.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.cli, class: BitcoinCLITool">
@@ -27,163 +27,164 @@
 <span class="source-line-no">014</span><span id="line-14">import java.net.URI;</span>
 <span class="source-line-no">015</span><span id="line-15">import java.net.URISyntaxException;</span>
 <span class="source-line-no">016</span><span id="line-16">import java.security.NoSuchAlgorithmException;</span>
-<span class="source-line-no">017</span><span id="line-17"></span>
-<span class="source-line-no">018</span><span id="line-18">import static org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_REGTEST;</span>
-<span class="source-line-no">019</span><span id="line-19">import static org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_TESTNET;</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">/**</span>
-<span class="source-line-no">022</span><span id="line-22"> * An attempt at cloning the {@code bitcoin-cli} tool, but using Java and &lt;b&gt;bitcoinj&lt;/b&gt;.</span>
-<span class="source-line-no">023</span><span id="line-23"> * The generic JSON-RPC client in {@code consensusj-jsonrpc-cli} is better-maintained.</span>
-<span class="source-line-no">024</span><span id="line-24"> */</span>
-<span class="source-line-no">025</span><span id="line-25">public class BitcoinCLITool extends BaseJsonRpcTool {</span>
-<span class="source-line-no">026</span><span id="line-26">    public final static String commandName = "cj-bitcoin-cli";</span>
-<span class="source-line-no">027</span><span id="line-27">    private final Options options;</span>
-<span class="source-line-no">028</span><span id="line-28"></span>
-<span class="source-line-no">029</span><span id="line-29">    public BitcoinCLITool() {</span>
-<span class="source-line-no">030</span><span id="line-30">        this.options = new BitcoinRpcCliOptions();</span>
-<span class="source-line-no">031</span><span id="line-31">    }</span>
-<span class="source-line-no">032</span><span id="line-32"></span>
-<span class="source-line-no">033</span><span id="line-33">    @Override</span>
-<span class="source-line-no">034</span><span id="line-34">    public String name() {</span>
-<span class="source-line-no">035</span><span id="line-35">        return commandName;</span>
-<span class="source-line-no">036</span><span id="line-36">    }</span>
-<span class="source-line-no">037</span><span id="line-37"></span>
-<span class="source-line-no">038</span><span id="line-38">    @Override</span>
-<span class="source-line-no">039</span><span id="line-39">    public Options options() {</span>
-<span class="source-line-no">040</span><span id="line-40">        return options;</span>
-<span class="source-line-no">041</span><span id="line-41">    }</span>
-<span class="source-line-no">042</span><span id="line-42"></span>
-<span class="source-line-no">043</span><span id="line-43">    /**</span>
-<span class="source-line-no">044</span><span id="line-44">     * main method for bitcoinj-cli tool.</span>
-<span class="source-line-no">045</span><span id="line-45">     * &lt;p&gt;</span>
-<span class="source-line-no">046</span><span id="line-46">     * See {@link BitcoinRpcCliOptions} for options and &lt;a href="https://bitcoin.org/en/developer-reference#bitcoin-core-apis"&gt;Bitcoin Core JSON-RPC API&lt;/a&gt;</span>
-<span class="source-line-no">047</span><span id="line-47">     * for the methods and parameters. Users can use {@code -?} to get general help or {@code help &lt;command&gt;} to get help</span>
-<span class="source-line-no">048</span><span id="line-48">     * on a specific command.</span>
-<span class="source-line-no">049</span><span id="line-49">     *</span>
-<span class="source-line-no">050</span><span id="line-50">     * @param args options, JSON-RPC method, JSON-RPC parameters</span>
-<span class="source-line-no">051</span><span id="line-51">     */</span>
-<span class="source-line-no">052</span><span id="line-52">    public static void main(String[] args) {</span>
-<span class="source-line-no">053</span><span id="line-53">        BitcoinCLITool command = new BitcoinCLITool();</span>
-<span class="source-line-no">054</span><span id="line-54">        int status = command.run(System.out, System.err, args);</span>
-<span class="source-line-no">055</span><span id="line-55">        System.exit(status);</span>
-<span class="source-line-no">056</span><span id="line-56">    }</span>
-<span class="source-line-no">057</span><span id="line-57"></span>
-<span class="source-line-no">058</span><span id="line-58">    @Override</span>
-<span class="source-line-no">059</span><span id="line-59">    public BitcoinCLICall createCall(PrintWriter out, PrintWriter err, String... args) {</span>
-<span class="source-line-no">060</span><span id="line-60">        return new BitcoinCLICall(this, out, err, args);</span>
-<span class="source-line-no">061</span><span id="line-61">    }</span>
-<span class="source-line-no">062</span><span id="line-62"></span>
-<span class="source-line-no">063</span><span id="line-63">    public static class BitcoinCLICall extends BaseJsonRpcTool.CommonsCLICall {</span>
-<span class="source-line-no">064</span><span id="line-64">        private BitcoinClient client;</span>
-<span class="source-line-no">065</span><span id="line-65">        private final boolean rpcWait;</span>
-<span class="source-line-no">066</span><span id="line-66"></span>
-<span class="source-line-no">067</span><span id="line-67">        public BitcoinCLICall(BitcoinCLITool tool, PrintWriter out, PrintWriter err, String[] args) {</span>
-<span class="source-line-no">068</span><span id="line-68">            super(tool, out, err, args);</span>
-<span class="source-line-no">069</span><span id="line-69">            rpcWait = line.hasOption("rpcwait");</span>
-<span class="source-line-no">070</span><span id="line-70">        }</span>
-<span class="source-line-no">071</span><span id="line-71"></span>
-<span class="source-line-no">072</span><span id="line-72">        @Override</span>
-<span class="source-line-no">073</span><span id="line-73">        public BitcoinClient rpcClient(SSLContext sslContext) {</span>
-<span class="source-line-no">074</span><span id="line-74">            // Not threadsafe</span>
-<span class="source-line-no">075</span><span id="line-75">            // This needs work if there are ever going to be multiple clients calling this method</span>
-<span class="source-line-no">076</span><span id="line-76">            if (client == null) {</span>
-<span class="source-line-no">077</span><span id="line-77">                RpcConfig config = getRPCConfig();</span>
-<span class="source-line-no">078</span><span id="line-78">                client = createClient(sslContext, config);</span>
-<span class="source-line-no">079</span><span id="line-79">                if (rpcWait) {</span>
-<span class="source-line-no">080</span><span id="line-80">                    // TODO: Add logging here to replace the System.out.println</span>
-<span class="source-line-no">081</span><span id="line-81">                    //System.out.println("Connecting to: " + getRPCConfig().getURI() + " with -rpcWait");</span>
-<span class="source-line-no">082</span><span id="line-82">                    boolean available = false;   // Wait up to 1 hour</span>
-<span class="source-line-no">083</span><span id="line-83">                    try {</span>
-<span class="source-line-no">084</span><span id="line-84">                        available = client.waitForServer(60*60);</span>
-<span class="source-line-no">085</span><span id="line-85">                    } catch (JsonRpcException e) {</span>
-<span class="source-line-no">086</span><span id="line-86">                        rpcTool.printError(this, "JSON-RPC Exception: " + e.getMessage());</span>
-<span class="source-line-no">087</span><span id="line-87">                        throw new ToolException(1, e.getMessage());</span>
-<span class="source-line-no">088</span><span id="line-88">                    }</span>
-<span class="source-line-no">089</span><span id="line-89">                    if (!available) {</span>
-<span class="source-line-no">090</span><span id="line-90">                        rpcTool.printError(this,"Timeout error.");</span>
-<span class="source-line-no">091</span><span id="line-91">                        throw new ToolException(1, "Timeout error.");</span>
-<span class="source-line-no">092</span><span id="line-92">                    }</span>
-<span class="source-line-no">093</span><span id="line-93">                }</span>
-<span class="source-line-no">094</span><span id="line-94">            }</span>
-<span class="source-line-no">095</span><span id="line-95">            return client;</span>
-<span class="source-line-no">096</span><span id="line-96">        }</span>
-<span class="source-line-no">097</span><span id="line-97"></span>
-<span class="source-line-no">098</span><span id="line-98">        @Override</span>
-<span class="source-line-no">099</span><span id="line-99">        public BitcoinClient rpcClient() {</span>
-<span class="source-line-no">100</span><span id="line-100">            SSLContext sslContext;</span>
-<span class="source-line-no">101</span><span id="line-101">            try {</span>
-<span class="source-line-no">102</span><span id="line-102">                sslContext = SSLContext.getDefault();</span>
-<span class="source-line-no">103</span><span id="line-103">            } catch (NoSuchAlgorithmException e) {</span>
-<span class="source-line-no">104</span><span id="line-104">                throw new RuntimeException(e);</span>
-<span class="source-line-no">105</span><span id="line-105">            }</span>
-<span class="source-line-no">106</span><span id="line-106">            return rpcClient(sslContext);</span>
-<span class="source-line-no">107</span><span id="line-107">        }</span>
-<span class="source-line-no">108</span><span id="line-108"></span>
-<span class="source-line-no">109</span><span id="line-109">        /**</span>
-<span class="source-line-no">110</span><span id="line-110">         * Override this method to customize the client implementation subclass</span>
-<span class="source-line-no">111</span><span id="line-111">         * @param config Configuration information for connecting to server</span>
-<span class="source-line-no">112</span><span id="line-112">         * @return a newly constructed BitcoinClient with specified config</span>
-<span class="source-line-no">113</span><span id="line-113">         */</span>
-<span class="source-line-no">114</span><span id="line-114">        protected BitcoinClient createClient(SSLContext sslContext, RpcConfig config) {</span>
-<span class="source-line-no">115</span><span id="line-115">            return new BitcoinClient( sslContext, config.network(),</span>
-<span class="source-line-no">116</span><span id="line-116">                    config.getURI(),</span>
-<span class="source-line-no">117</span><span id="line-117">                    config.getUsername(),</span>
-<span class="source-line-no">118</span><span id="line-118">                    config.getPassword());</span>
-<span class="source-line-no">119</span><span id="line-119">        }</span>
-<span class="source-line-no">120</span><span id="line-120"></span>
-<span class="source-line-no">121</span><span id="line-121">        public RpcConfig getRPCConfig() {</span>
-<span class="source-line-no">122</span><span id="line-122">            RpcConfig confFileConfig = BitcoinConfFile.readDefaultConfig().getRPCConfig();</span>
-<span class="source-line-no">123</span><span id="line-123">            URI uri = getServerURI(confFileConfig.getURI());</span>
-<span class="source-line-no">124</span><span id="line-124">            String user = line.getOptionValue("rpcuser", confFileConfig.getUsername());</span>
-<span class="source-line-no">125</span><span id="line-125">            String pass = line.getOptionValue("rpcpassword", confFileConfig.getPassword());</span>
-<span class="source-line-no">126</span><span id="line-126">            Network network;</span>
-<span class="source-line-no">127</span><span id="line-127">            if (line.hasOption("regtest")) {</span>
-<span class="source-line-no">128</span><span id="line-128">                network = BitcoinNetwork.REGTEST;</span>
-<span class="source-line-no">129</span><span id="line-129">            } else if (line.hasOption(("testnet"))) {</span>
-<span class="source-line-no">130</span><span id="line-130">                network = BitcoinNetwork.TESTNET;</span>
-<span class="source-line-no">131</span><span id="line-131">            } else {</span>
-<span class="source-line-no">132</span><span id="line-132">                // TODO: Use network params from BitcoinConfFile, before falling back</span>
-<span class="source-line-no">133</span><span id="line-133">                network =BitcoinNetwork.MAINNET;</span>
-<span class="source-line-no">134</span><span id="line-134">            }</span>
-<span class="source-line-no">135</span><span id="line-135">            return new RpcConfig(network, uri, user, pass);</span>
-<span class="source-line-no">136</span><span id="line-136">        }</span>
-<span class="source-line-no">137</span><span id="line-137"></span>
-<span class="source-line-no">138</span><span id="line-138">        private URI getServerURI(URI confFileURI) {</span>
-<span class="source-line-no">139</span><span id="line-139">            String scheme = confFileURI.getScheme();</span>
-<span class="source-line-no">140</span><span id="line-140">            String host = confFileURI.getHost();</span>
-<span class="source-line-no">141</span><span id="line-141">            int port = confFileURI.getPort();</span>
-<span class="source-line-no">142</span><span id="line-142">            String file = confFileURI.getPath();</span>
-<span class="source-line-no">143</span><span id="line-143"></span>
-<span class="source-line-no">144</span><span id="line-144">            if (line.hasOption("rpcssl")) {</span>
-<span class="source-line-no">145</span><span id="line-145">                scheme = "https";</span>
-<span class="source-line-no">146</span><span id="line-146">            }</span>
-<span class="source-line-no">147</span><span id="line-147">            if (line.hasOption("rpcconnect")) {</span>
-<span class="source-line-no">148</span><span id="line-148">                host = line.getOptionValue("rpcconnect", host);</span>
-<span class="source-line-no">149</span><span id="line-149">            }</span>
-<span class="source-line-no">150</span><span id="line-150">            if (line.hasOption("regtest"))  {</span>
-<span class="source-line-no">151</span><span id="line-151">                port = RPCPORT_REGTEST;</span>
-<span class="source-line-no">152</span><span id="line-152">            } else if (line.hasOption("testnet")) {</span>
-<span class="source-line-no">153</span><span id="line-153">                port = RPCPORT_TESTNET;</span>
-<span class="source-line-no">154</span><span id="line-154">            }</span>
-<span class="source-line-no">155</span><span id="line-155">            if (line.hasOption("rpcport")) {</span>
-<span class="source-line-no">156</span><span id="line-156">                String portString = line.getOptionValue("rpcport");</span>
-<span class="source-line-no">157</span><span id="line-157">                port = Integer.parseInt(portString);</span>
-<span class="source-line-no">158</span><span id="line-158">            }</span>
-<span class="source-line-no">159</span><span id="line-159">            URI rpcServerURI = null;</span>
-<span class="source-line-no">160</span><span id="line-160">            try {</span>
-<span class="source-line-no">161</span><span id="line-161">                rpcServerURI = new URI(scheme, null, host, port, file, null, null);</span>
-<span class="source-line-no">162</span><span id="line-162">            } catch (URISyntaxException e) {</span>
-<span class="source-line-no">163</span><span id="line-163">                // We should be careful that this never happens</span>
-<span class="source-line-no">164</span><span id="line-164">                e.printStackTrace();</span>
-<span class="source-line-no">165</span><span id="line-165">                // But if it does, throw an unchecked exception</span>
-<span class="source-line-no">166</span><span id="line-166">                throw new RuntimeException(e);</span>
-<span class="source-line-no">167</span><span id="line-167">            }</span>
-<span class="source-line-no">168</span><span id="line-168">            return rpcServerURI;</span>
-<span class="source-line-no">169</span><span id="line-169">        }</span>
-<span class="source-line-no">170</span><span id="line-170"></span>
+<span class="source-line-no">017</span><span id="line-17">import java.time.Duration;</span>
+<span class="source-line-no">018</span><span id="line-18"></span>
+<span class="source-line-no">019</span><span id="line-19">import static org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_REGTEST;</span>
+<span class="source-line-no">020</span><span id="line-20">import static org.consensusj.bitcoin.jsonrpc.RpcURI.RPCPORT_TESTNET;</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">/**</span>
+<span class="source-line-no">023</span><span id="line-23"> * An attempt at cloning the {@code bitcoin-cli} tool, but using Java and &lt;b&gt;bitcoinj&lt;/b&gt;.</span>
+<span class="source-line-no">024</span><span id="line-24"> * The generic JSON-RPC client in {@code consensusj-jsonrpc-cli} is better-maintained.</span>
+<span class="source-line-no">025</span><span id="line-25"> */</span>
+<span class="source-line-no">026</span><span id="line-26">public class BitcoinCLITool extends BaseJsonRpcTool {</span>
+<span class="source-line-no">027</span><span id="line-27">    public final static String commandName = "cj-bitcoin-cli";</span>
+<span class="source-line-no">028</span><span id="line-28">    private final Options options;</span>
+<span class="source-line-no">029</span><span id="line-29"></span>
+<span class="source-line-no">030</span><span id="line-30">    public BitcoinCLITool() {</span>
+<span class="source-line-no">031</span><span id="line-31">        this.options = new BitcoinRpcCliOptions();</span>
+<span class="source-line-no">032</span><span id="line-32">    }</span>
+<span class="source-line-no">033</span><span id="line-33"></span>
+<span class="source-line-no">034</span><span id="line-34">    @Override</span>
+<span class="source-line-no">035</span><span id="line-35">    public String name() {</span>
+<span class="source-line-no">036</span><span id="line-36">        return commandName;</span>
+<span class="source-line-no">037</span><span id="line-37">    }</span>
+<span class="source-line-no">038</span><span id="line-38"></span>
+<span class="source-line-no">039</span><span id="line-39">    @Override</span>
+<span class="source-line-no">040</span><span id="line-40">    public Options options() {</span>
+<span class="source-line-no">041</span><span id="line-41">        return options;</span>
+<span class="source-line-no">042</span><span id="line-42">    }</span>
+<span class="source-line-no">043</span><span id="line-43"></span>
+<span class="source-line-no">044</span><span id="line-44">    /**</span>
+<span class="source-line-no">045</span><span id="line-45">     * main method for bitcoinj-cli tool.</span>
+<span class="source-line-no">046</span><span id="line-46">     * &lt;p&gt;</span>
+<span class="source-line-no">047</span><span id="line-47">     * See {@link BitcoinRpcCliOptions} for options and &lt;a href="https://bitcoin.org/en/developer-reference#bitcoin-core-apis"&gt;Bitcoin Core JSON-RPC API&lt;/a&gt;</span>
+<span class="source-line-no">048</span><span id="line-48">     * for the methods and parameters. Users can use {@code -?} to get general help or {@code help &lt;command&gt;} to get help</span>
+<span class="source-line-no">049</span><span id="line-49">     * on a specific command.</span>
+<span class="source-line-no">050</span><span id="line-50">     *</span>
+<span class="source-line-no">051</span><span id="line-51">     * @param args options, JSON-RPC method, JSON-RPC parameters</span>
+<span class="source-line-no">052</span><span id="line-52">     */</span>
+<span class="source-line-no">053</span><span id="line-53">    public static void main(String[] args) {</span>
+<span class="source-line-no">054</span><span id="line-54">        BitcoinCLITool command = new BitcoinCLITool();</span>
+<span class="source-line-no">055</span><span id="line-55">        int status = command.run(System.out, System.err, args);</span>
+<span class="source-line-no">056</span><span id="line-56">        System.exit(status);</span>
+<span class="source-line-no">057</span><span id="line-57">    }</span>
+<span class="source-line-no">058</span><span id="line-58"></span>
+<span class="source-line-no">059</span><span id="line-59">    @Override</span>
+<span class="source-line-no">060</span><span id="line-60">    public BitcoinCLICall createCall(PrintWriter out, PrintWriter err, String... args) {</span>
+<span class="source-line-no">061</span><span id="line-61">        return new BitcoinCLICall(this, out, err, args);</span>
+<span class="source-line-no">062</span><span id="line-62">    }</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64">    public static class BitcoinCLICall extends BaseJsonRpcTool.CommonsCLICall {</span>
+<span class="source-line-no">065</span><span id="line-65">        private BitcoinClient client;</span>
+<span class="source-line-no">066</span><span id="line-66">        private final boolean rpcWait;</span>
+<span class="source-line-no">067</span><span id="line-67"></span>
+<span class="source-line-no">068</span><span id="line-68">        public BitcoinCLICall(BitcoinCLITool tool, PrintWriter out, PrintWriter err, String[] args) {</span>
+<span class="source-line-no">069</span><span id="line-69">            super(tool, out, err, args);</span>
+<span class="source-line-no">070</span><span id="line-70">            rpcWait = line.hasOption("rpcwait");</span>
+<span class="source-line-no">071</span><span id="line-71">        }</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73">        @Override</span>
+<span class="source-line-no">074</span><span id="line-74">        public BitcoinClient rpcClient(SSLContext sslContext) {</span>
+<span class="source-line-no">075</span><span id="line-75">            // Not threadsafe</span>
+<span class="source-line-no">076</span><span id="line-76">            // This needs work if there are ever going to be multiple clients calling this method</span>
+<span class="source-line-no">077</span><span id="line-77">            if (client == null) {</span>
+<span class="source-line-no">078</span><span id="line-78">                RpcConfig config = getRPCConfig();</span>
+<span class="source-line-no">079</span><span id="line-79">                client = createClient(sslContext, config);</span>
+<span class="source-line-no">080</span><span id="line-80">                if (rpcWait) {</span>
+<span class="source-line-no">081</span><span id="line-81">                    // TODO: Add logging here to replace the System.out.println</span>
+<span class="source-line-no">082</span><span id="line-82">                    //System.out.println("Connecting to: " + getRPCConfig().getURI() + " with -rpcWait");</span>
+<span class="source-line-no">083</span><span id="line-83">                    boolean available = false;   // Wait up to 1 hour</span>
+<span class="source-line-no">084</span><span id="line-84">                    try {</span>
+<span class="source-line-no">085</span><span id="line-85">                        available = client.waitForServer(Duration.ofMinutes(60));</span>
+<span class="source-line-no">086</span><span id="line-86">                    } catch (JsonRpcException e) {</span>
+<span class="source-line-no">087</span><span id="line-87">                        rpcTool.printError(this, "JSON-RPC Exception: " + e.getMessage());</span>
+<span class="source-line-no">088</span><span id="line-88">                        throw new ToolException(1, e.getMessage());</span>
+<span class="source-line-no">089</span><span id="line-89">                    }</span>
+<span class="source-line-no">090</span><span id="line-90">                    if (!available) {</span>
+<span class="source-line-no">091</span><span id="line-91">                        rpcTool.printError(this,"Timeout error.");</span>
+<span class="source-line-no">092</span><span id="line-92">                        throw new ToolException(1, "Timeout error.");</span>
+<span class="source-line-no">093</span><span id="line-93">                    }</span>
+<span class="source-line-no">094</span><span id="line-94">                }</span>
+<span class="source-line-no">095</span><span id="line-95">            }</span>
+<span class="source-line-no">096</span><span id="line-96">            return client;</span>
+<span class="source-line-no">097</span><span id="line-97">        }</span>
+<span class="source-line-no">098</span><span id="line-98"></span>
+<span class="source-line-no">099</span><span id="line-99">        @Override</span>
+<span class="source-line-no">100</span><span id="line-100">        public BitcoinClient rpcClient() {</span>
+<span class="source-line-no">101</span><span id="line-101">            SSLContext sslContext;</span>
+<span class="source-line-no">102</span><span id="line-102">            try {</span>
+<span class="source-line-no">103</span><span id="line-103">                sslContext = SSLContext.getDefault();</span>
+<span class="source-line-no">104</span><span id="line-104">            } catch (NoSuchAlgorithmException e) {</span>
+<span class="source-line-no">105</span><span id="line-105">                throw new RuntimeException(e);</span>
+<span class="source-line-no">106</span><span id="line-106">            }</span>
+<span class="source-line-no">107</span><span id="line-107">            return rpcClient(sslContext);</span>
+<span class="source-line-no">108</span><span id="line-108">        }</span>
+<span class="source-line-no">109</span><span id="line-109"></span>
+<span class="source-line-no">110</span><span id="line-110">        /**</span>
+<span class="source-line-no">111</span><span id="line-111">         * Override this method to customize the client implementation subclass</span>
+<span class="source-line-no">112</span><span id="line-112">         * @param config Configuration information for connecting to server</span>
+<span class="source-line-no">113</span><span id="line-113">         * @return a newly constructed BitcoinClient with specified config</span>
+<span class="source-line-no">114</span><span id="line-114">         */</span>
+<span class="source-line-no">115</span><span id="line-115">        protected BitcoinClient createClient(SSLContext sslContext, RpcConfig config) {</span>
+<span class="source-line-no">116</span><span id="line-116">            return new BitcoinClient( sslContext, config.network(),</span>
+<span class="source-line-no">117</span><span id="line-117">                    config.getURI(),</span>
+<span class="source-line-no">118</span><span id="line-118">                    config.getUsername(),</span>
+<span class="source-line-no">119</span><span id="line-119">                    config.getPassword());</span>
+<span class="source-line-no">120</span><span id="line-120">        }</span>
+<span class="source-line-no">121</span><span id="line-121"></span>
+<span class="source-line-no">122</span><span id="line-122">        public RpcConfig getRPCConfig() {</span>
+<span class="source-line-no">123</span><span id="line-123">            RpcConfig confFileConfig = BitcoinConfFile.readDefaultConfig().getRPCConfig();</span>
+<span class="source-line-no">124</span><span id="line-124">            URI uri = getServerURI(confFileConfig.getURI());</span>
+<span class="source-line-no">125</span><span id="line-125">            String user = line.getOptionValue("rpcuser", confFileConfig.getUsername());</span>
+<span class="source-line-no">126</span><span id="line-126">            String pass = line.getOptionValue("rpcpassword", confFileConfig.getPassword());</span>
+<span class="source-line-no">127</span><span id="line-127">            Network network;</span>
+<span class="source-line-no">128</span><span id="line-128">            if (line.hasOption("regtest")) {</span>
+<span class="source-line-no">129</span><span id="line-129">                network = BitcoinNetwork.REGTEST;</span>
+<span class="source-line-no">130</span><span id="line-130">            } else if (line.hasOption(("testnet"))) {</span>
+<span class="source-line-no">131</span><span id="line-131">                network = BitcoinNetwork.TESTNET;</span>
+<span class="source-line-no">132</span><span id="line-132">            } else {</span>
+<span class="source-line-no">133</span><span id="line-133">                // TODO: Use network params from BitcoinConfFile, before falling back</span>
+<span class="source-line-no">134</span><span id="line-134">                network =BitcoinNetwork.MAINNET;</span>
+<span class="source-line-no">135</span><span id="line-135">            }</span>
+<span class="source-line-no">136</span><span id="line-136">            return new RpcConfig(network, uri, user, pass);</span>
+<span class="source-line-no">137</span><span id="line-137">        }</span>
+<span class="source-line-no">138</span><span id="line-138"></span>
+<span class="source-line-no">139</span><span id="line-139">        private URI getServerURI(URI confFileURI) {</span>
+<span class="source-line-no">140</span><span id="line-140">            String scheme = confFileURI.getScheme();</span>
+<span class="source-line-no">141</span><span id="line-141">            String host = confFileURI.getHost();</span>
+<span class="source-line-no">142</span><span id="line-142">            int port = confFileURI.getPort();</span>
+<span class="source-line-no">143</span><span id="line-143">            String file = confFileURI.getPath();</span>
+<span class="source-line-no">144</span><span id="line-144"></span>
+<span class="source-line-no">145</span><span id="line-145">            if (line.hasOption("rpcssl")) {</span>
+<span class="source-line-no">146</span><span id="line-146">                scheme = "https";</span>
+<span class="source-line-no">147</span><span id="line-147">            }</span>
+<span class="source-line-no">148</span><span id="line-148">            if (line.hasOption("rpcconnect")) {</span>
+<span class="source-line-no">149</span><span id="line-149">                host = line.getOptionValue("rpcconnect", host);</span>
+<span class="source-line-no">150</span><span id="line-150">            }</span>
+<span class="source-line-no">151</span><span id="line-151">            if (line.hasOption("regtest"))  {</span>
+<span class="source-line-no">152</span><span id="line-152">                port = RPCPORT_REGTEST;</span>
+<span class="source-line-no">153</span><span id="line-153">            } else if (line.hasOption("testnet")) {</span>
+<span class="source-line-no">154</span><span id="line-154">                port = RPCPORT_TESTNET;</span>
+<span class="source-line-no">155</span><span id="line-155">            }</span>
+<span class="source-line-no">156</span><span id="line-156">            if (line.hasOption("rpcport")) {</span>
+<span class="source-line-no">157</span><span id="line-157">                String portString = line.getOptionValue("rpcport");</span>
+<span class="source-line-no">158</span><span id="line-158">                port = Integer.parseInt(portString);</span>
+<span class="source-line-no">159</span><span id="line-159">            }</span>
+<span class="source-line-no">160</span><span id="line-160">            URI rpcServerURI = null;</span>
+<span class="source-line-no">161</span><span id="line-161">            try {</span>
+<span class="source-line-no">162</span><span id="line-162">                rpcServerURI = new URI(scheme, null, host, port, file, null, null);</span>
+<span class="source-line-no">163</span><span id="line-163">            } catch (URISyntaxException e) {</span>
+<span class="source-line-no">164</span><span id="line-164">                // We should be careful that this never happens</span>
+<span class="source-line-no">165</span><span id="line-165">                e.printStackTrace();</span>
+<span class="source-line-no">166</span><span id="line-166">                // But if it does, throw an unchecked exception</span>
+<span class="source-line-no">167</span><span id="line-167">                throw new RuntimeException(e);</span>
+<span class="source-line-no">168</span><span id="line-168">            }</span>
+<span class="source-line-no">169</span><span id="line-169">            return rpcServerURI;</span>
+<span class="source-line-no">170</span><span id="line-170">        }</span>
 <span class="source-line-no">171</span><span id="line-171"></span>
-<span class="source-line-no">172</span><span id="line-172">    }</span>
-<span class="source-line-no">173</span><span id="line-173">}</span>
+<span class="source-line-no">172</span><span id="line-172"></span>
+<span class="source-line-no">173</span><span id="line-173">    }</span>
+<span class="source-line-no">174</span><span id="line-174">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinRpcCliOptions.html b/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinRpcCliOptions.html
index 71f3851ea..ce3824d00 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinRpcCliOptions.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/cli/BitcoinRpcCliOptions.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.cli, class: BitcoinRpcCliOptions">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html
index 8f9664749..2054c9a39 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressDeserializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: AddressDeserializer">
@@ -23,73 +23,57 @@
 <span class="source-line-no">010</span><span id="line-10">import org.bitcoinj.base.AddressParser;</span>
 <span class="source-line-no">011</span><span id="line-11">import org.bitcoinj.base.Network;</span>
 <span class="source-line-no">012</span><span id="line-12">import org.bitcoinj.base.exceptions.AddressFormatException;</span>
-<span class="source-line-no">013</span><span id="line-13">import org.bitcoinj.core.NetworkParameters;</span>
-<span class="source-line-no">014</span><span id="line-14"></span>
-<span class="source-line-no">015</span><span id="line-15">import java.io.IOException;</span>
-<span class="source-line-no">016</span><span id="line-16"></span>
-<span class="source-line-no">017</span><span id="line-17">/**</span>
-<span class="source-line-no">018</span><span id="line-18"> * Deserialize bitcoinj (family) addresses</span>
-<span class="source-line-no">019</span><span id="line-19"> */</span>
-<span class="source-line-no">020</span><span id="line-20">public class AddressDeserializer extends JsonDeserializer&lt;Address&gt; {</span>
-<span class="source-line-no">021</span><span id="line-21">    private final AddressParser addressParser;</span>
-<span class="source-line-no">022</span><span id="line-22"></span>
-<span class="source-line-no">023</span><span id="line-23">    /**</span>
-<span class="source-line-no">024</span><span id="line-24">     * Construct an address deserializer that will deserialize addresses for any of the default supported networks.</span>
-<span class="source-line-no">025</span><span id="line-25">     * See {@link Network} to understand what the supported networks are.</span>
-<span class="source-line-no">026</span><span id="line-26">     */</span>
-<span class="source-line-no">027</span><span id="line-27">    public AddressDeserializer() {</span>
-<span class="source-line-no">028</span><span id="line-28">        this(AddressParser.getDefault());</span>
-<span class="source-line-no">029</span><span id="line-29">    }</span>
-<span class="source-line-no">030</span><span id="line-30"></span>
-<span class="source-line-no">031</span><span id="line-31">    /**</span>
-<span class="source-line-no">032</span><span id="line-32">     * Construct an address deserializer that validates addresses for the specified {@link Network}.</span>
-<span class="source-line-no">033</span><span id="line-33">     * When deserializing addresses, addresses that are not from the specified network will cause a</span>
-<span class="source-line-no">034</span><span id="line-34">     * {@link InvalidFormatException} to be thrown during deserialization.</span>
-<span class="source-line-no">035</span><span id="line-35">     *</span>
-<span class="source-line-no">036</span><span id="line-36">     * @param network Network id to specify the only network we will deserialize addresses for.</span>
-<span class="source-line-no">037</span><span id="line-37">     */</span>
-<span class="source-line-no">038</span><span id="line-38">    public AddressDeserializer(Network network) {</span>
-<span class="source-line-no">039</span><span id="line-39">        this(AddressParser.getDefault(network));</span>
-<span class="source-line-no">040</span><span id="line-40">    }</span>
-<span class="source-line-no">041</span><span id="line-41"></span>
-<span class="source-line-no">042</span><span id="line-42">    /**</span>
-<span class="source-line-no">043</span><span id="line-43">     * Construct an address deserializer that validates addresses for the specified {@link NetworkParameters}.</span>
-<span class="source-line-no">044</span><span id="line-44">     * When deserializing addresses, addresses that are not from the specified network will cause a</span>
-<span class="source-line-no">045</span><span id="line-45">     * {@link InvalidFormatException} to be thrown during deserialization.</span>
-<span class="source-line-no">046</span><span id="line-46">     *</span>
-<span class="source-line-no">047</span><span id="line-47">     * @param netParams Network parameters to specify the only network we will deserialize addresses for.</span>
-<span class="source-line-no">048</span><span id="line-48">     * @deprecated Use {@link AddressDeserializer#AddressDeserializer(Network)}</span>
-<span class="source-line-no">049</span><span id="line-49">     */</span>
-<span class="source-line-no">050</span><span id="line-50">    @Deprecated</span>
-<span class="source-line-no">051</span><span id="line-51">    public AddressDeserializer(NetworkParameters netParams) {</span>
-<span class="source-line-no">052</span><span id="line-52">        this((netParams != null)</span>
-<span class="source-line-no">053</span><span id="line-53">                ? AddressParser.getDefault(netParams.network())</span>
-<span class="source-line-no">054</span><span id="line-54">                : AddressParser.getDefault());</span>
-<span class="source-line-no">055</span><span id="line-55">    }</span>
-<span class="source-line-no">056</span><span id="line-56"></span>
-<span class="source-line-no">057</span><span id="line-57">    /**</span>
-<span class="source-line-no">058</span><span id="line-58">     * Construct an address deserializer with a custom {@link AddressParser}</span>
-<span class="source-line-no">059</span><span id="line-59">     * @param addressParser parser to convert a string to an address</span>
-<span class="source-line-no">060</span><span id="line-60">     */</span>
-<span class="source-line-no">061</span><span id="line-61">    public AddressDeserializer(AddressParser addressParser) {</span>
-<span class="source-line-no">062</span><span id="line-62">        this.addressParser = addressParser;</span>
-<span class="source-line-no">063</span><span id="line-63">    }</span>
-<span class="source-line-no">064</span><span id="line-64"></span>
-<span class="source-line-no">065</span><span id="line-65">    @Override</span>
-<span class="source-line-no">066</span><span id="line-66">    public Address deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {</span>
-<span class="source-line-no">067</span><span id="line-67">        JsonToken token = p.getCurrentToken();</span>
-<span class="source-line-no">068</span><span id="line-68">        switch (token) {</span>
-<span class="source-line-no">069</span><span id="line-69">            case VALUE_STRING:</span>
-<span class="source-line-no">070</span><span id="line-70">                try {</span>
-<span class="source-line-no">071</span><span id="line-71">                    return addressParser.parseAddress(p.getValueAsString());</span>
-<span class="source-line-no">072</span><span id="line-72">                } catch (AddressFormatException e) {</span>
-<span class="source-line-no">073</span><span id="line-73">                    throw new InvalidFormatException(p, "Invalid Address: " + p.getValueAsString(), p.getValueAsString(), Address.class);</span>
-<span class="source-line-no">074</span><span id="line-74">                }</span>
-<span class="source-line-no">075</span><span id="line-75">            default:</span>
-<span class="source-line-no">076</span><span id="line-76">                return (Address) ctxt.handleUnexpectedToken(Address.class, p);</span>
-<span class="source-line-no">077</span><span id="line-77">        }</span>
-<span class="source-line-no">078</span><span id="line-78">    }</span>
-<span class="source-line-no">079</span><span id="line-79">}</span>
+<span class="source-line-no">013</span><span id="line-13"></span>
+<span class="source-line-no">014</span><span id="line-14">import java.io.IOException;</span>
+<span class="source-line-no">015</span><span id="line-15"></span>
+<span class="source-line-no">016</span><span id="line-16">/**</span>
+<span class="source-line-no">017</span><span id="line-17"> * Deserialize bitcoinj (family) addresses</span>
+<span class="source-line-no">018</span><span id="line-18"> */</span>
+<span class="source-line-no">019</span><span id="line-19">public class AddressDeserializer extends JsonDeserializer&lt;Address&gt; {</span>
+<span class="source-line-no">020</span><span id="line-20">    private final AddressParser addressParser;</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">    /**</span>
+<span class="source-line-no">023</span><span id="line-23">     * Construct an address deserializer that will deserialize addresses for any of the default supported networks.</span>
+<span class="source-line-no">024</span><span id="line-24">     * See {@link Network} to understand what the supported networks are.</span>
+<span class="source-line-no">025</span><span id="line-25">     */</span>
+<span class="source-line-no">026</span><span id="line-26">    public AddressDeserializer() {</span>
+<span class="source-line-no">027</span><span id="line-27">        this(AddressParser.getDefault());</span>
+<span class="source-line-no">028</span><span id="line-28">    }</span>
+<span class="source-line-no">029</span><span id="line-29"></span>
+<span class="source-line-no">030</span><span id="line-30">    /**</span>
+<span class="source-line-no">031</span><span id="line-31">     * Construct an address deserializer that validates addresses for the specified {@link Network}.</span>
+<span class="source-line-no">032</span><span id="line-32">     * When deserializing addresses, addresses that are not from the specified network will cause a</span>
+<span class="source-line-no">033</span><span id="line-33">     * {@link InvalidFormatException} to be thrown during deserialization.</span>
+<span class="source-line-no">034</span><span id="line-34">     *</span>
+<span class="source-line-no">035</span><span id="line-35">     * @param network Network id to specify the only network we will deserialize addresses for.</span>
+<span class="source-line-no">036</span><span id="line-36">     */</span>
+<span class="source-line-no">037</span><span id="line-37">    public AddressDeserializer(Network network) {</span>
+<span class="source-line-no">038</span><span id="line-38">        this(AddressParser.getDefault(network));</span>
+<span class="source-line-no">039</span><span id="line-39">    }</span>
+<span class="source-line-no">040</span><span id="line-40"></span>
+<span class="source-line-no">041</span><span id="line-41">    /**</span>
+<span class="source-line-no">042</span><span id="line-42">     * Construct an address deserializer with a custom {@link AddressParser}</span>
+<span class="source-line-no">043</span><span id="line-43">     * @param addressParser parser to convert a string to an address</span>
+<span class="source-line-no">044</span><span id="line-44">     */</span>
+<span class="source-line-no">045</span><span id="line-45">    public AddressDeserializer(AddressParser addressParser) {</span>
+<span class="source-line-no">046</span><span id="line-46">        this.addressParser = addressParser;</span>
+<span class="source-line-no">047</span><span id="line-47">    }</span>
+<span class="source-line-no">048</span><span id="line-48"></span>
+<span class="source-line-no">049</span><span id="line-49">    @Override</span>
+<span class="source-line-no">050</span><span id="line-50">    public Address deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {</span>
+<span class="source-line-no">051</span><span id="line-51">        JsonToken token = p.getCurrentToken();</span>
+<span class="source-line-no">052</span><span id="line-52">        switch (token) {</span>
+<span class="source-line-no">053</span><span id="line-53">            case VALUE_STRING:</span>
+<span class="source-line-no">054</span><span id="line-54">                try {</span>
+<span class="source-line-no">055</span><span id="line-55">                    return addressParser.parseAddress(p.getValueAsString());</span>
+<span class="source-line-no">056</span><span id="line-56">                } catch (AddressFormatException e) {</span>
+<span class="source-line-no">057</span><span id="line-57">                    throw new InvalidFormatException(p, "Invalid Address: " + p.getValueAsString(), p.getValueAsString(), Address.class);</span>
+<span class="source-line-no">058</span><span id="line-58">                }</span>
+<span class="source-line-no">059</span><span id="line-59">            default:</span>
+<span class="source-line-no">060</span><span id="line-60">                return (Address) ctxt.handleUnexpectedToken(Address.class, p);</span>
+<span class="source-line-no">061</span><span id="line-61">        }</span>
+<span class="source-line-no">062</span><span id="line-62">    }</span>
+<span class="source-line-no">063</span><span id="line-63">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html
index 572108a46..1442d4ce4 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressKeyDeserializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: AddressKeyDeserializer">
@@ -21,62 +21,53 @@
 <span class="source-line-no">008</span><span id="line-8">import org.bitcoinj.base.AddressParser;</span>
 <span class="source-line-no">009</span><span id="line-9">import org.bitcoinj.base.Network;</span>
 <span class="source-line-no">010</span><span id="line-10">import org.bitcoinj.base.exceptions.AddressFormatException;</span>
-<span class="source-line-no">011</span><span id="line-11">import org.bitcoinj.core.NetworkParameters;</span>
-<span class="source-line-no">012</span><span id="line-12"></span>
-<span class="source-line-no">013</span><span id="line-13">import java.io.IOException;</span>
-<span class="source-line-no">014</span><span id="line-14"></span>
-<span class="source-line-no">015</span><span id="line-15">/**</span>
-<span class="source-line-no">016</span><span id="line-16"> * Key Deserializer to support using Address as the key in a Map.</span>
-<span class="source-line-no">017</span><span id="line-17"> */</span>
-<span class="source-line-no">018</span><span id="line-18">public class AddressKeyDeserializer extends KeyDeserializer {</span>
-<span class="source-line-no">019</span><span id="line-19">    private final AddressParser addressParser;</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">    /**</span>
-<span class="source-line-no">022</span><span id="line-22">     * Construct an address deserializer that will deserialize addresses for the default supported networks.</span>
-<span class="source-line-no">023</span><span id="line-23">     * See {@link Network} to understand what the supported networks are.</span>
-<span class="source-line-no">024</span><span id="line-24">     */</span>
-<span class="source-line-no">025</span><span id="line-25">    public AddressKeyDeserializer() {</span>
-<span class="source-line-no">026</span><span id="line-26">        this(AddressParser.getDefault());</span>
-<span class="source-line-no">027</span><span id="line-27">    }</span>
-<span class="source-line-no">028</span><span id="line-28"></span>
-<span class="source-line-no">029</span><span id="line-29">    /**</span>
-<span class="source-line-no">030</span><span id="line-30">     * Construct an address KeyDeserializer with a custom {@link AddressParser}</span>
-<span class="source-line-no">031</span><span id="line-31">     * @param addressParser parser to convert a string to an address</span>
-<span class="source-line-no">032</span><span id="line-32">     */</span>
-<span class="source-line-no">033</span><span id="line-33">    public AddressKeyDeserializer(AddressParser addressParser) {</span>
-<span class="source-line-no">034</span><span id="line-34">        this.addressParser = addressParser;</span>
-<span class="source-line-no">035</span><span id="line-35">    }</span>
-<span class="source-line-no">036</span><span id="line-36"></span>
-<span class="source-line-no">037</span><span id="line-37">    /**</span>
-<span class="source-line-no">038</span><span id="line-38">     * Construct an address KeyDeserializer that validates addresses for the specified {@link Network}.</span>
-<span class="source-line-no">039</span><span id="line-39">     * When deserializing addresses, addresses that are not from the specified network will cause a</span>
-<span class="source-line-no">040</span><span id="line-40">     * {@link InvalidFormatException} to be thrown during deserialization.</span>
-<span class="source-line-no">041</span><span id="line-41">     *</span>
-<span class="source-line-no">042</span><span id="line-42">     * @param network specify the only network we will deserialize addresses for.</span>
-<span class="source-line-no">043</span><span id="line-43">     */</span>
-<span class="source-line-no">044</span><span id="line-44">    public AddressKeyDeserializer(Network network) {</span>
-<span class="source-line-no">045</span><span id="line-45">        this( (network != null)</span>
-<span class="source-line-no">046</span><span id="line-46">                ? AddressParser.getDefault(network)</span>
-<span class="source-line-no">047</span><span id="line-47">                : AddressParser.getDefault());</span>
-<span class="source-line-no">048</span><span id="line-48">    }</span>
-<span class="source-line-no">049</span><span id="line-49"></span>
-<span class="source-line-no">050</span><span id="line-50">    /**</span>
-<span class="source-line-no">051</span><span id="line-51">     * @deprecated use {@link #AddressKeyDeserializer(Network)}</span>
-<span class="source-line-no">052</span><span id="line-52">     */</span>
-<span class="source-line-no">053</span><span id="line-53">    @Deprecated</span>
-<span class="source-line-no">054</span><span id="line-54">    public AddressKeyDeserializer(NetworkParameters netParams) {</span>
-<span class="source-line-no">055</span><span id="line-55">        this(netParams.network());</span>
+<span class="source-line-no">011</span><span id="line-11"></span>
+<span class="source-line-no">012</span><span id="line-12">import java.io.IOException;</span>
+<span class="source-line-no">013</span><span id="line-13"></span>
+<span class="source-line-no">014</span><span id="line-14">/**</span>
+<span class="source-line-no">015</span><span id="line-15"> * Key Deserializer to support using Address as the key in a Map.</span>
+<span class="source-line-no">016</span><span id="line-16"> */</span>
+<span class="source-line-no">017</span><span id="line-17">public class AddressKeyDeserializer extends KeyDeserializer {</span>
+<span class="source-line-no">018</span><span id="line-18">    private final AddressParser addressParser;</span>
+<span class="source-line-no">019</span><span id="line-19"></span>
+<span class="source-line-no">020</span><span id="line-20">    /**</span>
+<span class="source-line-no">021</span><span id="line-21">     * Construct an address deserializer that will deserialize addresses for the default supported networks.</span>
+<span class="source-line-no">022</span><span id="line-22">     * See {@link Network} to understand what the supported networks are.</span>
+<span class="source-line-no">023</span><span id="line-23">     */</span>
+<span class="source-line-no">024</span><span id="line-24">    public AddressKeyDeserializer() {</span>
+<span class="source-line-no">025</span><span id="line-25">        this(AddressParser.getDefault());</span>
+<span class="source-line-no">026</span><span id="line-26">    }</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    /**</span>
+<span class="source-line-no">029</span><span id="line-29">     * Construct an address KeyDeserializer with a custom {@link AddressParser}</span>
+<span class="source-line-no">030</span><span id="line-30">     * @param addressParser parser to convert a string to an address</span>
+<span class="source-line-no">031</span><span id="line-31">     */</span>
+<span class="source-line-no">032</span><span id="line-32">    public AddressKeyDeserializer(AddressParser addressParser) {</span>
+<span class="source-line-no">033</span><span id="line-33">        this.addressParser = addressParser;</span>
+<span class="source-line-no">034</span><span id="line-34">    }</span>
+<span class="source-line-no">035</span><span id="line-35"></span>
+<span class="source-line-no">036</span><span id="line-36">    /**</span>
+<span class="source-line-no">037</span><span id="line-37">     * Construct an address KeyDeserializer that validates addresses for the specified {@link Network}.</span>
+<span class="source-line-no">038</span><span id="line-38">     * When deserializing addresses, addresses that are not from the specified network will cause a</span>
+<span class="source-line-no">039</span><span id="line-39">     * {@link InvalidFormatException} to be thrown during deserialization.</span>
+<span class="source-line-no">040</span><span id="line-40">     *</span>
+<span class="source-line-no">041</span><span id="line-41">     * @param network specify the only network we will deserialize addresses for.</span>
+<span class="source-line-no">042</span><span id="line-42">     */</span>
+<span class="source-line-no">043</span><span id="line-43">    public AddressKeyDeserializer(Network network) {</span>
+<span class="source-line-no">044</span><span id="line-44">        this( (network != null)</span>
+<span class="source-line-no">045</span><span id="line-45">                ? AddressParser.getDefault(network)</span>
+<span class="source-line-no">046</span><span id="line-46">                : AddressParser.getDefault());</span>
+<span class="source-line-no">047</span><span id="line-47">    }</span>
+<span class="source-line-no">048</span><span id="line-48"></span>
+<span class="source-line-no">049</span><span id="line-49">    @Override</span>
+<span class="source-line-no">050</span><span id="line-50">    public Object deserializeKey(String key, DeserializationContext ctxt) throws IOException, JsonProcessingException {</span>
+<span class="source-line-no">051</span><span id="line-51">        try {</span>
+<span class="source-line-no">052</span><span id="line-52">            return addressParser.parseAddress(key);</span>
+<span class="source-line-no">053</span><span id="line-53">        } catch (AddressFormatException afe) {</span>
+<span class="source-line-no">054</span><span id="line-54">            throw new InvalidFormatException(ctxt.getParser(), "Invalid Address: " + key, key, Address.class);</span>
+<span class="source-line-no">055</span><span id="line-55">        }</span>
 <span class="source-line-no">056</span><span id="line-56">    }</span>
-<span class="source-line-no">057</span><span id="line-57"></span>
-<span class="source-line-no">058</span><span id="line-58">    @Override</span>
-<span class="source-line-no">059</span><span id="line-59">    public Object deserializeKey(String key, DeserializationContext ctxt) throws IOException, JsonProcessingException {</span>
-<span class="source-line-no">060</span><span id="line-60">        try {</span>
-<span class="source-line-no">061</span><span id="line-61">            return addressParser.parseAddress(key);</span>
-<span class="source-line-no">062</span><span id="line-62">        } catch (AddressFormatException afe) {</span>
-<span class="source-line-no">063</span><span id="line-63">            throw new InvalidFormatException(ctxt.getParser(), "Invalid Address: " + key, key, Address.class);</span>
-<span class="source-line-no">064</span><span id="line-64">        }</span>
-<span class="source-line-no">065</span><span id="line-65">    }</span>
-<span class="source-line-no">066</span><span id="line-66">}</span>
+<span class="source-line-no">057</span><span id="line-57">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressSerializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressSerializer.html
index c023d234f..f516cb4d3 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressSerializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/AddressSerializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: AddressSerializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html
index 7172d2dec..fb9e0debb 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/BlockHexDeserializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: BlockHexDeserializer">
@@ -19,46 +19,35 @@
 <span class="source-line-no">006</span><span id="line-6">import com.fasterxml.jackson.databind.DeserializationContext;</span>
 <span class="source-line-no">007</span><span id="line-7">import com.fasterxml.jackson.databind.JsonDeserializer;</span>
 <span class="source-line-no">008</span><span id="line-8">import com.fasterxml.jackson.databind.exc.InvalidFormatException;</span>
-<span class="source-line-no">009</span><span id="line-9">import org.bitcoinj.base.Network;</span>
-<span class="source-line-no">010</span><span id="line-10">import org.bitcoinj.core.Block;</span>
-<span class="source-line-no">011</span><span id="line-11">import org.bitcoinj.core.NetworkParameters;</span>
-<span class="source-line-no">012</span><span id="line-12">import org.bitcoinj.core.ProtocolException;</span>
-<span class="source-line-no">013</span><span id="line-13"></span>
-<span class="source-line-no">014</span><span id="line-14">import java.io.IOException;</span>
-<span class="source-line-no">015</span><span id="line-15">import java.nio.ByteBuffer;</span>
-<span class="source-line-no">016</span><span id="line-16"></span>
-<span class="source-line-no">017</span><span id="line-17">/**</span>
-<span class="source-line-no">018</span><span id="line-18"> * Deserializes a hex string as a Bitcoin {@link Block}</span>
-<span class="source-line-no">019</span><span id="line-19"> */</span>
-<span class="source-line-no">020</span><span id="line-20">public class BlockHexDeserializer extends JsonDeserializer&lt;Block&gt; {</span>
-<span class="source-line-no">021</span><span id="line-21"></span>
-<span class="source-line-no">022</span><span id="line-22">    public BlockHexDeserializer() {</span>
-<span class="source-line-no">023</span><span id="line-23">    }</span>
-<span class="source-line-no">024</span><span id="line-24"></span>
-<span class="source-line-no">025</span><span id="line-25">    @Deprecated</span>
-<span class="source-line-no">026</span><span id="line-26">    public BlockHexDeserializer(Network network) {</span>
-<span class="source-line-no">027</span><span id="line-27">    }</span>
-<span class="source-line-no">028</span><span id="line-28"></span>
-<span class="source-line-no">029</span><span id="line-29">    @Deprecated</span>
-<span class="source-line-no">030</span><span id="line-30">    public BlockHexDeserializer(NetworkParameters netParams) {</span>
-<span class="source-line-no">031</span><span id="line-31">    }</span>
-<span class="source-line-no">032</span><span id="line-32"></span>
-<span class="source-line-no">033</span><span id="line-33">    @Override</span>
-<span class="source-line-no">034</span><span id="line-34">    public Block deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {</span>
-<span class="source-line-no">035</span><span id="line-35">        JsonToken token = p.getCurrentToken();</span>
-<span class="source-line-no">036</span><span id="line-36">        switch (token) {</span>
-<span class="source-line-no">037</span><span id="line-37">            case VALUE_STRING:</span>
-<span class="source-line-no">038</span><span id="line-38">                try {</span>
-<span class="source-line-no">039</span><span id="line-39">                    byte[] payload = HexUtil.hexStringToByteArray(p.getValueAsString()); // convert  to hex</span>
-<span class="source-line-no">040</span><span id="line-40">                    return Block.read(ByteBuffer.wrap(payload));</span>
-<span class="source-line-no">041</span><span id="line-41">                } catch (ProtocolException e) {</span>
-<span class="source-line-no">042</span><span id="line-42">                    throw new InvalidFormatException(p, "Invalid Block", p.getValueAsString(), Block.class);</span>
-<span class="source-line-no">043</span><span id="line-43">                }</span>
-<span class="source-line-no">044</span><span id="line-44">            default:</span>
-<span class="source-line-no">045</span><span id="line-45">                return (Block) ctxt.handleUnexpectedToken(Block.class, p);</span>
-<span class="source-line-no">046</span><span id="line-46">        }</span>
-<span class="source-line-no">047</span><span id="line-47">    }</span>
-<span class="source-line-no">048</span><span id="line-48">}</span>
+<span class="source-line-no">009</span><span id="line-9">import org.bitcoinj.core.Block;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.bitcoinj.core.ProtocolException;</span>
+<span class="source-line-no">011</span><span id="line-11"></span>
+<span class="source-line-no">012</span><span id="line-12">import java.io.IOException;</span>
+<span class="source-line-no">013</span><span id="line-13">import java.nio.ByteBuffer;</span>
+<span class="source-line-no">014</span><span id="line-14"></span>
+<span class="source-line-no">015</span><span id="line-15">/**</span>
+<span class="source-line-no">016</span><span id="line-16"> * Deserializes a hex string as a Bitcoin {@link Block}</span>
+<span class="source-line-no">017</span><span id="line-17"> */</span>
+<span class="source-line-no">018</span><span id="line-18">public class BlockHexDeserializer extends JsonDeserializer&lt;Block&gt; {</span>
+<span class="source-line-no">019</span><span id="line-19"></span>
+<span class="source-line-no">020</span><span id="line-20">    public BlockHexDeserializer() {</span>
+<span class="source-line-no">021</span><span id="line-21">    }</span>
+<span class="source-line-no">022</span><span id="line-22">    @Override</span>
+<span class="source-line-no">023</span><span id="line-23">    public Block deserialize(JsonParser p, DeserializationContext ctxt) throws IOException, JsonProcessingException {</span>
+<span class="source-line-no">024</span><span id="line-24">        JsonToken token = p.getCurrentToken();</span>
+<span class="source-line-no">025</span><span id="line-25">        switch (token) {</span>
+<span class="source-line-no">026</span><span id="line-26">            case VALUE_STRING:</span>
+<span class="source-line-no">027</span><span id="line-27">                try {</span>
+<span class="source-line-no">028</span><span id="line-28">                    byte[] payload = HexUtil.hexStringToByteArray(p.getValueAsString()); // convert  to hex</span>
+<span class="source-line-no">029</span><span id="line-29">                    return Block.read(ByteBuffer.wrap(payload));</span>
+<span class="source-line-no">030</span><span id="line-30">                } catch (ProtocolException e) {</span>
+<span class="source-line-no">031</span><span id="line-31">                    throw new InvalidFormatException(p, "Invalid Block", p.getValueAsString(), Block.class);</span>
+<span class="source-line-no">032</span><span id="line-32">                }</span>
+<span class="source-line-no">033</span><span id="line-33">            default:</span>
+<span class="source-line-no">034</span><span id="line-34">                return (Block) ctxt.handleUnexpectedToken(Block.class, p);</span>
+<span class="source-line-no">035</span><span id="line-35">        }</span>
+<span class="source-line-no">036</span><span id="line-36">    }</span>
+<span class="source-line-no">037</span><span id="line-37">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/CoinDeserializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/CoinDeserializer.html
index ba61429b3..82c152bf3 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/CoinDeserializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/CoinDeserializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: CoinDeserializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/CoinSerializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/CoinSerializer.html
index 00976665e..27a022785 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/CoinSerializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/CoinSerializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: CoinSerializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ECKeyDeserializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ECKeyDeserializer.html
index 02955e4b9..6de0f39e8 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ECKeyDeserializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ECKeyDeserializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: ECKeyDeserializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ECKeySerializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ECKeySerializer.html
index 9dd98cdf0..c9bac6030 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ECKeySerializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ECKeySerializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: ECKeySerializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/HexUtil.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/HexUtil.html
index bc7dba0fb..de4d0877f 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/HexUtil.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/HexUtil.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: HexUtil">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/PeerSerializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/PeerSerializer.html
index 1200b8c17..94fc96ec7 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/PeerSerializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/PeerSerializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: PeerSerializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/RpcClientModule.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/RpcClientModule.html
index c4a9639e5..c15ea999c 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/RpcClientModule.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/RpcClientModule.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: RpcClientModule">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/RpcServerModule.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/RpcServerModule.html
index 42b84d9ef..11c3698fa 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/RpcServerModule.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/RpcServerModule.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: RpcServerModule">
@@ -18,37 +18,31 @@
 <span class="source-line-no">005</span><span id="line-5">import org.bitcoinj.base.Address;</span>
 <span class="source-line-no">006</span><span id="line-6">import org.bitcoinj.base.Coin;</span>
 <span class="source-line-no">007</span><span id="line-7">import org.bitcoinj.crypto.ECKey;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.bitcoinj.core.NetworkParameters;</span>
-<span class="source-line-no">009</span><span id="line-9">import org.bitcoinj.core.Peer;</span>
-<span class="source-line-no">010</span><span id="line-10">import org.bitcoinj.base.Sha256Hash;</span>
-<span class="source-line-no">011</span><span id="line-11">import org.bitcoinj.core.Transaction;</span>
-<span class="source-line-no">012</span><span id="line-12">import org.bitcoinj.script.Script;</span>
-<span class="source-line-no">013</span><span id="line-13"></span>
-<span class="source-line-no">014</span><span id="line-14">/**</span>
-<span class="source-line-no">015</span><span id="line-15"> * Jackson Module with serializers and deserializers for JSON-RPC servers.</span>
-<span class="source-line-no">016</span><span id="line-16"> */</span>
-<span class="source-line-no">017</span><span id="line-17">public class RpcServerModule extends SimpleModule {</span>
-<span class="source-line-no">018</span><span id="line-18">    public RpcServerModule() {</span>
-<span class="source-line-no">019</span><span id="line-19">        super("BitcoinJMappingServer", new Version(1, 0, 0, null, null, null));</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">        this.addDeserializer(Address.class, new AddressDeserializer())</span>
-<span class="source-line-no">022</span><span id="line-22">                .addDeserializer(Coin.class, new CoinDeserializer())</span>
-<span class="source-line-no">023</span><span id="line-23">                .addDeserializer(ECKey.class, new ECKeyDeserializer())</span>
-<span class="source-line-no">024</span><span id="line-24">                .addDeserializer(Sha256Hash.class, new Sha256HashDeserializer())</span>
-<span class="source-line-no">025</span><span id="line-25">                .addSerializer(Address.class, new AddressSerializer())</span>
-<span class="source-line-no">026</span><span id="line-26">                .addSerializer(Coin.class, new CoinSerializer())</span>
-<span class="source-line-no">027</span><span id="line-27">                .addSerializer(ECKey.class, new ECKeySerializer())</span>
-<span class="source-line-no">028</span><span id="line-28">                .addSerializer(Peer.class, new PeerSerializer())</span>
-<span class="source-line-no">029</span><span id="line-29">                .addSerializer(Sha256Hash.class, new Sha256HashSerializer())</span>
-<span class="source-line-no">030</span><span id="line-30">                .addSerializer(Transaction.class, new TransactionSerializer())</span>
-<span class="source-line-no">031</span><span id="line-31">                .addSerializer(Script.class, new ScriptSerializer());</span>
-<span class="source-line-no">032</span><span id="line-32">    }</span>
-<span class="source-line-no">033</span><span id="line-33"></span>
-<span class="source-line-no">034</span><span id="line-34">    @Deprecated</span>
-<span class="source-line-no">035</span><span id="line-35">    public RpcServerModule(NetworkParameters netParams) {</span>
-<span class="source-line-no">036</span><span id="line-36">        this();</span>
-<span class="source-line-no">037</span><span id="line-37">    }</span>
-<span class="source-line-no">038</span><span id="line-38">}</span>
+<span class="source-line-no">008</span><span id="line-8">import org.bitcoinj.core.Peer;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.bitcoinj.base.Sha256Hash;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.bitcoinj.core.Transaction;</span>
+<span class="source-line-no">011</span><span id="line-11">import org.bitcoinj.script.Script;</span>
+<span class="source-line-no">012</span><span id="line-12"></span>
+<span class="source-line-no">013</span><span id="line-13">/**</span>
+<span class="source-line-no">014</span><span id="line-14"> * Jackson Module with serializers and deserializers for JSON-RPC servers.</span>
+<span class="source-line-no">015</span><span id="line-15"> */</span>
+<span class="source-line-no">016</span><span id="line-16">public class RpcServerModule extends SimpleModule {</span>
+<span class="source-line-no">017</span><span id="line-17">    public RpcServerModule() {</span>
+<span class="source-line-no">018</span><span id="line-18">        super("BitcoinJMappingServer", new Version(1, 0, 0, null, null, null));</span>
+<span class="source-line-no">019</span><span id="line-19"></span>
+<span class="source-line-no">020</span><span id="line-20">        this.addDeserializer(Address.class, new AddressDeserializer())</span>
+<span class="source-line-no">021</span><span id="line-21">                .addDeserializer(Coin.class, new CoinDeserializer())</span>
+<span class="source-line-no">022</span><span id="line-22">                .addDeserializer(ECKey.class, new ECKeyDeserializer())</span>
+<span class="source-line-no">023</span><span id="line-23">                .addDeserializer(Sha256Hash.class, new Sha256HashDeserializer())</span>
+<span class="source-line-no">024</span><span id="line-24">                .addSerializer(Address.class, new AddressSerializer())</span>
+<span class="source-line-no">025</span><span id="line-25">                .addSerializer(Coin.class, new CoinSerializer())</span>
+<span class="source-line-no">026</span><span id="line-26">                .addSerializer(ECKey.class, new ECKeySerializer())</span>
+<span class="source-line-no">027</span><span id="line-27">                .addSerializer(Peer.class, new PeerSerializer())</span>
+<span class="source-line-no">028</span><span id="line-28">                .addSerializer(Sha256Hash.class, new Sha256HashSerializer())</span>
+<span class="source-line-no">029</span><span id="line-29">                .addSerializer(Transaction.class, new TransactionSerializer())</span>
+<span class="source-line-no">030</span><span id="line-30">                .addSerializer(Script.class, new ScriptSerializer());</span>
+<span class="source-line-no">031</span><span id="line-31">    }</span>
+<span class="source-line-no">032</span><span id="line-32">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ScriptSerializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ScriptSerializer.html
index a26d0a1b0..e452424c3 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ScriptSerializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/ScriptSerializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: ScriptSerializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/Sha256HashDeserializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/Sha256HashDeserializer.html
index a6c513a5d..da48189c1 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/Sha256HashDeserializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/Sha256HashDeserializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: Sha256HashDeserializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/Sha256HashSerializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/Sha256HashSerializer.html
index 8e25726ab..dce312d89 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/Sha256HashSerializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/Sha256HashSerializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: Sha256HashSerializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/TransactionHexSerializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/TransactionHexSerializer.html
index d19b85dbb..d7fe410dc 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/TransactionHexSerializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/TransactionHexSerializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: TransactionHexSerializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/TransactionSerializer.html b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/TransactionSerializer.html
index 83a1454e6..412af836a 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/conversion/TransactionSerializer.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/conversion/TransactionSerializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.conversion, class: TransactionSerializer">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html
index 8976ac730..cb92df442 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/AddressGroupingItem.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: AddressGroupingItem">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/AddressInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/AddressInfo.html
index 175e49e3d..bf535eb58 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/AddressInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/AddressInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: AddressInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html
index 13179cd8e..7aabd49e1 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BitcoinTransactionInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: BitcoinTransactionInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html
index 46fe98bf2..d43c71813 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockChainInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: BlockChainInfo">
@@ -17,71 +17,121 @@
 <span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.annotation.JsonIgnoreProperties;</span>
 <span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.annotation.JsonProperty;</span>
 <span class="source-line-no">006</span><span id="line-6">import org.bitcoinj.base.BitcoinNetwork;</span>
-<span class="source-line-no">007</span><span id="line-7">import org.bitcoinj.base.Sha256Hash;</span>
-<span class="source-line-no">008</span><span id="line-8"></span>
-<span class="source-line-no">009</span><span id="line-9">import java.math.BigDecimal;</span>
-<span class="source-line-no">010</span><span id="line-10"></span>
-<span class="source-line-no">011</span><span id="line-11">/**</span>
-<span class="source-line-no">012</span><span id="line-12"> * POJO for `getblockchaininfo` RPC response.</span>
-<span class="source-line-no">013</span><span id="line-13"> */</span>
-<span class="source-line-no">014</span><span id="line-14">public class BlockChainInfo {</span>
-<span class="source-line-no">015</span><span id="line-15">    private final String      chain;</span>
-<span class="source-line-no">016</span><span id="line-16">    private final int         blocks;</span>
-<span class="source-line-no">017</span><span id="line-17">    private final int         headers;</span>
-<span class="source-line-no">018</span><span id="line-18">    private final Sha256Hash  bestBlockHash;</span>
-<span class="source-line-no">019</span><span id="line-19">    private final BigDecimal  difficulty;</span>
-<span class="source-line-no">020</span><span id="line-20">    private final BigDecimal  verificationProgress;</span>
-<span class="source-line-no">021</span><span id="line-21">    private final byte[]      chainWork;</span>
-<span class="source-line-no">022</span><span id="line-22"></span>
-<span class="source-line-no">023</span><span id="line-23">    @JsonCreator</span>
-<span class="source-line-no">024</span><span id="line-24">    public BlockChainInfo(@JsonProperty("chain")            String chain,</span>
-<span class="source-line-no">025</span><span id="line-25">                          @JsonProperty("blocks")           int blocks,</span>
-<span class="source-line-no">026</span><span id="line-26">                          @JsonProperty("headers")          int headers,</span>
-<span class="source-line-no">027</span><span id="line-27">                          @JsonProperty("bestblockhash")        Sha256Hash bestBlockHash,</span>
-<span class="source-line-no">028</span><span id="line-28">                          @JsonProperty("difficulty")           BigDecimal difficulty,</span>
-<span class="source-line-no">029</span><span id="line-29">                          @JsonProperty("verificationprogress") BigDecimal verificationProgress,</span>
-<span class="source-line-no">030</span><span id="line-30">                          @JsonProperty("chainwork")            byte[] chainWork) {</span>
-<span class="source-line-no">031</span><span id="line-31">        this.chain = chain;</span>
-<span class="source-line-no">032</span><span id="line-32">        this.blocks = blocks;</span>
-<span class="source-line-no">033</span><span id="line-33">        this.headers = headers;</span>
-<span class="source-line-no">034</span><span id="line-34">        this.bestBlockHash = bestBlockHash;</span>
-<span class="source-line-no">035</span><span id="line-35">        this.difficulty = difficulty;</span>
-<span class="source-line-no">036</span><span id="line-36">        this.verificationProgress = verificationProgress;</span>
-<span class="source-line-no">037</span><span id="line-37">        this.chainWork = chainWork;</span>
-<span class="source-line-no">038</span><span id="line-38">    }</span>
-<span class="source-line-no">039</span><span id="line-39"></span>
-<span class="source-line-no">040</span><span id="line-40">    /**</span>
-<span class="source-line-no">041</span><span id="line-41">     *</span>
-<span class="source-line-no">042</span><span id="line-42">     * @return a short string identifying which chain (Note: this differs from {@link BitcoinNetwork#toString()}</span>
-<span class="source-line-no">043</span><span id="line-43">     */</span>
-<span class="source-line-no">044</span><span id="line-44">    public String getChain() {</span>
-<span class="source-line-no">045</span><span id="line-45">        return chain;</span>
-<span class="source-line-no">046</span><span id="line-46">    }</span>
-<span class="source-line-no">047</span><span id="line-47"></span>
-<span class="source-line-no">048</span><span id="line-48">    public int getBlocks() {</span>
-<span class="source-line-no">049</span><span id="line-49">        return blocks;</span>
-<span class="source-line-no">050</span><span id="line-50">    }</span>
-<span class="source-line-no">051</span><span id="line-51"></span>
-<span class="source-line-no">052</span><span id="line-52">    public int getHeaders() {</span>
-<span class="source-line-no">053</span><span id="line-53">        return headers;</span>
-<span class="source-line-no">054</span><span id="line-54">    }</span>
-<span class="source-line-no">055</span><span id="line-55"></span>
-<span class="source-line-no">056</span><span id="line-56">    public Sha256Hash getBestBlockHash() {</span>
-<span class="source-line-no">057</span><span id="line-57">        return bestBlockHash;</span>
-<span class="source-line-no">058</span><span id="line-58">    }</span>
-<span class="source-line-no">059</span><span id="line-59"></span>
-<span class="source-line-no">060</span><span id="line-60">    public BigDecimal getDifficulty() {</span>
-<span class="source-line-no">061</span><span id="line-61">        return difficulty;</span>
-<span class="source-line-no">062</span><span id="line-62">    }</span>
-<span class="source-line-no">063</span><span id="line-63"></span>
-<span class="source-line-no">064</span><span id="line-64">    public BigDecimal getVerificationProgress() {</span>
-<span class="source-line-no">065</span><span id="line-65">        return verificationProgress;</span>
-<span class="source-line-no">066</span><span id="line-66">    }</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68">    public byte[] getChainWork() {</span>
-<span class="source-line-no">069</span><span id="line-69">        return chainWork;</span>
-<span class="source-line-no">070</span><span id="line-70">    }</span>
-<span class="source-line-no">071</span><span id="line-71">}</span>
+<span class="source-line-no">007</span><span id="line-7">import org.bitcoinj.base.Network;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.bitcoinj.base.Sha256Hash;</span>
+<span class="source-line-no">009</span><span id="line-9"></span>
+<span class="source-line-no">010</span><span id="line-10">import java.math.BigDecimal;</span>
+<span class="source-line-no">011</span><span id="line-11"></span>
+<span class="source-line-no">012</span><span id="line-12">/**</span>
+<span class="source-line-no">013</span><span id="line-13"> * POJO for `getblockchaininfo` RPC response.</span>
+<span class="source-line-no">014</span><span id="line-14"> */</span>
+<span class="source-line-no">015</span><span id="line-15">public class BlockChainInfo {</span>
+<span class="source-line-no">016</span><span id="line-16">    private final String      chain;</span>
+<span class="source-line-no">017</span><span id="line-17">    private final int         blocks;</span>
+<span class="source-line-no">018</span><span id="line-18">    private final int         headers;</span>
+<span class="source-line-no">019</span><span id="line-19">    private final Sha256Hash  bestBlockHash;</span>
+<span class="source-line-no">020</span><span id="line-20">    private final BigDecimal  difficulty;</span>
+<span class="source-line-no">021</span><span id="line-21">    private final BigDecimal  verificationProgress;</span>
+<span class="source-line-no">022</span><span id="line-22">    private final byte[]      chainWork;</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">    @JsonCreator</span>
+<span class="source-line-no">025</span><span id="line-25">    public BlockChainInfo(@JsonProperty("chain")            String chain,</span>
+<span class="source-line-no">026</span><span id="line-26">                          @JsonProperty("blocks")           int blocks,</span>
+<span class="source-line-no">027</span><span id="line-27">                          @JsonProperty("headers")          int headers,</span>
+<span class="source-line-no">028</span><span id="line-28">                          @JsonProperty("bestblockhash")        Sha256Hash bestBlockHash,</span>
+<span class="source-line-no">029</span><span id="line-29">                          @JsonProperty("difficulty")           BigDecimal difficulty,</span>
+<span class="source-line-no">030</span><span id="line-30">                          @JsonProperty("verificationprogress") BigDecimal verificationProgress,</span>
+<span class="source-line-no">031</span><span id="line-31">                          @JsonProperty("chainwork")            byte[] chainWork) {</span>
+<span class="source-line-no">032</span><span id="line-32">        this.chain = chain;</span>
+<span class="source-line-no">033</span><span id="line-33">        this.blocks = blocks;</span>
+<span class="source-line-no">034</span><span id="line-34">        this.headers = headers;</span>
+<span class="source-line-no">035</span><span id="line-35">        this.bestBlockHash = bestBlockHash;</span>
+<span class="source-line-no">036</span><span id="line-36">        this.difficulty = difficulty;</span>
+<span class="source-line-no">037</span><span id="line-37">        this.verificationProgress = verificationProgress;</span>
+<span class="source-line-no">038</span><span id="line-38">        this.chainWork = chainWork;</span>
+<span class="source-line-no">039</span><span id="line-39">    }</span>
+<span class="source-line-no">040</span><span id="line-40"></span>
+<span class="source-line-no">041</span><span id="line-41">    /**</span>
+<span class="source-line-no">042</span><span id="line-42">     *</span>
+<span class="source-line-no">043</span><span id="line-43">     * @return a short string identifying which chain (Note: this differs from {@link BitcoinNetwork#toString()}</span>
+<span class="source-line-no">044</span><span id="line-44">     */</span>
+<span class="source-line-no">045</span><span id="line-45">    public String getChain() {</span>
+<span class="source-line-no">046</span><span id="line-46">        return chain;</span>
+<span class="source-line-no">047</span><span id="line-47">    }</span>
+<span class="source-line-no">048</span><span id="line-48"></span>
+<span class="source-line-no">049</span><span id="line-49">    public int getBlocks() {</span>
+<span class="source-line-no">050</span><span id="line-50">        return blocks;</span>
+<span class="source-line-no">051</span><span id="line-51">    }</span>
+<span class="source-line-no">052</span><span id="line-52"></span>
+<span class="source-line-no">053</span><span id="line-53">    public int getHeaders() {</span>
+<span class="source-line-no">054</span><span id="line-54">        return headers;</span>
+<span class="source-line-no">055</span><span id="line-55">    }</span>
+<span class="source-line-no">056</span><span id="line-56"></span>
+<span class="source-line-no">057</span><span id="line-57">    public Sha256Hash getBestBlockHash() {</span>
+<span class="source-line-no">058</span><span id="line-58">        return bestBlockHash;</span>
+<span class="source-line-no">059</span><span id="line-59">    }</span>
+<span class="source-line-no">060</span><span id="line-60"></span>
+<span class="source-line-no">061</span><span id="line-61">    public BigDecimal getDifficulty() {</span>
+<span class="source-line-no">062</span><span id="line-62">        return difficulty;</span>
+<span class="source-line-no">063</span><span id="line-63">    }</span>
+<span class="source-line-no">064</span><span id="line-64"></span>
+<span class="source-line-no">065</span><span id="line-65">    public BigDecimal getVerificationProgress() {</span>
+<span class="source-line-no">066</span><span id="line-66">        return verificationProgress;</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69">    public byte[] getChainWork() {</span>
+<span class="source-line-no">070</span><span id="line-70">        return chainWork;</span>
+<span class="source-line-no">071</span><span id="line-71">    }</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73">    /**</span>
+<span class="source-line-no">074</span><span id="line-74">     * Map a BlockChainInfo chain string to a Network. These strings are different from the standard values</span>
+<span class="source-line-no">075</span><span id="line-75">     * in {@link BitcoinNetwork#toString()}.</span>
+<span class="source-line-no">076</span><span id="line-76">     * @param info {@code BlockChainInfo}</span>
+<span class="source-line-no">077</span><span id="line-77">     * @return the matching network.</span>
+<span class="source-line-no">078</span><span id="line-78">     */</span>
+<span class="source-line-no">079</span><span id="line-79">    public static Network chainToNetwork(BlockChainInfo info) {</span>
+<span class="source-line-no">080</span><span id="line-80">        Network network;</span>
+<span class="source-line-no">081</span><span id="line-81">        switch(info.getChain()) {</span>
+<span class="source-line-no">082</span><span id="line-82">            case "main":</span>
+<span class="source-line-no">083</span><span id="line-83">                network = BitcoinNetwork.MAINNET;</span>
+<span class="source-line-no">084</span><span id="line-84">                break;</span>
+<span class="source-line-no">085</span><span id="line-85">            case "test":</span>
+<span class="source-line-no">086</span><span id="line-86">                network = BitcoinNetwork.TESTNET;</span>
+<span class="source-line-no">087</span><span id="line-87">                break;</span>
+<span class="source-line-no">088</span><span id="line-88">            case "signet":</span>
+<span class="source-line-no">089</span><span id="line-89">                network = BitcoinNetwork.SIGNET;</span>
+<span class="source-line-no">090</span><span id="line-90">                break;</span>
+<span class="source-line-no">091</span><span id="line-91">            case "regtest":</span>
+<span class="source-line-no">092</span><span id="line-92">                network = BitcoinNetwork.REGTEST;</span>
+<span class="source-line-no">093</span><span id="line-93">                break;</span>
+<span class="source-line-no">094</span><span id="line-94">            default:</span>
+<span class="source-line-no">095</span><span id="line-95">                throw new RuntimeException("BlockChainInfo contains unrecognized Bitcoin network");</span>
+<span class="source-line-no">096</span><span id="line-96">        }</span>
+<span class="source-line-no">097</span><span id="line-97">        return network;</span>
+<span class="source-line-no">098</span><span id="line-98">    }</span>
+<span class="source-line-no">099</span><span id="line-99"></span>
+<span class="source-line-no">100</span><span id="line-100">    /**</span>
+<span class="source-line-no">101</span><span id="line-101">     * Map {@link BitcoinNetwork} to a chain-id string.</span>
+<span class="source-line-no">102</span><span id="line-102">     * Bitcoin Core returns strings that differ from {@link BitcoinNetwork#toString()}.</span>
+<span class="source-line-no">103</span><span id="line-103">     * @param network bitcoinj enum type</span>
+<span class="source-line-no">104</span><span id="line-104">     * @return Bitcoin Core-compatible &lt;q&gt;chain&lt;/q&gt; string</span>
+<span class="source-line-no">105</span><span id="line-105">     */</span>
+<span class="source-line-no">106</span><span id="line-106">    public static String networkToChainName(BitcoinNetwork network) {</span>
+<span class="source-line-no">107</span><span id="line-107">        String name;</span>
+<span class="source-line-no">108</span><span id="line-108">        switch(network) {</span>
+<span class="source-line-no">109</span><span id="line-109">            case MAINNET:</span>
+<span class="source-line-no">110</span><span id="line-110">                name = "main";</span>
+<span class="source-line-no">111</span><span id="line-111">                break;</span>
+<span class="source-line-no">112</span><span id="line-112">            case TESTNET:</span>
+<span class="source-line-no">113</span><span id="line-113">                name = "test";</span>
+<span class="source-line-no">114</span><span id="line-114">                break;</span>
+<span class="source-line-no">115</span><span id="line-115">            default:</span>
+<span class="source-line-no">116</span><span id="line-116">                name = network.toString();</span>
+<span class="source-line-no">117</span><span id="line-117">                break;</span>
+<span class="source-line-no">118</span><span id="line-118">        };</span>
+<span class="source-line-no">119</span><span id="line-119">        return name;</span>
+<span class="source-line-no">120</span><span id="line-120">    }</span>
+<span class="source-line-no">121</span><span id="line-121">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.IncludeTxFlag.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.IncludeTxFlag.html
index 17269c882..d822032b4 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.IncludeTxFlag.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.IncludeTxFlag.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: BlockInfo, enum: IncludeTxFlag">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.Sha256HashList.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.Sha256HashList.html
index d7a1411e8..3fc2a13b3 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.Sha256HashList.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.Sha256HashList.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: BlockInfo, class: Sha256HashList">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.html
index 7ee44d5ae..f66fa7e85 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/BlockInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: BlockInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ChainTip.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ChainTip.html
index df1ad4414..bec01808f 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ChainTip.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ChainTip.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: ChainTip">
@@ -57,25 +57,30 @@
 <span class="source-line-no">044</span><span id="line-44">        return status;</span>
 <span class="source-line-no">045</span><span id="line-45">    }</span>
 <span class="source-line-no">046</span><span id="line-46"></span>
-<span class="source-line-no">047</span><span id="line-47">    public static Optional&lt;ChainTip&gt; findActiveChainTip(List&lt;ChainTip&gt; chainTips) {</span>
-<span class="source-line-no">048</span><span id="line-48">        return chainTips.stream().filter(tip -&gt; tip.getStatus().equals("active")).findFirst();</span>
-<span class="source-line-no">049</span><span id="line-49">    }</span>
-<span class="source-line-no">050</span><span id="line-50"></span>
-<span class="source-line-no">051</span><span id="line-51">    public static ChainTip findActiveChainTipOrElseThrow(List&lt;ChainTip&gt; chainTips) {</span>
-<span class="source-line-no">052</span><span id="line-52">        return findActiveChainTip(chainTips).orElseThrow(() -&gt; new RuntimeException("No active ChainTip"));</span>
-<span class="source-line-no">053</span><span id="line-53">    }</span>
-<span class="source-line-no">054</span><span id="line-54"></span>
-<span class="source-line-no">055</span><span id="line-55">    /**</span>
-<span class="source-line-no">056</span><span id="line-56">     * Construct an "active" {@link ChainTip}</span>
-<span class="source-line-no">057</span><span id="line-57">     *</span>
-<span class="source-line-no">058</span><span id="line-58">     * @param height best block height</span>
-<span class="source-line-no">059</span><span id="line-59">     * @param hash best block hash</span>
-<span class="source-line-no">060</span><span id="line-60">     * @return current "active" ChainTip</span>
-<span class="source-line-no">061</span><span id="line-61">     */</span>
-<span class="source-line-no">062</span><span id="line-62">    public static ChainTip ofActive(int height, Sha256Hash hash) {</span>
-<span class="source-line-no">063</span><span id="line-63">        return new ChainTip(height, hash, 0, "active");</span>
-<span class="source-line-no">064</span><span id="line-64">    }</span>
-<span class="source-line-no">065</span><span id="line-65">}</span>
+<span class="source-line-no">047</span><span id="line-47">    /**</span>
+<span class="source-line-no">048</span><span id="line-48">     * Find the active chain tip if there is one</span>
+<span class="source-line-no">049</span><span id="line-49">     * @param chainTips the list to search</span>
+<span class="source-line-no">050</span><span id="line-50">     * @return non-empty optional if active is found, empty optional if not found</span>
+<span class="source-line-no">051</span><span id="line-51">     */</span>
+<span class="source-line-no">052</span><span id="line-52">    public static Optional&lt;ChainTip&gt; findActiveChainTip(List&lt;ChainTip&gt; chainTips) {</span>
+<span class="source-line-no">053</span><span id="line-53">        return chainTips.stream().filter(tip -&gt; tip.getStatus().equals("active")).findFirst();</span>
+<span class="source-line-no">054</span><span id="line-54">    }</span>
+<span class="source-line-no">055</span><span id="line-55"></span>
+<span class="source-line-no">056</span><span id="line-56">    public static ChainTip findActiveChainTipOrElseThrow(List&lt;ChainTip&gt; chainTips) {</span>
+<span class="source-line-no">057</span><span id="line-57">        return findActiveChainTip(chainTips).orElseThrow(() -&gt; new RuntimeException("No active ChainTip"));</span>
+<span class="source-line-no">058</span><span id="line-58">    }</span>
+<span class="source-line-no">059</span><span id="line-59"></span>
+<span class="source-line-no">060</span><span id="line-60">    /**</span>
+<span class="source-line-no">061</span><span id="line-61">     * Construct an "active" {@link ChainTip}</span>
+<span class="source-line-no">062</span><span id="line-62">     *</span>
+<span class="source-line-no">063</span><span id="line-63">     * @param height best block height</span>
+<span class="source-line-no">064</span><span id="line-64">     * @param hash best block hash</span>
+<span class="source-line-no">065</span><span id="line-65">     * @return current "active" ChainTip</span>
+<span class="source-line-no">066</span><span id="line-66">     */</span>
+<span class="source-line-no">067</span><span id="line-67">    public static ChainTip ofActive(int height, Sha256Hash hash) {</span>
+<span class="source-line-no">068</span><span id="line-68">        return new ChainTip(height, hash, 0, "active");</span>
+<span class="source-line-no">069</span><span id="line-69">    }</span>
+<span class="source-line-no">070</span><span id="line-70">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/LoadWalletResult.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/LoadWalletResult.html
index 0ed67f6fa..7bfc5f8dc 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/LoadWalletResult.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/LoadWalletResult.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: LoadWalletResult">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/MethodHelpEntry.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/MethodHelpEntry.html
index c5c8f2162..7fc89a49b 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/MethodHelpEntry.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/MethodHelpEntry.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: MethodHelpEntry">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/NetworkInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/NetworkInfo.html
index 5334d82cf..48f73ff6d 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/NetworkInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/NetworkInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: NetworkInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/Outpoint.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/Outpoint.html
index d25b06dd9..513482001 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/Outpoint.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/Outpoint.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: Outpoint">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html
index 61501994d..bac6248be 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/PrevTxOutInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: PrevTxOutInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.ScriptPubKeyInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.ScriptPubKeyInfo.html
index 795c980c6..1f32b617a 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.ScriptPubKeyInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.ScriptPubKeyInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo, class: ScriptPubKeyInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vin.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vin.html
index 5db3d7262..23c9719a4 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vin.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vin.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo, class: Vin">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VinList.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VinList.html
index 4573291c8..183724f73 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VinList.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VinList.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo, class: VinList">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vout.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vout.html
index 322e17313..fcfa66c4b 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vout.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.Vout.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo, class: Vout">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VoutList.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VoutList.html
index 9a59f04a1..797235611 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VoutList.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.VoutList.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo, class: VoutList">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html
index 1245e66e0..745882456 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/RawTransactionInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: RawTransactionInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html
index 872169bb0..3ba9fcef8 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ReceivedByAddressInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: ReceivedByAddressInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ServerInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ServerInfo.html
index 64836e7f1..c198b231e 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ServerInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ServerInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: ServerInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/SignedRawTransaction.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/SignedRawTransaction.html
index 68a33fe35..65efcb5dc 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/SignedRawTransaction.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/SignedRawTransaction.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: SignedRawTransaction">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/TxOutInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/TxOutInfo.html
index dfd4ca547..a3f77474c 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/TxOutInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/TxOutInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: TxOutInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html
index a039f8a80..caa8f8217 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/TxOutSetInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: TxOutSetInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UnloadWalletResult.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UnloadWalletResult.html
index b31ec3069..877773f0c 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UnloadWalletResult.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UnloadWalletResult.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: UnloadWalletResult">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UnspentOutput.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UnspentOutput.html
index c203fc773..c7b3bb9d0 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UnspentOutput.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UnspentOutput.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: UnspentOutput">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UtxoInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UtxoInfo.html
index 6030852d1..011f07668 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UtxoInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/UtxoInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, interface: UtxoInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.Detail.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.Detail.html
index 50b75fd10..8863c383b 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.Detail.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.Detail.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: WalletTransactionInfo, class: Detail">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.DetailList.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.DetailList.html
index a95c5d0c5..cb0a3b010 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.DetailList.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.DetailList.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: WalletTransactionInfo, class: DetailList">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.WalletConflictList.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.WalletConflictList.html
index bfe64761c..77b85d340 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.WalletConflictList.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.WalletConflictList.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: WalletTransactionInfo, class: WalletConflictList">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html
index 28776ad76..6d7a458e6 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/WalletTransactionInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: WalletTransactionInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ZmqNotification.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ZmqNotification.html
index 2380b39e8..2ab29e2da 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ZmqNotification.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/ZmqNotification.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo, class: ZmqNotification">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html
index 6c8ced9e7..7fe1bb354 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressBalanceInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo.bitcore, class: AddressBalanceInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html
index 19a1e5110..c6a1b801a 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressRequest.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo.bitcore, class: AddressRequest">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoInfo.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoInfo.html
index a08e71158..a09e5ad27 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoInfo.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoInfo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo.bitcore, class: AddressUtxoInfo">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoResult.html b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoResult.html
index 84c805670..8547de75c 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoResult.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/pojo/bitcore/AddressUtxoResult.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.pojo.bitcore, class: AddressUtxoResult">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html b/apidoc/src-html/org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html
index fe0245bf0..d003552b5 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/json/rpc/BitcoinJsonRpc.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.json.rpc, interface: BitcoinJsonRpc">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html
index d45eb6961..03f927108 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/BitcoinClient.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc, class: BitcoinClient">
@@ -44,1216 +44,1259 @@
 <span class="source-line-no">031</span><span id="line-31">import org.consensusj.bitcoin.json.pojo.bitcore.AddressRequest;</span>
 <span class="source-line-no">032</span><span id="line-32">import org.consensusj.bitcoin.json.pojo.bitcore.AddressUtxoInfo;</span>
 <span class="source-line-no">033</span><span id="line-33">import org.consensusj.bitcoin.jsonrpc.internal.BitcoinClientThreadFactory;</span>
-<span class="source-line-no">034</span><span id="line-34">import org.consensusj.jsonrpc.JsonRpcError;</span>
-<span class="source-line-no">035</span><span id="line-35">import org.consensusj.jsonrpc.JsonRpcErrorException;</span>
-<span class="source-line-no">036</span><span id="line-36">import org.consensusj.jsonrpc.JsonRpcException;</span>
-<span class="source-line-no">037</span><span id="line-37">import org.consensusj.jsonrpc.JsonRpcMessage;</span>
-<span class="source-line-no">038</span><span id="line-38">import org.consensusj.jsonrpc.JsonRpcRequest;</span>
-<span class="source-line-no">039</span><span id="line-39">import org.consensusj.jsonrpc.JsonRpcResponse;</span>
-<span class="source-line-no">040</span><span id="line-40">import org.consensusj.jsonrpc.JsonRpcStatusException;</span>
-<span class="source-line-no">041</span><span id="line-41">import org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection;</span>
+<span class="source-line-no">034</span><span id="line-34">import org.consensusj.jsonrpc.DefaultRpcClient;</span>
+<span class="source-line-no">035</span><span id="line-35">import org.consensusj.jsonrpc.JsonRpcError;</span>
+<span class="source-line-no">036</span><span id="line-36">import org.consensusj.jsonrpc.JsonRpcErrorException;</span>
+<span class="source-line-no">037</span><span id="line-37">import org.consensusj.jsonrpc.JsonRpcException;</span>
+<span class="source-line-no">038</span><span id="line-38">import org.consensusj.jsonrpc.JsonRpcMessage;</span>
+<span class="source-line-no">039</span><span id="line-39">import org.consensusj.jsonrpc.JsonRpcRequest;</span>
+<span class="source-line-no">040</span><span id="line-40">import org.consensusj.jsonrpc.JsonRpcResponse;</span>
+<span class="source-line-no">041</span><span id="line-41">import org.consensusj.jsonrpc.JsonRpcStatusException;</span>
 <span class="source-line-no">042</span><span id="line-42">import org.bitcoinj.base.Address;</span>
 <span class="source-line-no">043</span><span id="line-43">import org.bitcoinj.core.Block;</span>
 <span class="source-line-no">044</span><span id="line-44">import org.bitcoinj.base.Coin;</span>
 <span class="source-line-no">045</span><span id="line-45">import org.bitcoinj.core.Context;</span>
 <span class="source-line-no">046</span><span id="line-46">import org.bitcoinj.crypto.ECKey;</span>
-<span class="source-line-no">047</span><span id="line-47">import org.bitcoinj.core.NetworkParameters;</span>
-<span class="source-line-no">048</span><span id="line-48">import org.bitcoinj.base.Sha256Hash;</span>
-<span class="source-line-no">049</span><span id="line-49">import org.bitcoinj.core.Transaction;</span>
+<span class="source-line-no">047</span><span id="line-47">import org.bitcoinj.base.Sha256Hash;</span>
+<span class="source-line-no">048</span><span id="line-48">import org.bitcoinj.core.Transaction;</span>
+<span class="source-line-no">049</span><span id="line-49">import org.consensusj.jsonrpc.JsonRpcTransport;</span>
 <span class="source-line-no">050</span><span id="line-50">import org.slf4j.Logger;</span>
 <span class="source-line-no">051</span><span id="line-51">import org.slf4j.LoggerFactory;</span>
 <span class="source-line-no">052</span><span id="line-52"></span>
 <span class="source-line-no">053</span><span id="line-53">import javax.net.ssl.SSLContext;</span>
-<span class="source-line-no">054</span><span id="line-54">import javax.net.ssl.SSLSocketFactory;</span>
-<span class="source-line-no">055</span><span id="line-55">import java.io.EOFException;</span>
-<span class="source-line-no">056</span><span id="line-56">import java.io.IOException;</span>
+<span class="source-line-no">054</span><span id="line-54">import java.io.EOFException;</span>
+<span class="source-line-no">055</span><span id="line-55">import java.io.IOException;</span>
+<span class="source-line-no">056</span><span id="line-56">import java.net.ConnectException;</span>
 <span class="source-line-no">057</span><span id="line-57">import java.net.SocketException;</span>
 <span class="source-line-no">058</span><span id="line-58">import java.net.URI;</span>
 <span class="source-line-no">059</span><span id="line-59">import java.nio.ByteBuffer;</span>
-<span class="source-line-no">060</span><span id="line-60">import java.util.List;</span>
-<span class="source-line-no">061</span><span id="line-61">import java.util.Map;</span>
-<span class="source-line-no">062</span><span id="line-62">import java.util.concurrent.CompletableFuture;</span>
-<span class="source-line-no">063</span><span id="line-63">import java.util.concurrent.ExecutorService;</span>
-<span class="source-line-no">064</span><span id="line-64">import java.util.concurrent.Executors;</span>
-<span class="source-line-no">065</span><span id="line-65">import java.util.concurrent.ThreadFactory;</span>
-<span class="source-line-no">066</span><span id="line-66">import java.util.concurrent.TimeUnit;</span>
-<span class="source-line-no">067</span><span id="line-67">import java.util.stream.Collectors;</span>
-<span class="source-line-no">068</span><span id="line-68">import java.util.stream.Stream;</span>
-<span class="source-line-no">069</span><span id="line-69"></span>
-<span class="source-line-no">070</span><span id="line-70">/**</span>
-<span class="source-line-no">071</span><span id="line-71"> * JSON-RPC Client for &lt;b&gt;Bitcoin Core&lt;/b&gt;.</span>
-<span class="source-line-no">072</span><span id="line-72"> * &lt;p&gt;</span>
-<span class="source-line-no">073</span><span id="line-73"> * A strongly-typed wrapper for a Bitcoin Core JSON-RPC client using the</span>
-<span class="source-line-no">074</span><span id="line-74"> * &lt;a href="https://bitcoincore.org/en/doc/"&gt;Bitcoin Core JSON-RPC API&lt;/a&gt;.</span>
-<span class="source-line-no">075</span><span id="line-75"> * &lt;p&gt;</span>
-<span class="source-line-no">076</span><span id="line-76"> * &lt;a href="https://bitcoinj.org"&gt;bitcoinj&lt;/a&gt; types are used where appropriate.</span>
-<span class="source-line-no">077</span><span id="line-77"> * For example, requesting a block hash will return a {@link org.bitcoinj.base.Sha256Hash}:</span>
-<span class="source-line-no">078</span><span id="line-78"> *</span>
-<span class="source-line-no">079</span><span id="line-79"> * &lt;pre&gt; {@code</span>
-<span class="source-line-no">080</span><span id="line-80"> * Sha256Hash hash = client.getBlockHash(342650);</span>
-<span class="source-line-no">081</span><span id="line-81"> * }&lt;/pre&gt;</span>
-<span class="source-line-no">082</span><span id="line-82"> *</span>
-<span class="source-line-no">083</span><span id="line-83"> * Requesting a Bitcoin balance will return the amount as a {@link org.bitcoinj.base.Coin}:</span>
-<span class="source-line-no">084</span><span id="line-84"> *</span>
-<span class="source-line-no">085</span><span id="line-85"> * &lt;pre&gt; {@code</span>
-<span class="source-line-no">086</span><span id="line-86"> * Coin balance = client.getBalance();</span>
-<span class="source-line-no">087</span><span id="line-87"> * }&lt;/pre&gt;</span>
-<span class="source-line-no">088</span><span id="line-88"> *</span>
-<span class="source-line-no">089</span><span id="line-89"> * This version is written to be compatible with Bitcoin Core 0.20 and later. If used with</span>
-<span class="source-line-no">090</span><span id="line-90"> * Omni Core (an enhanced version of Bitcoin Core with Omni Protocol support) Omni Core 0.11.0 or later is required.</span>
-<span class="source-line-no">091</span><span id="line-91"> * &lt;p&gt;</span>
-<span class="source-line-no">092</span><span id="line-92"> * Note that according to &lt;a href="https://github.com/bitcoin/bitcoin/issues/2960"&gt;Issue #2960: Support JSON-RPC 2.0&lt;/a&gt; Bitcoin Core</span>
-<span class="source-line-no">093</span><span id="line-93"> * does not correctly follow the JSON-RPC 2.0 specification.</span>
-<span class="source-line-no">094</span><span id="line-94"> * @see org.consensusj.jsonrpc.JsonRpcClient</span>
-<span class="source-line-no">095</span><span id="line-95"> * @see &lt;a href="https://bitcoincore.org/en/doc/"&gt;Bitcoin Core JSON-RPC API reference&lt;/a&gt;</span>
-<span class="source-line-no">096</span><span id="line-96"> * @see &lt;a href="https://github.com/bitcoin/bitcoin/issues/2960"&gt;Bitcoin Core Issue #2960: Support JSON-RPC 2.0&lt;/a&gt;</span>
-<span class="source-line-no">097</span><span id="line-97"> * &lt;p&gt;</span>
-<span class="source-line-no">098</span><span id="line-98"> * &lt;b&gt;This is still a work-in-progress and the API will change.&lt;/b&gt;</span>
-<span class="source-line-no">099</span><span id="line-99"> *</span>
-<span class="source-line-no">100</span><span id="line-100"> */</span>
-<span class="source-line-no">101</span><span id="line-101">public class BitcoinClient extends JsonRpcClientHttpUrlConnection implements ChainTipClient {</span>
-<span class="source-line-no">102</span><span id="line-102">    private static final Logger log = LoggerFactory.getLogger(BitcoinClient.class);</span>
-<span class="source-line-no">103</span><span id="line-103"></span>
-<span class="source-line-no">104</span><span id="line-104">    private static final int THREAD_POOL_SIZE = 5;</span>
-<span class="source-line-no">105</span><span id="line-105"></span>
-<span class="source-line-no">106</span><span id="line-106">    private static final int SECOND_IN_MSEC = 1000;</span>
-<span class="source-line-no">107</span><span id="line-107">    private static final int RETRY_SECONDS = 5;</span>
-<span class="source-line-no">108</span><span id="line-108">    private static final int MESSAGE_SECONDS = 30;</span>
-<span class="source-line-no">109</span><span id="line-109"></span>
-<span class="source-line-no">110</span><span id="line-110">    public static final int BITCOIN_CORE_VERSION_MIN = 200000;              // Minimum Bitcoin Core supported (tested) version</span>
-<span class="source-line-no">111</span><span id="line-111">    public static final int BITCOIN_CORE_VERSION_DESC_DEFAULT = 230000;     // Bitcoin Core version that DEFAULTS to descriptor wallets</span>
-<span class="source-line-no">112</span><span id="line-112"></span>
-<span class="source-line-no">113</span><span id="line-113">    private Network network;</span>
-<span class="source-line-no">114</span><span id="line-114">    private final ExecutorService executorService;</span>
+<span class="source-line-no">060</span><span id="line-60">import java.time.Duration;</span>
+<span class="source-line-no">061</span><span id="line-61">import java.util.List;</span>
+<span class="source-line-no">062</span><span id="line-62">import java.util.Map;</span>
+<span class="source-line-no">063</span><span id="line-63">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">064</span><span id="line-64">import java.util.concurrent.CompletionException;</span>
+<span class="source-line-no">065</span><span id="line-65">import java.util.concurrent.ExecutorService;</span>
+<span class="source-line-no">066</span><span id="line-66">import java.util.concurrent.Executors;</span>
+<span class="source-line-no">067</span><span id="line-67">import java.util.concurrent.ThreadFactory;</span>
+<span class="source-line-no">068</span><span id="line-68">import java.util.concurrent.TimeUnit;</span>
+<span class="source-line-no">069</span><span id="line-69">import java.util.concurrent.TimeoutException;</span>
+<span class="source-line-no">070</span><span id="line-70">import java.util.function.Function;</span>
+<span class="source-line-no">071</span><span id="line-71">import java.util.function.Supplier;</span>
+<span class="source-line-no">072</span><span id="line-72">import java.util.stream.Collectors;</span>
+<span class="source-line-no">073</span><span id="line-73">import java.util.stream.Stream;</span>
+<span class="source-line-no">074</span><span id="line-74"></span>
+<span class="source-line-no">075</span><span id="line-75">/**</span>
+<span class="source-line-no">076</span><span id="line-76"> * JSON-RPC Client for &lt;b&gt;Bitcoin Core&lt;/b&gt;.</span>
+<span class="source-line-no">077</span><span id="line-77"> * &lt;p&gt;</span>
+<span class="source-line-no">078</span><span id="line-78"> * A strongly-typed wrapper for a Bitcoin Core JSON-RPC client using the</span>
+<span class="source-line-no">079</span><span id="line-79"> * &lt;a href="https://bitcoincore.org/en/doc/"&gt;Bitcoin Core JSON-RPC API&lt;/a&gt;.</span>
+<span class="source-line-no">080</span><span id="line-80"> * &lt;p&gt;</span>
+<span class="source-line-no">081</span><span id="line-81"> * &lt;a href="https://bitcoinj.org"&gt;bitcoinj&lt;/a&gt; types are used where appropriate.</span>
+<span class="source-line-no">082</span><span id="line-82"> * For example, requesting a block hash will return a {@link org.bitcoinj.base.Sha256Hash}:</span>
+<span class="source-line-no">083</span><span id="line-83"> *</span>
+<span class="source-line-no">084</span><span id="line-84"> * &lt;pre&gt; {@code</span>
+<span class="source-line-no">085</span><span id="line-85"> * Sha256Hash hash = client.getBlockHash(342650);</span>
+<span class="source-line-no">086</span><span id="line-86"> * }&lt;/pre&gt;</span>
+<span class="source-line-no">087</span><span id="line-87"> *</span>
+<span class="source-line-no">088</span><span id="line-88"> * Requesting a Bitcoin balance will return the amount as a {@link org.bitcoinj.base.Coin}:</span>
+<span class="source-line-no">089</span><span id="line-89"> *</span>
+<span class="source-line-no">090</span><span id="line-90"> * &lt;pre&gt; {@code</span>
+<span class="source-line-no">091</span><span id="line-91"> * Coin balance = client.getBalance();</span>
+<span class="source-line-no">092</span><span id="line-92"> * }&lt;/pre&gt;</span>
+<span class="source-line-no">093</span><span id="line-93"> *</span>
+<span class="source-line-no">094</span><span id="line-94"> * This version is written to be compatible with Bitcoin Core 0.20 and later. If used with</span>
+<span class="source-line-no">095</span><span id="line-95"> * Omni Core (an enhanced version of Bitcoin Core with Omni Protocol support) Omni Core 0.11.0 or later is required.</span>
+<span class="source-line-no">096</span><span id="line-96"> * &lt;p&gt;</span>
+<span class="source-line-no">097</span><span id="line-97"> * Note that according to &lt;a href="https://github.com/bitcoin/bitcoin/issues/2960"&gt;Issue #2960: Support JSON-RPC 2.0&lt;/a&gt; Bitcoin Core</span>
+<span class="source-line-no">098</span><span id="line-98"> * does not correctly follow the JSON-RPC 2.0 specification.</span>
+<span class="source-line-no">099</span><span id="line-99"> * @see org.consensusj.jsonrpc.JsonRpcClient</span>
+<span class="source-line-no">100</span><span id="line-100"> * @see &lt;a href="https://bitcoincore.org/en/doc/"&gt;Bitcoin Core JSON-RPC API reference&lt;/a&gt;</span>
+<span class="source-line-no">101</span><span id="line-101"> * @see &lt;a href="https://github.com/bitcoin/bitcoin/issues/2960"&gt;Bitcoin Core Issue #2960: Support JSON-RPC 2.0&lt;/a&gt;</span>
+<span class="source-line-no">102</span><span id="line-102"> * &lt;p&gt;</span>
+<span class="source-line-no">103</span><span id="line-103"> * &lt;b&gt;This is still a work-in-progress and the API will change.&lt;/b&gt;</span>
+<span class="source-line-no">104</span><span id="line-104"> *</span>
+<span class="source-line-no">105</span><span id="line-105"> */</span>
+<span class="source-line-no">106</span><span id="line-106">public class BitcoinClient extends DefaultRpcClient implements ChainTipClient {</span>
+<span class="source-line-no">107</span><span id="line-107">    private static final Logger log = LoggerFactory.getLogger(BitcoinClient.class);</span>
+<span class="source-line-no">108</span><span id="line-108"></span>
+<span class="source-line-no">109</span><span id="line-109">    private static final int THREAD_POOL_SIZE = 5;</span>
+<span class="source-line-no">110</span><span id="line-110"></span>
+<span class="source-line-no">111</span><span id="line-111">    // Delay between retries in waitForServer and waitForBlock</span>
+<span class="source-line-no">112</span><span id="line-112">    private static final Duration RETRY_DELAY = Duration.ofSeconds(5);</span>
+<span class="source-line-no">113</span><span id="line-113">    // Delay between log messages in waitForBlock</span>
+<span class="source-line-no">114</span><span id="line-114">    private static final Duration MESSAGE_DELAY = Duration.ofSeconds(30);</span>
 <span class="source-line-no">115</span><span id="line-115"></span>
-<span class="source-line-no">116</span><span id="line-116">    private int serverVersion = 0;    // 0 means unknown serverVersion</span>
-<span class="source-line-no">117</span><span id="line-117">    private boolean isAddressIndexSuccessfullyTested = false;</span>
-<span class="source-line-no">118</span><span id="line-118">    private boolean isAddressIndexEnabled;</span>
-<span class="source-line-no">119</span><span id="line-119"></span>
-<span class="source-line-no">120</span><span id="line-120">    public BitcoinClient(SSLContext sslContext, Network network, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">121</span><span id="line-121">        super(sslContext, JsonRpcMessage.Version.V2, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">122</span><span id="line-122">        this.network = network;</span>
-<span class="source-line-no">123</span><span id="line-123">        ThreadFactory threadFactory = new BitcoinClientThreadFactory(new Context(), "Bitcoin RPC Client");</span>
-<span class="source-line-no">124</span><span id="line-124">        // TODO: Tune and/or make configurable the thread pool size.</span>
-<span class="source-line-no">125</span><span id="line-125">        // Current pool size of 5 is chosen to minimize simultaneous active RPC</span>
-<span class="source-line-no">126</span><span id="line-126">        // calls in `bitcoind` -- which is not designed for serving multiple clients.</span>
-<span class="source-line-no">127</span><span id="line-127">        executorService = Executors.newFixedThreadPool(THREAD_POOL_SIZE, threadFactory);</span>
-<span class="source-line-no">128</span><span id="line-128">        mapper.registerModule(new RpcClientModule());</span>
-<span class="source-line-no">129</span><span id="line-129">    }</span>
-<span class="source-line-no">130</span><span id="line-130"></span>
-<span class="source-line-no">131</span><span id="line-131">    /**</span>
-<span class="source-line-no">132</span><span id="line-132">     * @deprecated Use {@link BitcoinClient#BitcoinClient(SSLContext, Network, URI, String, String)}</span>
-<span class="source-line-no">133</span><span id="line-133">     */</span>
-<span class="source-line-no">134</span><span id="line-134">    @Deprecated</span>
-<span class="source-line-no">135</span><span id="line-135">    public BitcoinClient(SSLSocketFactory sslSocketFactory, Network network, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">136</span><span id="line-136">        super(sslSocketFactory, JsonRpcMessage.Version.V2, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">137</span><span id="line-137">        this.network = network;</span>
-<span class="source-line-no">138</span><span id="line-138">        ThreadFactory threadFactory = new BitcoinClientThreadFactory(new Context(), "Bitcoin RPC Client");</span>
+<span class="source-line-no">116</span><span id="line-116">    public static final int BITCOIN_CORE_VERSION_MIN = 200000;              // Minimum Bitcoin Core supported (tested) version</span>
+<span class="source-line-no">117</span><span id="line-117">    public static final int BITCOIN_CORE_VERSION_DESC_DEFAULT = 230000;     // Bitcoin Core version that DEFAULTS to descriptor wallets</span>
+<span class="source-line-no">118</span><span id="line-118"></span>
+<span class="source-line-no">119</span><span id="line-119">    // CompletableFuture&lt;Network&gt; is used to handle optional lazy (from-remote) initialization </span>
+<span class="source-line-no">120</span><span id="line-120">    private final CompletableFuture&lt;Network&gt; fNetwork = new CompletableFuture&lt;&gt;();</span>
+<span class="source-line-no">121</span><span id="line-121">    // This tells us that we have successfully connected to the server at least once via any of the methods</span>
+<span class="source-line-no">122</span><span id="line-122">    // that eventually call waitForBlockchainInfoAsync()</span>
+<span class="source-line-no">123</span><span id="line-123">    private final CompletableFuture&lt;Void&gt; fConnectedOnce = new CompletableFuture&lt;&gt;();</span>
+<span class="source-line-no">124</span><span id="line-124">    private final ExecutorService executorService;</span>
+<span class="source-line-no">125</span><span id="line-125"></span>
+<span class="source-line-no">126</span><span id="line-126">    private int serverVersion = 0;    // 0 means unknown serverVersion</span>
+<span class="source-line-no">127</span><span id="line-127">    private boolean isAddressIndexSuccessfullyTested = false;</span>
+<span class="source-line-no">128</span><span id="line-128">    private boolean isAddressIndexEnabled;</span>
+<span class="source-line-no">129</span><span id="line-129"></span>
+<span class="source-line-no">130</span><span id="line-130">    public BitcoinClient(SSLContext sslContext, Network network, URI server, String rpcuser, String rpcpassword) {</span>
+<span class="source-line-no">131</span><span id="line-131">        super(sslContext, JsonRpcMessage.Version.V2, server, rpcuser, rpcpassword);</span>
+<span class="source-line-no">132</span><span id="line-132">        if (network != null) {</span>
+<span class="source-line-no">133</span><span id="line-133">            this.fNetwork.complete(network); // Non-lazy initialization case</span>
+<span class="source-line-no">134</span><span id="line-134">        }</span>
+<span class="source-line-no">135</span><span id="line-135">        ThreadFactory threadFactory = new BitcoinClientThreadFactory(new Context(), "Bitcoin RPC Client");</span>
+<span class="source-line-no">136</span><span id="line-136">        // TODO: Tune and/or make configurable the thread pool size.</span>
+<span class="source-line-no">137</span><span id="line-137">        // Current pool size of 5 is chosen to minimize simultaneous active RPC</span>
+<span class="source-line-no">138</span><span id="line-138">        // calls in `bitcoind` -- which is not designed for serving multiple clients.</span>
 <span class="source-line-no">139</span><span id="line-139">        executorService = Executors.newFixedThreadPool(THREAD_POOL_SIZE, threadFactory);</span>
 <span class="source-line-no">140</span><span id="line-140">        mapper.registerModule(new RpcClientModule());</span>
 <span class="source-line-no">141</span><span id="line-141">    }</span>
 <span class="source-line-no">142</span><span id="line-142"></span>
-<span class="source-line-no">143</span><span id="line-143">    /**</span>
-<span class="source-line-no">144</span><span id="line-144">     * @deprecated Use {@link BitcoinClient#BitcoinClient(SSLContext, Network, URI, String, String)}</span>
-<span class="source-line-no">145</span><span id="line-145">     */</span>
-<span class="source-line-no">146</span><span id="line-146">    @Deprecated</span>
-<span class="source-line-no">147</span><span id="line-147">    public BitcoinClient(SSLSocketFactory sslSocketFactory, NetworkParameters netParams, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">148</span><span id="line-148">        this(sslSocketFactory, netParams.network(), server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">149</span><span id="line-149">    }</span>
-<span class="source-line-no">150</span><span id="line-150"></span>
-<span class="source-line-no">151</span><span id="line-151">    // TODO: Reconcile this constructor mode with {@link #waitForServer(int)}</span>
-<span class="source-line-no">152</span><span id="line-152">    /**</span>
-<span class="source-line-no">153</span><span id="line-153">     * Incubating constructor that doesn't require a {@link Network}.</span>
-<span class="source-line-no">154</span><span id="line-154">     * &lt;p&gt;</span>
-<span class="source-line-no">155</span><span id="line-155">     * When using this constructor, it is recommended that {@link #getNetwork()} be called after construction</span>
-<span class="source-line-no">156</span><span id="line-156">     * and before any other methods are called, to allow the Bitcoin network type to be initialized.</span>
-<span class="source-line-no">157</span><span id="line-157">     * @param sslContext Custom socket factory</span>
-<span class="source-line-no">158</span><span id="line-158">     * @param server URI of the Bitcoin RPC server</span>
-<span class="source-line-no">159</span><span id="line-159">     * @param rpcuser Username (if required)</span>
-<span class="source-line-no">160</span><span id="line-160">     * @param rpcpassword Password (if required)</span>
-<span class="source-line-no">161</span><span id="line-161">     */</span>
-<span class="source-line-no">162</span><span id="line-162">    public BitcoinClient(SSLContext sslContext, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">163</span><span id="line-163">        this(sslContext, (Network) null, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">164</span><span id="line-164">    }</span>
-<span class="source-line-no">165</span><span id="line-165"></span>
-<span class="source-line-no">166</span><span id="line-166">    /**</span>
-<span class="source-line-no">167</span><span id="line-167">     * Incubating constructor that doesn't require a {@link Network}.</span>
-<span class="source-line-no">168</span><span id="line-168">     * &lt;p&gt;</span>
-<span class="source-line-no">169</span><span id="line-169">     * When using this constructor, it is recommended that {@link #getNetwork()} be called after construction</span>
-<span class="source-line-no">170</span><span id="line-170">     * and before any other methods are called, to allow the Bitcoin network type to be initialized.</span>
-<span class="source-line-no">171</span><span id="line-171">     * @param server URI of the Bitcoin RPC server</span>
-<span class="source-line-no">172</span><span id="line-172">     * @param rpcuser Username (if required)</span>
-<span class="source-line-no">173</span><span id="line-173">     * @param rpcpassword Password (if required)</span>
-<span class="source-line-no">174</span><span id="line-174">     */</span>
-<span class="source-line-no">175</span><span id="line-175">    public BitcoinClient(URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">176</span><span id="line-176">        this(getDefaultSSLContext(), (Network) null, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">177</span><span id="line-177">    }</span>
-<span class="source-line-no">178</span><span id="line-178"></span>
-<span class="source-line-no">179</span><span id="line-179">    /**</span>
-<span class="source-line-no">180</span><span id="line-180">     * Construct a BitcoinClient from Network, URI, user name, and password.</span>
-<span class="source-line-no">181</span><span id="line-181">     * @param network Correct Network Parameters for destination server</span>
-<span class="source-line-no">182</span><span id="line-182">     * @param server URI of the Bitcoin RPC server</span>
-<span class="source-line-no">183</span><span id="line-183">     * @param rpcuser Username (if required)</span>
-<span class="source-line-no">184</span><span id="line-184">     * @param rpcpassword Password (if required)</span>
-<span class="source-line-no">185</span><span id="line-185">     */</span>
-<span class="source-line-no">186</span><span id="line-186">    public BitcoinClient(Network network, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">187</span><span id="line-187">        this(getDefaultSSLContext(), network, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">188</span><span id="line-188">    }</span>
-<span class="source-line-no">189</span><span id="line-189"></span>
-<span class="source-line-no">190</span><span id="line-190">    @Deprecated</span>
-<span class="source-line-no">191</span><span id="line-191">    public BitcoinClient(NetworkParameters netParams, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">192</span><span id="line-192">        this(netParams.network(), server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">193</span><span id="line-193">    }</span>
-<span class="source-line-no">194</span><span id="line-194"></span>
-<span class="source-line-no">195</span><span id="line-195">    /**</span>
-<span class="source-line-no">196</span><span id="line-196">     * Construct a BitcoinClient from an RPCConfig data object.</span>
-<span class="source-line-no">197</span><span id="line-197">     * @param config Contains URI, user name, and password</span>
-<span class="source-line-no">198</span><span id="line-198">     */</span>
-<span class="source-line-no">199</span><span id="line-199">    public BitcoinClient(RpcConfig config) {</span>
-<span class="source-line-no">200</span><span id="line-200">        this(config.network(), config.getURI(), config.getUsername(), config.getPassword());</span>
-<span class="source-line-no">201</span><span id="line-201">    }</span>
-<span class="source-line-no">202</span><span id="line-202"></span>
-<span class="source-line-no">203</span><span id="line-203">    /**</span>
-<span class="source-line-no">204</span><span id="line-204">     * Get network parameters</span>
-<span class="source-line-no">205</span><span id="line-205">     * @return network parameters for the server</span>
-<span class="source-line-no">206</span><span id="line-206">     * @deprecated Use {@link #getNetwork()}</span>
-<span class="source-line-no">207</span><span id="line-207">     */</span>
-<span class="source-line-no">208</span><span id="line-208">    @Deprecated</span>
-<span class="source-line-no">209</span><span id="line-209">    public synchronized NetworkParameters getNetParams() {</span>
-<span class="source-line-no">210</span><span id="line-210">        return NetworkParameters.of(getNetwork());</span>
-<span class="source-line-no">211</span><span id="line-211">    }</span>
-<span class="source-line-no">212</span><span id="line-212"></span>
-<span class="source-line-no">213</span><span id="line-213">    /**</span>
-<span class="source-line-no">214</span><span id="line-214">     * Get network.</span>
-<span class="source-line-no">215</span><span id="line-215">     * &lt;p&gt;</span>
-<span class="source-line-no">216</span><span id="line-216">     * Historically the Bitcoin network has been required as a constructor parameter and required to match</span>
-<span class="source-line-no">217</span><span id="line-217">     * the mode of the server. However, to simplify client configuration we have added a constructor</span>
-<span class="source-line-no">218</span><span id="line-218">     * that doesn't require specification of a network. This changes some assumptions about how {@code BitcoinClient} works.</span>
-<span class="source-line-no">219</span><span id="line-219">     * Previously, no JSON-RPC I/O calls would be performed unless something was explicitly requested -- which</span>
-<span class="source-line-no">220</span><span id="line-220">     * also gave users of {@code BitcoinClient} the ability to call {@link #waitForServer(int)}</span>
-<span class="source-line-no">221</span><span id="line-221">     * before calling any RPCs.</span>
-<span class="source-line-no">222</span><span id="line-222">     * &lt;p&gt;</span>
-<span class="source-line-no">223</span><span id="line-223">     * Until further improvements/changes are made, if you use one of the constructors that does not specify a</span>
-<span class="source-line-no">224</span><span id="line-224">     * {@code Network} you should call {@link #getNetwork()} as soon as possible after calling the constructor</span>
-<span class="source-line-no">225</span><span id="line-225">     * (especially before calling any JSON-RPC I/O methods except {@link #waitForServer(int)}).</span>
-<span class="source-line-no">226</span><span id="line-226">     * @return network for the server</span>
-<span class="source-line-no">227</span><span id="line-227">     */</span>
-<span class="source-line-no">228</span><span id="line-228">    public synchronized Network getNetwork() {</span>
-<span class="source-line-no">229</span><span id="line-229">        if (network == null) {</span>
-<span class="source-line-no">230</span><span id="line-230">            network = getNetworkFromServer().join();</span>
-<span class="source-line-no">231</span><span id="line-231">        }</span>
-<span class="source-line-no">232</span><span id="line-232">        return network;</span>
+<span class="source-line-no">143</span><span id="line-143">    // TODO: Reconcile this constructor mode with {@link #waitForServer(int)}</span>
+<span class="source-line-no">144</span><span id="line-144">    /**</span>
+<span class="source-line-no">145</span><span id="line-145">     * Incubating constructor that doesn't require a {@link Network}.</span>
+<span class="source-line-no">146</span><span id="line-146">     * &lt;p&gt;</span>
+<span class="source-line-no">147</span><span id="line-147">     * When using this constructor, it is recommended that {@link #getNetwork()} be called after construction</span>
+<span class="source-line-no">148</span><span id="line-148">     * and before any other methods are called, to allow the Bitcoin network type to be initialized.</span>
+<span class="source-line-no">149</span><span id="line-149">     * @param sslContext Custom socket factory</span>
+<span class="source-line-no">150</span><span id="line-150">     * @param server URI of the Bitcoin RPC server</span>
+<span class="source-line-no">151</span><span id="line-151">     * @param rpcuser Username (if required)</span>
+<span class="source-line-no">152</span><span id="line-152">     * @param rpcpassword Password (if required)</span>
+<span class="source-line-no">153</span><span id="line-153">     */</span>
+<span class="source-line-no">154</span><span id="line-154">    public BitcoinClient(SSLContext sslContext, URI server, String rpcuser, String rpcpassword) {</span>
+<span class="source-line-no">155</span><span id="line-155">        this(sslContext, null, server, rpcuser, rpcpassword);</span>
+<span class="source-line-no">156</span><span id="line-156">        // Lazy initialization of network. Should we send a request from the constructor?</span>
+<span class="source-line-no">157</span><span id="line-157">    }</span>
+<span class="source-line-no">158</span><span id="line-158"></span>
+<span class="source-line-no">159</span><span id="line-159">    /**</span>
+<span class="source-line-no">160</span><span id="line-160">     * Incubating constructor that doesn't require a {@link Network}.</span>
+<span class="source-line-no">161</span><span id="line-161">     * &lt;p&gt;</span>
+<span class="source-line-no">162</span><span id="line-162">     * When using this constructor, it is recommended that {@link #getNetwork()} be called after construction</span>
+<span class="source-line-no">163</span><span id="line-163">     * and before any other methods are called, to allow the Bitcoin network type to be initialized.</span>
+<span class="source-line-no">164</span><span id="line-164">     * @param server URI of the Bitcoin RPC server</span>
+<span class="source-line-no">165</span><span id="line-165">     * @param rpcuser Username (if required)</span>
+<span class="source-line-no">166</span><span id="line-166">     * @param rpcpassword Password (if required)</span>
+<span class="source-line-no">167</span><span id="line-167">     */</span>
+<span class="source-line-no">168</span><span id="line-168">    public BitcoinClient(URI server, String rpcuser, String rpcpassword) {</span>
+<span class="source-line-no">169</span><span id="line-169">        this(JsonRpcTransport.getDefaultSSLContext(), server, rpcuser, rpcpassword);</span>
+<span class="source-line-no">170</span><span id="line-170">    }</span>
+<span class="source-line-no">171</span><span id="line-171"></span>
+<span class="source-line-no">172</span><span id="line-172">    /**</span>
+<span class="source-line-no">173</span><span id="line-173">     * Construct a BitcoinClient from Network, URI, user name, and password.</span>
+<span class="source-line-no">174</span><span id="line-174">     * @param network Correct Network Parameters for destination server</span>
+<span class="source-line-no">175</span><span id="line-175">     * @param server URI of the Bitcoin RPC server</span>
+<span class="source-line-no">176</span><span id="line-176">     * @param rpcuser Username (if required)</span>
+<span class="source-line-no">177</span><span id="line-177">     * @param rpcpassword Password (if required)</span>
+<span class="source-line-no">178</span><span id="line-178">     */</span>
+<span class="source-line-no">179</span><span id="line-179">    public BitcoinClient(Network network, URI server, String rpcuser, String rpcpassword) {</span>
+<span class="source-line-no">180</span><span id="line-180">        this(JsonRpcTransport.getDefaultSSLContext(), network, server, rpcuser, rpcpassword);</span>
+<span class="source-line-no">181</span><span id="line-181">    }</span>
+<span class="source-line-no">182</span><span id="line-182"></span>
+<span class="source-line-no">183</span><span id="line-183">    /**</span>
+<span class="source-line-no">184</span><span id="line-184">     * Construct a BitcoinClient from an RPCConfig data object.</span>
+<span class="source-line-no">185</span><span id="line-185">     * @param config Contains URI, user name, and password</span>
+<span class="source-line-no">186</span><span id="line-186">     */</span>
+<span class="source-line-no">187</span><span id="line-187">    public BitcoinClient(RpcConfig config) {</span>
+<span class="source-line-no">188</span><span id="line-188">        this(config.network(), config.getURI(), config.getUsername(), config.getPassword());</span>
+<span class="source-line-no">189</span><span id="line-189">    }</span>
+<span class="source-line-no">190</span><span id="line-190"></span>
+<span class="source-line-no">191</span><span id="line-191">    /**</span>
+<span class="source-line-no">192</span><span id="line-192">     * Get network.</span>
+<span class="source-line-no">193</span><span id="line-193">     * &lt;p&gt;</span>
+<span class="source-line-no">194</span><span id="line-194">     * Historically the Bitcoin network has been required as a constructor parameter and required to match</span>
+<span class="source-line-no">195</span><span id="line-195">     * the mode of the server. However, to simplify client configuration we have added a constructor</span>
+<span class="source-line-no">196</span><span id="line-196">     * that doesn't require specification of a network. This changes some assumptions about how {@code BitcoinClient} works.</span>
+<span class="source-line-no">197</span><span id="line-197">     * Previously, no JSON-RPC I/O calls would be performed unless something was explicitly requested -- which</span>
+<span class="source-line-no">198</span><span id="line-198">     * also gave users of {@code BitcoinClient} the ability to call {@link #waitForServer(Duration)}</span>
+<span class="source-line-no">199</span><span id="line-199">     * before calling any RPCs.</span>
+<span class="source-line-no">200</span><span id="line-200">     * &lt;p&gt;</span>
+<span class="source-line-no">201</span><span id="line-201">     * Until further improvements/changes are made, if you use one of the constructors that does not specify a</span>
+<span class="source-line-no">202</span><span id="line-202">     * {@code Network} you should call {@link #connectToServer(Duration)} as soon as possible after calling the constructor</span>
+<span class="source-line-no">203</span><span id="line-203">     * (especially before calling any JSON-RPC I/O methods.</span>
+<span class="source-line-no">204</span><span id="line-204">     * &lt;p&gt;</span>
+<span class="source-line-no">205</span><span id="line-205">     *  Well-behaved users of {@code BitcoinClient} should only call this method &lt;i&gt;after&lt;/i&gt; either providing</span>
+<span class="source-line-no">206</span><span id="line-206">     *  a {@link Network} in the constructor or calling one of the methods that makes a connection. Because this</span>
+<span class="source-line-no">207</span><span id="line-207">     *  method is also used internally and indirectly, there is a short timeout specified for extra safety.</span>
+<span class="source-line-no">208</span><span id="line-208">     * @return network for the server</span>
+<span class="source-line-no">209</span><span id="line-209">     */</span>
+<span class="source-line-no">210</span><span id="line-210">    public synchronized Network getNetwork() {</span>
+<span class="source-line-no">211</span><span id="line-211">        // TODO: Should this auto-connect?</span>
+<span class="source-line-no">212</span><span id="line-212">        return fNetwork.orTimeout(1, TimeUnit.MINUTES).join();</span>
+<span class="source-line-no">213</span><span id="line-213">    }</span>
+<span class="source-line-no">214</span><span id="line-214"></span>
+<span class="source-line-no">215</span><span id="line-215">    @Override</span>
+<span class="source-line-no">216</span><span id="line-216">    public ExecutorService getDefaultAsyncExecutor() {</span>
+<span class="source-line-no">217</span><span id="line-217">        return executorService;</span>
+<span class="source-line-no">218</span><span id="line-218">    }</span>
+<span class="source-line-no">219</span><span id="line-219">    </span>
+<span class="source-line-no">220</span><span id="line-220">    /**</span>
+<span class="source-line-no">221</span><span id="line-221">     * Shutdown our thread pool, etc.</span>
+<span class="source-line-no">222</span><span id="line-222">     *</span>
+<span class="source-line-no">223</span><span id="line-223">     * @throws InterruptedException if one happens</span>
+<span class="source-line-no">224</span><span id="line-224">     */</span>
+<span class="source-line-no">225</span><span id="line-225">    @Override</span>
+<span class="source-line-no">226</span><span id="line-226">    public void close() throws InterruptedException {</span>
+<span class="source-line-no">227</span><span id="line-227">        // TODO: See shutdownAndAwaitTermination method in the ExecutorService JavaDoc for how to correctly implement this.</span>
+<span class="source-line-no">228</span><span id="line-228">        executorService.shutdown();</span>
+<span class="source-line-no">229</span><span id="line-229">        boolean successfullyTerminated = executorService.awaitTermination(10, TimeUnit.SECONDS);</span>
+<span class="source-line-no">230</span><span id="line-230">        if (!successfullyTerminated) {</span>
+<span class="source-line-no">231</span><span id="line-231">            log.warn("timeout while closing");</span>
+<span class="source-line-no">232</span><span id="line-232">        }</span>
 <span class="source-line-no">233</span><span id="line-233">    }</span>
 <span class="source-line-no">234</span><span id="line-234"></span>
-<span class="source-line-no">235</span><span id="line-235">    @Override</span>
-<span class="source-line-no">236</span><span id="line-236">    public ExecutorService getDefaultAsyncExecutor() {</span>
-<span class="source-line-no">237</span><span id="line-237">        return executorService;</span>
-<span class="source-line-no">238</span><span id="line-238">    }</span>
-<span class="source-line-no">239</span><span id="line-239">    </span>
-<span class="source-line-no">240</span><span id="line-240">    /**</span>
-<span class="source-line-no">241</span><span id="line-241">     * Shutdown our thread pool, etc.</span>
-<span class="source-line-no">242</span><span id="line-242">     *</span>
-<span class="source-line-no">243</span><span id="line-243">     * @throws InterruptedException if one happens</span>
-<span class="source-line-no">244</span><span id="line-244">     */</span>
-<span class="source-line-no">245</span><span id="line-245">    @Override</span>
-<span class="source-line-no">246</span><span id="line-246">    public void close() throws InterruptedException {</span>
-<span class="source-line-no">247</span><span id="line-247">        // TODO: See shutdownAndAwaitTermination method in the ExecutorService JavaDoc for how to correctly implement this.</span>
-<span class="source-line-no">248</span><span id="line-248">        executorService.shutdown();</span>
-<span class="source-line-no">249</span><span id="line-249">        boolean successfullyTerminated = executorService.awaitTermination(10, TimeUnit.SECONDS);</span>
-<span class="source-line-no">250</span><span id="line-250">        if (!successfullyTerminated) {</span>
-<span class="source-line-no">251</span><span id="line-251">            log.warn("timeout while closing");</span>
-<span class="source-line-no">252</span><span id="line-252">        }</span>
-<span class="source-line-no">253</span><span id="line-253">    }</span>
-<span class="source-line-no">254</span><span id="line-254"></span>
-<span class="source-line-no">255</span><span id="line-255">    /**</span>
-<span class="source-line-no">256</span><span id="line-256">     * Get a (cached after first call) serverVersion number</span>
-<span class="source-line-no">257</span><span id="line-257">     * @return serverVersion version of bitcoin server node</span>
-<span class="source-line-no">258</span><span id="line-258">     */</span>
-<span class="source-line-no">259</span><span id="line-259">    synchronized int getServerVersion() {</span>
-<span class="source-line-no">260</span><span id="line-260">        if (serverVersion == 0) {</span>
-<span class="source-line-no">261</span><span id="line-261">            try {</span>
-<span class="source-line-no">262</span><span id="line-262">                serverVersion = getNetworkInfo().getVersion();</span>
-<span class="source-line-no">263</span><span id="line-263">            } catch (IOException e) {</span>
-<span class="source-line-no">264</span><span id="line-264">                throw new RuntimeException(e);</span>
-<span class="source-line-no">265</span><span id="line-265">            }</span>
-<span class="source-line-no">266</span><span id="line-266">            if (serverVersion &lt; BITCOIN_CORE_VERSION_MIN) {</span>
-<span class="source-line-no">267</span><span id="line-267">                throw new RuntimeException("Unsupported server version");</span>
-<span class="source-line-no">268</span><span id="line-268">            }</span>
-<span class="source-line-no">269</span><span id="line-269">        }</span>
-<span class="source-line-no">270</span><span id="line-270">        return serverVersion;</span>
-<span class="source-line-no">271</span><span id="line-271">    }</span>
-<span class="source-line-no">272</span><span id="line-272"></span>
-<span class="source-line-no">273</span><span id="line-273">    /**</span>
-<span class="source-line-no">274</span><span id="line-274">     * Get the {@link Network} for this client by asking the server.</span>
-<span class="source-line-no">275</span><span id="line-275">     * @return A future for the server-side {@code Network}</span>
-<span class="source-line-no">276</span><span id="line-276">     */</span>
-<span class="source-line-no">277</span><span id="line-277">    private CompletableFuture&lt;Network&gt; getNetworkFromServer() {</span>
-<span class="source-line-no">278</span><span id="line-278">        return getBlockchainInfoMap().thenApply(map -&gt; {</span>
-<span class="source-line-no">279</span><span id="line-279">            Network network;</span>
-<span class="source-line-no">280</span><span id="line-280">            switch((String) map.get("chain")) {</span>
-<span class="source-line-no">281</span><span id="line-281">                case "main":</span>
-<span class="source-line-no">282</span><span id="line-282">                    network = BitcoinNetwork.MAINNET;</span>
-<span class="source-line-no">283</span><span id="line-283">                    break;</span>
-<span class="source-line-no">284</span><span id="line-284">                case "test":</span>
-<span class="source-line-no">285</span><span id="line-285">                    network = BitcoinNetwork.TESTNET;</span>
-<span class="source-line-no">286</span><span id="line-286">                    break;</span>
-<span class="source-line-no">287</span><span id="line-287">                case "signet":</span>
-<span class="source-line-no">288</span><span id="line-288">                    network = BitcoinNetwork.SIGNET;</span>
-<span class="source-line-no">289</span><span id="line-289">                    break;</span>
-<span class="source-line-no">290</span><span id="line-290">                case "regtest":</span>
-<span class="source-line-no">291</span><span id="line-291">                    network = BitcoinNetwork.REGTEST;</span>
-<span class="source-line-no">292</span><span id="line-292">                    break;</span>
-<span class="source-line-no">293</span><span id="line-293">                default:</span>
-<span class="source-line-no">294</span><span id="line-294">                    throw new RuntimeException("Server returned unrecognized Bitcoin network");</span>
-<span class="source-line-no">295</span><span id="line-295"></span>
-<span class="source-line-no">296</span><span id="line-296">            }</span>
-<span class="source-line-no">297</span><span id="line-297">            return network;</span>
-<span class="source-line-no">298</span><span id="line-298">        });</span>
-<span class="source-line-no">299</span><span id="line-299">    }</span>
-<span class="source-line-no">300</span><span id="line-300"></span>
-<span class="source-line-no">301</span><span id="line-301">    /**</span>
-<span class="source-line-no">302</span><span id="line-302">     * Return {@code BlockchainInfo} as a {@link Map}. This avoids use of {@link RpcClientModule} and a circular dependency on {@link Network}</span>
-<span class="source-line-no">303</span><span id="line-303">     * @return  {@code getblockchaininfo} response JSON as a {@link Map}</span>
-<span class="source-line-no">304</span><span id="line-304">     */</span>
-<span class="source-line-no">305</span><span id="line-305">    private CompletableFuture&lt;Map&lt;String, Object&gt;&gt; getBlockchainInfoMap() {</span>
-<span class="source-line-no">306</span><span id="line-306">        JsonRpcRequest request = buildJsonRequest("getblockchaininfo");</span>
-<span class="source-line-no">307</span><span id="line-307">        CompletableFuture&lt;JsonRpcResponse&lt;Map&lt;String, Object&gt;&gt;&gt; response = sendRequestForResponseAsync(request, responseTypeFor(Map.class));</span>
-<span class="source-line-no">308</span><span id="line-308">        return response.thenApply(JsonRpcResponse::getResult);</span>
-<span class="source-line-no">309</span><span id="line-309">    }</span>
-<span class="source-line-no">310</span><span id="line-310"></span>
-<span class="source-line-no">311</span><span id="line-311">    /**</span>
-<span class="source-line-no">312</span><span id="line-312">     * Test if address index is enabled, caching the result of the first successful check</span>
-<span class="source-line-no">313</span><span id="line-313">     *</span>
-<span class="source-line-no">314</span><span id="line-314">     * @return true if enabled, false if not enabled</span>
-<span class="source-line-no">315</span><span id="line-315">     * @throws JsonRpcException an exception other than 1 of the two expected exceptions is thrown</span>
-<span class="source-line-no">316</span><span id="line-316">     * @throws IOException something else went wrong</span>
-<span class="source-line-no">317</span><span id="line-317">     */</span>
-<span class="source-line-no">318</span><span id="line-318">    public synchronized boolean isAddressIndexEnabled() throws JsonRpcException, IOException {</span>
-<span class="source-line-no">319</span><span id="line-319">        if (!isAddressIndexSuccessfullyTested) {</span>
-<span class="source-line-no">320</span><span id="line-320">            try {</span>
-<span class="source-line-no">321</span><span id="line-321">                AddressBalanceInfo info = getAddressBalance(getTestAddress());</span>
-<span class="source-line-no">322</span><span id="line-322">                isAddressIndexSuccessfullyTested = true;</span>
-<span class="source-line-no">323</span><span id="line-323">                isAddressIndexEnabled = true;</span>
-<span class="source-line-no">324</span><span id="line-324">            } catch (JsonRpcErrorException ee) {</span>
-<span class="source-line-no">325</span><span id="line-325">                // If method not found, the method we use for the test isn't even present, so definitely</span>
-<span class="source-line-no">326</span><span id="line-326">                // no address index support is available</span>
-<span class="source-line-no">327</span><span id="line-327">                if (ee.getError().getCode() == JsonRpcError.Error.METHOD_NOT_FOUND.getCode()) {</span>
-<span class="source-line-no">328</span><span id="line-328">                    isAddressIndexSuccessfullyTested = true;</span>
-<span class="source-line-no">329</span><span id="line-329">                    isAddressIndexEnabled = false;</span>
-<span class="source-line-no">330</span><span id="line-330">                } else {</span>
-<span class="source-line-no">331</span><span id="line-331">                    // Some other, unexpected exception, throw it</span>
-<span class="source-line-no">332</span><span id="line-332">                    throw ee;</span>
-<span class="source-line-no">333</span><span id="line-333">                }</span>
-<span class="source-line-no">334</span><span id="line-334">            } catch (JsonRpcStatusException se) {</span>
-<span class="source-line-no">335</span><span id="line-335">                // If the method is there and it returns an error of "Address index not enabled" then we also</span>
-<span class="source-line-no">336</span><span id="line-336">                // know that no address index support is available</span>
-<span class="source-line-no">337</span><span id="line-337">                if (se.getMessage().equals("Address index not enabled")) {</span>
-<span class="source-line-no">338</span><span id="line-338">                    isAddressIndexSuccessfullyTested = true;</span>
-<span class="source-line-no">339</span><span id="line-339">                    isAddressIndexEnabled = false;</span>
-<span class="source-line-no">340</span><span id="line-340">                } else if ( se.jsonRpcCode == JsonRpcError.Error.METHOD_NOT_FOUND.getCode()) {</span>
-<span class="source-line-no">341</span><span id="line-341">                    // It looks like the behavior changed in Bitcoin Core v23.0 and we end up here rather than in the  JsonRpcErrorException handler above</span>
-<span class="source-line-no">342</span><span id="line-342">                    isAddressIndexSuccessfullyTested = true;</span>
-<span class="source-line-no">343</span><span id="line-343">                    isAddressIndexEnabled = false;</span>
-<span class="source-line-no">344</span><span id="line-344">                } else {</span>
-<span class="source-line-no">345</span><span id="line-345">                    // Some other, unexpected exception, throw it</span>
-<span class="source-line-no">346</span><span id="line-346">                    throw se;</span>
-<span class="source-line-no">347</span><span id="line-347">                }</span>
-<span class="source-line-no">348</span><span id="line-348">            }</span>
-<span class="source-line-no">349</span><span id="line-349">        }</span>
-<span class="source-line-no">350</span><span id="line-350">        return isAddressIndexEnabled;</span>
-<span class="source-line-no">351</span><span id="line-351">    }</span>
-<span class="source-line-no">352</span><span id="line-352"></span>
-<span class="source-line-no">353</span><span id="line-353">    private Address getTestAddress() {</span>
-<span class="source-line-no">354</span><span id="line-354">        BitcoinNetwork network = (BitcoinNetwork) getNetwork();</span>
-<span class="source-line-no">355</span><span id="line-355">        switch (network) {</span>
-<span class="source-line-no">356</span><span id="line-356">            case MAINNET:</span>
-<span class="source-line-no">357</span><span id="line-357">                return LegacyAddress.fromBase58( "1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa", network);</span>
-<span class="source-line-no">358</span><span id="line-358">            case TESTNET:</span>
-<span class="source-line-no">359</span><span id="line-359">            case REGTEST:</span>
-<span class="source-line-no">360</span><span id="line-360">            case SIGNET:</span>
-<span class="source-line-no">361</span><span id="line-361">            default:</span>
-<span class="source-line-no">362</span><span id="line-362">                return LegacyAddress.fromBase58( "moneyqMan7uh8FqdCA2BV5yZ8qVrc9ikLP", network);</span>
-<span class="source-line-no">363</span><span id="line-363">        }</span>
-<span class="source-line-no">364</span><span id="line-364">    }</span>
-<span class="source-line-no">365</span><span id="line-365"></span>
-<span class="source-line-no">366</span><span id="line-366">    // TODO: Make this an async method that returns CompletableFuture.</span>
-<span class="source-line-no">367</span><span id="line-367">    // TODO: Consider renaming this method "connect"</span>
-<span class="source-line-no">368</span><span id="line-368">    // TODO: Consider having this method automatically get the Bitcoin Network, Server Version, RegTest mining address, etc once connection is made</span>
-<span class="source-line-no">369</span><span id="line-369">    /**</span>
-<span class="source-line-no">370</span><span id="line-370">     * Wait until the server is available.</span>
-<span class="source-line-no">371</span><span id="line-371">     *</span>
-<span class="source-line-no">372</span><span id="line-372">     * Keep trying, ignoring (and logging) a known list of exception conditions that may occur while waiting for</span>
-<span class="source-line-no">373</span><span id="line-373">     * a `bitcoind` server to start up. This is similar to the behavior enabled by the `-rpcwait`</span>
-<span class="source-line-no">374</span><span id="line-374">     * option to the `bitcoin-cli` command-line tool.</span>
-<span class="source-line-no">375</span><span id="line-375">     *</span>
-<span class="source-line-no">376</span><span id="line-376">     * @param timeout Timeout in seconds</span>
-<span class="source-line-no">377</span><span id="line-377">     * @return true if ready, false if timeout or interrupted</span>
-<span class="source-line-no">378</span><span id="line-378">     * @throws JsonRpcException if an "unexpected" exception happens (i.e. an error other than what happens during normal server startup)</span>
+<span class="source-line-no">235</span><span id="line-235">    /**</span>
+<span class="source-line-no">236</span><span id="line-236">     * Get a (cached after first call) serverVersion number</span>
+<span class="source-line-no">237</span><span id="line-237">     * @return serverVersion version of bitcoin server node</span>
+<span class="source-line-no">238</span><span id="line-238">     */</span>
+<span class="source-line-no">239</span><span id="line-239">    synchronized int getServerVersion() {</span>
+<span class="source-line-no">240</span><span id="line-240">        if (serverVersion == 0) {</span>
+<span class="source-line-no">241</span><span id="line-241">            try {</span>
+<span class="source-line-no">242</span><span id="line-242">                serverVersion = getNetworkInfo().getVersion();</span>
+<span class="source-line-no">243</span><span id="line-243">            } catch (IOException e) {</span>
+<span class="source-line-no">244</span><span id="line-244">                throw new RuntimeException(e);</span>
+<span class="source-line-no">245</span><span id="line-245">            }</span>
+<span class="source-line-no">246</span><span id="line-246">            if (serverVersion &lt; BITCOIN_CORE_VERSION_MIN) {</span>
+<span class="source-line-no">247</span><span id="line-247">                throw new RuntimeException("Unsupported server version");</span>
+<span class="source-line-no">248</span><span id="line-248">            }</span>
+<span class="source-line-no">249</span><span id="line-249">        }</span>
+<span class="source-line-no">250</span><span id="line-250">        return serverVersion;</span>
+<span class="source-line-no">251</span><span id="line-251">    }</span>
+<span class="source-line-no">252</span><span id="line-252"></span>
+<span class="source-line-no">253</span><span id="line-253">    /**</span>
+<span class="source-line-no">254</span><span id="line-254">     * Get the {@link Network} for this client by asking the server.</span>
+<span class="source-line-no">255</span><span id="line-255">     * @return A future for the server-side {@code Network}</span>
+<span class="source-line-no">256</span><span id="line-256">     */</span>
+<span class="source-line-no">257</span><span id="line-257">    private CompletableFuture&lt;Network&gt; getNetworkFromServer() {</span>
+<span class="source-line-no">258</span><span id="line-258">        return getBlockChainInfoAsync().thenApply(BlockChainInfo::chainToNetwork);</span>
+<span class="source-line-no">259</span><span id="line-259">    }</span>
+<span class="source-line-no">260</span><span id="line-260"></span>
+<span class="source-line-no">261</span><span id="line-261">    /**</span>
+<span class="source-line-no">262</span><span id="line-262">     * Test if address index is enabled, caching the result of the first successful check</span>
+<span class="source-line-no">263</span><span id="line-263">     *</span>
+<span class="source-line-no">264</span><span id="line-264">     * @return true if enabled, false if not enabled</span>
+<span class="source-line-no">265</span><span id="line-265">     * @throws JsonRpcException an exception other than 1 of the two expected exceptions is thrown</span>
+<span class="source-line-no">266</span><span id="line-266">     * @throws IOException something else went wrong</span>
+<span class="source-line-no">267</span><span id="line-267">     */</span>
+<span class="source-line-no">268</span><span id="line-268">    public synchronized boolean isAddressIndexEnabled() throws JsonRpcException, IOException {</span>
+<span class="source-line-no">269</span><span id="line-269">        if (!isAddressIndexSuccessfullyTested) {</span>
+<span class="source-line-no">270</span><span id="line-270">            try {</span>
+<span class="source-line-no">271</span><span id="line-271">                AddressBalanceInfo info = getAddressBalance(getTestAddress());</span>
+<span class="source-line-no">272</span><span id="line-272">                isAddressIndexSuccessfullyTested = true;</span>
+<span class="source-line-no">273</span><span id="line-273">                isAddressIndexEnabled = true;</span>
+<span class="source-line-no">274</span><span id="line-274">            } catch (JsonRpcErrorException ee) {</span>
+<span class="source-line-no">275</span><span id="line-275">                // If method not found, the method we use for the test isn't even present, so definitely</span>
+<span class="source-line-no">276</span><span id="line-276">                // no address index support is available</span>
+<span class="source-line-no">277</span><span id="line-277">                if (ee.getError().getCode() == JsonRpcError.Error.METHOD_NOT_FOUND.getCode()) {</span>
+<span class="source-line-no">278</span><span id="line-278">                    isAddressIndexSuccessfullyTested = true;</span>
+<span class="source-line-no">279</span><span id="line-279">                    isAddressIndexEnabled = false;</span>
+<span class="source-line-no">280</span><span id="line-280">                } else {</span>
+<span class="source-line-no">281</span><span id="line-281">                    // Some other, unexpected exception, throw it</span>
+<span class="source-line-no">282</span><span id="line-282">                    throw ee;</span>
+<span class="source-line-no">283</span><span id="line-283">                }</span>
+<span class="source-line-no">284</span><span id="line-284">            } catch (JsonRpcStatusException se) {</span>
+<span class="source-line-no">285</span><span id="line-285">                // If the method is there and it returns an error of "Address index not enabled" then we also</span>
+<span class="source-line-no">286</span><span id="line-286">                // know that no address index support is available</span>
+<span class="source-line-no">287</span><span id="line-287">                if (se.getMessage().equals("Address index not enabled")) {</span>
+<span class="source-line-no">288</span><span id="line-288">                    isAddressIndexSuccessfullyTested = true;</span>
+<span class="source-line-no">289</span><span id="line-289">                    isAddressIndexEnabled = false;</span>
+<span class="source-line-no">290</span><span id="line-290">                } else if ( se.jsonRpcCode == JsonRpcError.Error.METHOD_NOT_FOUND.getCode()) {</span>
+<span class="source-line-no">291</span><span id="line-291">                    // It looks like the behavior changed in Bitcoin Core v23.0 and we end up here rather than in the  JsonRpcErrorException handler above</span>
+<span class="source-line-no">292</span><span id="line-292">                    isAddressIndexSuccessfullyTested = true;</span>
+<span class="source-line-no">293</span><span id="line-293">                    isAddressIndexEnabled = false;</span>
+<span class="source-line-no">294</span><span id="line-294">                } else {</span>
+<span class="source-line-no">295</span><span id="line-295">                    // Some other, unexpected exception, throw it</span>
+<span class="source-line-no">296</span><span id="line-296">                    throw se;</span>
+<span class="source-line-no">297</span><span id="line-297">                }</span>
+<span class="source-line-no">298</span><span id="line-298">            }</span>
+<span class="source-line-no">299</span><span id="line-299">        }</span>
+<span class="source-line-no">300</span><span id="line-300">        return isAddressIndexEnabled;</span>
+<span class="source-line-no">301</span><span id="line-301">    }</span>
+<span class="source-line-no">302</span><span id="line-302"></span>
+<span class="source-line-no">303</span><span id="line-303">    private Address getTestAddress() {</span>
+<span class="source-line-no">304</span><span id="line-304">        BitcoinNetwork network = (BitcoinNetwork) getNetwork();</span>
+<span class="source-line-no">305</span><span id="line-305">        switch (network) {</span>
+<span class="source-line-no">306</span><span id="line-306">            case MAINNET:</span>
+<span class="source-line-no">307</span><span id="line-307">                return LegacyAddress.fromBase58( "1A1zP1eP5QGefi2DMPTfTL5SLmv7DivfNa", network);</span>
+<span class="source-line-no">308</span><span id="line-308">            case TESTNET:</span>
+<span class="source-line-no">309</span><span id="line-309">            case REGTEST:</span>
+<span class="source-line-no">310</span><span id="line-310">            case SIGNET:</span>
+<span class="source-line-no">311</span><span id="line-311">            default:</span>
+<span class="source-line-no">312</span><span id="line-312">                return LegacyAddress.fromBase58( "moneyqMan7uh8FqdCA2BV5yZ8qVrc9ikLP", network);</span>
+<span class="source-line-no">313</span><span id="line-313">        }</span>
+<span class="source-line-no">314</span><span id="line-314">    }</span>
+<span class="source-line-no">315</span><span id="line-315"></span>
+<span class="source-line-no">316</span><span id="line-316">    /**</span>
+<span class="source-line-no">317</span><span id="line-317">     * Wait until the server is available.</span>
+<span class="source-line-no">318</span><span id="line-318">     * &lt;p&gt;</span>
+<span class="source-line-no">319</span><span id="line-319">     * Keep trying, ignoring (and logging) a known list of exception conditions that may occur while waiting for</span>
+<span class="source-line-no">320</span><span id="line-320">     * a {@code bitcoind} server to start up. This is similar to the behavior enabled by the {@code -rpcwait}</span>
+<span class="source-line-no">321</span><span id="line-321">     * option to the {@code bitcoin-cli} command-line tool.</span>
+<span class="source-line-no">322</span><span id="line-322">     *</span>
+<span class="source-line-no">323</span><span id="line-323">     * @param timeoutSeconds Timeout in seconds</span>
+<span class="source-line-no">324</span><span id="line-324">     * @return true if ready, false if timeout or interrupted</span>
+<span class="source-line-no">325</span><span id="line-325">     * @throws JsonRpcException if an "unexpected" exception happens (i.e. an error other than what happens during normal server startup)</span>
+<span class="source-line-no">326</span><span id="line-326">     * @deprecated Use {@link #waitForServer(Duration)}</span>
+<span class="source-line-no">327</span><span id="line-327">     */</span>
+<span class="source-line-no">328</span><span id="line-328">    @Deprecated</span>
+<span class="source-line-no">329</span><span id="line-329">    public boolean waitForServer(int timeoutSeconds) throws JsonRpcException {</span>
+<span class="source-line-no">330</span><span id="line-330">        return waitForServer(Duration.ofSeconds(timeoutSeconds));</span>
+<span class="source-line-no">331</span><span id="line-331">    }</span>
+<span class="source-line-no">332</span><span id="line-332"></span>
+<span class="source-line-no">333</span><span id="line-333">    /**</span>
+<span class="source-line-no">334</span><span id="line-334">     * Poll the server regularly until it responds.</span>
+<span class="source-line-no">335</span><span id="line-335">     * @param timeout how long to wait for server</span>
+<span class="source-line-no">336</span><span id="line-336">     * @return Completes with {@code true} if server responded, {@code false} for timeout</span>
+<span class="source-line-no">337</span><span id="line-337">     * @throws JsonRpcException if an unexpected JsonRpcException occurs</span>
+<span class="source-line-no">338</span><span id="line-338">     */</span>
+<span class="source-line-no">339</span><span id="line-339">    public boolean waitForServer(Duration timeout) throws JsonRpcException {</span>
+<span class="source-line-no">340</span><span id="line-340">        try {</span>
+<span class="source-line-no">341</span><span id="line-341">            return syncGet(waitForServerAsync(timeout, RETRY_DELAY));</span>
+<span class="source-line-no">342</span><span id="line-342">        } catch (JsonRpcException je) {</span>
+<span class="source-line-no">343</span><span id="line-343">            throw je;</span>
+<span class="source-line-no">344</span><span id="line-344">        } catch (IOException ioe) {</span>
+<span class="source-line-no">345</span><span id="line-345">            throw new RuntimeException(ioe);</span>
+<span class="source-line-no">346</span><span id="line-346">        }</span>
+<span class="source-line-no">347</span><span id="line-347">    }</span>
+<span class="source-line-no">348</span><span id="line-348"></span>
+<span class="source-line-no">349</span><span id="line-349">    /**</span>
+<span class="source-line-no">350</span><span id="line-350">     * Actively connect to server (one time) waiting for it to start if necessary</span>
+<span class="source-line-no">351</span><span id="line-351">     * @param timeout how long to wait</span>
+<span class="source-line-no">352</span><span id="line-352">     * @return completes successfully on connection or exceptionally on fatal error or timeout</span>
+<span class="source-line-no">353</span><span id="line-353">     */</span>
+<span class="source-line-no">354</span><span id="line-354">    public CompletableFuture&lt;Void&gt; connectToServer(Duration timeout) {</span>
+<span class="source-line-no">355</span><span id="line-355">        return waitForBlockchainInfoAsync(timeout, RETRY_DELAY)</span>
+<span class="source-line-no">356</span><span id="line-356">                .thenApply(info -&gt; null);</span>
+<span class="source-line-no">357</span><span id="line-357">    }</span>
+<span class="source-line-no">358</span><span id="line-358"></span>
+<span class="source-line-no">359</span><span id="line-359">    /**</span>
+<span class="source-line-no">360</span><span id="line-360">     * This is like waitForServer but does not initiate a connection. It depends upon</span>
+<span class="source-line-no">361</span><span id="line-361">     * something else having done so.</span>
+<span class="source-line-no">362</span><span id="line-362">     * @return a future (possibly already completed) that indicates we have connected at least once to the server</span>
+<span class="source-line-no">363</span><span id="line-363">     */</span>
+<span class="source-line-no">364</span><span id="line-364">    public CompletableFuture&lt;Void&gt; waitForConnected() {</span>
+<span class="source-line-no">365</span><span id="line-365">        return fConnectedOnce.minimalCompletionStage().toCompletableFuture();</span>
+<span class="source-line-no">366</span><span id="line-366">    }</span>
+<span class="source-line-no">367</span><span id="line-367"></span>
+<span class="source-line-no">368</span><span id="line-368">    public CompletableFuture&lt;Void&gt; waitForConnected(Duration timeout) {</span>
+<span class="source-line-no">369</span><span id="line-369">        return waitForConnected().orTimeout(timeout.toSeconds(), TimeUnit.SECONDS);</span>
+<span class="source-line-no">370</span><span id="line-370">    }</span>
+<span class="source-line-no">371</span><span id="line-371"></span>
+<span class="source-line-no">372</span><span id="line-372">    // TODO: Consider renaming this method "connect"</span>
+<span class="source-line-no">373</span><span id="line-373">    // TODO: Consider having this method automatically get the Bitcoin Network, Server Version, RegTest mining address, etc once connection is made (the generic waitForServer() method is capable of doing that)</span>
+<span class="source-line-no">374</span><span id="line-374">    /**</span>
+<span class="source-line-no">375</span><span id="line-375">     * Wait for a connection to the server. Uses {@code getblockchaininfo} to poll server.</span>
+<span class="source-line-no">376</span><span id="line-376">     * @param timeout how long to wait for server</span>
+<span class="source-line-no">377</span><span id="line-377">     * @param retry time to wait between retries</span>
+<span class="source-line-no">378</span><span id="line-378">     * @return Completes with {@code true} if server responded, {@code false} for timeout, exceptionally for unexpected errors.</span>
 <span class="source-line-no">379</span><span id="line-379">     */</span>
-<span class="source-line-no">380</span><span id="line-380">    public Boolean waitForServer(int timeout) throws JsonRpcException {</span>
-<span class="source-line-no">381</span><span id="line-381"></span>
-<span class="source-line-no">382</span><span id="line-382">        log.debug("Waiting for server RPC ready...");</span>
-<span class="source-line-no">383</span><span id="line-383"></span>
-<span class="source-line-no">384</span><span id="line-384">        String status;          // Status message for logging</span>
-<span class="source-line-no">385</span><span id="line-385">        String statusLast = null;</span>
-<span class="source-line-no">386</span><span id="line-386">        int seconds = 0;</span>
-<span class="source-line-no">387</span><span id="line-387">        while (seconds &lt; timeout) {</span>
-<span class="source-line-no">388</span><span id="line-388">            try {</span>
-<span class="source-line-no">389</span><span id="line-389">                Integer block = this.getBlockCount();</span>
-<span class="source-line-no">390</span><span id="line-390">                if (block != null) {</span>
-<span class="source-line-no">391</span><span id="line-391">                    log.debug("RPC Ready.");</span>
-<span class="source-line-no">392</span><span id="line-392">                    return true;</span>
-<span class="source-line-no">393</span><span id="line-393">                }</span>
-<span class="source-line-no">394</span><span id="line-394">                status = "getBlock returned null";</span>
-<span class="source-line-no">395</span><span id="line-395">            } catch (SocketException se) {</span>
-<span class="source-line-no">396</span><span id="line-396">                // These are expected exceptions while waiting for a server</span>
-<span class="source-line-no">397</span><span id="line-397">                if (se.getMessage().equals("Unexpected end of file from server") ||</span>
-<span class="source-line-no">398</span><span id="line-398">                        se.getMessage().equals("Connection reset") ||</span>
-<span class="source-line-no">399</span><span id="line-399">                        se.getMessage().contains("Connection refused") ||</span>
-<span class="source-line-no">400</span><span id="line-400">                        se.getMessage().equals("recvfrom failed: ECONNRESET (Connection reset by peer)")) {</span>
-<span class="source-line-no">401</span><span id="line-401">                    status = se.getMessage();</span>
-<span class="source-line-no">402</span><span id="line-402">                } else {</span>
-<span class="source-line-no">403</span><span id="line-403">                    throw new JsonRpcException("Unexpected exception in waitForServer", se) ;</span>
-<span class="source-line-no">404</span><span id="line-404">                }</span>
-<span class="source-line-no">405</span><span id="line-405"></span>
-<span class="source-line-no">406</span><span id="line-406">            } catch (EOFException ignored) {</span>
-<span class="source-line-no">407</span><span id="line-407">                /* Android exception, ignore */</span>
-<span class="source-line-no">408</span><span id="line-408">                // Expected exceptions on Android, RoboVM</span>
-<span class="source-line-no">409</span><span id="line-409">                status = ignored.getMessage();</span>
-<span class="source-line-no">410</span><span id="line-410">            } catch (JsonRpcStatusException e) {</span>
-<span class="source-line-no">411</span><span id="line-411">                // If server is in "warm-up" mode, e.g. validating/parsing the blockchain...</span>
-<span class="source-line-no">412</span><span id="line-412">                if (e.jsonRpcCode == -28) {</span>
-<span class="source-line-no">413</span><span id="line-413">                    // ...then grab text message for status logging</span>
-<span class="source-line-no">414</span><span id="line-414">                    status = e.getMessage();</span>
-<span class="source-line-no">415</span><span id="line-415">                } else {</span>
-<span class="source-line-no">416</span><span id="line-416">                    log.error("Rethrowing JsonRpcStatusException: ", e);</span>
-<span class="source-line-no">417</span><span id="line-417">                    throw e;</span>
-<span class="source-line-no">418</span><span id="line-418">                }</span>
-<span class="source-line-no">419</span><span id="line-419">            } catch (IOException e) {</span>
-<span class="source-line-no">420</span><span id="line-420">                // Ignore all IOExceptions</span>
-<span class="source-line-no">421</span><span id="line-421">                status = e.getMessage();</span>
-<span class="source-line-no">422</span><span id="line-422">            }</span>
-<span class="source-line-no">423</span><span id="line-423">            try {</span>
-<span class="source-line-no">424</span><span id="line-424">                // Log status messages only once, if new or updated</span>
-<span class="source-line-no">425</span><span id="line-425">                if (!status.equals(statusLast)) {</span>
-<span class="source-line-no">426</span><span id="line-426">                    log.info("Waiting for server: RPC Status: " + status);</span>
-<span class="source-line-no">427</span><span id="line-427">                    statusLast = status;</span>
-<span class="source-line-no">428</span><span id="line-428">                }</span>
-<span class="source-line-no">429</span><span id="line-429">                Thread.sleep(RETRY_SECONDS * SECOND_IN_MSEC);</span>
-<span class="source-line-no">430</span><span id="line-430">                seconds += RETRY_SECONDS;</span>
-<span class="source-line-no">431</span><span id="line-431">            } catch (InterruptedException e) {</span>
-<span class="source-line-no">432</span><span id="line-432">                log.error(e.toString());</span>
-<span class="source-line-no">433</span><span id="line-433">                Thread.currentThread().interrupt();</span>
-<span class="source-line-no">434</span><span id="line-434">                return false;</span>
-<span class="source-line-no">435</span><span id="line-435">            }</span>
-<span class="source-line-no">436</span><span id="line-436">        }</span>
-<span class="source-line-no">437</span><span id="line-437"></span>
-<span class="source-line-no">438</span><span id="line-438">        log.error("waitForServer() timed out after {} seconds.", timeout);</span>
-<span class="source-line-no">439</span><span id="line-439">        return false;</span>
-<span class="source-line-no">440</span><span id="line-440">    }</span>
-<span class="source-line-no">441</span><span id="line-441"></span>
-<span class="source-line-no">442</span><span id="line-442">    /**</span>
-<span class="source-line-no">443</span><span id="line-443">     * Wait for RPC server to reach specified block height.</span>
-<span class="source-line-no">444</span><span id="line-444">     *</span>
-<span class="source-line-no">445</span><span id="line-445">     * @param blockHeight Block height to wait for</span>
-<span class="source-line-no">446</span><span id="line-446">     * @param timeout     Timeout in seconds</span>
-<span class="source-line-no">447</span><span id="line-447">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">448</span><span id="line-448">     * @throws IOException network error</span>
-<span class="source-line-no">449</span><span id="line-449">     * @return True if blockHeight reached, false if timeout or interrupted</span>
-<span class="source-line-no">450</span><span id="line-450">     */</span>
-<span class="source-line-no">451</span><span id="line-451">    public Boolean waitForBlock(int blockHeight, int timeout) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">452</span><span id="line-452"></span>
-<span class="source-line-no">453</span><span id="line-453">        log.info("Waiting for server to reach block " + blockHeight);</span>
-<span class="source-line-no">454</span><span id="line-454"></span>
-<span class="source-line-no">455</span><span id="line-455">        int seconds = 0;</span>
-<span class="source-line-no">456</span><span id="line-456">        while (seconds &lt; timeout) {</span>
-<span class="source-line-no">457</span><span id="line-457">            Integer block = this.getBlockCount();</span>
-<span class="source-line-no">458</span><span id="line-458">            if (block &gt;= blockHeight) {</span>
-<span class="source-line-no">459</span><span id="line-459">                log.info("Server is at block " + block + " returning 'true'.");</span>
-<span class="source-line-no">460</span><span id="line-460">                return true;</span>
-<span class="source-line-no">461</span><span id="line-461">            } else {</span>
-<span class="source-line-no">462</span><span id="line-462">                try {</span>
-<span class="source-line-no">463</span><span id="line-463">                    if (seconds % MESSAGE_SECONDS == 0) {</span>
-<span class="source-line-no">464</span><span id="line-464">                        log.debug("Server at block " + block);</span>
-<span class="source-line-no">465</span><span id="line-465">                    }</span>
-<span class="source-line-no">466</span><span id="line-466">                    Thread.sleep(RETRY_SECONDS * SECOND_IN_MSEC);</span>
-<span class="source-line-no">467</span><span id="line-467">                    seconds += RETRY_SECONDS;</span>
-<span class="source-line-no">468</span><span id="line-468">                } catch (InterruptedException e) {</span>
-<span class="source-line-no">469</span><span id="line-469">                    log.error(e.toString());</span>
-<span class="source-line-no">470</span><span id="line-470">                    Thread.currentThread().interrupt();</span>
-<span class="source-line-no">471</span><span id="line-471">                    return false;</span>
-<span class="source-line-no">472</span><span id="line-472">                }</span>
-<span class="source-line-no">473</span><span id="line-473">            }</span>
-<span class="source-line-no">474</span><span id="line-474">        }</span>
-<span class="source-line-no">475</span><span id="line-475"></span>
-<span class="source-line-no">476</span><span id="line-476">        log.error("Timeout waiting for block " + blockHeight);</span>
-<span class="source-line-no">477</span><span id="line-477">        return false;</span>
-<span class="source-line-no">478</span><span id="line-478">    }</span>
-<span class="source-line-no">479</span><span id="line-479"></span>
-<span class="source-line-no">480</span><span id="line-480"></span>
-<span class="source-line-no">481</span><span id="line-481">    /**</span>
-<span class="source-line-no">482</span><span id="line-482">     * Tell the server to stop</span>
-<span class="source-line-no">483</span><span id="line-483">     * @return A status string</span>
-<span class="source-line-no">484</span><span id="line-484">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">485</span><span id="line-485">     * @throws IOException network error</span>
-<span class="source-line-no">486</span><span id="line-486">     */</span>
-<span class="source-line-no">487</span><span id="line-487">    public String stop() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">488</span><span id="line-488">        return send("stop");</span>
-<span class="source-line-no">489</span><span id="line-489">    }</span>
-<span class="source-line-no">490</span><span id="line-490"></span>
-<span class="source-line-no">491</span><span id="line-491">    /**</span>
-<span class="source-line-no">492</span><span id="line-492">     * Returns the number of blocks in the longest block chain.</span>
-<span class="source-line-no">493</span><span id="line-493">     *</span>
-<span class="source-line-no">494</span><span id="line-494">     * @return The current block count</span>
-<span class="source-line-no">495</span><span id="line-495">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">496</span><span id="line-496">     * @throws IOException network error</span>
-<span class="source-line-no">497</span><span id="line-497">     */</span>
-<span class="source-line-no">498</span><span id="line-498">    public Integer getBlockCount() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">499</span><span id="line-499">        return send("getblockcount");</span>
-<span class="source-line-no">500</span><span id="line-500">    }</span>
-<span class="source-line-no">501</span><span id="line-501"></span>
-<span class="source-line-no">502</span><span id="line-502">    /**</span>
-<span class="source-line-no">503</span><span id="line-503">     * Returns the hash of block in best-block-chain at index provided.</span>
-<span class="source-line-no">504</span><span id="line-504">     *</span>
-<span class="source-line-no">505</span><span id="line-505">     * @param index The block index</span>
-<span class="source-line-no">506</span><span id="line-506">     * @return The block hash</span>
-<span class="source-line-no">507</span><span id="line-507">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">508</span><span id="line-508">     * @throws IOException network error</span>
-<span class="source-line-no">509</span><span id="line-509">     */</span>
-<span class="source-line-no">510</span><span id="line-510">    public Sha256Hash getBlockHash(Integer index) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">511</span><span id="line-511">        return send("getblockhash", Sha256Hash.class, index);</span>
-<span class="source-line-no">512</span><span id="line-512">    }</span>
-<span class="source-line-no">513</span><span id="line-513"></span>
-<span class="source-line-no">514</span><span id="line-514">    /**</span>
-<span class="source-line-no">515</span><span id="line-515">     * Returns information about a block with the given block hash.</span>
-<span class="source-line-no">516</span><span id="line-516">     *</span>
-<span class="source-line-no">517</span><span id="line-517">     * @param hash The block hash</span>
-<span class="source-line-no">518</span><span id="line-518">     * @return The information about the block (JSON/POJO object)</span>
-<span class="source-line-no">519</span><span id="line-519">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">520</span><span id="line-520">     * @throws IOException network error</span>
-<span class="source-line-no">521</span><span id="line-521">     */</span>
-<span class="source-line-no">522</span><span id="line-522">    public BlockInfo getBlockInfo(Sha256Hash hash) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">523</span><span id="line-523">        // Use "verbose = true"</span>
-<span class="source-line-no">524</span><span id="line-524">        return send("getblock", BlockInfo.class, hash, true);</span>
-<span class="source-line-no">525</span><span id="line-525">    }</span>
-<span class="source-line-no">526</span><span id="line-526"></span>
-<span class="source-line-no">527</span><span id="line-527">    /**</span>
-<span class="source-line-no">528</span><span id="line-528">     * Returns information about a block with the given block hash.</span>
-<span class="source-line-no">529</span><span id="line-529">     *</span>
-<span class="source-line-no">530</span><span id="line-530">     * @param hash The block hash</span>
-<span class="source-line-no">531</span><span id="line-531">     * @return The information about the block (bitcoinj {@link Block} object)</span>
-<span class="source-line-no">532</span><span id="line-532">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">533</span><span id="line-533">     * @throws IOException network error</span>
-<span class="source-line-no">534</span><span id="line-534">     */</span>
-<span class="source-line-no">535</span><span id="line-535">    public Block getBlock(Sha256Hash hash) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">536</span><span id="line-536">        // Use "verbose = false"</span>
-<span class="source-line-no">537</span><span id="line-537">        return send("getblock", Block.class, hash, false);</span>
-<span class="source-line-no">538</span><span id="line-538">    }</span>
-<span class="source-line-no">539</span><span id="line-539"></span>
-<span class="source-line-no">540</span><span id="line-540">    /**</span>
-<span class="source-line-no">541</span><span id="line-541">     * Mine blocks immediately (RegTest mode)</span>
-<span class="source-line-no">542</span><span id="line-542">     * @since Bitcoin Core 0.13.0</span>
-<span class="source-line-no">543</span><span id="line-543">     *</span>
-<span class="source-line-no">544</span><span id="line-544">     * @param numBlocks Number of blocks to mine</span>
-<span class="source-line-no">545</span><span id="line-545">     * @param address Address to send mined coins to</span>
-<span class="source-line-no">546</span><span id="line-546">     * @param maxtries How many iterations to try (or null to use server default -- currently 1,000,000)</span>
-<span class="source-line-no">547</span><span id="line-547">     * @return list containing block header hashes of the generated blocks</span>
-<span class="source-line-no">548</span><span id="line-548">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">549</span><span id="line-549">     * @throws IOException network error</span>
-<span class="source-line-no">550</span><span id="line-550">     */</span>
-<span class="source-line-no">551</span><span id="line-551">    public List&lt;Sha256Hash&gt; generateToAddress(int numBlocks, Address address, Integer maxtries) throws IOException {</span>
-<span class="source-line-no">552</span><span id="line-552">        JavaType resultType = mapper.getTypeFactory().constructCollectionType(List.class, Sha256Hash.class);</span>
-<span class="source-line-no">553</span><span id="line-553">        return send("generatetoaddress", resultType, (long) numBlocks, address, maxtries);</span>
-<span class="source-line-no">554</span><span id="line-554">    }</span>
-<span class="source-line-no">555</span><span id="line-555"></span>
-<span class="source-line-no">556</span><span id="line-556">    /**</span>
-<span class="source-line-no">557</span><span id="line-557">     * Mine blocks immediately (RegTest mode)</span>
-<span class="source-line-no">558</span><span id="line-558">     * @since Bitcoin Core 0.13.0</span>
-<span class="source-line-no">559</span><span id="line-559">     *</span>
-<span class="source-line-no">560</span><span id="line-560">     * @param numBlocks Number of blocks to mine</span>
-<span class="source-line-no">561</span><span id="line-561">     * @param address Address to send mined coins to</span>
-<span class="source-line-no">562</span><span id="line-562">     * @return list containing block header hashes of the generated blocks</span>
-<span class="source-line-no">563</span><span id="line-563">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">564</span><span id="line-564">     * @throws IOException network error</span>
-<span class="source-line-no">565</span><span id="line-565">     */</span>
-<span class="source-line-no">566</span><span id="line-566">    public List&lt;Sha256Hash&gt; generateToAddress(int numBlocks, Address address) throws IOException {</span>
-<span class="source-line-no">567</span><span id="line-567">        return generateToAddress(numBlocks,address, null);</span>
-<span class="source-line-no">568</span><span id="line-568">    }</span>
-<span class="source-line-no">569</span><span id="line-569"></span>
-<span class="source-line-no">570</span><span id="line-570">    public List&lt;String&gt; listWallets() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">571</span><span id="line-571">        JavaType resultType = mapper.getTypeFactory().constructCollectionType(List.class, String.class);</span>
-<span class="source-line-no">572</span><span id="line-572">        return send("listwallets", resultType);</span>
-<span class="source-line-no">573</span><span id="line-573">    }</span>
-<span class="source-line-no">574</span><span id="line-574"></span>
-<span class="source-line-no">575</span><span id="line-575">    public LoadWalletResult createWallet(String name, Boolean disablePrivateKeys, Boolean blank) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">576</span><span id="line-576">        return createWallet(name, disablePrivateKeys, blank, null, null, null, null, null);</span>
-<span class="source-line-no">577</span><span id="line-577">    }</span>
-<span class="source-line-no">578</span><span id="line-578"></span>
-<span class="source-line-no">579</span><span id="line-579">    public LoadWalletResult createWallet(String name, Boolean disablePrivateKeys, Boolean blank, String passPhrase,</span>
-<span class="source-line-no">580</span><span id="line-580">                                         Boolean avoidReuse) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">581</span><span id="line-581">        return send("createwallet", LoadWalletResult.class, name, disablePrivateKeys, blank, passPhrase, avoidReuse);</span>
-<span class="source-line-no">582</span><span id="line-582">    }</span>
-<span class="source-line-no">583</span><span id="line-583"></span>
-<span class="source-line-no">584</span><span id="line-584">    // To use all these params server must be "recent"</span>
-<span class="source-line-no">585</span><span id="line-585">    public LoadWalletResult createWallet(String name, Boolean disablePrivateKeys, Boolean blank, String passPhrase,</span>
-<span class="source-line-no">586</span><span id="line-586">                                         Boolean avoidReuse, Boolean descriptors, Boolean loadOnStartup,</span>
-<span class="source-line-no">587</span><span id="line-587">                                         Boolean externalSigner) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">588</span><span id="line-588">        return send("createwallet", LoadWalletResult.class, name, disablePrivateKeys, blank, passPhrase, avoidReuse, descriptors, loadOnStartup, externalSigner);</span>
-<span class="source-line-no">589</span><span id="line-589">    }</span>
-<span class="source-line-no">590</span><span id="line-590"></span>
-<span class="source-line-no">591</span><span id="line-591">    public UnloadWalletResult unloadWallet() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">592</span><span id="line-592">        return unloadWallet(null, null);</span>
-<span class="source-line-no">593</span><span id="line-593">    }</span>
-<span class="source-line-no">594</span><span id="line-594"></span>
-<span class="source-line-no">595</span><span id="line-595">    public UnloadWalletResult unloadWallet(String name, Boolean loadOnStartup) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">596</span><span id="line-596">        return send("unloadwallet", UnloadWalletResult.class, name, loadOnStartup);</span>
-<span class="source-line-no">597</span><span id="line-597">    }</span>
-<span class="source-line-no">598</span><span id="line-598"></span>
-<span class="source-line-no">599</span><span id="line-599">    /**</span>
-<span class="source-line-no">600</span><span id="line-600">     * Creates a new Bitcoin address for receiving payments, linked to the default account "".</span>
-<span class="source-line-no">601</span><span id="line-601">     *</span>
-<span class="source-line-no">602</span><span id="line-602">     * @return A new Bitcoin address</span>
-<span class="source-line-no">603</span><span id="line-603">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">604</span><span id="line-604">     * @throws IOException network error</span>
-<span class="source-line-no">605</span><span id="line-605">     */</span>
-<span class="source-line-no">606</span><span id="line-606">    public Address getNewAddress() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">607</span><span id="line-607">        return getNewAddress(null);</span>
+<span class="source-line-no">380</span><span id="line-380">    protected CompletableFuture&lt;Boolean&gt; waitForServerAsync(Duration timeout, Duration retry) {</span>
+<span class="source-line-no">381</span><span id="line-381">        return waitForBlockchainInfoAsync(timeout, retry)</span>
+<span class="source-line-no">382</span><span id="line-382">                .handle((i, t) -&gt; {</span>
+<span class="source-line-no">383</span><span id="line-383">                    if (i != null) {</span>
+<span class="source-line-no">384</span><span id="line-384">                        return CompletableFuture.completedFuture(Boolean.TRUE);</span>
+<span class="source-line-no">385</span><span id="line-385">                    } else if (t instanceof TimeoutException) {</span>
+<span class="source-line-no">386</span><span id="line-386">                        return CompletableFuture.completedFuture(Boolean.FALSE);</span>
+<span class="source-line-no">387</span><span id="line-387">                    } else {</span>
+<span class="source-line-no">388</span><span id="line-388">                        return CompletableFuture.&lt;Boolean&gt;failedFuture(t);</span>
+<span class="source-line-no">389</span><span id="line-389">                    }</span>
+<span class="source-line-no">390</span><span id="line-390">                })</span>
+<span class="source-line-no">391</span><span id="line-391">                .thenCompose(Function.identity());</span>
+<span class="source-line-no">392</span><span id="line-392">    }</span>
+<span class="source-line-no">393</span><span id="line-393"></span>
+<span class="source-line-no">394</span><span id="line-394">    protected CompletableFuture&lt;BlockChainInfo&gt; waitForBlockchainInfoAsync(Duration timeout, Duration retry) {</span>
+<span class="source-line-no">395</span><span id="line-395">        Supplier&lt;JsonRpcRequest&gt; requestSupplier = () -&gt; buildJsonRequest("getblockchaininfo");</span>
+<span class="source-line-no">396</span><span id="line-396">        CompletableFuture&lt;BlockChainInfo&gt; cf = waitForServer(timeout, retry, requestSupplier, typeForClass(BlockChainInfo.class), this::mapBitcoinTransientErrors);</span>
+<span class="source-line-no">397</span><span id="line-397">        return cf.whenComplete((info, t) -&gt; {</span>
+<span class="source-line-no">398</span><span id="line-398">            if (info != null) {</span>
+<span class="source-line-no">399</span><span id="line-399">                fConnectedOnce.complete(null);</span>
+<span class="source-line-no">400</span><span id="line-400">                fNetwork.complete(BlockChainInfo.chainToNetwork(info));</span>
+<span class="source-line-no">401</span><span id="line-401">            }</span>
+<span class="source-line-no">402</span><span id="line-402">        });</span>
+<span class="source-line-no">403</span><span id="line-403">    }</span>
+<span class="source-line-no">404</span><span id="line-404"></span>
+<span class="source-line-no">405</span><span id="line-405">    /**</span>
+<span class="source-line-no">406</span><span id="line-406">     * Wait for RPC server to reach specified block height.</span>
+<span class="source-line-no">407</span><span id="line-407">     *</span>
+<span class="source-line-no">408</span><span id="line-408">     * @param blockHeight Block height to wait for</span>
+<span class="source-line-no">409</span><span id="line-409">     * @param timeout     Timeout in seconds</span>
+<span class="source-line-no">410</span><span id="line-410">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">411</span><span id="line-411">     * @throws IOException network error</span>
+<span class="source-line-no">412</span><span id="line-412">     * @return True if blockHeight reached, false if timeout or interrupted</span>
+<span class="source-line-no">413</span><span id="line-413">     */</span>
+<span class="source-line-no">414</span><span id="line-414">    public Boolean waitForBlock(int blockHeight, int timeout) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">415</span><span id="line-415"></span>
+<span class="source-line-no">416</span><span id="line-416">        log.info("Waiting for server to reach block " + blockHeight);</span>
+<span class="source-line-no">417</span><span id="line-417"></span>
+<span class="source-line-no">418</span><span id="line-418">        long seconds = 0;</span>
+<span class="source-line-no">419</span><span id="line-419">        while (seconds &lt; timeout) {</span>
+<span class="source-line-no">420</span><span id="line-420">            Integer block = this.getBlockCount();</span>
+<span class="source-line-no">421</span><span id="line-421">            if (block &gt;= blockHeight) {</span>
+<span class="source-line-no">422</span><span id="line-422">                log.info("Server is at block " + block + " returning 'true'.");</span>
+<span class="source-line-no">423</span><span id="line-423">                return true;</span>
+<span class="source-line-no">424</span><span id="line-424">            } else {</span>
+<span class="source-line-no">425</span><span id="line-425">                try {</span>
+<span class="source-line-no">426</span><span id="line-426">                    if (seconds % MESSAGE_DELAY.toSeconds() == 0) {</span>
+<span class="source-line-no">427</span><span id="line-427">                        log.debug("Server at block " + block);</span>
+<span class="source-line-no">428</span><span id="line-428">                    }</span>
+<span class="source-line-no">429</span><span id="line-429">                    Thread.sleep(RETRY_DELAY.toMillis());</span>
+<span class="source-line-no">430</span><span id="line-430">                    seconds += RETRY_DELAY.toSeconds();</span>
+<span class="source-line-no">431</span><span id="line-431">                } catch (InterruptedException e) {</span>
+<span class="source-line-no">432</span><span id="line-432">                    log.error(e.toString());</span>
+<span class="source-line-no">433</span><span id="line-433">                    Thread.currentThread().interrupt();</span>
+<span class="source-line-no">434</span><span id="line-434">                    return false;</span>
+<span class="source-line-no">435</span><span id="line-435">                }</span>
+<span class="source-line-no">436</span><span id="line-436">            }</span>
+<span class="source-line-no">437</span><span id="line-437">        }</span>
+<span class="source-line-no">438</span><span id="line-438"></span>
+<span class="source-line-no">439</span><span id="line-439">        log.error("Timeout waiting for block " + blockHeight);</span>
+<span class="source-line-no">440</span><span id="line-440">        return false;</span>
+<span class="source-line-no">441</span><span id="line-441">    }</span>
+<span class="source-line-no">442</span><span id="line-442"></span>
+<span class="source-line-no">443</span><span id="line-443">    /**</span>
+<span class="source-line-no">444</span><span id="line-444">     * TransientErrorMapper suitable for waiting for a temporarily down or restarting Bitcoin JSON-RPC server. This</span>
+<span class="source-line-no">445</span><span id="line-445">     * can be used to implement the {@code -rpcwait} command-line option, for instance.</span>
+<span class="source-line-no">446</span><span id="line-446">     */</span>
+<span class="source-line-no">447</span><span id="line-447">    protected  &lt;T&gt; CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; mapBitcoinTransientErrors(JsonRpcRequest request, JsonRpcResponse&lt;T&gt; response, Throwable t) {</span>
+<span class="source-line-no">448</span><span id="line-448">        if (response != null) {</span>
+<span class="source-line-no">449</span><span id="line-449">            return CompletableFuture.completedFuture(response);</span>
+<span class="source-line-no">450</span><span id="line-450">        } else {</span>
+<span class="source-line-no">451</span><span id="line-451">            if (t instanceof CompletionException) {</span>
+<span class="source-line-no">452</span><span id="line-452">                // Java.net.http driver</span>
+<span class="source-line-no">453</span><span id="line-453">                if (t.getCause() != null) {</span>
+<span class="source-line-no">454</span><span id="line-454">                    if (t.getCause() instanceof ConnectException) {</span>
+<span class="source-line-no">455</span><span id="line-455">                        return CompletableFuture.completedFuture(temporarilyUnavailableResponse(request, t));</span>
+<span class="source-line-no">456</span><span id="line-456">                    } else {</span>
+<span class="source-line-no">457</span><span id="line-457">                        return CompletableFuture.failedFuture(t);</span>
+<span class="source-line-no">458</span><span id="line-458">                    }</span>
+<span class="source-line-no">459</span><span id="line-459">                }</span>
+<span class="source-line-no">460</span><span id="line-460">            }</span>
+<span class="source-line-no">461</span><span id="line-461">            if (t instanceof SocketException) {</span>
+<span class="source-line-no">462</span><span id="line-462">                // Java HttpUrlConnection driver</span>
+<span class="source-line-no">463</span><span id="line-463">                SocketException se = (SocketException) t;</span>
+<span class="source-line-no">464</span><span id="line-464">                // These are expected exceptions while waiting for a server</span>
+<span class="source-line-no">465</span><span id="line-465">                if (se.getMessage().equals("Unexpected end of file from server") ||</span>
+<span class="source-line-no">466</span><span id="line-466">                        se.getMessage().equals("Connection reset") ||</span>
+<span class="source-line-no">467</span><span id="line-467">                        se.getMessage().contains("Connection refused") ||</span>
+<span class="source-line-no">468</span><span id="line-468">                        se.getMessage().equals("recvfrom failed: ECONNRESET (Connection reset by peer)")) {</span>
+<span class="source-line-no">469</span><span id="line-469">                    // Transient error, generate synthetic JSON-RPC error response with appropriate values</span>
+<span class="source-line-no">470</span><span id="line-470">                    return CompletableFuture.completedFuture(temporarilyUnavailableResponse(request, t));</span>
+<span class="source-line-no">471</span><span id="line-471">                } else {</span>
+<span class="source-line-no">472</span><span id="line-472">                    return CompletableFuture.failedFuture(se);</span>
+<span class="source-line-no">473</span><span id="line-473">                }</span>
+<span class="source-line-no">474</span><span id="line-474">            } else if (t instanceof EOFException) {</span>
+<span class="source-line-no">475</span><span id="line-475">                /* Android exception, ignore */</span>
+<span class="source-line-no">476</span><span id="line-476">                // Expected exceptions on Android, RoboVM</span>
+<span class="source-line-no">477</span><span id="line-477">                return CompletableFuture.completedFuture(temporarilyUnavailableResponse(request, t));</span>
+<span class="source-line-no">478</span><span id="line-478">            } else if (t instanceof JsonRpcStatusException) {</span>
+<span class="source-line-no">479</span><span id="line-479">                JsonRpcStatusException e = (JsonRpcStatusException) t;</span>
+<span class="source-line-no">480</span><span id="line-480">                // If server is in "warm-up" mode, e.g. validating/parsing the blockchain...</span>
+<span class="source-line-no">481</span><span id="line-481">                if (e.jsonRpcCode == -28) {</span>
+<span class="source-line-no">482</span><span id="line-482">                    // ...then grab text message for status logging</span>
+<span class="source-line-no">483</span><span id="line-483">                    return CompletableFuture.completedFuture(temporarilyUnavailableResponse(request, t));</span>
+<span class="source-line-no">484</span><span id="line-484">                } else {</span>
+<span class="source-line-no">485</span><span id="line-485">                    return CompletableFuture.failedFuture(e);</span>
+<span class="source-line-no">486</span><span id="line-486">                }</span>
+<span class="source-line-no">487</span><span id="line-487">            } else if (t instanceof IOException) {</span>
+<span class="source-line-no">488</span><span id="line-488">                // Ignore all IOExceptions</span>
+<span class="source-line-no">489</span><span id="line-489">                return CompletableFuture.completedFuture(temporarilyUnavailableResponse(request, t));</span>
+<span class="source-line-no">490</span><span id="line-490">            } else {</span>
+<span class="source-line-no">491</span><span id="line-491">                return CompletableFuture.failedFuture(t);</span>
+<span class="source-line-no">492</span><span id="line-492">            }</span>
+<span class="source-line-no">493</span><span id="line-493">        }</span>
+<span class="source-line-no">494</span><span id="line-494">    }</span>
+<span class="source-line-no">495</span><span id="line-495"></span>
+<span class="source-line-no">496</span><span id="line-496">    /**</span>
+<span class="source-line-no">497</span><span id="line-497">     * Tell the server to stop</span>
+<span class="source-line-no">498</span><span id="line-498">     * @return A status string</span>
+<span class="source-line-no">499</span><span id="line-499">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">500</span><span id="line-500">     * @throws IOException network error</span>
+<span class="source-line-no">501</span><span id="line-501">     */</span>
+<span class="source-line-no">502</span><span id="line-502">    public String stop() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">503</span><span id="line-503">        return send("stop");</span>
+<span class="source-line-no">504</span><span id="line-504">    }</span>
+<span class="source-line-no">505</span><span id="line-505"></span>
+<span class="source-line-no">506</span><span id="line-506">    /**</span>
+<span class="source-line-no">507</span><span id="line-507">     * Returns the number of blocks in the longest block chain.</span>
+<span class="source-line-no">508</span><span id="line-508">     *</span>
+<span class="source-line-no">509</span><span id="line-509">     * @return The current block count</span>
+<span class="source-line-no">510</span><span id="line-510">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">511</span><span id="line-511">     * @throws IOException network error</span>
+<span class="source-line-no">512</span><span id="line-512">     */</span>
+<span class="source-line-no">513</span><span id="line-513">    public Integer getBlockCount() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">514</span><span id="line-514">        return send("getblockcount");</span>
+<span class="source-line-no">515</span><span id="line-515">    }</span>
+<span class="source-line-no">516</span><span id="line-516"></span>
+<span class="source-line-no">517</span><span id="line-517">    /**</span>
+<span class="source-line-no">518</span><span id="line-518">     * Returns the hash of block in best-block-chain at index provided.</span>
+<span class="source-line-no">519</span><span id="line-519">     *</span>
+<span class="source-line-no">520</span><span id="line-520">     * @param index The block index</span>
+<span class="source-line-no">521</span><span id="line-521">     * @return The block hash</span>
+<span class="source-line-no">522</span><span id="line-522">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">523</span><span id="line-523">     * @throws IOException network error</span>
+<span class="source-line-no">524</span><span id="line-524">     */</span>
+<span class="source-line-no">525</span><span id="line-525">    public Sha256Hash getBlockHash(Integer index) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">526</span><span id="line-526">        return send("getblockhash", Sha256Hash.class, index);</span>
+<span class="source-line-no">527</span><span id="line-527">    }</span>
+<span class="source-line-no">528</span><span id="line-528"></span>
+<span class="source-line-no">529</span><span id="line-529">    /**</span>
+<span class="source-line-no">530</span><span id="line-530">     * Returns information about a block with the given block hash.</span>
+<span class="source-line-no">531</span><span id="line-531">     *</span>
+<span class="source-line-no">532</span><span id="line-532">     * @param hash The block hash</span>
+<span class="source-line-no">533</span><span id="line-533">     * @return The information about the block (JSON/POJO object)</span>
+<span class="source-line-no">534</span><span id="line-534">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">535</span><span id="line-535">     * @throws IOException network error</span>
+<span class="source-line-no">536</span><span id="line-536">     */</span>
+<span class="source-line-no">537</span><span id="line-537">    public BlockInfo getBlockInfo(Sha256Hash hash) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">538</span><span id="line-538">        // Use "verbose = true"</span>
+<span class="source-line-no">539</span><span id="line-539">        return send("getblock", BlockInfo.class, hash, true);</span>
+<span class="source-line-no">540</span><span id="line-540">    }</span>
+<span class="source-line-no">541</span><span id="line-541"></span>
+<span class="source-line-no">542</span><span id="line-542">    /**</span>
+<span class="source-line-no">543</span><span id="line-543">     * Returns information about a block with the given block hash.</span>
+<span class="source-line-no">544</span><span id="line-544">     *</span>
+<span class="source-line-no">545</span><span id="line-545">     * @param hash The block hash</span>
+<span class="source-line-no">546</span><span id="line-546">     * @return The information about the block (bitcoinj {@link Block} object)</span>
+<span class="source-line-no">547</span><span id="line-547">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">548</span><span id="line-548">     * @throws IOException network error</span>
+<span class="source-line-no">549</span><span id="line-549">     */</span>
+<span class="source-line-no">550</span><span id="line-550">    public Block getBlock(Sha256Hash hash) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">551</span><span id="line-551">        return syncGet(getBlockAsync(hash));</span>
+<span class="source-line-no">552</span><span id="line-552">    }</span>
+<span class="source-line-no">553</span><span id="line-553"></span>
+<span class="source-line-no">554</span><span id="line-554">    public CompletableFuture&lt;Block&gt; getBlockAsync(Sha256Hash hash) {</span>
+<span class="source-line-no">555</span><span id="line-555">        // Use "verbosity = 0" for raw block data</span>
+<span class="source-line-no">556</span><span id="line-556">        return sendAsync("getblock", Block.class, hash, 0);</span>
+<span class="source-line-no">557</span><span id="line-557">    }</span>
+<span class="source-line-no">558</span><span id="line-558"></span>
+<span class="source-line-no">559</span><span id="line-559">    /**</span>
+<span class="source-line-no">560</span><span id="line-560">     * Composite query that first calls ChainTips, then gets best block for the active tip</span>
+<span class="source-line-no">561</span><span id="line-561">     * @return The current best block</span>
+<span class="source-line-no">562</span><span id="line-562">     */</span>
+<span class="source-line-no">563</span><span id="line-563">    public CompletableFuture&lt;Block&gt; getBestBlock() {</span>
+<span class="source-line-no">564</span><span id="line-564">        return getChainTipsAsync()</span>
+<span class="source-line-no">565</span><span id="line-565">                .thenCompose(tips -&gt; ChainTip.findActiveChainTip(tips)</span>
+<span class="source-line-no">566</span><span id="line-566">                        .map(tip -&gt; getBlockAsync(tip.getHash()))</span>
+<span class="source-line-no">567</span><span id="line-567">                        .orElseGet(() -&gt; CompletableFuture.failedFuture(new RuntimeException("No active ChainTip")))</span>
+<span class="source-line-no">568</span><span id="line-568">                );</span>
+<span class="source-line-no">569</span><span id="line-569">    }</span>
+<span class="source-line-no">570</span><span id="line-570"></span>
+<span class="source-line-no">571</span><span id="line-571">    /**</span>
+<span class="source-line-no">572</span><span id="line-572">     * Mine blocks immediately (RegTest mode)</span>
+<span class="source-line-no">573</span><span id="line-573">     * @since Bitcoin Core 0.13.0</span>
+<span class="source-line-no">574</span><span id="line-574">     *</span>
+<span class="source-line-no">575</span><span id="line-575">     * @param numBlocks Number of blocks to mine</span>
+<span class="source-line-no">576</span><span id="line-576">     * @param address Address to send mined coins to</span>
+<span class="source-line-no">577</span><span id="line-577">     * @param maxtries How many iterations to try (or null to use server default -- currently 1,000,000)</span>
+<span class="source-line-no">578</span><span id="line-578">     * @return list containing block header hashes of the generated blocks</span>
+<span class="source-line-no">579</span><span id="line-579">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">580</span><span id="line-580">     * @throws IOException network error</span>
+<span class="source-line-no">581</span><span id="line-581">     */</span>
+<span class="source-line-no">582</span><span id="line-582">    public List&lt;Sha256Hash&gt; generateToAddress(int numBlocks, Address address, Integer maxtries) throws IOException {</span>
+<span class="source-line-no">583</span><span id="line-583">        JavaType resultType = collectionTypeForClasses(List.class, Sha256Hash.class);</span>
+<span class="source-line-no">584</span><span id="line-584">        return send("generatetoaddress", resultType, (long) numBlocks, address, maxtries);</span>
+<span class="source-line-no">585</span><span id="line-585">    }</span>
+<span class="source-line-no">586</span><span id="line-586"></span>
+<span class="source-line-no">587</span><span id="line-587">    /**</span>
+<span class="source-line-no">588</span><span id="line-588">     * Mine blocks immediately (RegTest mode)</span>
+<span class="source-line-no">589</span><span id="line-589">     * @since Bitcoin Core 0.13.0</span>
+<span class="source-line-no">590</span><span id="line-590">     *</span>
+<span class="source-line-no">591</span><span id="line-591">     * @param numBlocks Number of blocks to mine</span>
+<span class="source-line-no">592</span><span id="line-592">     * @param address Address to send mined coins to</span>
+<span class="source-line-no">593</span><span id="line-593">     * @return list containing block header hashes of the generated blocks</span>
+<span class="source-line-no">594</span><span id="line-594">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">595</span><span id="line-595">     * @throws IOException network error</span>
+<span class="source-line-no">596</span><span id="line-596">     */</span>
+<span class="source-line-no">597</span><span id="line-597">    public List&lt;Sha256Hash&gt; generateToAddress(int numBlocks, Address address) throws IOException {</span>
+<span class="source-line-no">598</span><span id="line-598">        return generateToAddress(numBlocks,address, null);</span>
+<span class="source-line-no">599</span><span id="line-599">    }</span>
+<span class="source-line-no">600</span><span id="line-600"></span>
+<span class="source-line-no">601</span><span id="line-601">    public List&lt;String&gt; listWallets() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">602</span><span id="line-602">        JavaType resultType = collectionTypeForClasses(List.class, String.class);</span>
+<span class="source-line-no">603</span><span id="line-603">        return send("listwallets", resultType);</span>
+<span class="source-line-no">604</span><span id="line-604">    }</span>
+<span class="source-line-no">605</span><span id="line-605"></span>
+<span class="source-line-no">606</span><span id="line-606">    public LoadWalletResult createWallet(String name, Boolean disablePrivateKeys, Boolean blank) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">607</span><span id="line-607">        return createWallet(name, disablePrivateKeys, blank, null, null, null, null, null);</span>
 <span class="source-line-no">608</span><span id="line-608">    }</span>
 <span class="source-line-no">609</span><span id="line-609"></span>
-<span class="source-line-no">610</span><span id="line-610">    /**</span>
-<span class="source-line-no">611</span><span id="line-611">     * Creates a new Bitcoin address for receiving payments.</span>
-<span class="source-line-no">612</span><span id="line-612">     *</span>
-<span class="source-line-no">613</span><span id="line-613">     * @param label The label name for the address to be linked to.</span>
-<span class="source-line-no">614</span><span id="line-614">     * @return A new Bitcoin address</span>
-<span class="source-line-no">615</span><span id="line-615">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">616</span><span id="line-616">     * @throws IOException network error</span>
-<span class="source-line-no">617</span><span id="line-617">     */</span>
-<span class="source-line-no">618</span><span id="line-618">    public Address getNewAddress(String label) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">619</span><span id="line-619">        return send("getnewaddress", Address.class, label);</span>
+<span class="source-line-no">610</span><span id="line-610">    public LoadWalletResult createWallet(String name, Boolean disablePrivateKeys, Boolean blank, String passPhrase,</span>
+<span class="source-line-no">611</span><span id="line-611">                                         Boolean avoidReuse) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">612</span><span id="line-612">        return send("createwallet", LoadWalletResult.class, name, disablePrivateKeys, blank, passPhrase, avoidReuse);</span>
+<span class="source-line-no">613</span><span id="line-613">    }</span>
+<span class="source-line-no">614</span><span id="line-614"></span>
+<span class="source-line-no">615</span><span id="line-615">    // To use all these params server must be "recent"</span>
+<span class="source-line-no">616</span><span id="line-616">    public LoadWalletResult createWallet(String name, Boolean disablePrivateKeys, Boolean blank, String passPhrase,</span>
+<span class="source-line-no">617</span><span id="line-617">                                         Boolean avoidReuse, Boolean descriptors, Boolean loadOnStartup,</span>
+<span class="source-line-no">618</span><span id="line-618">                                         Boolean externalSigner) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">619</span><span id="line-619">        return send("createwallet", LoadWalletResult.class, name, disablePrivateKeys, blank, passPhrase, avoidReuse, descriptors, loadOnStartup, externalSigner);</span>
 <span class="source-line-no">620</span><span id="line-620">    }</span>
-<span class="source-line-no">621</span><span id="line-621">    </span>
-<span class="source-line-no">622</span><span id="line-622">    /**</span>
-<span class="source-line-no">623</span><span id="line-623">     * Return the private key from the server.</span>
-<span class="source-line-no">624</span><span id="line-624">     *</span>
-<span class="source-line-no">625</span><span id="line-625">     * Note: must be in wallet mode with unlocked or unencrypted wallet.</span>
-<span class="source-line-no">626</span><span id="line-626">     *</span>
-<span class="source-line-no">627</span><span id="line-627">     * @param address Address corresponding to the private key to return</span>
-<span class="source-line-no">628</span><span id="line-628">     * @return The private key</span>
-<span class="source-line-no">629</span><span id="line-629">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">630</span><span id="line-630">     * @throws IOException network error</span>
-<span class="source-line-no">631</span><span id="line-631">     */</span>
-<span class="source-line-no">632</span><span id="line-632">    public ECKey dumpPrivKey(Address address) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">633</span><span id="line-633">        return send("dumpprivkey", ECKey.class, address);</span>
-<span class="source-line-no">634</span><span id="line-634">    }</span>
-<span class="source-line-no">635</span><span id="line-635"></span>
-<span class="source-line-no">636</span><span id="line-636">    /**</span>
-<span class="source-line-no">637</span><span id="line-637">     * Import a private key into the server's wallet</span>
-<span class="source-line-no">638</span><span id="line-638">     *</span>
-<span class="source-line-no">639</span><span id="line-639">     * @param privateKey An ECKey (containing a private key)</span>
-<span class="source-line-no">640</span><span id="line-640">     * @param label The server-side label for the key</span>
-<span class="source-line-no">641</span><span id="line-641">     * @param rescan Rescan the blockchain to find transactions for this key</span>
-<span class="source-line-no">642</span><span id="line-642">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">643</span><span id="line-643">     * @throws IOException network error</span>
-<span class="source-line-no">644</span><span id="line-644">     */</span>
-<span class="source-line-no">645</span><span id="line-645">    public void importPrivKey(ECKey privateKey, String label, boolean rescan) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">646</span><span id="line-646">        send("importprivkey", Void.class, privateKey.getPrivateKeyEncoded(this.getNetwork()).toBase58(), label, rescan);</span>
-<span class="source-line-no">647</span><span id="line-647">    }</span>
-<span class="source-line-no">648</span><span id="line-648">    </span>
-<span class="source-line-no">649</span><span id="line-649">    /**</span>
-<span class="source-line-no">650</span><span id="line-650">     * Creates a raw transaction spending the given inputs to the given destinations.</span>
-<span class="source-line-no">651</span><span id="line-651">     *</span>
-<span class="source-line-no">652</span><span id="line-652">     * Note: the transaction inputs are not signed, and the transaction is not stored in the wallet or transmitted to</span>
-<span class="source-line-no">653</span><span id="line-653">     * the network.</span>
-<span class="source-line-no">654</span><span id="line-654">     *</span>
-<span class="source-line-no">655</span><span id="line-655">     * @param inputs  The outpoints to spent</span>
-<span class="source-line-no">656</span><span id="line-656">     * @param outputs The destinations and amounts to transfer</span>
-<span class="source-line-no">657</span><span id="line-657">     * @return The hex-encoded raw transaction</span>
-<span class="source-line-no">658</span><span id="line-658">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">659</span><span id="line-659">     * @throws IOException network error</span>
-<span class="source-line-no">660</span><span id="line-660">     */</span>
-<span class="source-line-no">661</span><span id="line-661">    public String createRawTransaction(List&lt;Outpoint&gt; inputs, Map&lt;Address, Coin&gt; outputs)</span>
-<span class="source-line-no">662</span><span id="line-662">            throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">663</span><span id="line-663">        return send("createrawtransaction", inputs, outputs);</span>
-<span class="source-line-no">664</span><span id="line-664">    }</span>
-<span class="source-line-no">665</span><span id="line-665"></span>
-<span class="source-line-no">666</span><span id="line-666">    /**</span>
-<span class="source-line-no">667</span><span id="line-667">     * Signs inputs of a raw transaction using the wallet. Arguments 2 and 3 of the RPC are currently</span>
-<span class="source-line-no">668</span><span id="line-668">     * not supported, which means UTXOs not currently in the blockchain can't be used and `sighashtype`</span>
-<span class="source-line-no">669</span><span id="line-669">     * defaults to `ALL`.</span>
-<span class="source-line-no">670</span><span id="line-670">     *</span>
-<span class="source-line-no">671</span><span id="line-671">     * @param unsignedTransaction The hex-encoded raw transaction</span>
-<span class="source-line-no">672</span><span id="line-672">     * @return The signed transaction and information whether it has a complete set of signature</span>
+<span class="source-line-no">621</span><span id="line-621"></span>
+<span class="source-line-no">622</span><span id="line-622">    public UnloadWalletResult unloadWallet() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">623</span><span id="line-623">        return unloadWallet(null, null);</span>
+<span class="source-line-no">624</span><span id="line-624">    }</span>
+<span class="source-line-no">625</span><span id="line-625"></span>
+<span class="source-line-no">626</span><span id="line-626">    public UnloadWalletResult unloadWallet(String name, Boolean loadOnStartup) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">627</span><span id="line-627">        return send("unloadwallet", UnloadWalletResult.class, name, loadOnStartup);</span>
+<span class="source-line-no">628</span><span id="line-628">    }</span>
+<span class="source-line-no">629</span><span id="line-629"></span>
+<span class="source-line-no">630</span><span id="line-630">    /**</span>
+<span class="source-line-no">631</span><span id="line-631">     * Creates a new Bitcoin address for receiving payments, linked to the default account "".</span>
+<span class="source-line-no">632</span><span id="line-632">     *</span>
+<span class="source-line-no">633</span><span id="line-633">     * @return A new Bitcoin address</span>
+<span class="source-line-no">634</span><span id="line-634">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">635</span><span id="line-635">     * @throws IOException network error</span>
+<span class="source-line-no">636</span><span id="line-636">     */</span>
+<span class="source-line-no">637</span><span id="line-637">    public Address getNewAddress() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">638</span><span id="line-638">        return getNewAddress(null);</span>
+<span class="source-line-no">639</span><span id="line-639">    }</span>
+<span class="source-line-no">640</span><span id="line-640"></span>
+<span class="source-line-no">641</span><span id="line-641">    /**</span>
+<span class="source-line-no">642</span><span id="line-642">     * Creates a new Bitcoin address for receiving payments.</span>
+<span class="source-line-no">643</span><span id="line-643">     *</span>
+<span class="source-line-no">644</span><span id="line-644">     * @param label The label name for the address to be linked to.</span>
+<span class="source-line-no">645</span><span id="line-645">     * @return A new Bitcoin address</span>
+<span class="source-line-no">646</span><span id="line-646">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">647</span><span id="line-647">     * @throws IOException network error</span>
+<span class="source-line-no">648</span><span id="line-648">     */</span>
+<span class="source-line-no">649</span><span id="line-649">    public Address getNewAddress(String label) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">650</span><span id="line-650">        return send("getnewaddress", Address.class, label);</span>
+<span class="source-line-no">651</span><span id="line-651">    }</span>
+<span class="source-line-no">652</span><span id="line-652">    </span>
+<span class="source-line-no">653</span><span id="line-653">    /**</span>
+<span class="source-line-no">654</span><span id="line-654">     * Return the private key from the server.</span>
+<span class="source-line-no">655</span><span id="line-655">     *</span>
+<span class="source-line-no">656</span><span id="line-656">     * Note: must be in wallet mode with unlocked or unencrypted wallet.</span>
+<span class="source-line-no">657</span><span id="line-657">     *</span>
+<span class="source-line-no">658</span><span id="line-658">     * @param address Address corresponding to the private key to return</span>
+<span class="source-line-no">659</span><span id="line-659">     * @return The private key</span>
+<span class="source-line-no">660</span><span id="line-660">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">661</span><span id="line-661">     * @throws IOException network error</span>
+<span class="source-line-no">662</span><span id="line-662">     */</span>
+<span class="source-line-no">663</span><span id="line-663">    public ECKey dumpPrivKey(Address address) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">664</span><span id="line-664">        return send("dumpprivkey", ECKey.class, address);</span>
+<span class="source-line-no">665</span><span id="line-665">    }</span>
+<span class="source-line-no">666</span><span id="line-666"></span>
+<span class="source-line-no">667</span><span id="line-667">    /**</span>
+<span class="source-line-no">668</span><span id="line-668">     * Import a private key into the server's wallet</span>
+<span class="source-line-no">669</span><span id="line-669">     *</span>
+<span class="source-line-no">670</span><span id="line-670">     * @param privateKey An ECKey (containing a private key)</span>
+<span class="source-line-no">671</span><span id="line-671">     * @param label The server-side label for the key</span>
+<span class="source-line-no">672</span><span id="line-672">     * @param rescan Rescan the blockchain to find transactions for this key</span>
 <span class="source-line-no">673</span><span id="line-673">     * @throws JsonRpcStatusException JSON RPC status exception</span>
 <span class="source-line-no">674</span><span id="line-674">     * @throws IOException network error</span>
-<span class="source-line-no">675</span><span id="line-675">     * @since Bitcoin Core v0.17</span>
-<span class="source-line-no">676</span><span id="line-676">     */</span>
-<span class="source-line-no">677</span><span id="line-677">    public SignedRawTransaction signRawTransactionWithWallet(String unsignedTransaction) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">678</span><span id="line-678">        return send("signrawtransactionwithwallet", SignedRawTransaction.class, unsignedTransaction);</span>
-<span class="source-line-no">679</span><span id="line-679">    }</span>
-<span class="source-line-no">680</span><span id="line-680"></span>
-<span class="source-line-no">681</span><span id="line-681">    /**</span>
-<span class="source-line-no">682</span><span id="line-682">     * Get a "raw" transaction (which we use to construct a bitcoinj {@code Transaction})</span>
-<span class="source-line-no">683</span><span id="line-683">     * @param txid Transaction ID/hash</span>
-<span class="source-line-no">684</span><span id="line-684">     * @return bitcoinj Transaction</span>
-<span class="source-line-no">685</span><span id="line-685">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">686</span><span id="line-686">     * @throws IOException network error</span>
-<span class="source-line-no">687</span><span id="line-687">     */</span>
-<span class="source-line-no">688</span><span id="line-688">    public Transaction getRawTransaction(Sha256Hash txid) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">689</span><span id="line-689">        String hexEncoded = send("getrawtransaction", txid);</span>
-<span class="source-line-no">690</span><span id="line-690">        byte[] raw = HexUtil.hexStringToByteArray(hexEncoded);</span>
-<span class="source-line-no">691</span><span id="line-691">        return Transaction.read(ByteBuffer.wrap(raw));</span>
-<span class="source-line-no">692</span><span id="line-692">    }</span>
-<span class="source-line-no">693</span><span id="line-693"></span>
-<span class="source-line-no">694</span><span id="line-694">    /**</span>
-<span class="source-line-no">695</span><span id="line-695">     * Get a "raw" transaction as JSON (which we map to a RawTransactionInfo POJO)</span>
-<span class="source-line-no">696</span><span id="line-696">     * @param txid Transaction ID/hash</span>
-<span class="source-line-no">697</span><span id="line-697">     * @return RawTransactionInfo POJO</span>
-<span class="source-line-no">698</span><span id="line-698">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">699</span><span id="line-699">     * @throws IOException network error</span>
-<span class="source-line-no">700</span><span id="line-700">     */</span>
-<span class="source-line-no">701</span><span id="line-701">    public RawTransactionInfo getRawTransactionInfo(Sha256Hash txid) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">702</span><span id="line-702">        return send("getrawtransaction", RawTransactionInfo.class, txid, 1);</span>
-<span class="source-line-no">703</span><span id="line-703">    }</span>
-<span class="source-line-no">704</span><span id="line-704"></span>
-<span class="source-line-no">705</span><span id="line-705">    /**</span>
-<span class="source-line-no">706</span><span id="line-706">     * Submit a raw transaction to local node and network</span>
-<span class="source-line-no">707</span><span id="line-707">     *</span>
-<span class="source-line-no">708</span><span id="line-708">     * @since Bitcoin Core 0.19</span>
-<span class="source-line-no">709</span><span id="line-709">     * @param tx The raw transaction</span>
-<span class="source-line-no">710</span><span id="line-710">     * @param maxFeeRate  Reject transactions whose fee rate is higher than this value, expressed in BTC/kB.</span>
-<span class="source-line-no">711</span><span id="line-711">     *                    Set to 0 to accept any fee rate.</span>
-<span class="source-line-no">712</span><span id="line-712">     * @return SHA256 Transaction ID</span>
-<span class="source-line-no">713</span><span id="line-713">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">714</span><span id="line-714">     * @throws IOException network error</span>
-<span class="source-line-no">715</span><span id="line-715">     */</span>
-<span class="source-line-no">716</span><span id="line-716">    public Sha256Hash sendRawTransaction(Transaction tx, Coin maxFeeRate) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">717</span><span id="line-717">        return send("sendrawtransaction", Sha256Hash.class, tx, maxFeeRate);</span>
-<span class="source-line-no">718</span><span id="line-718">    }</span>
-<span class="source-line-no">719</span><span id="line-719"></span>
-<span class="source-line-no">720</span><span id="line-720">    /**</span>
-<span class="source-line-no">721</span><span id="line-721">     * Submit a raw transaction to local node and network</span>
-<span class="source-line-no">722</span><span id="line-722">     *</span>
-<span class="source-line-no">723</span><span id="line-723">     * @since Bitcoin Core 0.19</span>
-<span class="source-line-no">724</span><span id="line-724">     * @param hexTx The raw transaction as a hex-encoded string</span>
-<span class="source-line-no">725</span><span id="line-725">     * @param maxFeeRate  Reject transactions whose fee rate is higher than this value, expressed in BTC/kB.</span>
-<span class="source-line-no">726</span><span id="line-726">     *                    Set to 0 to accept any fee rate.</span>
-<span class="source-line-no">727</span><span id="line-727">     * @return SHA256 Transaction ID</span>
-<span class="source-line-no">728</span><span id="line-728">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">729</span><span id="line-729">     * @throws IOException network error</span>
-<span class="source-line-no">730</span><span id="line-730">     */</span>
-<span class="source-line-no">731</span><span id="line-731">    public Sha256Hash sendRawTransaction(String hexTx, Coin maxFeeRate) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">732</span><span id="line-732">        return send("sendrawtransaction", Sha256Hash.class, hexTx, maxFeeRate);</span>
-<span class="source-line-no">733</span><span id="line-733">    }</span>
-<span class="source-line-no">734</span><span id="line-734"></span>
-<span class="source-line-no">735</span><span id="line-735">    /**</span>
-<span class="source-line-no">736</span><span id="line-736">     * Submit a raw transaction to local node and network using server's default `maxFeeRate`</span>
-<span class="source-line-no">737</span><span id="line-737">     *</span>
-<span class="source-line-no">738</span><span id="line-738">     * @param tx The raw transaction</span>
-<span class="source-line-no">739</span><span id="line-739">     * @return SHA256 Transaction ID</span>
-<span class="source-line-no">740</span><span id="line-740">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">741</span><span id="line-741">     * @throws IOException network error</span>
-<span class="source-line-no">742</span><span id="line-742">     */</span>
-<span class="source-line-no">743</span><span id="line-743">    public Sha256Hash sendRawTransaction(Transaction tx) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">744</span><span id="line-744">        return sendRawTransaction(tx, (Coin) null);</span>
-<span class="source-line-no">745</span><span id="line-745">    }</span>
-<span class="source-line-no">746</span><span id="line-746"></span>
-<span class="source-line-no">747</span><span id="line-747">    /**</span>
-<span class="source-line-no">748</span><span id="line-748">     * Submit a raw transaction to local node and network using server's default `maxFeeRate`</span>
-<span class="source-line-no">749</span><span id="line-749">     *</span>
-<span class="source-line-no">750</span><span id="line-750">     * @since Bitcoin Core 0.19</span>
-<span class="source-line-no">751</span><span id="line-751">     * @param hexTx The raw transaction as a hex-encoded string</span>
-<span class="source-line-no">752</span><span id="line-752">     * @return SHA256 Transaction ID</span>
-<span class="source-line-no">753</span><span id="line-753">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">754</span><span id="line-754">     * @throws IOException network error</span>
-<span class="source-line-no">755</span><span id="line-755">     */</span>
-<span class="source-line-no">756</span><span id="line-756">    public Sha256Hash sendRawTransaction(String hexTx) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">757</span><span id="line-757">        return sendRawTransaction(hexTx, (Coin) null);</span>
-<span class="source-line-no">758</span><span id="line-758">    }</span>
-<span class="source-line-no">759</span><span id="line-759"></span>
-<span class="source-line-no">760</span><span id="line-760">    public AddressInfo getAddressInfo(Address address) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">761</span><span id="line-761">        return send("getaddressinfo", AddressInfo.class, address);</span>
-<span class="source-line-no">762</span><span id="line-762">    }</span>
-<span class="source-line-no">763</span><span id="line-763"></span>
-<span class="source-line-no">764</span><span id="line-764">    public Coin getReceivedByAddress(Address address) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">765</span><span id="line-765">        return getReceivedByAddress(address, 1);   // Default to 1 or more confirmations</span>
-<span class="source-line-no">766</span><span id="line-766">    }</span>
-<span class="source-line-no">767</span><span id="line-767"></span>
-<span class="source-line-no">768</span><span id="line-768">    /**</span>
-<span class="source-line-no">769</span><span id="line-769">     * get total amount received by an address.</span>
-<span class="source-line-no">770</span><span id="line-770">     *</span>
-<span class="source-line-no">771</span><span id="line-771">     * @param address Address to query</span>
-<span class="source-line-no">772</span><span id="line-772">     * @param minConf minimum number of confirmations</span>
-<span class="source-line-no">773</span><span id="line-773">     * @return Is now returning `Coin`, if you need to convert use `BitcoinMath.btcToCoin(result)`</span>
-<span class="source-line-no">774</span><span id="line-774">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">775</span><span id="line-775">     * @throws IOException network error</span>
-<span class="source-line-no">776</span><span id="line-776">     */</span>
-<span class="source-line-no">777</span><span id="line-777">    public Coin getReceivedByAddress(Address address, Integer minConf) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">778</span><span id="line-778">        return send("getreceivedbyaddress", Coin.class, address, minConf);</span>
-<span class="source-line-no">779</span><span id="line-779">    }</span>
-<span class="source-line-no">780</span><span id="line-780"></span>
-<span class="source-line-no">781</span><span id="line-781">    public List&lt;ReceivedByAddressInfo&gt; listReceivedByAddress(Integer minConf, Boolean includeEmpty)</span>
-<span class="source-line-no">782</span><span id="line-782">            throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">783</span><span id="line-783">        JavaType resultType = mapper.getTypeFactory().constructCollectionType(List.class, ReceivedByAddressInfo.class);</span>
-<span class="source-line-no">784</span><span id="line-784">        return send("listreceivedbyaddress", resultType, minConf, includeEmpty);</span>
-<span class="source-line-no">785</span><span id="line-785">    }</span>
-<span class="source-line-no">786</span><span id="line-786"></span>
-<span class="source-line-no">787</span><span id="line-787">    /**</span>
-<span class="source-line-no">788</span><span id="line-788">     * Returns a list of unspent transaction outputs with at least one confirmation.</span>
-<span class="source-line-no">789</span><span id="line-789">     *</span>
-<span class="source-line-no">790</span><span id="line-790">     * @return The unspent transaction outputs</span>
-<span class="source-line-no">791</span><span id="line-791">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">792</span><span id="line-792">     * @throws IOException network error</span>
-<span class="source-line-no">793</span><span id="line-793">     */</span>
-<span class="source-line-no">794</span><span id="line-794">    public List&lt;UnspentOutput&gt; listUnspent() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">795</span><span id="line-795">        return listUnspent(null, null, null, null);</span>
-<span class="source-line-no">796</span><span id="line-796">    }</span>
-<span class="source-line-no">797</span><span id="line-797"></span>
-<span class="source-line-no">798</span><span id="line-798">    /**</span>
-<span class="source-line-no">799</span><span id="line-799">     * Returns a list of unspent transaction outputs with at least {@code minConf} and not more than {@code maxConf}</span>
-<span class="source-line-no">800</span><span id="line-800">     * confirmations.</span>
+<span class="source-line-no">675</span><span id="line-675">     */</span>
+<span class="source-line-no">676</span><span id="line-676">    public void importPrivKey(ECKey privateKey, String label, boolean rescan) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">677</span><span id="line-677">        send("importprivkey", Void.class, privateKey.getPrivateKeyEncoded(this.getNetwork()).toBase58(), label, rescan);</span>
+<span class="source-line-no">678</span><span id="line-678">    }</span>
+<span class="source-line-no">679</span><span id="line-679">    </span>
+<span class="source-line-no">680</span><span id="line-680">    /**</span>
+<span class="source-line-no">681</span><span id="line-681">     * Creates a raw transaction spending the given inputs to the given destinations.</span>
+<span class="source-line-no">682</span><span id="line-682">     *</span>
+<span class="source-line-no">683</span><span id="line-683">     * Note: the transaction inputs are not signed, and the transaction is not stored in the wallet or transmitted to</span>
+<span class="source-line-no">684</span><span id="line-684">     * the network.</span>
+<span class="source-line-no">685</span><span id="line-685">     *</span>
+<span class="source-line-no">686</span><span id="line-686">     * @param inputs  The outpoints to spent</span>
+<span class="source-line-no">687</span><span id="line-687">     * @param outputs The destinations and amounts to transfer</span>
+<span class="source-line-no">688</span><span id="line-688">     * @return The hex-encoded raw transaction</span>
+<span class="source-line-no">689</span><span id="line-689">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">690</span><span id="line-690">     * @throws IOException network error</span>
+<span class="source-line-no">691</span><span id="line-691">     */</span>
+<span class="source-line-no">692</span><span id="line-692">    public String createRawTransaction(List&lt;Outpoint&gt; inputs, Map&lt;Address, Coin&gt; outputs)</span>
+<span class="source-line-no">693</span><span id="line-693">            throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">694</span><span id="line-694">        return send("createrawtransaction", inputs, outputs);</span>
+<span class="source-line-no">695</span><span id="line-695">    }</span>
+<span class="source-line-no">696</span><span id="line-696"></span>
+<span class="source-line-no">697</span><span id="line-697">    /**</span>
+<span class="source-line-no">698</span><span id="line-698">     * Signs inputs of a raw transaction using the wallet. Arguments 2 and 3 of the RPC are currently</span>
+<span class="source-line-no">699</span><span id="line-699">     * not supported, which means UTXOs not currently in the blockchain can't be used and `sighashtype`</span>
+<span class="source-line-no">700</span><span id="line-700">     * defaults to `ALL`.</span>
+<span class="source-line-no">701</span><span id="line-701">     *</span>
+<span class="source-line-no">702</span><span id="line-702">     * @param unsignedTransaction The hex-encoded raw transaction</span>
+<span class="source-line-no">703</span><span id="line-703">     * @return The signed transaction and information whether it has a complete set of signature</span>
+<span class="source-line-no">704</span><span id="line-704">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">705</span><span id="line-705">     * @throws IOException network error</span>
+<span class="source-line-no">706</span><span id="line-706">     * @since Bitcoin Core v0.17</span>
+<span class="source-line-no">707</span><span id="line-707">     */</span>
+<span class="source-line-no">708</span><span id="line-708">    public SignedRawTransaction signRawTransactionWithWallet(String unsignedTransaction) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">709</span><span id="line-709">        return send("signrawtransactionwithwallet", SignedRawTransaction.class, unsignedTransaction);</span>
+<span class="source-line-no">710</span><span id="line-710">    }</span>
+<span class="source-line-no">711</span><span id="line-711"></span>
+<span class="source-line-no">712</span><span id="line-712">    /**</span>
+<span class="source-line-no">713</span><span id="line-713">     * Get a "raw" transaction (which we use to construct a bitcoinj {@code Transaction})</span>
+<span class="source-line-no">714</span><span id="line-714">     * @param txid Transaction ID/hash</span>
+<span class="source-line-no">715</span><span id="line-715">     * @return bitcoinj Transaction</span>
+<span class="source-line-no">716</span><span id="line-716">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">717</span><span id="line-717">     * @throws IOException network error</span>
+<span class="source-line-no">718</span><span id="line-718">     */</span>
+<span class="source-line-no">719</span><span id="line-719">    public Transaction getRawTransaction(Sha256Hash txid) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">720</span><span id="line-720">        String hexEncoded = send("getrawtransaction", txid);</span>
+<span class="source-line-no">721</span><span id="line-721">        byte[] raw = HexUtil.hexStringToByteArray(hexEncoded);</span>
+<span class="source-line-no">722</span><span id="line-722">        return Transaction.read(ByteBuffer.wrap(raw));</span>
+<span class="source-line-no">723</span><span id="line-723">    }</span>
+<span class="source-line-no">724</span><span id="line-724"></span>
+<span class="source-line-no">725</span><span id="line-725">    /**</span>
+<span class="source-line-no">726</span><span id="line-726">     * Get a "raw" transaction as JSON (which we map to a RawTransactionInfo POJO)</span>
+<span class="source-line-no">727</span><span id="line-727">     * @param txid Transaction ID/hash</span>
+<span class="source-line-no">728</span><span id="line-728">     * @return RawTransactionInfo POJO</span>
+<span class="source-line-no">729</span><span id="line-729">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">730</span><span id="line-730">     * @throws IOException network error</span>
+<span class="source-line-no">731</span><span id="line-731">     */</span>
+<span class="source-line-no">732</span><span id="line-732">    public RawTransactionInfo getRawTransactionInfo(Sha256Hash txid) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">733</span><span id="line-733">        return send("getrawtransaction", RawTransactionInfo.class, txid, 1);</span>
+<span class="source-line-no">734</span><span id="line-734">    }</span>
+<span class="source-line-no">735</span><span id="line-735"></span>
+<span class="source-line-no">736</span><span id="line-736">    /**</span>
+<span class="source-line-no">737</span><span id="line-737">     * Submit a raw transaction to local node and network</span>
+<span class="source-line-no">738</span><span id="line-738">     *</span>
+<span class="source-line-no">739</span><span id="line-739">     * @since Bitcoin Core 0.19</span>
+<span class="source-line-no">740</span><span id="line-740">     * @param tx The raw transaction</span>
+<span class="source-line-no">741</span><span id="line-741">     * @param maxFeeRate  Reject transactions whose fee rate is higher than this value, expressed in BTC/kB.</span>
+<span class="source-line-no">742</span><span id="line-742">     *                    Set to 0 to accept any fee rate.</span>
+<span class="source-line-no">743</span><span id="line-743">     * @return SHA256 Transaction ID</span>
+<span class="source-line-no">744</span><span id="line-744">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">745</span><span id="line-745">     * @throws IOException network error</span>
+<span class="source-line-no">746</span><span id="line-746">     */</span>
+<span class="source-line-no">747</span><span id="line-747">    public Sha256Hash sendRawTransaction(Transaction tx, Coin maxFeeRate) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">748</span><span id="line-748">        return send("sendrawtransaction", Sha256Hash.class, tx, maxFeeRate);</span>
+<span class="source-line-no">749</span><span id="line-749">    }</span>
+<span class="source-line-no">750</span><span id="line-750"></span>
+<span class="source-line-no">751</span><span id="line-751">    /**</span>
+<span class="source-line-no">752</span><span id="line-752">     * Submit a raw transaction to local node and network</span>
+<span class="source-line-no">753</span><span id="line-753">     *</span>
+<span class="source-line-no">754</span><span id="line-754">     * @since Bitcoin Core 0.19</span>
+<span class="source-line-no">755</span><span id="line-755">     * @param hexTx The raw transaction as a hex-encoded string</span>
+<span class="source-line-no">756</span><span id="line-756">     * @param maxFeeRate  Reject transactions whose fee rate is higher than this value, expressed in BTC/kB.</span>
+<span class="source-line-no">757</span><span id="line-757">     *                    Set to 0 to accept any fee rate.</span>
+<span class="source-line-no">758</span><span id="line-758">     * @return SHA256 Transaction ID</span>
+<span class="source-line-no">759</span><span id="line-759">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">760</span><span id="line-760">     * @throws IOException network error</span>
+<span class="source-line-no">761</span><span id="line-761">     */</span>
+<span class="source-line-no">762</span><span id="line-762">    public Sha256Hash sendRawTransaction(String hexTx, Coin maxFeeRate) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">763</span><span id="line-763">        return send("sendrawtransaction", Sha256Hash.class, hexTx, maxFeeRate);</span>
+<span class="source-line-no">764</span><span id="line-764">    }</span>
+<span class="source-line-no">765</span><span id="line-765"></span>
+<span class="source-line-no">766</span><span id="line-766">    /**</span>
+<span class="source-line-no">767</span><span id="line-767">     * Submit a raw transaction to local node and network using server's default `maxFeeRate`</span>
+<span class="source-line-no">768</span><span id="line-768">     *</span>
+<span class="source-line-no">769</span><span id="line-769">     * @param tx The raw transaction</span>
+<span class="source-line-no">770</span><span id="line-770">     * @return SHA256 Transaction ID</span>
+<span class="source-line-no">771</span><span id="line-771">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">772</span><span id="line-772">     * @throws IOException network error</span>
+<span class="source-line-no">773</span><span id="line-773">     */</span>
+<span class="source-line-no">774</span><span id="line-774">    public Sha256Hash sendRawTransaction(Transaction tx) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">775</span><span id="line-775">        return sendRawTransaction(tx, (Coin) null);</span>
+<span class="source-line-no">776</span><span id="line-776">    }</span>
+<span class="source-line-no">777</span><span id="line-777"></span>
+<span class="source-line-no">778</span><span id="line-778">    /**</span>
+<span class="source-line-no">779</span><span id="line-779">     * Submit a raw transaction to local node and network using server's default `maxFeeRate`</span>
+<span class="source-line-no">780</span><span id="line-780">     *</span>
+<span class="source-line-no">781</span><span id="line-781">     * @since Bitcoin Core 0.19</span>
+<span class="source-line-no">782</span><span id="line-782">     * @param hexTx The raw transaction as a hex-encoded string</span>
+<span class="source-line-no">783</span><span id="line-783">     * @return SHA256 Transaction ID</span>
+<span class="source-line-no">784</span><span id="line-784">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">785</span><span id="line-785">     * @throws IOException network error</span>
+<span class="source-line-no">786</span><span id="line-786">     */</span>
+<span class="source-line-no">787</span><span id="line-787">    public Sha256Hash sendRawTransaction(String hexTx) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">788</span><span id="line-788">        return sendRawTransaction(hexTx, (Coin) null);</span>
+<span class="source-line-no">789</span><span id="line-789">    }</span>
+<span class="source-line-no">790</span><span id="line-790"></span>
+<span class="source-line-no">791</span><span id="line-791">    public AddressInfo getAddressInfo(Address address) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">792</span><span id="line-792">        return send("getaddressinfo", AddressInfo.class, address);</span>
+<span class="source-line-no">793</span><span id="line-793">    }</span>
+<span class="source-line-no">794</span><span id="line-794"></span>
+<span class="source-line-no">795</span><span id="line-795">    public Coin getReceivedByAddress(Address address) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">796</span><span id="line-796">        return getReceivedByAddress(address, 1);   // Default to 1 or more confirmations</span>
+<span class="source-line-no">797</span><span id="line-797">    }</span>
+<span class="source-line-no">798</span><span id="line-798"></span>
+<span class="source-line-no">799</span><span id="line-799">    /**</span>
+<span class="source-line-no">800</span><span id="line-800">     * get total amount received by an address.</span>
 <span class="source-line-no">801</span><span id="line-801">     *</span>
-<span class="source-line-no">802</span><span id="line-802">     * @param minConf The minimum confirmations to filter</span>
-<span class="source-line-no">803</span><span id="line-803">     * @param maxConf The maximum confirmations to filter</span>
-<span class="source-line-no">804</span><span id="line-804">     * @return The unspent transaction outputs</span>
+<span class="source-line-no">802</span><span id="line-802">     * @param address Address to query</span>
+<span class="source-line-no">803</span><span id="line-803">     * @param minConf minimum number of confirmations</span>
+<span class="source-line-no">804</span><span id="line-804">     * @return Is now returning `Coin`, if you need to convert use `BitcoinMath.btcToCoin(result)`</span>
 <span class="source-line-no">805</span><span id="line-805">     * @throws JsonRpcStatusException JSON RPC status exception</span>
 <span class="source-line-no">806</span><span id="line-806">     * @throws IOException network error</span>
 <span class="source-line-no">807</span><span id="line-807">     */</span>
-<span class="source-line-no">808</span><span id="line-808">    public List&lt;UnspentOutput&gt; listUnspent(Integer minConf, Integer maxConf)</span>
-<span class="source-line-no">809</span><span id="line-809">            throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">810</span><span id="line-810">        return listUnspent(minConf, maxConf, null, null);</span>
-<span class="source-line-no">811</span><span id="line-811">    }</span>
-<span class="source-line-no">812</span><span id="line-812"></span>
-<span class="source-line-no">813</span><span id="line-813">    public List&lt;UnspentOutput&gt; listUnspent(Integer minConf, Integer maxConf, Address address)</span>
-<span class="source-line-no">814</span><span id="line-814">            throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">815</span><span id="line-815">        return listUnspent(minConf, maxConf, List.of(address), true);</span>
+<span class="source-line-no">808</span><span id="line-808">    public Coin getReceivedByAddress(Address address, Integer minConf) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">809</span><span id="line-809">        return send("getreceivedbyaddress", Coin.class, address, minConf);</span>
+<span class="source-line-no">810</span><span id="line-810">    }</span>
+<span class="source-line-no">811</span><span id="line-811"></span>
+<span class="source-line-no">812</span><span id="line-812">    public List&lt;ReceivedByAddressInfo&gt; listReceivedByAddress(Integer minConf, Boolean includeEmpty)</span>
+<span class="source-line-no">813</span><span id="line-813">            throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">814</span><span id="line-814">        JavaType resultType = collectionTypeForClasses(List.class, ReceivedByAddressInfo.class);</span>
+<span class="source-line-no">815</span><span id="line-815">        return send("listreceivedbyaddress", resultType, minConf, includeEmpty);</span>
 <span class="source-line-no">816</span><span id="line-816">    }</span>
 <span class="source-line-no">817</span><span id="line-817"></span>
-<span class="source-line-no">818</span><span id="line-818">    public List&lt;UnspentOutput&gt; listUnspent(Integer minConf, Integer maxConf, List&lt;Address&gt; filter)</span>
-<span class="source-line-no">819</span><span id="line-819">            throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">820</span><span id="line-820">        return listUnspent(minConf, maxConf, filter, true);</span>
-<span class="source-line-no">821</span><span id="line-821">    }</span>
-<span class="source-line-no">822</span><span id="line-822"></span>
-<span class="source-line-no">823</span><span id="line-823">    /**</span>
-<span class="source-line-no">824</span><span id="line-824">     * Returns a list of unspent transaction outputs with at least {@code minConf} and not more than {@code maxConf}</span>
-<span class="source-line-no">825</span><span id="line-825">     * confirmations, filtered by a list of addresses.</span>
-<span class="source-line-no">826</span><span id="line-826">     *</span>
-<span class="source-line-no">827</span><span id="line-827">     * @param minConf The minimum confirmations to filter</span>
-<span class="source-line-no">828</span><span id="line-828">     * @param maxConf The maximum confirmations to filter</span>
-<span class="source-line-no">829</span><span id="line-829">     * @param filter  Include only transaction outputs to the specified addresses</span>
-<span class="source-line-no">830</span><span id="line-830">     * @param includeUnsafe optional</span>
-<span class="source-line-no">831</span><span id="line-831">     * @return The unspent transaction outputs</span>
-<span class="source-line-no">832</span><span id="line-832">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">833</span><span id="line-833">     * @throws IOException network error</span>
-<span class="source-line-no">834</span><span id="line-834">     */</span>
-<span class="source-line-no">835</span><span id="line-835">    public List&lt;UnspentOutput&gt; listUnspent(Integer minConf, Integer maxConf, List&lt;Address&gt; filter, Boolean includeUnsafe)</span>
-<span class="source-line-no">836</span><span id="line-836">            throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">837</span><span id="line-837">        JavaType resultType = mapper.getTypeFactory().constructCollectionType(List.class, UnspentOutput.class);</span>
-<span class="source-line-no">838</span><span id="line-838">        return send("listunspent", resultType, minConf, maxConf, filter, includeUnsafe);</span>
-<span class="source-line-no">839</span><span id="line-839">    }</span>
-<span class="source-line-no">840</span><span id="line-840"></span>
-<span class="source-line-no">841</span><span id="line-841">    /**</span>
-<span class="source-line-no">842</span><span id="line-842">     * Returns details about an unspent transaction output.</span>
-<span class="source-line-no">843</span><span id="line-843">     *</span>
-<span class="source-line-no">844</span><span id="line-844">     * @param txid The transaction hash</span>
-<span class="source-line-no">845</span><span id="line-845">     * @param vout The transaction output index</span>
-<span class="source-line-no">846</span><span id="line-846">     * @return Details about an unspent output or nothing, if the output was already spent</span>
-<span class="source-line-no">847</span><span id="line-847">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">848</span><span id="line-848">     * @throws IOException network error</span>
-<span class="source-line-no">849</span><span id="line-849">     */</span>
-<span class="source-line-no">850</span><span id="line-850">    public TxOutInfo getTxOut(Sha256Hash txid, Integer vout) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">851</span><span id="line-851">        return getTxOut(txid, vout, null);</span>
+<span class="source-line-no">818</span><span id="line-818">    /**</span>
+<span class="source-line-no">819</span><span id="line-819">     * Returns a list of unspent transaction outputs with at least one confirmation.</span>
+<span class="source-line-no">820</span><span id="line-820">     *</span>
+<span class="source-line-no">821</span><span id="line-821">     * @return The unspent transaction outputs</span>
+<span class="source-line-no">822</span><span id="line-822">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">823</span><span id="line-823">     * @throws IOException network error</span>
+<span class="source-line-no">824</span><span id="line-824">     */</span>
+<span class="source-line-no">825</span><span id="line-825">    public List&lt;UnspentOutput&gt; listUnspent() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">826</span><span id="line-826">        return listUnspent(null, null, null, null);</span>
+<span class="source-line-no">827</span><span id="line-827">    }</span>
+<span class="source-line-no">828</span><span id="line-828"></span>
+<span class="source-line-no">829</span><span id="line-829">    /**</span>
+<span class="source-line-no">830</span><span id="line-830">     * Returns a list of unspent transaction outputs with at least {@code minConf} and not more than {@code maxConf}</span>
+<span class="source-line-no">831</span><span id="line-831">     * confirmations.</span>
+<span class="source-line-no">832</span><span id="line-832">     *</span>
+<span class="source-line-no">833</span><span id="line-833">     * @param minConf The minimum confirmations to filter</span>
+<span class="source-line-no">834</span><span id="line-834">     * @param maxConf The maximum confirmations to filter</span>
+<span class="source-line-no">835</span><span id="line-835">     * @return The unspent transaction outputs</span>
+<span class="source-line-no">836</span><span id="line-836">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">837</span><span id="line-837">     * @throws IOException network error</span>
+<span class="source-line-no">838</span><span id="line-838">     */</span>
+<span class="source-line-no">839</span><span id="line-839">    public List&lt;UnspentOutput&gt; listUnspent(Integer minConf, Integer maxConf)</span>
+<span class="source-line-no">840</span><span id="line-840">            throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">841</span><span id="line-841">        return listUnspent(minConf, maxConf, null, null);</span>
+<span class="source-line-no">842</span><span id="line-842">    }</span>
+<span class="source-line-no">843</span><span id="line-843"></span>
+<span class="source-line-no">844</span><span id="line-844">    public List&lt;UnspentOutput&gt; listUnspent(Integer minConf, Integer maxConf, Address address)</span>
+<span class="source-line-no">845</span><span id="line-845">            throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">846</span><span id="line-846">        return listUnspent(minConf, maxConf, List.of(address), true);</span>
+<span class="source-line-no">847</span><span id="line-847">    }</span>
+<span class="source-line-no">848</span><span id="line-848"></span>
+<span class="source-line-no">849</span><span id="line-849">    public List&lt;UnspentOutput&gt; listUnspent(Integer minConf, Integer maxConf, List&lt;Address&gt; filter)</span>
+<span class="source-line-no">850</span><span id="line-850">            throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">851</span><span id="line-851">        return listUnspent(minConf, maxConf, filter, true);</span>
 <span class="source-line-no">852</span><span id="line-852">    }</span>
 <span class="source-line-no">853</span><span id="line-853"></span>
-<span class="source-line-no">854</span><span id="line-854"></span>
-<span class="source-line-no">855</span><span id="line-855">    /**</span>
-<span class="source-line-no">856</span><span id="line-856">     * Returns details about an unspent transaction output.</span>
+<span class="source-line-no">854</span><span id="line-854">    /**</span>
+<span class="source-line-no">855</span><span id="line-855">     * Returns a list of unspent transaction outputs with at least {@code minConf} and not more than {@code maxConf}</span>
+<span class="source-line-no">856</span><span id="line-856">     * confirmations, filtered by a list of addresses.</span>
 <span class="source-line-no">857</span><span id="line-857">     *</span>
-<span class="source-line-no">858</span><span id="line-858">     * @param txid              The transaction hash</span>
-<span class="source-line-no">859</span><span id="line-859">     * @param vout              The transaction output index</span>
-<span class="source-line-no">860</span><span id="line-860">     * @param includeMemoryPool Whether to included the memory pool</span>
-<span class="source-line-no">861</span><span id="line-861">     * @return Details about an unspent output or nothing, if the output was already spent</span>
-<span class="source-line-no">862</span><span id="line-862">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">863</span><span id="line-863">     * @throws IOException network error</span>
-<span class="source-line-no">864</span><span id="line-864">     */</span>
-<span class="source-line-no">865</span><span id="line-865">    public TxOutInfo getTxOut(Sha256Hash txid, Integer vout, Boolean includeMemoryPool)</span>
-<span class="source-line-no">866</span><span id="line-866">            throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">867</span><span id="line-867">        return send("gettxout", TxOutInfo.class, txid, vout, includeMemoryPool);</span>
-<span class="source-line-no">868</span><span id="line-868">    }</span>
-<span class="source-line-no">869</span><span id="line-869"></span>
-<span class="source-line-no">870</span><span id="line-870">    /**</span>
-<span class="source-line-no">871</span><span id="line-871">     * Returns statistics about the unspent transaction output set.</span>
-<span class="source-line-no">872</span><span id="line-872">     * Note this call may take some time.</span>
-<span class="source-line-no">873</span><span id="line-873">     *</span>
-<span class="source-line-no">874</span><span id="line-874">     * @return statistics about the unspent transaction output set</span>
-<span class="source-line-no">875</span><span id="line-875">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">876</span><span id="line-876">     * @throws IOException network error</span>
-<span class="source-line-no">877</span><span id="line-877">     */</span>
-<span class="source-line-no">878</span><span id="line-878">    public TxOutSetInfo getTxOutSetInfo() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">879</span><span id="line-879">        return send("gettxoutsetinfo", TxOutSetInfo.class);</span>
-<span class="source-line-no">880</span><span id="line-880">    }</span>
-<span class="source-line-no">881</span><span id="line-881"></span>
-<span class="source-line-no">882</span><span id="line-882">    /**</span>
-<span class="source-line-no">883</span><span id="line-883">     * Get the balance for a the default Bitcoin "account"</span>
-<span class="source-line-no">884</span><span id="line-884">     *</span>
-<span class="source-line-no">885</span><span id="line-885">     * @return Is now returning `Coin`, if you need to convert use `BitcoinMath.btcToCoin(result)`</span>
-<span class="source-line-no">886</span><span id="line-886">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">887</span><span id="line-887">     * @throws IOException network error</span>
-<span class="source-line-no">888</span><span id="line-888">     */</span>
-<span class="source-line-no">889</span><span id="line-889">    public Coin getBalance() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">890</span><span id="line-890">        return getBalance(null, null);</span>
-<span class="source-line-no">891</span><span id="line-891">    }</span>
-<span class="source-line-no">892</span><span id="line-892"></span>
-<span class="source-line-no">893</span><span id="line-893">    /**</span>
-<span class="source-line-no">894</span><span id="line-894">     * Get the balance for a Bitcoin "account"</span>
-<span class="source-line-no">895</span><span id="line-895">     *</span>
-<span class="source-line-no">896</span><span id="line-896">     * @param account A Bitcoin "account". (Be wary of using this feature.)</span>
-<span class="source-line-no">897</span><span id="line-897">     * @return Is now returning `Coin`, if you need to convert use `BitcoinMath.btcToCoin(result)`</span>
-<span class="source-line-no">898</span><span id="line-898">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">899</span><span id="line-899">     * @throws IOException network error</span>
-<span class="source-line-no">900</span><span id="line-900">     */</span>
-<span class="source-line-no">901</span><span id="line-901">    public Coin getBalance(String account) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">902</span><span id="line-902">        return getBalance(account, null);</span>
-<span class="source-line-no">903</span><span id="line-903">    }</span>
-<span class="source-line-no">904</span><span id="line-904"></span>
-<span class="source-line-no">905</span><span id="line-905">    /**</span>
-<span class="source-line-no">906</span><span id="line-906">     * Get the balance for a Bitcoin "account"</span>
-<span class="source-line-no">907</span><span id="line-907">     *</span>
-<span class="source-line-no">908</span><span id="line-908">     * @param account A Bitcoin "account". (Be wary of using this feature.)</span>
-<span class="source-line-no">909</span><span id="line-909">     * @param minConf minimum number of confirmations</span>
-<span class="source-line-no">910</span><span id="line-910">     * @return Is now returning `Coin`, if you need to convert use `BitcoinMath.btcToCoin(result)`</span>
-<span class="source-line-no">911</span><span id="line-911">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">912</span><span id="line-912">     * @throws IOException network error</span>
-<span class="source-line-no">913</span><span id="line-913">     */</span>
-<span class="source-line-no">914</span><span id="line-914">    public Coin getBalance(String account, Integer minConf) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">915</span><span id="line-915">        return send("getbalance", Coin.class, account, minConf);</span>
-<span class="source-line-no">916</span><span id="line-916">    }</span>
-<span class="source-line-no">917</span><span id="line-917"></span>
-<span class="source-line-no">918</span><span id="line-918">    public Sha256Hash sendToAddress(Address address, Coin amount) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">919</span><span id="line-919">        return sendToAddress(address, amount, null, null);</span>
-<span class="source-line-no">920</span><span id="line-920">    }</span>
-<span class="source-line-no">921</span><span id="line-921"></span>
-<span class="source-line-no">922</span><span id="line-922">    public Sha256Hash sendToAddress(Address address, Coin amount, String comment, String commentTo)</span>
-<span class="source-line-no">923</span><span id="line-923">            throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">924</span><span id="line-924">        return send("sendtoaddress", Sha256Hash.class, address, amount, comment, commentTo);</span>
-<span class="source-line-no">925</span><span id="line-925">    }</span>
-<span class="source-line-no">926</span><span id="line-926"></span>
-<span class="source-line-no">927</span><span id="line-927">    public Sha256Hash sendFrom(String account, Address address, Coin amount)</span>
-<span class="source-line-no">928</span><span id="line-928">            throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">929</span><span id="line-929">        return send("sendfrom", Sha256Hash.class, account, address, amount);</span>
-<span class="source-line-no">930</span><span id="line-930">    }</span>
-<span class="source-line-no">931</span><span id="line-931"></span>
-<span class="source-line-no">932</span><span id="line-932">    public Sha256Hash sendMany(String account, Map&lt;Address, Coin&gt; amounts) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">933</span><span id="line-933">        return send("sendmany", Sha256Hash.class, account, amounts);</span>
+<span class="source-line-no">858</span><span id="line-858">     * @param minConf The minimum confirmations to filter</span>
+<span class="source-line-no">859</span><span id="line-859">     * @param maxConf The maximum confirmations to filter</span>
+<span class="source-line-no">860</span><span id="line-860">     * @param filter  Include only transaction outputs to the specified addresses</span>
+<span class="source-line-no">861</span><span id="line-861">     * @param includeUnsafe optional</span>
+<span class="source-line-no">862</span><span id="line-862">     * @return The unspent transaction outputs</span>
+<span class="source-line-no">863</span><span id="line-863">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">864</span><span id="line-864">     * @throws IOException network error</span>
+<span class="source-line-no">865</span><span id="line-865">     */</span>
+<span class="source-line-no">866</span><span id="line-866">    public List&lt;UnspentOutput&gt; listUnspent(Integer minConf, Integer maxConf, List&lt;Address&gt; filter, Boolean includeUnsafe)</span>
+<span class="source-line-no">867</span><span id="line-867">            throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">868</span><span id="line-868">        JavaType resultType = collectionTypeForClasses(List.class, UnspentOutput.class);</span>
+<span class="source-line-no">869</span><span id="line-869">        return send("listunspent", resultType, minConf, maxConf, filter, includeUnsafe);</span>
+<span class="source-line-no">870</span><span id="line-870">    }</span>
+<span class="source-line-no">871</span><span id="line-871"></span>
+<span class="source-line-no">872</span><span id="line-872">    /**</span>
+<span class="source-line-no">873</span><span id="line-873">     * Returns details about an unspent transaction output.</span>
+<span class="source-line-no">874</span><span id="line-874">     *</span>
+<span class="source-line-no">875</span><span id="line-875">     * @param txid The transaction hash</span>
+<span class="source-line-no">876</span><span id="line-876">     * @param vout The transaction output index</span>
+<span class="source-line-no">877</span><span id="line-877">     * @return Details about an unspent output or nothing, if the output was already spent</span>
+<span class="source-line-no">878</span><span id="line-878">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">879</span><span id="line-879">     * @throws IOException network error</span>
+<span class="source-line-no">880</span><span id="line-880">     */</span>
+<span class="source-line-no">881</span><span id="line-881">    public TxOutInfo getTxOut(Sha256Hash txid, Integer vout) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">882</span><span id="line-882">        return getTxOut(txid, vout, null);</span>
+<span class="source-line-no">883</span><span id="line-883">    }</span>
+<span class="source-line-no">884</span><span id="line-884"></span>
+<span class="source-line-no">885</span><span id="line-885"></span>
+<span class="source-line-no">886</span><span id="line-886">    /**</span>
+<span class="source-line-no">887</span><span id="line-887">     * Returns details about an unspent transaction output.</span>
+<span class="source-line-no">888</span><span id="line-888">     *</span>
+<span class="source-line-no">889</span><span id="line-889">     * @param txid              The transaction hash</span>
+<span class="source-line-no">890</span><span id="line-890">     * @param vout              The transaction output index</span>
+<span class="source-line-no">891</span><span id="line-891">     * @param includeMemoryPool Whether to included the memory pool</span>
+<span class="source-line-no">892</span><span id="line-892">     * @return Details about an unspent output or nothing, if the output was already spent</span>
+<span class="source-line-no">893</span><span id="line-893">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">894</span><span id="line-894">     * @throws IOException network error</span>
+<span class="source-line-no">895</span><span id="line-895">     */</span>
+<span class="source-line-no">896</span><span id="line-896">    public TxOutInfo getTxOut(Sha256Hash txid, Integer vout, Boolean includeMemoryPool)</span>
+<span class="source-line-no">897</span><span id="line-897">            throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">898</span><span id="line-898">        return send("gettxout", TxOutInfo.class, txid, vout, includeMemoryPool);</span>
+<span class="source-line-no">899</span><span id="line-899">    }</span>
+<span class="source-line-no">900</span><span id="line-900"></span>
+<span class="source-line-no">901</span><span id="line-901">    /**</span>
+<span class="source-line-no">902</span><span id="line-902">     * Returns statistics about the unspent transaction output set.</span>
+<span class="source-line-no">903</span><span id="line-903">     * Note this call may take some time.</span>
+<span class="source-line-no">904</span><span id="line-904">     *</span>
+<span class="source-line-no">905</span><span id="line-905">     * @return statistics about the unspent transaction output set</span>
+<span class="source-line-no">906</span><span id="line-906">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">907</span><span id="line-907">     * @throws IOException network error</span>
+<span class="source-line-no">908</span><span id="line-908">     */</span>
+<span class="source-line-no">909</span><span id="line-909">    public TxOutSetInfo getTxOutSetInfo() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">910</span><span id="line-910">        return send("gettxoutsetinfo", TxOutSetInfo.class);</span>
+<span class="source-line-no">911</span><span id="line-911">    }</span>
+<span class="source-line-no">912</span><span id="line-912"></span>
+<span class="source-line-no">913</span><span id="line-913">    /**</span>
+<span class="source-line-no">914</span><span id="line-914">     * Get the balance for a the default Bitcoin "account"</span>
+<span class="source-line-no">915</span><span id="line-915">     *</span>
+<span class="source-line-no">916</span><span id="line-916">     * @return Is now returning `Coin`, if you need to convert use `BitcoinMath.btcToCoin(result)`</span>
+<span class="source-line-no">917</span><span id="line-917">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">918</span><span id="line-918">     * @throws IOException network error</span>
+<span class="source-line-no">919</span><span id="line-919">     */</span>
+<span class="source-line-no">920</span><span id="line-920">    public Coin getBalance() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">921</span><span id="line-921">        return getBalance(null, null);</span>
+<span class="source-line-no">922</span><span id="line-922">    }</span>
+<span class="source-line-no">923</span><span id="line-923"></span>
+<span class="source-line-no">924</span><span id="line-924">    /**</span>
+<span class="source-line-no">925</span><span id="line-925">     * Get the balance for a Bitcoin "account"</span>
+<span class="source-line-no">926</span><span id="line-926">     *</span>
+<span class="source-line-no">927</span><span id="line-927">     * @param account A Bitcoin "account". (Be wary of using this feature.)</span>
+<span class="source-line-no">928</span><span id="line-928">     * @return Is now returning `Coin`, if you need to convert use `BitcoinMath.btcToCoin(result)`</span>
+<span class="source-line-no">929</span><span id="line-929">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">930</span><span id="line-930">     * @throws IOException network error</span>
+<span class="source-line-no">931</span><span id="line-931">     */</span>
+<span class="source-line-no">932</span><span id="line-932">    public Coin getBalance(String account) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">933</span><span id="line-933">        return getBalance(account, null);</span>
 <span class="source-line-no">934</span><span id="line-934">    }</span>
 <span class="source-line-no">935</span><span id="line-935"></span>
 <span class="source-line-no">936</span><span id="line-936">    /**</span>
-<span class="source-line-no">937</span><span id="line-937">     * Set the transaction fee per kB.</span>
+<span class="source-line-no">937</span><span id="line-937">     * Get the balance for a Bitcoin "account"</span>
 <span class="source-line-no">938</span><span id="line-938">     *</span>
-<span class="source-line-no">939</span><span id="line-939">     * @param amount The transaction fee in BTC/kB rounded to the nearest 0.00000001.</span>
-<span class="source-line-no">940</span><span id="line-940">     * @return True if successful</span>
-<span class="source-line-no">941</span><span id="line-941">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">942</span><span id="line-942">     * @throws IOException network error</span>
-<span class="source-line-no">943</span><span id="line-943">     */</span>
-<span class="source-line-no">944</span><span id="line-944">    public Boolean setTxFee(Coin amount) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">945</span><span id="line-945">        return send("settxfee", amount);</span>
-<span class="source-line-no">946</span><span id="line-946">    }</span>
-<span class="source-line-no">947</span><span id="line-947"></span>
-<span class="source-line-no">948</span><span id="line-948">    public WalletTransactionInfo getTransaction(Sha256Hash txid) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">949</span><span id="line-949">        return getTransaction(txid, null, null);</span>
-<span class="source-line-no">950</span><span id="line-950">    }</span>
-<span class="source-line-no">951</span><span id="line-951"></span>
-<span class="source-line-no">952</span><span id="line-952">    public WalletTransactionInfo getTransaction(Sha256Hash txid, Boolean includeWatchOnly, Boolean verbose) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">953</span><span id="line-953">        return send("gettransaction", WalletTransactionInfo.class, txid, includeWatchOnly, verbose);</span>
-<span class="source-line-no">954</span><span id="line-954">    }</span>
-<span class="source-line-no">955</span><span id="line-955"></span>
-<span class="source-line-no">956</span><span id="line-956">    /**</span>
-<span class="source-line-no">957</span><span id="line-957">     * List the default number (10) of wallet transactions.</span>
-<span class="source-line-no">958</span><span id="line-958">     * @return A list of wallet transactions</span>
-<span class="source-line-no">959</span><span id="line-959">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">960</span><span id="line-960">     * @throws IOException network error</span>
-<span class="source-line-no">961</span><span id="line-961">     */</span>
-<span class="source-line-no">962</span><span id="line-962">    public List&lt;BitcoinTransactionInfo&gt; listTransactions() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">963</span><span id="line-963">        return listTransactions(null, null, null, null);</span>
-<span class="source-line-no">964</span><span id="line-964">    }</span>
-<span class="source-line-no">965</span><span id="line-965"></span>
-<span class="source-line-no">966</span><span id="line-966">    /**</span>
-<span class="source-line-no">967</span><span id="line-967">     * List wallet transactions.</span>
-<span class="source-line-no">968</span><span id="line-968">     * @param label Return transactions matching this address label, use "*" to return all transactions. {@code null} will use the server default ({@code "*"})</span>
-<span class="source-line-no">969</span><span id="line-969">     * @param count Maximum number of transactions to return. {@code null} will use the sever default number (10)</span>
-<span class="source-line-no">970</span><span id="line-970">     * @return A list of wallet transactions</span>
-<span class="source-line-no">971</span><span id="line-971">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">972</span><span id="line-972">     * @throws IOException network error</span>
-<span class="source-line-no">973</span><span id="line-973">     */</span>
-<span class="source-line-no">974</span><span id="line-974">    public List&lt;BitcoinTransactionInfo&gt; listTransactions(String label, Integer count) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">975</span><span id="line-975">        return listTransactions(label, count, null, null);</span>
-<span class="source-line-no">976</span><span id="line-976">    }</span>
-<span class="source-line-no">977</span><span id="line-977">    /**</span>
-<span class="source-line-no">978</span><span id="line-978">     * List wallet transactions</span>
-<span class="source-line-no">979</span><span id="line-979">     * @param label Return transactions matching this address label, use "*" to return all transactions. {@code null} will use the server default ({@code "*"})</span>
-<span class="source-line-no">980</span><span id="line-980">     * @param count Maximum number of transactions to return. {@code null} will use the sever default number (10)</span>
-<span class="source-line-no">981</span><span id="line-981">     * @param skip Number of transactions to skip. {@code null} will use the server default (0)</span>
-<span class="source-line-no">982</span><span id="line-982">     * @param includeWatchOnly Include transactions to/from watch-only addresses. {@code null} will use the server default, which is  ({@code true}) for watch-only wallets, {@code false} otherwise.</span>
-<span class="source-line-no">983</span><span id="line-983">     * @return A list of wallet transactions</span>
-<span class="source-line-no">984</span><span id="line-984">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">985</span><span id="line-985">     * @throws IOException network error</span>
-<span class="source-line-no">986</span><span id="line-986">     */</span>
-<span class="source-line-no">987</span><span id="line-987">    public List&lt;BitcoinTransactionInfo&gt; listTransactions(String label, Integer count, Integer skip, Boolean includeWatchOnly) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">988</span><span id="line-988">        JavaType resultType = mapper.getTypeFactory().constructCollectionType(List.class, BitcoinTransactionInfo.class);</span>
-<span class="source-line-no">989</span><span id="line-989">        return send("listtransactions", resultType, label, count, skip, includeWatchOnly);</span>
-<span class="source-line-no">990</span><span id="line-990">    }</span>
-<span class="source-line-no">991</span><span id="line-991"></span>
-<span class="source-line-no">992</span><span id="line-992">    /**</span>
-<span class="source-line-no">993</span><span id="line-993">     * The getblockchaininfo RPC provides information about the current state of the block chain.</span>
-<span class="source-line-no">994</span><span id="line-994">     *</span>
-<span class="source-line-no">995</span><span id="line-995">     * @return An object containing information about the current state of the block chain.</span>
-<span class="source-line-no">996</span><span id="line-996">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">997</span><span id="line-997">     * @throws IOException network error</span>
-<span class="source-line-no">998</span><span id="line-998">     */</span>
-<span class="source-line-no">999</span><span id="line-999">    public BlockChainInfo getBlockChainInfo() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1000</span><span id="line-1000">        return send("getblockchaininfo", BlockChainInfo.class);</span>
-<span class="source-line-no">1001</span><span id="line-1001">    }</span>
-<span class="source-line-no">1002</span><span id="line-1002"></span>
-<span class="source-line-no">1003</span><span id="line-1003">    /**</span>
-<span class="source-line-no">1004</span><span id="line-1004">     * The getnetworkinfo RPC returns information about the node's connection to the network.</span>
-<span class="source-line-no">1005</span><span id="line-1005">     *</span>
-<span class="source-line-no">1006</span><span id="line-1006">     * @return information about the node's connection to the network</span>
-<span class="source-line-no">1007</span><span id="line-1007">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1008</span><span id="line-1008">     * @throws IOException network error</span>
-<span class="source-line-no">1009</span><span id="line-1009">     */</span>
-<span class="source-line-no">1010</span><span id="line-1010">    public NetworkInfo getNetworkInfo() throws JsonRpcStatusException, IOException  {</span>
-<span class="source-line-no">1011</span><span id="line-1011">        return send("getnetworkinfo", NetworkInfo.class);</span>
-<span class="source-line-no">1012</span><span id="line-1012">    }</span>
-<span class="source-line-no">1013</span><span id="line-1013"></span>
-<span class="source-line-no">1014</span><span id="line-1014">    /**</span>
-<span class="source-line-no">1015</span><span id="line-1015">     * The getzmqnotifications RPC returns information about which configured ZMQ notifications are enabled</span>
-<span class="source-line-no">1016</span><span id="line-1016">     * and on which ports.</span>
-<span class="source-line-no">1017</span><span id="line-1017">     * </span>
-<span class="source-line-no">1018</span><span id="line-1018">     * @return A List of ZMQ Notification info records</span>
-<span class="source-line-no">1019</span><span id="line-1019">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1020</span><span id="line-1020">     * @throws IOException network error</span>
-<span class="source-line-no">1021</span><span id="line-1021">     */</span>
-<span class="source-line-no">1022</span><span id="line-1022">    public List&lt;ZmqNotification&gt; getZmqNotifications() throws JsonRpcStatusException, IOException  {</span>
-<span class="source-line-no">1023</span><span id="line-1023">        JavaType resultType = mapper.getTypeFactory().constructCollectionType(List.class, ZmqNotification.class);</span>
-<span class="source-line-no">1024</span><span id="line-1024">        return send("getzmqnotifications", resultType);</span>
-<span class="source-line-no">1025</span><span id="line-1025">    }</span>
-<span class="source-line-no">1026</span><span id="line-1026"></span>
-<span class="source-line-no">1027</span><span id="line-1027">    /**</span>
-<span class="source-line-no">1028</span><span id="line-1028">     * Returns list of related addresses.</span>
-<span class="source-line-no">1029</span><span id="line-1029">     * Also useful for finding all change addresses in the wallet</span>
-<span class="source-line-no">1030</span><span id="line-1030">     * @return a list of address groupings</span>
-<span class="source-line-no">1031</span><span id="line-1031">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1032</span><span id="line-1032">     * @throws IOException network error</span>
-<span class="source-line-no">1033</span><span id="line-1033">     */</span>
-<span class="source-line-no">1034</span><span id="line-1034">    public List&lt;List&lt;AddressGroupingItem&gt;&gt;  listAddressGroupings() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1035</span><span id="line-1035">        TypeFactory tf = mapper.getTypeFactory();</span>
-<span class="source-line-no">1036</span><span id="line-1036">        JavaType agiListType = tf.constructCollectionType(List.class, AddressGroupingItem.class);</span>
-<span class="source-line-no">1037</span><span id="line-1037">        JavaType resultType = tf.constructCollectionType(List.class, agiListType);</span>
-<span class="source-line-no">1038</span><span id="line-1038">        return send("listaddressgroupings", resultType);</span>
-<span class="source-line-no">1039</span><span id="line-1039">    }</span>
-<span class="source-line-no">1040</span><span id="line-1040"></span>
-<span class="source-line-no">1041</span><span id="line-1041">    /**</span>
-<span class="source-line-no">1042</span><span id="line-1042">     * Returns a human-readable list of available commands.</span>
-<span class="source-line-no">1043</span><span id="line-1043">     * &lt;p&gt;</span>
-<span class="source-line-no">1044</span><span id="line-1044">     * Bitcoin Core 0.10+ returns a categorized list of commands including blank lines</span>
-<span class="source-line-no">1045</span><span id="line-1045">     * and header lines.</span>
-<span class="source-line-no">1046</span><span id="line-1046">     *</span>
-<span class="source-line-no">1047</span><span id="line-1047">     * @return The list of commands as string</span>
-<span class="source-line-no">1048</span><span id="line-1048">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1049</span><span id="line-1049">     * @throws IOException network error</span>
-<span class="source-line-no">1050</span><span id="line-1050">     */</span>
-<span class="source-line-no">1051</span><span id="line-1051">    public String help() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1052</span><span id="line-1052">        return help(null);</span>
-<span class="source-line-no">1053</span><span id="line-1053">    }</span>
-<span class="source-line-no">1054</span><span id="line-1054"></span>
-<span class="source-line-no">1055</span><span id="line-1055">    /**</span>
-<span class="source-line-no">1056</span><span id="line-1056">     * Returns a human-readable list of available commands.</span>
-<span class="source-line-no">1057</span><span id="line-1057">     *</span>
-<span class="source-line-no">1058</span><span id="line-1058">     * @return The response as a stream of one {@link String} for each line</span>
-<span class="source-line-no">1059</span><span id="line-1059">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1060</span><span id="line-1060">     * @throws IOException network error</span>
-<span class="source-line-no">1061</span><span id="line-1061">     */</span>
-<span class="source-line-no">1062</span><span id="line-1062">    public Stream&lt;String&gt; helpAsStream() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1063</span><span id="line-1063">        return lines(help());</span>
+<span class="source-line-no">939</span><span id="line-939">     * @param account A Bitcoin "account". (Be wary of using this feature.)</span>
+<span class="source-line-no">940</span><span id="line-940">     * @param minConf minimum number of confirmations</span>
+<span class="source-line-no">941</span><span id="line-941">     * @return Is now returning `Coin`, if you need to convert use `BitcoinMath.btcToCoin(result)`</span>
+<span class="source-line-no">942</span><span id="line-942">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">943</span><span id="line-943">     * @throws IOException network error</span>
+<span class="source-line-no">944</span><span id="line-944">     */</span>
+<span class="source-line-no">945</span><span id="line-945">    public Coin getBalance(String account, Integer minConf) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">946</span><span id="line-946">        return send("getbalance", Coin.class, account, minConf);</span>
+<span class="source-line-no">947</span><span id="line-947">    }</span>
+<span class="source-line-no">948</span><span id="line-948"></span>
+<span class="source-line-no">949</span><span id="line-949">    public Sha256Hash sendToAddress(Address address, Coin amount) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">950</span><span id="line-950">        return sendToAddress(address, amount, null, null);</span>
+<span class="source-line-no">951</span><span id="line-951">    }</span>
+<span class="source-line-no">952</span><span id="line-952"></span>
+<span class="source-line-no">953</span><span id="line-953">    public Sha256Hash sendToAddress(Address address, Coin amount, String comment, String commentTo)</span>
+<span class="source-line-no">954</span><span id="line-954">            throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">955</span><span id="line-955">        return send("sendtoaddress", Sha256Hash.class, address, amount, comment, commentTo);</span>
+<span class="source-line-no">956</span><span id="line-956">    }</span>
+<span class="source-line-no">957</span><span id="line-957"></span>
+<span class="source-line-no">958</span><span id="line-958">    public Sha256Hash sendFrom(String account, Address address, Coin amount)</span>
+<span class="source-line-no">959</span><span id="line-959">            throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">960</span><span id="line-960">        return send("sendfrom", Sha256Hash.class, account, address, amount);</span>
+<span class="source-line-no">961</span><span id="line-961">    }</span>
+<span class="source-line-no">962</span><span id="line-962"></span>
+<span class="source-line-no">963</span><span id="line-963">    public Sha256Hash sendMany(String account, Map&lt;Address, Coin&gt; amounts) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">964</span><span id="line-964">        return send("sendmany", Sha256Hash.class, account, amounts);</span>
+<span class="source-line-no">965</span><span id="line-965">    }</span>
+<span class="source-line-no">966</span><span id="line-966"></span>
+<span class="source-line-no">967</span><span id="line-967">    /**</span>
+<span class="source-line-no">968</span><span id="line-968">     * Set the transaction fee per kB.</span>
+<span class="source-line-no">969</span><span id="line-969">     *</span>
+<span class="source-line-no">970</span><span id="line-970">     * @param amount The transaction fee in BTC/kB rounded to the nearest 0.00000001.</span>
+<span class="source-line-no">971</span><span id="line-971">     * @return True if successful</span>
+<span class="source-line-no">972</span><span id="line-972">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">973</span><span id="line-973">     * @throws IOException network error</span>
+<span class="source-line-no">974</span><span id="line-974">     */</span>
+<span class="source-line-no">975</span><span id="line-975">    public Boolean setTxFee(Coin amount) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">976</span><span id="line-976">        return send("settxfee", amount);</span>
+<span class="source-line-no">977</span><span id="line-977">    }</span>
+<span class="source-line-no">978</span><span id="line-978"></span>
+<span class="source-line-no">979</span><span id="line-979">    public WalletTransactionInfo getTransaction(Sha256Hash txid) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">980</span><span id="line-980">        return getTransaction(txid, null, null);</span>
+<span class="source-line-no">981</span><span id="line-981">    }</span>
+<span class="source-line-no">982</span><span id="line-982"></span>
+<span class="source-line-no">983</span><span id="line-983">    public WalletTransactionInfo getTransaction(Sha256Hash txid, Boolean includeWatchOnly, Boolean verbose) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">984</span><span id="line-984">        return send("gettransaction", WalletTransactionInfo.class, txid, includeWatchOnly, verbose);</span>
+<span class="source-line-no">985</span><span id="line-985">    }</span>
+<span class="source-line-no">986</span><span id="line-986"></span>
+<span class="source-line-no">987</span><span id="line-987">    /**</span>
+<span class="source-line-no">988</span><span id="line-988">     * List the default number (10) of wallet transactions.</span>
+<span class="source-line-no">989</span><span id="line-989">     * @return A list of wallet transactions</span>
+<span class="source-line-no">990</span><span id="line-990">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">991</span><span id="line-991">     * @throws IOException network error</span>
+<span class="source-line-no">992</span><span id="line-992">     */</span>
+<span class="source-line-no">993</span><span id="line-993">    public List&lt;BitcoinTransactionInfo&gt; listTransactions() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">994</span><span id="line-994">        return listTransactions(null, null, null, null);</span>
+<span class="source-line-no">995</span><span id="line-995">    }</span>
+<span class="source-line-no">996</span><span id="line-996"></span>
+<span class="source-line-no">997</span><span id="line-997">    /**</span>
+<span class="source-line-no">998</span><span id="line-998">     * List wallet transactions.</span>
+<span class="source-line-no">999</span><span id="line-999">     * @param label Return transactions matching this address label, use "*" to return all transactions. {@code null} will use the server default ({@code "*"})</span>
+<span class="source-line-no">1000</span><span id="line-1000">     * @param count Maximum number of transactions to return. {@code null} will use the sever default number (10)</span>
+<span class="source-line-no">1001</span><span id="line-1001">     * @return A list of wallet transactions</span>
+<span class="source-line-no">1002</span><span id="line-1002">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1003</span><span id="line-1003">     * @throws IOException network error</span>
+<span class="source-line-no">1004</span><span id="line-1004">     */</span>
+<span class="source-line-no">1005</span><span id="line-1005">    public List&lt;BitcoinTransactionInfo&gt; listTransactions(String label, Integer count) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1006</span><span id="line-1006">        return listTransactions(label, count, null, null);</span>
+<span class="source-line-no">1007</span><span id="line-1007">    }</span>
+<span class="source-line-no">1008</span><span id="line-1008">    /**</span>
+<span class="source-line-no">1009</span><span id="line-1009">     * List wallet transactions</span>
+<span class="source-line-no">1010</span><span id="line-1010">     * @param label Return transactions matching this address label, use "*" to return all transactions. {@code null} will use the server default ({@code "*"})</span>
+<span class="source-line-no">1011</span><span id="line-1011">     * @param count Maximum number of transactions to return. {@code null} will use the sever default number (10)</span>
+<span class="source-line-no">1012</span><span id="line-1012">     * @param skip Number of transactions to skip. {@code null} will use the server default (0)</span>
+<span class="source-line-no">1013</span><span id="line-1013">     * @param includeWatchOnly Include transactions to/from watch-only addresses. {@code null} will use the server default, which is  ({@code true}) for watch-only wallets, {@code false} otherwise.</span>
+<span class="source-line-no">1014</span><span id="line-1014">     * @return A list of wallet transactions</span>
+<span class="source-line-no">1015</span><span id="line-1015">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1016</span><span id="line-1016">     * @throws IOException network error</span>
+<span class="source-line-no">1017</span><span id="line-1017">     */</span>
+<span class="source-line-no">1018</span><span id="line-1018">    public List&lt;BitcoinTransactionInfo&gt; listTransactions(String label, Integer count, Integer skip, Boolean includeWatchOnly) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1019</span><span id="line-1019">        JavaType resultType = collectionTypeForClasses(List.class, BitcoinTransactionInfo.class);</span>
+<span class="source-line-no">1020</span><span id="line-1020">        return send("listtransactions", resultType, label, count, skip, includeWatchOnly);</span>
+<span class="source-line-no">1021</span><span id="line-1021">    }</span>
+<span class="source-line-no">1022</span><span id="line-1022"></span>
+<span class="source-line-no">1023</span><span id="line-1023">    /**</span>
+<span class="source-line-no">1024</span><span id="line-1024">     * The getblockchaininfo RPC provides information about the current state of the block chain.</span>
+<span class="source-line-no">1025</span><span id="line-1025">     *</span>
+<span class="source-line-no">1026</span><span id="line-1026">     * @return An object containing information about the current state of the block chain.</span>
+<span class="source-line-no">1027</span><span id="line-1027">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1028</span><span id="line-1028">     * @throws IOException network error</span>
+<span class="source-line-no">1029</span><span id="line-1029">     */</span>
+<span class="source-line-no">1030</span><span id="line-1030">    public BlockChainInfo getBlockChainInfo() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1031</span><span id="line-1031">        return syncGet(getBlockChainInfoAsync());</span>
+<span class="source-line-no">1032</span><span id="line-1032">    }</span>
+<span class="source-line-no">1033</span><span id="line-1033"></span>
+<span class="source-line-no">1034</span><span id="line-1034">    public CompletableFuture&lt;BlockChainInfo&gt; getBlockChainInfoAsync() {</span>
+<span class="source-line-no">1035</span><span id="line-1035">        return sendAsync("getblockchaininfo", BlockChainInfo.class);</span>
+<span class="source-line-no">1036</span><span id="line-1036">    }</span>
+<span class="source-line-no">1037</span><span id="line-1037"></span>
+<span class="source-line-no">1038</span><span id="line-1038">    /**</span>
+<span class="source-line-no">1039</span><span id="line-1039">     * The getnetworkinfo RPC returns information about the node's connection to the network.</span>
+<span class="source-line-no">1040</span><span id="line-1040">     *</span>
+<span class="source-line-no">1041</span><span id="line-1041">     * @return information about the node's connection to the network</span>
+<span class="source-line-no">1042</span><span id="line-1042">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1043</span><span id="line-1043">     * @throws IOException network error</span>
+<span class="source-line-no">1044</span><span id="line-1044">     */</span>
+<span class="source-line-no">1045</span><span id="line-1045">    public NetworkInfo getNetworkInfo() throws JsonRpcStatusException, IOException  {</span>
+<span class="source-line-no">1046</span><span id="line-1046">        return send("getnetworkinfo", NetworkInfo.class);</span>
+<span class="source-line-no">1047</span><span id="line-1047">    }</span>
+<span class="source-line-no">1048</span><span id="line-1048"></span>
+<span class="source-line-no">1049</span><span id="line-1049">    /**</span>
+<span class="source-line-no">1050</span><span id="line-1050">     * The {@code getzmqnotifications} RPC returns information about which configured ZMQ notifications are enabled</span>
+<span class="source-line-no">1051</span><span id="line-1051">     * and on which ports.</span>
+<span class="source-line-no">1052</span><span id="line-1052">     * </span>
+<span class="source-line-no">1053</span><span id="line-1053">     * @return A List of ZMQ Notification info records</span>
+<span class="source-line-no">1054</span><span id="line-1054">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1055</span><span id="line-1055">     * @throws IOException network error</span>
+<span class="source-line-no">1056</span><span id="line-1056">     */</span>
+<span class="source-line-no">1057</span><span id="line-1057">    public List&lt;ZmqNotification&gt; getZmqNotifications() throws JsonRpcStatusException, IOException  {</span>
+<span class="source-line-no">1058</span><span id="line-1058">        return syncGet(getZmqNotificationsAsync());</span>
+<span class="source-line-no">1059</span><span id="line-1059">    }</span>
+<span class="source-line-no">1060</span><span id="line-1060"></span>
+<span class="source-line-no">1061</span><span id="line-1061">    public CompletableFuture&lt;List&lt;ZmqNotification&gt;&gt; getZmqNotificationsAsync() {</span>
+<span class="source-line-no">1062</span><span id="line-1062">        JavaType resultType = collectionTypeForClasses(List.class, ZmqNotification.class);</span>
+<span class="source-line-no">1063</span><span id="line-1063">        return sendAsync("getzmqnotifications", resultType);</span>
 <span class="source-line-no">1064</span><span id="line-1064">    }</span>
 <span class="source-line-no">1065</span><span id="line-1065"></span>
 <span class="source-line-no">1066</span><span id="line-1066">    /**</span>
-<span class="source-line-no">1067</span><span id="line-1067">     * Returns a human-readable list of available commands.</span>
-<span class="source-line-no">1068</span><span id="line-1068">     *</span>
-<span class="source-line-no">1069</span><span id="line-1069">     * @return The response as a list one {@link String} for each line</span>
+<span class="source-line-no">1067</span><span id="line-1067">     * Returns list of related addresses.</span>
+<span class="source-line-no">1068</span><span id="line-1068">     * Also useful for finding all change addresses in the wallet</span>
+<span class="source-line-no">1069</span><span id="line-1069">     * @return a list of address groupings</span>
 <span class="source-line-no">1070</span><span id="line-1070">     * @throws JsonRpcStatusException JSON RPC status exception</span>
 <span class="source-line-no">1071</span><span id="line-1071">     * @throws IOException network error</span>
 <span class="source-line-no">1072</span><span id="line-1072">     */</span>
-<span class="source-line-no">1073</span><span id="line-1073">    public List&lt;String&gt; helpAsLines() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1074</span><span id="line-1074">        return helpAsStream().collect(Collectors.toList());</span>
-<span class="source-line-no">1075</span><span id="line-1075">    }</span>
-<span class="source-line-no">1076</span><span id="line-1076"></span>
-<span class="source-line-no">1077</span><span id="line-1077">    /**</span>
-<span class="source-line-no">1078</span><span id="line-1078">     * Returns a human-readable list of available commands.</span>
-<span class="source-line-no">1079</span><span id="line-1079">     *</span>
-<span class="source-line-no">1080</span><span id="line-1080">     * @return The response as a list one {@link MethodHelpEntry} for each method</span>
-<span class="source-line-no">1081</span><span id="line-1081">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1082</span><span id="line-1082">     * @throws IOException network error</span>
-<span class="source-line-no">1083</span><span id="line-1083">     */</span>
-<span class="source-line-no">1084</span><span id="line-1084">    public List&lt;MethodHelpEntry&gt; helpAsMethodEntries() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1085</span><span id="line-1085">        return helpAsStream()</span>
-<span class="source-line-no">1086</span><span id="line-1086">                .filter(this::isMethodEntry)</span>
-<span class="source-line-no">1087</span><span id="line-1087">                .map(MethodHelpEntry::new)</span>
-<span class="source-line-no">1088</span><span id="line-1088">                .collect(Collectors.toList());</span>
-<span class="source-line-no">1089</span><span id="line-1089">    }</span>
-<span class="source-line-no">1090</span><span id="line-1090"></span>
-<span class="source-line-no">1091</span><span id="line-1091">    /**</span>
-<span class="source-line-no">1092</span><span id="line-1092">     * Returns helpful information for a specific command.</span>
-<span class="source-line-no">1093</span><span id="line-1093">     *</span>
-<span class="source-line-no">1094</span><span id="line-1094">     * @param command The name of the command to get help for</span>
-<span class="source-line-no">1095</span><span id="line-1095">     * @return The help text</span>
-<span class="source-line-no">1096</span><span id="line-1096">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1097</span><span id="line-1097">     * @throws IOException network error</span>
-<span class="source-line-no">1098</span><span id="line-1098">     */</span>
-<span class="source-line-no">1099</span><span id="line-1099">    public String help(String command) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1100</span><span id="line-1100">        return send("help", command);</span>
-<span class="source-line-no">1101</span><span id="line-1101">    }</span>
-<span class="source-line-no">1102</span><span id="line-1102"></span>
-<span class="source-line-no">1103</span><span id="line-1103">    /**</span>
-<span class="source-line-no">1104</span><span id="line-1104">     * Returns a list of available commands.</span>
-<span class="source-line-no">1105</span><span id="line-1105">     *</span>
-<span class="source-line-no">1106</span><span id="line-1106">     * Commands which are unavailable will not be listed, such as wallet RPCs, if wallet support is disabled.</span>
-<span class="source-line-no">1107</span><span id="line-1107">     *</span>
-<span class="source-line-no">1108</span><span id="line-1108">     * @return The list of commands</span>
-<span class="source-line-no">1109</span><span id="line-1109">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1110</span><span id="line-1110">     * @throws IOException network error</span>
-<span class="source-line-no">1111</span><span id="line-1111">     */</span>
-<span class="source-line-no">1112</span><span id="line-1112">    public List&lt;String&gt; getCommands() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1113</span><span id="line-1113">        return helpAsMethodEntries().stream()</span>
-<span class="source-line-no">1114</span><span id="line-1114">                .map(MethodHelpEntry::getMethodName)</span>
-<span class="source-line-no">1115</span><span id="line-1115">                .collect(Collectors.toList());</span>
-<span class="source-line-no">1116</span><span id="line-1116">    }</span>
-<span class="source-line-no">1117</span><span id="line-1117"></span>
-<span class="source-line-no">1118</span><span id="line-1118">    private Stream&lt;String&gt; lines(String string) {</span>
-<span class="source-line-no">1119</span><span id="line-1119">        // In JDK 11 this can be replaced by String::lines</span>
-<span class="source-line-no">1120</span><span id="line-1120">        return Stream.of(string.split("\n"));</span>
-<span class="source-line-no">1121</span><span id="line-1121">    }</span>
-<span class="source-line-no">1122</span><span id="line-1122"></span>
-<span class="source-line-no">1123</span><span id="line-1123">    private boolean isMethodEntry(String line) {</span>
-<span class="source-line-no">1124</span><span id="line-1124">        // Filter out blank and header lines</span>
-<span class="source-line-no">1125</span><span id="line-1125">        return !line.isEmpty() &amp;&amp; !line.matches("== (.+) ==");</span>
-<span class="source-line-no">1126</span><span id="line-1126">    }</span>
-<span class="source-line-no">1127</span><span id="line-1127"></span>
-<span class="source-line-no">1128</span><span id="line-1128">    /**</span>
-<span class="source-line-no">1129</span><span id="line-1129">     * Checks whether a command exists.</span>
-<span class="source-line-no">1130</span><span id="line-1130">     *</span>
-<span class="source-line-no">1131</span><span id="line-1131">     * This is done indirectly, by using {help(String) help} to get information about the command, and if information</span>
-<span class="source-line-no">1132</span><span id="line-1132">     * about the command is available, then the command exists. The absence of information does not necessarily imply</span>
-<span class="source-line-no">1133</span><span id="line-1133">     * the non-existence of a command.</span>
-<span class="source-line-no">1134</span><span id="line-1134">     *</span>
-<span class="source-line-no">1135</span><span id="line-1135">     * @param command The name of the command to check</span>
-<span class="source-line-no">1136</span><span id="line-1136">     * @return True if the command exists</span>
-<span class="source-line-no">1137</span><span id="line-1137">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1138</span><span id="line-1138">     * @throws IOException network error</span>
-<span class="source-line-no">1139</span><span id="line-1139">     */</span>
-<span class="source-line-no">1140</span><span id="line-1140">    public Boolean commandExists(String command) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1141</span><span id="line-1141">        return !help(command).contains("help: unknown command");</span>
-<span class="source-line-no">1142</span><span id="line-1142">    }</span>
-<span class="source-line-no">1143</span><span id="line-1143"></span>
-<span class="source-line-no">1144</span><span id="line-1144">    /**</span>
-<span class="source-line-no">1145</span><span id="line-1145">     * Permanently marks a block as invalid, as if it violated a consensus rule.</span>
-<span class="source-line-no">1146</span><span id="line-1146">     *</span>
-<span class="source-line-no">1147</span><span id="line-1147">     * @param hash The block hash</span>
-<span class="source-line-no">1148</span><span id="line-1148">     * @since Bitcoin Core 0.10</span>
-<span class="source-line-no">1149</span><span id="line-1149">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1150</span><span id="line-1150">     * @throws IOException network error</span>
-<span class="source-line-no">1151</span><span id="line-1151">     */</span>
-<span class="source-line-no">1152</span><span id="line-1152">    public void invalidateBlock(Sha256Hash hash) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1153</span><span id="line-1153">        send("invalidateblock", hash);</span>
+<span class="source-line-no">1073</span><span id="line-1073">    public List&lt;List&lt;AddressGroupingItem&gt;&gt;  listAddressGroupings() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1074</span><span id="line-1074">        JavaType agiListType = collectionTypeForClasses(List.class, AddressGroupingItem.class);</span>
+<span class="source-line-no">1075</span><span id="line-1075">        JavaType resultType = collectionTypeForClasses(List.class, agiListType);</span>
+<span class="source-line-no">1076</span><span id="line-1076">        return send("listaddressgroupings", resultType);</span>
+<span class="source-line-no">1077</span><span id="line-1077">    }</span>
+<span class="source-line-no">1078</span><span id="line-1078"></span>
+<span class="source-line-no">1079</span><span id="line-1079">    /**</span>
+<span class="source-line-no">1080</span><span id="line-1080">     * Returns a human-readable list of available commands.</span>
+<span class="source-line-no">1081</span><span id="line-1081">     * &lt;p&gt;</span>
+<span class="source-line-no">1082</span><span id="line-1082">     * Bitcoin Core 0.10+ returns a categorized list of commands including blank lines</span>
+<span class="source-line-no">1083</span><span id="line-1083">     * and header lines.</span>
+<span class="source-line-no">1084</span><span id="line-1084">     *</span>
+<span class="source-line-no">1085</span><span id="line-1085">     * @return The list of commands as string</span>
+<span class="source-line-no">1086</span><span id="line-1086">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1087</span><span id="line-1087">     * @throws IOException network error</span>
+<span class="source-line-no">1088</span><span id="line-1088">     */</span>
+<span class="source-line-no">1089</span><span id="line-1089">    public String help() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1090</span><span id="line-1090">        return help(null);</span>
+<span class="source-line-no">1091</span><span id="line-1091">    }</span>
+<span class="source-line-no">1092</span><span id="line-1092"></span>
+<span class="source-line-no">1093</span><span id="line-1093">    /**</span>
+<span class="source-line-no">1094</span><span id="line-1094">     * Returns a human-readable list of available commands.</span>
+<span class="source-line-no">1095</span><span id="line-1095">     *</span>
+<span class="source-line-no">1096</span><span id="line-1096">     * @return The response as a stream of one {@link String} for each line</span>
+<span class="source-line-no">1097</span><span id="line-1097">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1098</span><span id="line-1098">     * @throws IOException network error</span>
+<span class="source-line-no">1099</span><span id="line-1099">     */</span>
+<span class="source-line-no">1100</span><span id="line-1100">    public Stream&lt;String&gt; helpAsStream() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1101</span><span id="line-1101">        return lines(help());</span>
+<span class="source-line-no">1102</span><span id="line-1102">    }</span>
+<span class="source-line-no">1103</span><span id="line-1103"></span>
+<span class="source-line-no">1104</span><span id="line-1104">    /**</span>
+<span class="source-line-no">1105</span><span id="line-1105">     * Returns a human-readable list of available commands.</span>
+<span class="source-line-no">1106</span><span id="line-1106">     *</span>
+<span class="source-line-no">1107</span><span id="line-1107">     * @return The response as a list one {@link String} for each line</span>
+<span class="source-line-no">1108</span><span id="line-1108">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1109</span><span id="line-1109">     * @throws IOException network error</span>
+<span class="source-line-no">1110</span><span id="line-1110">     */</span>
+<span class="source-line-no">1111</span><span id="line-1111">    public List&lt;String&gt; helpAsLines() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1112</span><span id="line-1112">        return helpAsStream().collect(Collectors.toList());</span>
+<span class="source-line-no">1113</span><span id="line-1113">    }</span>
+<span class="source-line-no">1114</span><span id="line-1114"></span>
+<span class="source-line-no">1115</span><span id="line-1115">    /**</span>
+<span class="source-line-no">1116</span><span id="line-1116">     * Returns a human-readable list of available commands.</span>
+<span class="source-line-no">1117</span><span id="line-1117">     *</span>
+<span class="source-line-no">1118</span><span id="line-1118">     * @return The response as a list one {@link MethodHelpEntry} for each method</span>
+<span class="source-line-no">1119</span><span id="line-1119">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1120</span><span id="line-1120">     * @throws IOException network error</span>
+<span class="source-line-no">1121</span><span id="line-1121">     */</span>
+<span class="source-line-no">1122</span><span id="line-1122">    public List&lt;MethodHelpEntry&gt; helpAsMethodEntries() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1123</span><span id="line-1123">        return helpAsStream()</span>
+<span class="source-line-no">1124</span><span id="line-1124">                .filter(this::isMethodEntry)</span>
+<span class="source-line-no">1125</span><span id="line-1125">                .map(MethodHelpEntry::new)</span>
+<span class="source-line-no">1126</span><span id="line-1126">                .collect(Collectors.toList());</span>
+<span class="source-line-no">1127</span><span id="line-1127">    }</span>
+<span class="source-line-no">1128</span><span id="line-1128"></span>
+<span class="source-line-no">1129</span><span id="line-1129">    /**</span>
+<span class="source-line-no">1130</span><span id="line-1130">     * Returns helpful information for a specific command.</span>
+<span class="source-line-no">1131</span><span id="line-1131">     *</span>
+<span class="source-line-no">1132</span><span id="line-1132">     * @param command The name of the command to get help for</span>
+<span class="source-line-no">1133</span><span id="line-1133">     * @return The help text</span>
+<span class="source-line-no">1134</span><span id="line-1134">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1135</span><span id="line-1135">     * @throws IOException network error</span>
+<span class="source-line-no">1136</span><span id="line-1136">     */</span>
+<span class="source-line-no">1137</span><span id="line-1137">    public String help(String command) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1138</span><span id="line-1138">        return send("help", command);</span>
+<span class="source-line-no">1139</span><span id="line-1139">    }</span>
+<span class="source-line-no">1140</span><span id="line-1140"></span>
+<span class="source-line-no">1141</span><span id="line-1141">    /**</span>
+<span class="source-line-no">1142</span><span id="line-1142">     * Returns a list of available commands.</span>
+<span class="source-line-no">1143</span><span id="line-1143">     * &lt;p&gt;</span>
+<span class="source-line-no">1144</span><span id="line-1144">     * Commands which are unavailable will not be listed, such as wallet RPCs, if wallet support is disabled.</span>
+<span class="source-line-no">1145</span><span id="line-1145">     *</span>
+<span class="source-line-no">1146</span><span id="line-1146">     * @return The list of commands</span>
+<span class="source-line-no">1147</span><span id="line-1147">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1148</span><span id="line-1148">     * @throws IOException network error</span>
+<span class="source-line-no">1149</span><span id="line-1149">     */</span>
+<span class="source-line-no">1150</span><span id="line-1150">    public List&lt;String&gt; getCommands() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1151</span><span id="line-1151">        return helpAsMethodEntries().stream()</span>
+<span class="source-line-no">1152</span><span id="line-1152">                .map(MethodHelpEntry::getMethodName)</span>
+<span class="source-line-no">1153</span><span id="line-1153">                .collect(Collectors.toList());</span>
 <span class="source-line-no">1154</span><span id="line-1154">    }</span>
 <span class="source-line-no">1155</span><span id="line-1155"></span>
-<span class="source-line-no">1156</span><span id="line-1156">    /**</span>
-<span class="source-line-no">1157</span><span id="line-1157">     * Removes invalidity status of a block and its descendants, reconsider them for activation.</span>
-<span class="source-line-no">1158</span><span id="line-1158">     * &lt;p&gt;</span>
-<span class="source-line-no">1159</span><span id="line-1159">     * This can be used to undo the effects of {link invalidateBlock(Sha256Hash) invalidateBlock}.</span>
-<span class="source-line-no">1160</span><span id="line-1160">     *</span>
-<span class="source-line-no">1161</span><span id="line-1161">     * @param hash The hash of the block to reconsider</span>
-<span class="source-line-no">1162</span><span id="line-1162">     * @since Bitcoin Core 0.10</span>
-<span class="source-line-no">1163</span><span id="line-1163">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1164</span><span id="line-1164">     * @throws IOException network error</span>
-<span class="source-line-no">1165</span><span id="line-1165">     */</span>
-<span class="source-line-no">1166</span><span id="line-1166">    public void reconsiderBlock(Sha256Hash hash) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1167</span><span id="line-1167">        send("reconsiderblock", hash);</span>
-<span class="source-line-no">1168</span><span id="line-1168">    }</span>
-<span class="source-line-no">1169</span><span id="line-1169"></span>
-<span class="source-line-no">1170</span><span id="line-1170">    /**</span>
-<span class="source-line-no">1171</span><span id="line-1171">     * Return information about all known tips in the block tree, including the main chain as well as orphaned branches.</span>
+<span class="source-line-no">1156</span><span id="line-1156">    private Stream&lt;String&gt; lines(String string) {</span>
+<span class="source-line-no">1157</span><span id="line-1157">        // In JDK 11 this can be replaced by String::lines</span>
+<span class="source-line-no">1158</span><span id="line-1158">        return Stream.of(string.split("\n"));</span>
+<span class="source-line-no">1159</span><span id="line-1159">    }</span>
+<span class="source-line-no">1160</span><span id="line-1160"></span>
+<span class="source-line-no">1161</span><span id="line-1161">    private boolean isMethodEntry(String line) {</span>
+<span class="source-line-no">1162</span><span id="line-1162">        // Filter out blank and header lines</span>
+<span class="source-line-no">1163</span><span id="line-1163">        return !line.isEmpty() &amp;&amp; !line.matches("== (.+) ==");</span>
+<span class="source-line-no">1164</span><span id="line-1164">    }</span>
+<span class="source-line-no">1165</span><span id="line-1165"></span>
+<span class="source-line-no">1166</span><span id="line-1166">    /**</span>
+<span class="source-line-no">1167</span><span id="line-1167">     * Checks whether a command exists.</span>
+<span class="source-line-no">1168</span><span id="line-1168">     * &lt;p&gt;</span>
+<span class="source-line-no">1169</span><span id="line-1169">     * This is done indirectly, by using {help(String) help} to get information about the command, and if information</span>
+<span class="source-line-no">1170</span><span id="line-1170">     * about the command is available, then the command exists. The absence of information does not necessarily imply</span>
+<span class="source-line-no">1171</span><span id="line-1171">     * the non-existence of a command.</span>
 <span class="source-line-no">1172</span><span id="line-1172">     *</span>
-<span class="source-line-no">1173</span><span id="line-1173">     * @return A list of chain tip information</span>
-<span class="source-line-no">1174</span><span id="line-1174">     * @since Bitcoin Core 0.10</span>
+<span class="source-line-no">1173</span><span id="line-1173">     * @param command The name of the command to check</span>
+<span class="source-line-no">1174</span><span id="line-1174">     * @return True if the command exists</span>
 <span class="source-line-no">1175</span><span id="line-1175">     * @throws JsonRpcStatusException JSON RPC status exception</span>
 <span class="source-line-no">1176</span><span id="line-1176">     * @throws IOException network error</span>
 <span class="source-line-no">1177</span><span id="line-1177">     */</span>
-<span class="source-line-no">1178</span><span id="line-1178">    @Override</span>
-<span class="source-line-no">1179</span><span id="line-1179">    public List&lt;ChainTip&gt; getChainTips() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1180</span><span id="line-1180">        JavaType resultType = mapper.getTypeFactory().constructCollectionType(List.class, ChainTip.class);</span>
-<span class="source-line-no">1181</span><span id="line-1181">        return send("getchaintips",resultType);</span>
-<span class="source-line-no">1182</span><span id="line-1182">    }</span>
-<span class="source-line-no">1183</span><span id="line-1183"></span>
-<span class="source-line-no">1184</span><span id="line-1184">    /**</span>
-<span class="source-line-no">1185</span><span id="line-1185">     * Attempt to add or remove a node from the addnode list, or to try a connection to a node once.</span>
-<span class="source-line-no">1186</span><span id="line-1186">     *</span>
-<span class="source-line-no">1187</span><span id="line-1187">     * @param node node to add as a string in the form of {@code IP_address:port}</span>
-<span class="source-line-no">1188</span><span id="line-1188">     * @param command `add`, `remove`, or `onetry`</span>
-<span class="source-line-no">1189</span><span id="line-1189">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1190</span><span id="line-1190">     * @throws IOException network error</span>
-<span class="source-line-no">1191</span><span id="line-1191">     */</span>
-<span class="source-line-no">1192</span><span id="line-1192">    public void addNode(String node, String command) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">1193</span><span id="line-1193">        send("addnode", node, command);</span>
-<span class="source-line-no">1194</span><span id="line-1194">    }</span>
-<span class="source-line-no">1195</span><span id="line-1195"></span>
-<span class="source-line-no">1196</span><span id="line-1196">    /**</span>
-<span class="source-line-no">1197</span><span id="line-1197">     * Return information about the given added node</span>
+<span class="source-line-no">1178</span><span id="line-1178">    public Boolean commandExists(String command) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1179</span><span id="line-1179">        return !help(command).contains("help: unknown command");</span>
+<span class="source-line-no">1180</span><span id="line-1180">    }</span>
+<span class="source-line-no">1181</span><span id="line-1181"></span>
+<span class="source-line-no">1182</span><span id="line-1182">    /**</span>
+<span class="source-line-no">1183</span><span id="line-1183">     * Permanently marks a block as invalid, as if it violated a consensus rule.</span>
+<span class="source-line-no">1184</span><span id="line-1184">     *</span>
+<span class="source-line-no">1185</span><span id="line-1185">     * @param hash The block hash</span>
+<span class="source-line-no">1186</span><span id="line-1186">     * @since Bitcoin Core 0.10</span>
+<span class="source-line-no">1187</span><span id="line-1187">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1188</span><span id="line-1188">     * @throws IOException network error</span>
+<span class="source-line-no">1189</span><span id="line-1189">     */</span>
+<span class="source-line-no">1190</span><span id="line-1190">    public void invalidateBlock(Sha256Hash hash) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1191</span><span id="line-1191">        send("invalidateblock", hash);</span>
+<span class="source-line-no">1192</span><span id="line-1192">    }</span>
+<span class="source-line-no">1193</span><span id="line-1193"></span>
+<span class="source-line-no">1194</span><span id="line-1194">    /**</span>
+<span class="source-line-no">1195</span><span id="line-1195">     * Removes invalidity status of a block and its descendants, reconsider them for activation.</span>
+<span class="source-line-no">1196</span><span id="line-1196">     * &lt;p&gt;</span>
+<span class="source-line-no">1197</span><span id="line-1197">     * This can be used to undo the effects of {link invalidateBlock(Sha256Hash) invalidateBlock}.</span>
 <span class="source-line-no">1198</span><span id="line-1198">     *</span>
-<span class="source-line-no">1199</span><span id="line-1199">     * @param details `true` to return detailed information</span>
-<span class="source-line-no">1200</span><span id="line-1200">     * @param node the node to provide information about</span>
-<span class="source-line-no">1201</span><span id="line-1201">     * @return A Jackson JsonNode object (until we define a POJO)</span>
-<span class="source-line-no">1202</span><span id="line-1202">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1203</span><span id="line-1203">     * @throws IOException network error</span>
-<span class="source-line-no">1204</span><span id="line-1204">     */</span>
-<span class="source-line-no">1205</span><span id="line-1205">    public JsonNode getAddedNodeInfo(boolean details, String node) throws JsonRpcStatusException, IOException  {</span>
-<span class="source-line-no">1206</span><span id="line-1206">        return send("getaddednodeinfo", JsonNode.class, details, node);</span>
-<span class="source-line-no">1207</span><span id="line-1207">    }</span>
-<span class="source-line-no">1208</span><span id="line-1208"></span>
-<span class="source-line-no">1209</span><span id="line-1209">    /**</span>
-<span class="source-line-no">1210</span><span id="line-1210">     * Return information about all added nodes</span>
-<span class="source-line-no">1211</span><span id="line-1211">     *</span>
-<span class="source-line-no">1212</span><span id="line-1212">     * @param details `true` to return detailed information</span>
-<span class="source-line-no">1213</span><span id="line-1213">     * @return A Jackson JsonNode object (until we define a POJO)</span>
-<span class="source-line-no">1214</span><span id="line-1214">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">1215</span><span id="line-1215">     * @throws IOException network error</span>
+<span class="source-line-no">1199</span><span id="line-1199">     * @param hash The hash of the block to reconsider</span>
+<span class="source-line-no">1200</span><span id="line-1200">     * @since Bitcoin Core 0.10</span>
+<span class="source-line-no">1201</span><span id="line-1201">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1202</span><span id="line-1202">     * @throws IOException network error</span>
+<span class="source-line-no">1203</span><span id="line-1203">     */</span>
+<span class="source-line-no">1204</span><span id="line-1204">    public void reconsiderBlock(Sha256Hash hash) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1205</span><span id="line-1205">        send("reconsiderblock", hash);</span>
+<span class="source-line-no">1206</span><span id="line-1206">    }</span>
+<span class="source-line-no">1207</span><span id="line-1207"></span>
+<span class="source-line-no">1208</span><span id="line-1208">    /**</span>
+<span class="source-line-no">1209</span><span id="line-1209">     * Return information about all known tips in the block tree, including the main chain as well as orphaned branches.</span>
+<span class="source-line-no">1210</span><span id="line-1210">     *</span>
+<span class="source-line-no">1211</span><span id="line-1211">     * @return A list of chain tip information</span>
+<span class="source-line-no">1212</span><span id="line-1212">     * @since Bitcoin Core 0.10</span>
+<span class="source-line-no">1213</span><span id="line-1213">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1214</span><span id="line-1214">     * @throws IOException network error</span>
+<span class="source-line-no">1215</span><span id="line-1215">     * @deprecated Use {@link #getChainTipsAsync()}</span>
 <span class="source-line-no">1216</span><span id="line-1216">     */</span>
-<span class="source-line-no">1217</span><span id="line-1217">    public JsonNode getAddedNodeInfo(boolean details) throws JsonRpcStatusException, IOException  {</span>
-<span class="source-line-no">1218</span><span id="line-1218">        return getAddedNodeInfo(details, null);</span>
-<span class="source-line-no">1219</span><span id="line-1219">    }</span>
-<span class="source-line-no">1220</span><span id="line-1220"></span>
-<span class="source-line-no">1221</span><span id="line-1221">    // Bitcore/Omni transaction for getting non-wallet address balances</span>
-<span class="source-line-no">1222</span><span id="line-1222">    public AddressBalanceInfo getAddressBalance(Address address) throws JsonRpcException, IOException {</span>
-<span class="source-line-no">1223</span><span id="line-1223">        return send("getaddressbalance", AddressBalanceInfo.class, address);</span>
-<span class="source-line-no">1224</span><span id="line-1224">    }</span>
-<span class="source-line-no">1225</span><span id="line-1225"></span>
-<span class="source-line-no">1226</span><span id="line-1226">    // Bitcore/Omni transaction for getting non-wallet address balances</span>
-<span class="source-line-no">1227</span><span id="line-1227">    public AddressBalanceInfo getAddressBalance(List&lt;Address&gt; addressList) throws JsonRpcException, IOException {</span>
-<span class="source-line-no">1228</span><span id="line-1228">        return send("getaddressbalance", AddressBalanceInfo.class, new AddressRequest(addressList));</span>
-<span class="source-line-no">1229</span><span id="line-1229">    }</span>
-<span class="source-line-no">1230</span><span id="line-1230"></span>
-<span class="source-line-no">1231</span><span id="line-1231">    // Bitcore/Omni transaction for getting non-wallet address UTXO Info</span>
-<span class="source-line-no">1232</span><span id="line-1232">    public List&lt;AddressUtxoInfo&gt;  getAddressUtxos(Address address) throws JsonRpcException, IOException {</span>
-<span class="source-line-no">1233</span><span id="line-1233">        JavaType resultType = mapper.getTypeFactory().constructCollectionType(List.class, AddressUtxoInfo.class);</span>
-<span class="source-line-no">1234</span><span id="line-1234">        return send("getaddressutxos", resultType, address);</span>
-<span class="source-line-no">1235</span><span id="line-1235">    }</span>
-<span class="source-line-no">1236</span><span id="line-1236"></span>
-<span class="source-line-no">1237</span><span id="line-1237">    // Bitcore/Omni transaction for getting non-wallet address UTXO Info</span>
-<span class="source-line-no">1238</span><span id="line-1238">    public List&lt;AddressUtxoInfo&gt; getAddressUtxos(List&lt;Address&gt; addressList) throws JsonRpcException, IOException {</span>
-<span class="source-line-no">1239</span><span id="line-1239">        JavaType resultType = mapper.getTypeFactory().constructCollectionType(List.class, AddressUtxoInfo.class);</span>
-<span class="source-line-no">1240</span><span id="line-1240">        return send("getaddressutxos", resultType, new AddressRequest(addressList));</span>
-<span class="source-line-no">1241</span><span id="line-1241">    }</span>
-<span class="source-line-no">1242</span><span id="line-1242"></span>
-<span class="source-line-no">1243</span><span id="line-1243">}</span>
+<span class="source-line-no">1217</span><span id="line-1217">    @Override</span>
+<span class="source-line-no">1218</span><span id="line-1218">    public List&lt;ChainTip&gt; getChainTips() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1219</span><span id="line-1219">        return syncGet(getChainTipsAsync());</span>
+<span class="source-line-no">1220</span><span id="line-1220">    }</span>
+<span class="source-line-no">1221</span><span id="line-1221"></span>
+<span class="source-line-no">1222</span><span id="line-1222">    @Override</span>
+<span class="source-line-no">1223</span><span id="line-1223">    public CompletableFuture&lt;List&lt;ChainTip&gt;&gt; getChainTipsAsync() {</span>
+<span class="source-line-no">1224</span><span id="line-1224">        JavaType resultType = collectionTypeForClasses(List.class, ChainTip.class);</span>
+<span class="source-line-no">1225</span><span id="line-1225">        return sendAsync("getchaintips", resultType);</span>
+<span class="source-line-no">1226</span><span id="line-1226">    }</span>
+<span class="source-line-no">1227</span><span id="line-1227"></span>
+<span class="source-line-no">1228</span><span id="line-1228">    /**</span>
+<span class="source-line-no">1229</span><span id="line-1229">     * Attempt to add or remove a node from the addnode list, or to try a connection to a node once.</span>
+<span class="source-line-no">1230</span><span id="line-1230">     *</span>
+<span class="source-line-no">1231</span><span id="line-1231">     * @param node node to add as a string in the form of {@code IP_address:port}</span>
+<span class="source-line-no">1232</span><span id="line-1232">     * @param command `add`, `remove`, or `onetry`</span>
+<span class="source-line-no">1233</span><span id="line-1233">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1234</span><span id="line-1234">     * @throws IOException network error</span>
+<span class="source-line-no">1235</span><span id="line-1235">     */</span>
+<span class="source-line-no">1236</span><span id="line-1236">    public void addNode(String node, String command) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">1237</span><span id="line-1237">        send("addnode", node, command);</span>
+<span class="source-line-no">1238</span><span id="line-1238">    }</span>
+<span class="source-line-no">1239</span><span id="line-1239"></span>
+<span class="source-line-no">1240</span><span id="line-1240">    /**</span>
+<span class="source-line-no">1241</span><span id="line-1241">     * Return information about the given added node</span>
+<span class="source-line-no">1242</span><span id="line-1242">     *</span>
+<span class="source-line-no">1243</span><span id="line-1243">     * @param details `true` to return detailed information</span>
+<span class="source-line-no">1244</span><span id="line-1244">     * @param node the node to provide information about</span>
+<span class="source-line-no">1245</span><span id="line-1245">     * @return A Jackson JsonNode object (until we define a POJO)</span>
+<span class="source-line-no">1246</span><span id="line-1246">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1247</span><span id="line-1247">     * @throws IOException network error</span>
+<span class="source-line-no">1248</span><span id="line-1248">     */</span>
+<span class="source-line-no">1249</span><span id="line-1249">    public JsonNode getAddedNodeInfo(boolean details, String node) throws JsonRpcStatusException, IOException  {</span>
+<span class="source-line-no">1250</span><span id="line-1250">        return send("getaddednodeinfo", JsonNode.class, details, node);</span>
+<span class="source-line-no">1251</span><span id="line-1251">    }</span>
+<span class="source-line-no">1252</span><span id="line-1252"></span>
+<span class="source-line-no">1253</span><span id="line-1253">    /**</span>
+<span class="source-line-no">1254</span><span id="line-1254">     * Return information about all added nodes</span>
+<span class="source-line-no">1255</span><span id="line-1255">     *</span>
+<span class="source-line-no">1256</span><span id="line-1256">     * @param details `true` to return detailed information</span>
+<span class="source-line-no">1257</span><span id="line-1257">     * @return A Jackson JsonNode object (until we define a POJO)</span>
+<span class="source-line-no">1258</span><span id="line-1258">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">1259</span><span id="line-1259">     * @throws IOException network error</span>
+<span class="source-line-no">1260</span><span id="line-1260">     */</span>
+<span class="source-line-no">1261</span><span id="line-1261">    public JsonNode getAddedNodeInfo(boolean details) throws JsonRpcStatusException, IOException  {</span>
+<span class="source-line-no">1262</span><span id="line-1262">        return getAddedNodeInfo(details, null);</span>
+<span class="source-line-no">1263</span><span id="line-1263">    }</span>
+<span class="source-line-no">1264</span><span id="line-1264"></span>
+<span class="source-line-no">1265</span><span id="line-1265">    // Bitcore/Omni transaction for getting non-wallet address balances</span>
+<span class="source-line-no">1266</span><span id="line-1266">    public AddressBalanceInfo getAddressBalance(Address address) throws JsonRpcException, IOException {</span>
+<span class="source-line-no">1267</span><span id="line-1267">        return send("getaddressbalance", AddressBalanceInfo.class, address);</span>
+<span class="source-line-no">1268</span><span id="line-1268">    }</span>
+<span class="source-line-no">1269</span><span id="line-1269"></span>
+<span class="source-line-no">1270</span><span id="line-1270">    // Bitcore/Omni transaction for getting non-wallet address balances</span>
+<span class="source-line-no">1271</span><span id="line-1271">    public AddressBalanceInfo getAddressBalance(List&lt;Address&gt; addressList) throws JsonRpcException, IOException {</span>
+<span class="source-line-no">1272</span><span id="line-1272">        return send("getaddressbalance", AddressBalanceInfo.class, new AddressRequest(addressList));</span>
+<span class="source-line-no">1273</span><span id="line-1273">    }</span>
+<span class="source-line-no">1274</span><span id="line-1274"></span>
+<span class="source-line-no">1275</span><span id="line-1275">    // Bitcore/Omni transaction for getting non-wallet address UTXO Info</span>
+<span class="source-line-no">1276</span><span id="line-1276">    public List&lt;AddressUtxoInfo&gt;  getAddressUtxos(Address address) throws JsonRpcException, IOException {</span>
+<span class="source-line-no">1277</span><span id="line-1277">        JavaType resultType = collectionTypeForClasses(List.class, AddressUtxoInfo.class);</span>
+<span class="source-line-no">1278</span><span id="line-1278">        return send("getaddressutxos", resultType, address);</span>
+<span class="source-line-no">1279</span><span id="line-1279">    }</span>
+<span class="source-line-no">1280</span><span id="line-1280"></span>
+<span class="source-line-no">1281</span><span id="line-1281">    // Bitcore/Omni transaction for getting non-wallet address UTXO Info</span>
+<span class="source-line-no">1282</span><span id="line-1282">    public List&lt;AddressUtxoInfo&gt; getAddressUtxos(List&lt;Address&gt; addressList) throws JsonRpcException, IOException {</span>
+<span class="source-line-no">1283</span><span id="line-1283">        JavaType resultType = collectionTypeForClasses(List.class, AddressUtxoInfo.class);</span>
+<span class="source-line-no">1284</span><span id="line-1284">        return send("getaddressutxos", resultType, new AddressRequest(addressList));</span>
+<span class="source-line-no">1285</span><span id="line-1285">    }</span>
+<span class="source-line-no">1286</span><span id="line-1286">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html
index c7d3ae300..f374378b0 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/BitcoinExtendedClient.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc, class: BitcoinExtendedClient">
@@ -31,500 +31,484 @@
 <span class="source-line-no">018</span><span id="line-18">import org.bitcoinj.base.Address;</span>
 <span class="source-line-no">019</span><span id="line-19">import org.bitcoinj.base.Coin;</span>
 <span class="source-line-no">020</span><span id="line-20">import org.bitcoinj.crypto.ECKey;</span>
-<span class="source-line-no">021</span><span id="line-21">import org.bitcoinj.core.NetworkParameters;</span>
-<span class="source-line-no">022</span><span id="line-22">import org.bitcoinj.base.Sha256Hash;</span>
-<span class="source-line-no">023</span><span id="line-23">import org.bitcoinj.core.Transaction;</span>
-<span class="source-line-no">024</span><span id="line-24">import org.bitcoinj.core.TransactionOutPoint;</span>
-<span class="source-line-no">025</span><span id="line-25">import org.bitcoinj.core.TransactionOutput;</span>
+<span class="source-line-no">021</span><span id="line-21">import org.bitcoinj.base.Sha256Hash;</span>
+<span class="source-line-no">022</span><span id="line-22">import org.bitcoinj.core.Transaction;</span>
+<span class="source-line-no">023</span><span id="line-23">import org.bitcoinj.core.TransactionOutPoint;</span>
+<span class="source-line-no">024</span><span id="line-24">import org.bitcoinj.core.TransactionOutput;</span>
+<span class="source-line-no">025</span><span id="line-25">import org.consensusj.jsonrpc.JsonRpcTransport;</span>
 <span class="source-line-no">026</span><span id="line-26">import org.slf4j.Logger;</span>
 <span class="source-line-no">027</span><span id="line-27">import org.slf4j.LoggerFactory;</span>
 <span class="source-line-no">028</span><span id="line-28"></span>
 <span class="source-line-no">029</span><span id="line-29">import javax.net.ssl.SSLContext;</span>
-<span class="source-line-no">030</span><span id="line-30">import javax.net.ssl.SSLSocketFactory;</span>
-<span class="source-line-no">031</span><span id="line-31">import java.io.IOException;</span>
-<span class="source-line-no">032</span><span id="line-32">import java.math.BigInteger;</span>
-<span class="source-line-no">033</span><span id="line-33">import java.net.URI;</span>
-<span class="source-line-no">034</span><span id="line-34">import java.util.HashMap;</span>
-<span class="source-line-no">035</span><span id="line-35">import java.util.List;</span>
-<span class="source-line-no">036</span><span id="line-36">import java.util.Map;</span>
-<span class="source-line-no">037</span><span id="line-37">import java.util.stream.Collectors;</span>
-<span class="source-line-no">038</span><span id="line-38"></span>
-<span class="source-line-no">039</span><span id="line-39">/**</span>
-<span class="source-line-no">040</span><span id="line-40"> * Extended Bitcoin JSON-RPC Client with added convenience methods.</span>
-<span class="source-line-no">041</span><span id="line-41"> *</span>
-<span class="source-line-no">042</span><span id="line-42"> * This class adds extra methods that aren't 1:1 mappings to standard</span>
-<span class="source-line-no">043</span><span id="line-43"> * Bitcoin API RPC methods, but are useful for many common use cases -- specifically</span>
-<span class="source-line-no">044</span><span id="line-44"> * the ones we ran into while building integration tests.</span>
-<span class="source-line-no">045</span><span id="line-45"> */</span>
-<span class="source-line-no">046</span><span id="line-46">public class BitcoinExtendedClient extends BitcoinClient {</span>
-<span class="source-line-no">047</span><span id="line-47">    private static final Logger log = LoggerFactory.getLogger(BitcoinExtendedClient.class);</span>
-<span class="source-line-no">048</span><span id="line-48"></span>
-<span class="source-line-no">049</span><span id="line-49">    public static final Address DEFAULT_REGTEST_MINING_ADDRESS = AddressParser.getDefault().parseAddress("mwQA8f4pH23BfHyy4zf8mgAyeNu5uoy6GU");</span>
-<span class="source-line-no">050</span><span id="line-50">    private static final BigInteger NotSoPrivatePrivateInt = new BigInteger(1, Hex.decode("180cb41c7c600be951b5d3d0a7334acc7506173875834f7a6c4c786a28fcbb19"));</span>
-<span class="source-line-no">051</span><span id="line-51">    private static final String RegTestMiningAddressLabel = "RegTestMiningAddress";</span>
-<span class="source-line-no">052</span><span id="line-52">    public static final String REGTEST_WALLET_NAME = "consensusj-regtest-wallet";</span>
-<span class="source-line-no">053</span><span id="line-53">    private boolean regTestWalletInitialized = false;</span>
-<span class="source-line-no">054</span><span id="line-54">    private /* lazy */ Address regTestMiningAddress;</span>
-<span class="source-line-no">055</span><span id="line-55"></span>
-<span class="source-line-no">056</span><span id="line-56">    public final Coin stdTxFee = Coin.valueOf(10000);</span>
-<span class="source-line-no">057</span><span id="line-57">    public final Coin stdRelayTxFee = Coin.valueOf(1000);</span>
-<span class="source-line-no">058</span><span id="line-58">    public final Integer defaultMaxConf = 9999999;</span>
-<span class="source-line-no">059</span><span id="line-59">    public final long stdTxFeeSatoshis = stdTxFee.getValue();</span>
-<span class="source-line-no">060</span><span id="line-60"></span>
-<span class="source-line-no">061</span><span id="line-61">    public Coin getStdTxFee() {</span>
-<span class="source-line-no">062</span><span id="line-62">        return stdTxFee;</span>
-<span class="source-line-no">063</span><span id="line-63">    }</span>
-<span class="source-line-no">064</span><span id="line-64"></span>
-<span class="source-line-no">065</span><span id="line-65">    public Coin getStdRelayTxFee() {</span>
-<span class="source-line-no">066</span><span id="line-66">        return stdRelayTxFee;</span>
-<span class="source-line-no">067</span><span id="line-67">    }</span>
-<span class="source-line-no">068</span><span id="line-68"></span>
-<span class="source-line-no">069</span><span id="line-69">    public Integer getDefaultMaxConf() {</span>
-<span class="source-line-no">070</span><span id="line-70">        return defaultMaxConf;</span>
-<span class="source-line-no">071</span><span id="line-71">    }</span>
+<span class="source-line-no">030</span><span id="line-30">import java.io.IOException;</span>
+<span class="source-line-no">031</span><span id="line-31">import java.math.BigInteger;</span>
+<span class="source-line-no">032</span><span id="line-32">import java.net.URI;</span>
+<span class="source-line-no">033</span><span id="line-33">import java.util.HashMap;</span>
+<span class="source-line-no">034</span><span id="line-34">import java.util.List;</span>
+<span class="source-line-no">035</span><span id="line-35">import java.util.Map;</span>
+<span class="source-line-no">036</span><span id="line-36">import java.util.stream.Collectors;</span>
+<span class="source-line-no">037</span><span id="line-37"></span>
+<span class="source-line-no">038</span><span id="line-38">/**</span>
+<span class="source-line-no">039</span><span id="line-39"> * Extended Bitcoin JSON-RPC Client with added convenience methods.</span>
+<span class="source-line-no">040</span><span id="line-40"> *</span>
+<span class="source-line-no">041</span><span id="line-41"> * This class adds extra methods that aren't 1:1 mappings to standard</span>
+<span class="source-line-no">042</span><span id="line-42"> * Bitcoin API RPC methods, but are useful for many common use cases -- specifically</span>
+<span class="source-line-no">043</span><span id="line-43"> * the ones we ran into while building integration tests.</span>
+<span class="source-line-no">044</span><span id="line-44"> */</span>
+<span class="source-line-no">045</span><span id="line-45">public class BitcoinExtendedClient extends BitcoinClient {</span>
+<span class="source-line-no">046</span><span id="line-46">    private static final Logger log = LoggerFactory.getLogger(BitcoinExtendedClient.class);</span>
+<span class="source-line-no">047</span><span id="line-47"></span>
+<span class="source-line-no">048</span><span id="line-48">    public static final Address DEFAULT_REGTEST_MINING_ADDRESS = AddressParser.getDefault().parseAddress("mwQA8f4pH23BfHyy4zf8mgAyeNu5uoy6GU");</span>
+<span class="source-line-no">049</span><span id="line-49">    private static final BigInteger NotSoPrivatePrivateInt = new BigInteger(1, Hex.decode("180cb41c7c600be951b5d3d0a7334acc7506173875834f7a6c4c786a28fcbb19"));</span>
+<span class="source-line-no">050</span><span id="line-50">    private static final String RegTestMiningAddressLabel = "RegTestMiningAddress";</span>
+<span class="source-line-no">051</span><span id="line-51">    public static final String REGTEST_WALLET_NAME = "consensusj-regtest-wallet";</span>
+<span class="source-line-no">052</span><span id="line-52">    private boolean regTestWalletInitialized = false;</span>
+<span class="source-line-no">053</span><span id="line-53">    private /* lazy */ Address regTestMiningAddress;</span>
+<span class="source-line-no">054</span><span id="line-54"></span>
+<span class="source-line-no">055</span><span id="line-55">    public final Coin stdTxFee = Coin.valueOf(10000);</span>
+<span class="source-line-no">056</span><span id="line-56">    public final Coin stdRelayTxFee = Coin.valueOf(1000);</span>
+<span class="source-line-no">057</span><span id="line-57">    public final Integer defaultMaxConf = 9999999;</span>
+<span class="source-line-no">058</span><span id="line-58">    public final long stdTxFeeSatoshis = stdTxFee.getValue();</span>
+<span class="source-line-no">059</span><span id="line-59"></span>
+<span class="source-line-no">060</span><span id="line-60">    public Coin getStdTxFee() {</span>
+<span class="source-line-no">061</span><span id="line-61">        return stdTxFee;</span>
+<span class="source-line-no">062</span><span id="line-62">    }</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64">    public Coin getStdRelayTxFee() {</span>
+<span class="source-line-no">065</span><span id="line-65">        return stdRelayTxFee;</span>
+<span class="source-line-no">066</span><span id="line-66">    }</span>
+<span class="source-line-no">067</span><span id="line-67"></span>
+<span class="source-line-no">068</span><span id="line-68">    public Integer getDefaultMaxConf() {</span>
+<span class="source-line-no">069</span><span id="line-69">        return defaultMaxConf;</span>
+<span class="source-line-no">070</span><span id="line-70">    }</span>
+<span class="source-line-no">071</span><span id="line-71"></span>
 <span class="source-line-no">072</span><span id="line-72"></span>
-<span class="source-line-no">073</span><span id="line-73"></span>
-<span class="source-line-no">074</span><span id="line-74">    public BitcoinExtendedClient(SSLContext sslContext, Network network, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">075</span><span id="line-75">        super(sslContext, network, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">076</span><span id="line-76">    }</span>
-<span class="source-line-no">077</span><span id="line-77"></span>
-<span class="source-line-no">078</span><span id="line-78">    @Deprecated</span>
-<span class="source-line-no">079</span><span id="line-79">    public BitcoinExtendedClient(SSLSocketFactory sslSocketFactory, Network network, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">080</span><span id="line-80">        super(sslSocketFactory, network, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">081</span><span id="line-81">    }</span>
-<span class="source-line-no">082</span><span id="line-82"></span>
-<span class="source-line-no">083</span><span id="line-83">    @Deprecated</span>
-<span class="source-line-no">084</span><span id="line-84">    public BitcoinExtendedClient(SSLSocketFactory sslSocketFactory, NetworkParameters netParams, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">085</span><span id="line-85">        super(sslSocketFactory, netParams.network(), server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">086</span><span id="line-86">    }</span>
-<span class="source-line-no">087</span><span id="line-87"></span>
-<span class="source-line-no">088</span><span id="line-88">    public BitcoinExtendedClient(Network network, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">089</span><span id="line-89">        this(getDefaultSSLContext(), network, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">090</span><span id="line-90">    }</span>
-<span class="source-line-no">091</span><span id="line-91"></span>
-<span class="source-line-no">092</span><span id="line-92">    @Deprecated</span>
-<span class="source-line-no">093</span><span id="line-93">    public BitcoinExtendedClient(NetworkParameters netParams, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">094</span><span id="line-94">        this(getDefaultSSLContext(), netParams.network(), server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">095</span><span id="line-95">    }</span>
-<span class="source-line-no">096</span><span id="line-96"></span>
-<span class="source-line-no">097</span><span id="line-97">    public BitcoinExtendedClient(URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">098</span><span id="line-98">        this(getDefaultSSLContext(), (Network) null, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">099</span><span id="line-99">    }</span>
-<span class="source-line-no">100</span><span id="line-100"></span>
-<span class="source-line-no">101</span><span id="line-101">    public BitcoinExtendedClient(RpcConfig config) {</span>
-<span class="source-line-no">102</span><span id="line-102">        this(config.network(), config.getURI(), config.getUsername(), config.getPassword());</span>
-<span class="source-line-no">103</span><span id="line-103">    }</span>
-<span class="source-line-no">104</span><span id="line-104"></span>
-<span class="source-line-no">105</span><span id="line-105">    /**</span>
-<span class="source-line-no">106</span><span id="line-106">     * Constructor that uses bitcoin.conf to get connection information (Incubating)</span>
-<span class="source-line-no">107</span><span id="line-107">     */</span>
-<span class="source-line-no">108</span><span id="line-108">    public BitcoinExtendedClient() {</span>
-<span class="source-line-no">109</span><span id="line-109">        this(BitcoinConfFile.readDefaultConfig().getRPCConfig());</span>
-<span class="source-line-no">110</span><span id="line-110">    }</span>
-<span class="source-line-no">111</span><span id="line-111"></span>
-<span class="source-line-no">112</span><span id="line-112">    /**</span>
-<span class="source-line-no">113</span><span id="line-113">     * Incubating: clone the client with a new base URI for a named wallet.</span>
-<span class="source-line-no">114</span><span id="line-114">     * @param walletName wallet name</span>
-<span class="source-line-no">115</span><span id="line-115">     * @param rpcUser username must be provided because it is not accessible in the parent class</span>
-<span class="source-line-no">116</span><span id="line-116">     * @param rpcPassword password must be provided because it is not accessible in the parent class</span>
-<span class="source-line-no">117</span><span id="line-117">     * @return A new client with a baseURI configured for the specified wallet name.</span>
-<span class="source-line-no">118</span><span id="line-118">     */</span>
-<span class="source-line-no">119</span><span id="line-119">    public BitcoinExtendedClient withWallet(String walletName, String rpcUser, String rpcPassword) {</span>
-<span class="source-line-no">120</span><span id="line-120">        return new BitcoinExtendedClient(this.getNetwork(), this.getServerURI().resolve("/wallet/" + walletName), rpcUser, rpcPassword);</span>
-<span class="source-line-no">121</span><span id="line-121">    }</span>
-<span class="source-line-no">122</span><span id="line-122"></span>
-<span class="source-line-no">123</span><span id="line-123">    public synchronized Address getRegTestMiningAddress() {</span>
-<span class="source-line-no">124</span><span id="line-124">        if (getNetwork() != BitcoinNetwork.REGTEST) {</span>
-<span class="source-line-no">125</span><span id="line-125">            throw new UnsupportedOperationException("Operation only supported in RegTest context");</span>
-<span class="source-line-no">126</span><span id="line-126">        }</span>
-<span class="source-line-no">127</span><span id="line-127">        if (regTestMiningAddress == null) {</span>
-<span class="source-line-no">128</span><span id="line-128">            if (!regTestWalletInitialized) {</span>
-<span class="source-line-no">129</span><span id="line-129">                initRegTestWallet();</span>
-<span class="source-line-no">130</span><span id="line-130">            }</span>
-<span class="source-line-no">131</span><span id="line-131">            // If in the future, we want to manage the keys for mined coins on the client side,</span>
-<span class="source-line-no">132</span><span id="line-132">            // we could initialize regTestMiningKey from a bitcoinj-generated ECKey or HD Keychain.</span>
-<span class="source-line-no">133</span><span id="line-133">            try {</span>
-<span class="source-line-no">134</span><span id="line-134">                ECKey notSoPrivatePrivateKey = ECKey.fromPrivate(NotSoPrivatePrivateInt, false);</span>
-<span class="source-line-no">135</span><span id="line-135">                Address address = notSoPrivatePrivateKey.toAddress(ScriptType.P2PKH, BitcoinNetwork.REGTEST);</span>
-<span class="source-line-no">136</span><span id="line-136">                AddressInfo addressInfo = getAddressInfo(address);</span>
-<span class="source-line-no">137</span><span id="line-137">                if (addressInfo.getIsmine() &amp;&amp; !addressInfo.getIswatchonly() &amp;&amp; addressInfo.getSolvable()) {</span>
-<span class="source-line-no">138</span><span id="line-138">                    log.warn("Address with label {} is present in server-side wallet", RegTestMiningAddressLabel);</span>
-<span class="source-line-no">139</span><span id="line-139">                    regTestMiningAddress = address;</span>
-<span class="source-line-no">140</span><span id="line-140">                } else {</span>
-<span class="source-line-no">141</span><span id="line-141">                    // Import known private key with label and rescan the blockchain for any transactions from</span>
-<span class="source-line-no">142</span><span id="line-142">                    // previous test runs, rescan shouldn't take too long on a typical RegTest chain</span>
-<span class="source-line-no">143</span><span id="line-143">                    log.warn("Adding private key for {} and rescanning chain", RegTestMiningAddressLabel);</span>
-<span class="source-line-no">144</span><span id="line-144">                    importPrivKey(notSoPrivatePrivateKey, RegTestMiningAddressLabel, true);</span>
-<span class="source-line-no">145</span><span id="line-145">                    regTestMiningAddress = address;</span>
-<span class="source-line-no">146</span><span id="line-146">                }</span>
-<span class="source-line-no">147</span><span id="line-147">                log.warn("Retrieved regTestMiningAddress = {}", regTestMiningAddress);</span>
-<span class="source-line-no">148</span><span id="line-148">            } catch (IOException e) {</span>
-<span class="source-line-no">149</span><span id="line-149">                log.error("Exception while checking/importing regTestMiningAddress", e);</span>
-<span class="source-line-no">150</span><span id="line-150">                throw new RuntimeException(e);</span>
-<span class="source-line-no">151</span><span id="line-151">            }</span>
-<span class="source-line-no">152</span><span id="line-152">        }</span>
-<span class="source-line-no">153</span><span id="line-153">        return regTestMiningAddress;</span>
-<span class="source-line-no">154</span><span id="line-154">    }</span>
-<span class="source-line-no">155</span><span id="line-155"></span>
-<span class="source-line-no">156</span><span id="line-156">    /**</span>
-<span class="source-line-no">157</span><span id="line-157">     * Initialize a server-side wallet for RegTest mining and test transaction funding. Creates a non-descriptor wallet</span>
-<span class="source-line-no">158</span><span id="line-158">     * with name {@link #REGTEST_WALLET_NAME} if it doesn't already exist.</span>
-<span class="source-line-no">159</span><span id="line-159">     */</span>
-<span class="source-line-no">160</span><span id="line-160">    public synchronized void initRegTestWallet() {</span>
-<span class="source-line-no">161</span><span id="line-161">        if (!regTestWalletInitialized) {</span>
-<span class="source-line-no">162</span><span id="line-162">            // Create a named wallet for RegTest (previously we used the default wallet with an empty-string name)</span>
-<span class="source-line-no">163</span><span id="line-163">            int bitcoinCoreVersion = getServerVersion();</span>
-<span class="source-line-no">164</span><span id="line-164">            try {</span>
-<span class="source-line-no">165</span><span id="line-165">                List&lt;String&gt; walletList = listWallets();</span>
-<span class="source-line-no">166</span><span id="line-166">                if (!walletList.contains(REGTEST_WALLET_NAME)) {</span>
-<span class="source-line-no">167</span><span id="line-167">                    createRegTestWallet(bitcoinCoreVersion, REGTEST_WALLET_NAME);</span>
-<span class="source-line-no">168</span><span id="line-168">                }</span>
-<span class="source-line-no">169</span><span id="line-169">            } catch (IOException ioe) {</span>
-<span class="source-line-no">170</span><span id="line-170">                throw new RuntimeException(ioe);</span>
-<span class="source-line-no">171</span><span id="line-171">            }</span>
-<span class="source-line-no">172</span><span id="line-172">            regTestWalletInitialized = true;</span>
-<span class="source-line-no">173</span><span id="line-173">        }</span>
-<span class="source-line-no">174</span><span id="line-174">    }</span>
-<span class="source-line-no">175</span><span id="line-175"></span>
-<span class="source-line-no">176</span><span id="line-176">    /**</span>
-<span class="source-line-no">177</span><span id="line-177">     * Create a server-side wallet suitable for RegTest mining/funding, defaulting all other parameters.</span>
-<span class="source-line-no">178</span><span id="line-178">     * @param bitcoinCoreVersion Used to select correct JSON-RPC parameters to used based on server version</span>
-<span class="source-line-no">179</span><span id="line-179">     * @param name name of wallet to create</span>
-<span class="source-line-no">180</span><span id="line-180">     */</span>
-<span class="source-line-no">181</span><span id="line-181">    private void createRegTestWallet(int bitcoinCoreVersion, String name) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">182</span><span id="line-182">        LoadWalletResult result = (bitcoinCoreVersion &gt;= BITCOIN_CORE_VERSION_DESC_DEFAULT)</span>
-<span class="source-line-no">183</span><span id="line-183">                    // Create a (non-descriptor) wallet</span>
-<span class="source-line-no">184</span><span id="line-184">                    ? createWallet(name, false, false, null, null, false, null, null)</span>
-<span class="source-line-no">185</span><span id="line-185">                    : createWallet(name, false, false, null, null);</span>
-<span class="source-line-no">186</span><span id="line-186">        if (result.getWarning().isEmpty()) {</span>
-<span class="source-line-no">187</span><span id="line-187">            log.info("Created REGTEST wallet: \"{}\"", result.getName());</span>
-<span class="source-line-no">188</span><span id="line-188">        } else {</span>
-<span class="source-line-no">189</span><span id="line-189">            log.warn("Warning creating REGTEST wallet \"{}\": {}", result.getName(), result.getWarning());</span>
-<span class="source-line-no">190</span><span id="line-190">        }</span>
-<span class="source-line-no">191</span><span id="line-191">    }</span>
-<span class="source-line-no">192</span><span id="line-192"></span>
-<span class="source-line-no">193</span><span id="line-193">    /**</span>
-<span class="source-line-no">194</span><span id="line-194">     * Generate blocks and funds (RegTest only)</span>
-<span class="source-line-no">195</span><span id="line-195">     *</span>
-<span class="source-line-no">196</span><span id="line-196">     * Use this to generate blocks and receive the block reward in {@code this.regTestMiningAddress}</span>
-<span class="source-line-no">197</span><span id="line-197">     * which can the be used to fund transactions in RegTest mode.</span>
-<span class="source-line-no">198</span><span id="line-198">     *</span>
-<span class="source-line-no">199</span><span id="line-199">     * @param numBlocks Number of blocks to mine</span>
-<span class="source-line-no">200</span><span id="line-200">     * @return list of block hashes</span>
-<span class="source-line-no">201</span><span id="line-201">     * @throws JsonRpcStatusException something broke</span>
-<span class="source-line-no">202</span><span id="line-202">     * @throws IOException something broke</span>
-<span class="source-line-no">203</span><span id="line-203">     */</span>
-<span class="source-line-no">204</span><span id="line-204">    public List&lt;Sha256Hash&gt; generateBlocks(int numBlocks) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">205</span><span id="line-205">        return this.generateToAddress(numBlocks, getRegTestMiningAddress());</span>
-<span class="source-line-no">206</span><span id="line-206">    }</span>
-<span class="source-line-no">207</span><span id="line-207"></span>
-<span class="source-line-no">208</span><span id="line-208">    /**</span>
-<span class="source-line-no">209</span><span id="line-209">     * Calculate the subsidy portion block reward for a given height on the current network</span>
-<span class="source-line-no">210</span><span id="line-210">     * @param height the height at which to calculate the mining subsidy</span>
-<span class="source-line-no">211</span><span id="line-211">     * @return mining subsidy</span>
-<span class="source-line-no">212</span><span id="line-212">     */</span>
-<span class="source-line-no">213</span><span id="line-213">    public Coin getBlockSubsidy(int height) {</span>
-<span class="source-line-no">214</span><span id="line-214">        BitcoinNetworkParams params = (BitcoinNetworkParams) BitcoinNetworkParams.of(getNetwork());</span>
-<span class="source-line-no">215</span><span id="line-215">        return params.getBlockInflation(height);</span>
-<span class="source-line-no">216</span><span id="line-216">    }</span>
-<span class="source-line-no">217</span><span id="line-217"></span>
-<span class="source-line-no">218</span><span id="line-218">    /**</span>
-<span class="source-line-no">219</span><span id="line-219">     * Returns information about a block at index provided.</span>
-<span class="source-line-no">220</span><span id="line-220">     *</span>
-<span class="source-line-no">221</span><span id="line-221">     * Uses two RPCs: {@code getblockhash} and then {@code getblock}.</span>
+<span class="source-line-no">073</span><span id="line-73">    public BitcoinExtendedClient(SSLContext sslContext, Network network, URI server, String rpcuser, String rpcpassword) {</span>
+<span class="source-line-no">074</span><span id="line-74">        super(sslContext, network, server, rpcuser, rpcpassword);</span>
+<span class="source-line-no">075</span><span id="line-75">    }</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">    public BitcoinExtendedClient(Network network, URI server, String rpcuser, String rpcpassword) {</span>
+<span class="source-line-no">078</span><span id="line-78">        this(JsonRpcTransport.getDefaultSSLContext(), network, server, rpcuser, rpcpassword);</span>
+<span class="source-line-no">079</span><span id="line-79">    }</span>
+<span class="source-line-no">080</span><span id="line-80"></span>
+<span class="source-line-no">081</span><span id="line-81">    public BitcoinExtendedClient(URI server, String rpcuser, String rpcpassword) {</span>
+<span class="source-line-no">082</span><span id="line-82">        this(JsonRpcTransport.getDefaultSSLContext(), null, server, rpcuser, rpcpassword);</span>
+<span class="source-line-no">083</span><span id="line-83">    }</span>
+<span class="source-line-no">084</span><span id="line-84"></span>
+<span class="source-line-no">085</span><span id="line-85">    public BitcoinExtendedClient(RpcConfig config) {</span>
+<span class="source-line-no">086</span><span id="line-86">        this(config.network(), config.getURI(), config.getUsername(), config.getPassword());</span>
+<span class="source-line-no">087</span><span id="line-87">    }</span>
+<span class="source-line-no">088</span><span id="line-88"></span>
+<span class="source-line-no">089</span><span id="line-89">    /**</span>
+<span class="source-line-no">090</span><span id="line-90">     * Constructor that uses bitcoin.conf to get connection information (Incubating)</span>
+<span class="source-line-no">091</span><span id="line-91">     */</span>
+<span class="source-line-no">092</span><span id="line-92">    public BitcoinExtendedClient() {</span>
+<span class="source-line-no">093</span><span id="line-93">        this(BitcoinConfFile.readDefaultConfig().getRPCConfig());</span>
+<span class="source-line-no">094</span><span id="line-94">    }</span>
+<span class="source-line-no">095</span><span id="line-95"></span>
+<span class="source-line-no">096</span><span id="line-96">    /**</span>
+<span class="source-line-no">097</span><span id="line-97">     * Incubating: clone the client with a new base URI for a named wallet.</span>
+<span class="source-line-no">098</span><span id="line-98">     * @param walletName wallet name</span>
+<span class="source-line-no">099</span><span id="line-99">     * @param rpcUser username must be provided because it is not accessible in the parent class</span>
+<span class="source-line-no">100</span><span id="line-100">     * @param rpcPassword password must be provided because it is not accessible in the parent class</span>
+<span class="source-line-no">101</span><span id="line-101">     * @return A new client with a baseURI configured for the specified wallet name.</span>
+<span class="source-line-no">102</span><span id="line-102">     */</span>
+<span class="source-line-no">103</span><span id="line-103">    public BitcoinExtendedClient withWallet(String walletName, String rpcUser, String rpcPassword) {</span>
+<span class="source-line-no">104</span><span id="line-104">        return new BitcoinExtendedClient(this.getNetwork(), this.getServerURI().resolve("/wallet/" + walletName), rpcUser, rpcPassword);</span>
+<span class="source-line-no">105</span><span id="line-105">    }</span>
+<span class="source-line-no">106</span><span id="line-106"></span>
+<span class="source-line-no">107</span><span id="line-107">    public synchronized Address getRegTestMiningAddress() {</span>
+<span class="source-line-no">108</span><span id="line-108">        if (getNetwork() != BitcoinNetwork.REGTEST) {</span>
+<span class="source-line-no">109</span><span id="line-109">            throw new UnsupportedOperationException("Operation only supported in RegTest context");</span>
+<span class="source-line-no">110</span><span id="line-110">        }</span>
+<span class="source-line-no">111</span><span id="line-111">        if (regTestMiningAddress == null) {</span>
+<span class="source-line-no">112</span><span id="line-112">            if (!regTestWalletInitialized) {</span>
+<span class="source-line-no">113</span><span id="line-113">                initRegTestWallet();</span>
+<span class="source-line-no">114</span><span id="line-114">            }</span>
+<span class="source-line-no">115</span><span id="line-115">            // If in the future, we want to manage the keys for mined coins on the client side,</span>
+<span class="source-line-no">116</span><span id="line-116">            // we could initialize regTestMiningKey from a bitcoinj-generated ECKey or HD Keychain.</span>
+<span class="source-line-no">117</span><span id="line-117">            try {</span>
+<span class="source-line-no">118</span><span id="line-118">                ECKey notSoPrivatePrivateKey = ECKey.fromPrivate(NotSoPrivatePrivateInt, false);</span>
+<span class="source-line-no">119</span><span id="line-119">                Address address = notSoPrivatePrivateKey.toAddress(ScriptType.P2PKH, BitcoinNetwork.REGTEST);</span>
+<span class="source-line-no">120</span><span id="line-120">                AddressInfo addressInfo = getAddressInfo(address);</span>
+<span class="source-line-no">121</span><span id="line-121">                if (addressInfo.getIsmine() &amp;&amp; !addressInfo.getIswatchonly() &amp;&amp; addressInfo.getSolvable()) {</span>
+<span class="source-line-no">122</span><span id="line-122">                    log.warn("Address with label {} is present in server-side wallet", RegTestMiningAddressLabel);</span>
+<span class="source-line-no">123</span><span id="line-123">                    regTestMiningAddress = address;</span>
+<span class="source-line-no">124</span><span id="line-124">                } else {</span>
+<span class="source-line-no">125</span><span id="line-125">                    // Import known private key with label and rescan the blockchain for any transactions from</span>
+<span class="source-line-no">126</span><span id="line-126">                    // previous test runs, rescan shouldn't take too long on a typical RegTest chain</span>
+<span class="source-line-no">127</span><span id="line-127">                    log.warn("Adding private key for {} and rescanning chain", RegTestMiningAddressLabel);</span>
+<span class="source-line-no">128</span><span id="line-128">                    importPrivKey(notSoPrivatePrivateKey, RegTestMiningAddressLabel, true);</span>
+<span class="source-line-no">129</span><span id="line-129">                    regTestMiningAddress = address;</span>
+<span class="source-line-no">130</span><span id="line-130">                }</span>
+<span class="source-line-no">131</span><span id="line-131">                log.warn("Retrieved regTestMiningAddress = {}", regTestMiningAddress);</span>
+<span class="source-line-no">132</span><span id="line-132">            } catch (IOException e) {</span>
+<span class="source-line-no">133</span><span id="line-133">                log.error("Exception while checking/importing regTestMiningAddress", e);</span>
+<span class="source-line-no">134</span><span id="line-134">                throw new RuntimeException(e);</span>
+<span class="source-line-no">135</span><span id="line-135">            }</span>
+<span class="source-line-no">136</span><span id="line-136">        }</span>
+<span class="source-line-no">137</span><span id="line-137">        return regTestMiningAddress;</span>
+<span class="source-line-no">138</span><span id="line-138">    }</span>
+<span class="source-line-no">139</span><span id="line-139"></span>
+<span class="source-line-no">140</span><span id="line-140">    /**</span>
+<span class="source-line-no">141</span><span id="line-141">     * Initialize a server-side wallet for RegTest mining and test transaction funding. Creates a non-descriptor wallet</span>
+<span class="source-line-no">142</span><span id="line-142">     * with name {@link #REGTEST_WALLET_NAME} if it doesn't already exist.</span>
+<span class="source-line-no">143</span><span id="line-143">     */</span>
+<span class="source-line-no">144</span><span id="line-144">    public synchronized void initRegTestWallet() {</span>
+<span class="source-line-no">145</span><span id="line-145">        if (!regTestWalletInitialized) {</span>
+<span class="source-line-no">146</span><span id="line-146">            // Create a named wallet for RegTest (previously we used the default wallet with an empty-string name)</span>
+<span class="source-line-no">147</span><span id="line-147">            int bitcoinCoreVersion = getServerVersion();</span>
+<span class="source-line-no">148</span><span id="line-148">            try {</span>
+<span class="source-line-no">149</span><span id="line-149">                List&lt;String&gt; walletList = listWallets();</span>
+<span class="source-line-no">150</span><span id="line-150">                if (!walletList.contains(REGTEST_WALLET_NAME)) {</span>
+<span class="source-line-no">151</span><span id="line-151">                    createRegTestWallet(bitcoinCoreVersion, REGTEST_WALLET_NAME);</span>
+<span class="source-line-no">152</span><span id="line-152">                }</span>
+<span class="source-line-no">153</span><span id="line-153">            } catch (IOException ioe) {</span>
+<span class="source-line-no">154</span><span id="line-154">                throw new RuntimeException(ioe);</span>
+<span class="source-line-no">155</span><span id="line-155">            }</span>
+<span class="source-line-no">156</span><span id="line-156">            regTestWalletInitialized = true;</span>
+<span class="source-line-no">157</span><span id="line-157">        }</span>
+<span class="source-line-no">158</span><span id="line-158">    }</span>
+<span class="source-line-no">159</span><span id="line-159"></span>
+<span class="source-line-no">160</span><span id="line-160">    /**</span>
+<span class="source-line-no">161</span><span id="line-161">     * Create a server-side wallet suitable for RegTest mining/funding, defaulting all other parameters.</span>
+<span class="source-line-no">162</span><span id="line-162">     * @param bitcoinCoreVersion Used to select correct JSON-RPC parameters to used based on server version</span>
+<span class="source-line-no">163</span><span id="line-163">     * @param name name of wallet to create</span>
+<span class="source-line-no">164</span><span id="line-164">     */</span>
+<span class="source-line-no">165</span><span id="line-165">    private void createRegTestWallet(int bitcoinCoreVersion, String name) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">166</span><span id="line-166">        LoadWalletResult result = (bitcoinCoreVersion &gt;= BITCOIN_CORE_VERSION_DESC_DEFAULT)</span>
+<span class="source-line-no">167</span><span id="line-167">                    // Create a (non-descriptor) wallet</span>
+<span class="source-line-no">168</span><span id="line-168">                    ? createWallet(name, false, false, null, null, false, null, null)</span>
+<span class="source-line-no">169</span><span id="line-169">                    : createWallet(name, false, false, null, null);</span>
+<span class="source-line-no">170</span><span id="line-170">        if (result.getWarning().isEmpty()) {</span>
+<span class="source-line-no">171</span><span id="line-171">            log.info("Created REGTEST wallet: \"{}\"", result.getName());</span>
+<span class="source-line-no">172</span><span id="line-172">        } else {</span>
+<span class="source-line-no">173</span><span id="line-173">            log.warn("Warning creating REGTEST wallet \"{}\": {}", result.getName(), result.getWarning());</span>
+<span class="source-line-no">174</span><span id="line-174">        }</span>
+<span class="source-line-no">175</span><span id="line-175">    }</span>
+<span class="source-line-no">176</span><span id="line-176"></span>
+<span class="source-line-no">177</span><span id="line-177">    /**</span>
+<span class="source-line-no">178</span><span id="line-178">     * Generate blocks and funds (RegTest only)</span>
+<span class="source-line-no">179</span><span id="line-179">     *</span>
+<span class="source-line-no">180</span><span id="line-180">     * Use this to generate blocks and receive the block reward in {@code this.regTestMiningAddress}</span>
+<span class="source-line-no">181</span><span id="line-181">     * which can the be used to fund transactions in RegTest mode.</span>
+<span class="source-line-no">182</span><span id="line-182">     *</span>
+<span class="source-line-no">183</span><span id="line-183">     * @param numBlocks Number of blocks to mine</span>
+<span class="source-line-no">184</span><span id="line-184">     * @return list of block hashes</span>
+<span class="source-line-no">185</span><span id="line-185">     * @throws JsonRpcStatusException something broke</span>
+<span class="source-line-no">186</span><span id="line-186">     * @throws IOException something broke</span>
+<span class="source-line-no">187</span><span id="line-187">     */</span>
+<span class="source-line-no">188</span><span id="line-188">    public List&lt;Sha256Hash&gt; generateBlocks(int numBlocks) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">189</span><span id="line-189">        return this.generateToAddress(numBlocks, getRegTestMiningAddress());</span>
+<span class="source-line-no">190</span><span id="line-190">    }</span>
+<span class="source-line-no">191</span><span id="line-191"></span>
+<span class="source-line-no">192</span><span id="line-192">    /**</span>
+<span class="source-line-no">193</span><span id="line-193">     * Calculate the subsidy portion block reward for a given height on the current network</span>
+<span class="source-line-no">194</span><span id="line-194">     * @param height the height at which to calculate the mining subsidy</span>
+<span class="source-line-no">195</span><span id="line-195">     * @return mining subsidy</span>
+<span class="source-line-no">196</span><span id="line-196">     */</span>
+<span class="source-line-no">197</span><span id="line-197">    public Coin getBlockSubsidy(int height) {</span>
+<span class="source-line-no">198</span><span id="line-198">        BitcoinNetworkParams params = (BitcoinNetworkParams) BitcoinNetworkParams.of(getNetwork());</span>
+<span class="source-line-no">199</span><span id="line-199">        return params.getBlockInflation(height);</span>
+<span class="source-line-no">200</span><span id="line-200">    }</span>
+<span class="source-line-no">201</span><span id="line-201"></span>
+<span class="source-line-no">202</span><span id="line-202">    /**</span>
+<span class="source-line-no">203</span><span id="line-203">     * Returns information about a block at index provided.</span>
+<span class="source-line-no">204</span><span id="line-204">     *</span>
+<span class="source-line-no">205</span><span id="line-205">     * Uses two RPCs: {@code getblockhash} and then {@code getblock}.</span>
+<span class="source-line-no">206</span><span id="line-206">     *</span>
+<span class="source-line-no">207</span><span id="line-207">     * @param index The block index</span>
+<span class="source-line-no">208</span><span id="line-208">     * @return The information about the block</span>
+<span class="source-line-no">209</span><span id="line-209">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">210</span><span id="line-210">     * @throws IOException network error</span>
+<span class="source-line-no">211</span><span id="line-211">     */</span>
+<span class="source-line-no">212</span><span id="line-212">    public Block getBlock(int index) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">213</span><span id="line-213">        Sha256Hash blockHash = getBlockHash(index);</span>
+<span class="source-line-no">214</span><span id="line-214">        return getBlock(blockHash);</span>
+<span class="source-line-no">215</span><span id="line-215">    }</span>
+<span class="source-line-no">216</span><span id="line-216"></span>
+<span class="source-line-no">217</span><span id="line-217">    /**</span>
+<span class="source-line-no">218</span><span id="line-218">     * Clears the memory pool and returns a list of the removed transactions.</span>
+<span class="source-line-no">219</span><span id="line-219">     *</span>
+<span class="source-line-no">220</span><span id="line-220">     * Note: this is a customized command, which is currently not part of Bitcoin Core.</span>
+<span class="source-line-no">221</span><span id="line-221">     * See https://github.com/OmniLayer/OmniJ/pull/72[Pull Request #72] on GitHub</span>
 <span class="source-line-no">222</span><span id="line-222">     *</span>
-<span class="source-line-no">223</span><span id="line-223">     * @param index The block index</span>
-<span class="source-line-no">224</span><span id="line-224">     * @return The information about the block</span>
-<span class="source-line-no">225</span><span id="line-225">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">226</span><span id="line-226">     * @throws IOException network error</span>
-<span class="source-line-no">227</span><span id="line-227">     */</span>
-<span class="source-line-no">228</span><span id="line-228">    public Block getBlock(int index) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">229</span><span id="line-229">        Sha256Hash blockHash = getBlockHash(index);</span>
-<span class="source-line-no">230</span><span id="line-230">        return getBlock(blockHash);</span>
-<span class="source-line-no">231</span><span id="line-231">    }</span>
-<span class="source-line-no">232</span><span id="line-232"></span>
-<span class="source-line-no">233</span><span id="line-233">    /**</span>
-<span class="source-line-no">234</span><span id="line-234">     * Clears the memory pool and returns a list of the removed transactions.</span>
-<span class="source-line-no">235</span><span id="line-235">     *</span>
-<span class="source-line-no">236</span><span id="line-236">     * Note: this is a customized command, which is currently not part of Bitcoin Core.</span>
-<span class="source-line-no">237</span><span id="line-237">     * See https://github.com/OmniLayer/OmniJ/pull/72[Pull Request #72] on GitHub</span>
+<span class="source-line-no">223</span><span id="line-223">     * @return A list of transaction hashes of the removed transactions</span>
+<span class="source-line-no">224</span><span id="line-224">     * @throws JsonRpcStatusException JSON RPC status exception</span>
+<span class="source-line-no">225</span><span id="line-225">     * @throws IOException network error</span>
+<span class="source-line-no">226</span><span id="line-226">     */</span>
+<span class="source-line-no">227</span><span id="line-227">    public List&lt;Sha256Hash&gt; clearMemPool() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">228</span><span id="line-228">        JavaType resultType = collectionTypeForClasses(List.class, Sha256Hash.class);</span>
+<span class="source-line-no">229</span><span id="line-229">        return send("clearmempool", resultType);</span>
+<span class="source-line-no">230</span><span id="line-230">    }</span>
+<span class="source-line-no">231</span><span id="line-231"></span>
+<span class="source-line-no">232</span><span id="line-232">    /**</span>
+<span class="source-line-no">233</span><span id="line-233">     * Creates a raw transaction, spending from a single address, whereby no new change address is created, and</span>
+<span class="source-line-no">234</span><span id="line-234">     * remaining amounts are returned to {@code fromAddress}.</span>
+<span class="source-line-no">235</span><span id="line-235">     * &lt;p&gt;</span>
+<span class="source-line-no">236</span><span id="line-236">     * Note: the transaction inputs are not signed, and the transaction is not stored in the wallet or transmitted to</span>
+<span class="source-line-no">237</span><span id="line-237">     * the network.</span>
 <span class="source-line-no">238</span><span id="line-238">     *</span>
-<span class="source-line-no">239</span><span id="line-239">     * @return A list of transaction hashes of the removed transactions</span>
-<span class="source-line-no">240</span><span id="line-240">     * @throws JsonRpcStatusException JSON RPC status exception</span>
-<span class="source-line-no">241</span><span id="line-241">     * @throws IOException network error</span>
+<span class="source-line-no">239</span><span id="line-239">     * @param fromAddress The source to spend from</span>
+<span class="source-line-no">240</span><span id="line-240">     * @param outputs The destinations and amounts to transfer</span>
+<span class="source-line-no">241</span><span id="line-241">     * @return The hex-encoded raw transaction</span>
 <span class="source-line-no">242</span><span id="line-242">     */</span>
-<span class="source-line-no">243</span><span id="line-243">    public List&lt;Sha256Hash&gt; clearMemPool() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">244</span><span id="line-244">        JavaType resultType = mapper.getTypeFactory().constructCollectionType(List.class, Sha256Hash.class);</span>
-<span class="source-line-no">245</span><span id="line-245">        return send("clearmempool", resultType);</span>
-<span class="source-line-no">246</span><span id="line-246">    }</span>
-<span class="source-line-no">247</span><span id="line-247"></span>
-<span class="source-line-no">248</span><span id="line-248">    /**</span>
-<span class="source-line-no">249</span><span id="line-249">     * Creates a raw transaction, spending from a single address, whereby no new change address is created, and</span>
-<span class="source-line-no">250</span><span id="line-250">     * remaining amounts are returned to {@code fromAddress}.</span>
-<span class="source-line-no">251</span><span id="line-251">     * &lt;p&gt;</span>
-<span class="source-line-no">252</span><span id="line-252">     * Note: the transaction inputs are not signed, and the transaction is not stored in the wallet or transmitted to</span>
-<span class="source-line-no">253</span><span id="line-253">     * the network.</span>
-<span class="source-line-no">254</span><span id="line-254">     *</span>
-<span class="source-line-no">255</span><span id="line-255">     * @param fromAddress The source to spend from</span>
-<span class="source-line-no">256</span><span id="line-256">     * @param outputs The destinations and amounts to transfer</span>
-<span class="source-line-no">257</span><span id="line-257">     * @return The hex-encoded raw transaction</span>
-<span class="source-line-no">258</span><span id="line-258">     */</span>
-<span class="source-line-no">259</span><span id="line-259">    public String createRawTransaction(Address fromAddress, Map&lt;Address, Coin&gt; outputs) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">260</span><span id="line-260">        // Copy the Map (which may be immutable) and add prepare change output if needed.</span>
-<span class="source-line-no">261</span><span id="line-261">        Map&lt;Address, Coin&gt; outputsWithChange = new HashMap&lt;&gt;(outputs);</span>
-<span class="source-line-no">262</span><span id="line-262">        // Get unspent outputs via RPC</span>
-<span class="source-line-no">263</span><span id="line-263">        List&lt;UnspentOutput&gt; unspentOutputs = listUnspent(0, defaultMaxConf, fromAddress);</span>
+<span class="source-line-no">243</span><span id="line-243">    public String createRawTransaction(Address fromAddress, Map&lt;Address, Coin&gt; outputs) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">244</span><span id="line-244">        // Copy the Map (which may be immutable) and add prepare change output if needed.</span>
+<span class="source-line-no">245</span><span id="line-245">        Map&lt;Address, Coin&gt; outputsWithChange = new HashMap&lt;&gt;(outputs);</span>
+<span class="source-line-no">246</span><span id="line-246">        // Get unspent outputs via RPC</span>
+<span class="source-line-no">247</span><span id="line-247">        List&lt;UnspentOutput&gt; unspentOutputs = listUnspent(0, defaultMaxConf, fromAddress);</span>
+<span class="source-line-no">248</span><span id="line-248"></span>
+<span class="source-line-no">249</span><span id="line-249">        // Gather inputs as OutPoints</span>
+<span class="source-line-no">250</span><span id="line-250">        List&lt;Outpoint&gt; inputs = unspentOutputs.stream()</span>
+<span class="source-line-no">251</span><span id="line-251">                .map(this::unspentToOutpoint)</span>
+<span class="source-line-no">252</span><span id="line-252">                .collect(Collectors.toList());</span>
+<span class="source-line-no">253</span><span id="line-253"></span>
+<span class="source-line-no">254</span><span id="line-254">        // Calculate change</span>
+<span class="source-line-no">255</span><span id="line-255">        final long amountIn = unspentOutputs</span>
+<span class="source-line-no">256</span><span id="line-256">                .stream()</span>
+<span class="source-line-no">257</span><span id="line-257">                .map(UnspentOutput::getAmount)</span>
+<span class="source-line-no">258</span><span id="line-258">                .mapToLong(Coin::getValue)</span>
+<span class="source-line-no">259</span><span id="line-259">                .sum();</span>
+<span class="source-line-no">260</span><span id="line-260">        final long amountOut = outputs.values()</span>
+<span class="source-line-no">261</span><span id="line-261">                .stream()</span>
+<span class="source-line-no">262</span><span id="line-262">                .mapToLong(Coin::getValue)</span>
+<span class="source-line-no">263</span><span id="line-263">                .sum();</span>
 <span class="source-line-no">264</span><span id="line-264"></span>
-<span class="source-line-no">265</span><span id="line-265">        // Gather inputs as OutPoints</span>
-<span class="source-line-no">266</span><span id="line-266">        List&lt;Outpoint&gt; inputs = unspentOutputs.stream()</span>
-<span class="source-line-no">267</span><span id="line-267">                .map(this::unspentToOutpoint)</span>
-<span class="source-line-no">268</span><span id="line-268">                .collect(Collectors.toList());</span>
-<span class="source-line-no">269</span><span id="line-269"></span>
-<span class="source-line-no">270</span><span id="line-270">        // Calculate change</span>
-<span class="source-line-no">271</span><span id="line-271">        final long amountIn = unspentOutputs</span>
-<span class="source-line-no">272</span><span id="line-272">                .stream()</span>
-<span class="source-line-no">273</span><span id="line-273">                .map(UnspentOutput::getAmount)</span>
-<span class="source-line-no">274</span><span id="line-274">                .mapToLong(Coin::getValue)</span>
-<span class="source-line-no">275</span><span id="line-275">                .sum();</span>
-<span class="source-line-no">276</span><span id="line-276">        final long amountOut = outputs.values()</span>
-<span class="source-line-no">277</span><span id="line-277">                .stream()</span>
-<span class="source-line-no">278</span><span id="line-278">                .mapToLong(Coin::getValue)</span>
-<span class="source-line-no">279</span><span id="line-279">                .sum();</span>
-<span class="source-line-no">280</span><span id="line-280"></span>
-<span class="source-line-no">281</span><span id="line-281">        // Change is the difference less the standard transaction fee</span>
-<span class="source-line-no">282</span><span id="line-282">        final long amountChange = amountIn - amountOut - stdTxFeeSatoshis;</span>
-<span class="source-line-no">283</span><span id="line-283">        if (amountChange &lt; 0) {</span>
-<span class="source-line-no">284</span><span id="line-284">            // TODO: Throw Exception</span>
-<span class="source-line-no">285</span><span id="line-285">            System.out.println("Insufficient funds"); // + ": ${amountIn} &lt; ${amountOut + stdTxFee}"</span>
-<span class="source-line-no">286</span><span id="line-286">        }</span>
-<span class="source-line-no">287</span><span id="line-287">        if (amountChange &gt; 0) {</span>
-<span class="source-line-no">288</span><span id="line-288">            // Add a change output that returns change to sending address</span>
-<span class="source-line-no">289</span><span id="line-289">            outputsWithChange.put(fromAddress, Coin.valueOf(amountChange));</span>
-<span class="source-line-no">290</span><span id="line-290">        }</span>
-<span class="source-line-no">291</span><span id="line-291"></span>
-<span class="source-line-no">292</span><span id="line-292">        // Call the server to create the transaction</span>
-<span class="source-line-no">293</span><span id="line-293">        return createRawTransaction(inputs, outputsWithChange);</span>
+<span class="source-line-no">265</span><span id="line-265">        // Change is the difference less the standard transaction fee</span>
+<span class="source-line-no">266</span><span id="line-266">        final long amountChange = amountIn - amountOut - stdTxFeeSatoshis;</span>
+<span class="source-line-no">267</span><span id="line-267">        if (amountChange &lt; 0) {</span>
+<span class="source-line-no">268</span><span id="line-268">            // TODO: Throw Exception</span>
+<span class="source-line-no">269</span><span id="line-269">            System.out.println("Insufficient funds"); // + ": ${amountIn} &lt; ${amountOut + stdTxFee}"</span>
+<span class="source-line-no">270</span><span id="line-270">        }</span>
+<span class="source-line-no">271</span><span id="line-271">        if (amountChange &gt; 0) {</span>
+<span class="source-line-no">272</span><span id="line-272">            // Add a change output that returns change to sending address</span>
+<span class="source-line-no">273</span><span id="line-273">            outputsWithChange.put(fromAddress, Coin.valueOf(amountChange));</span>
+<span class="source-line-no">274</span><span id="line-274">        }</span>
+<span class="source-line-no">275</span><span id="line-275"></span>
+<span class="source-line-no">276</span><span id="line-276">        // Call the server to create the transaction</span>
+<span class="source-line-no">277</span><span id="line-277">        return createRawTransaction(inputs, outputsWithChange);</span>
+<span class="source-line-no">278</span><span id="line-278">    }</span>
+<span class="source-line-no">279</span><span id="line-279"></span>
+<span class="source-line-no">280</span><span id="line-280">    /**</span>
+<span class="source-line-no">281</span><span id="line-281">     * Creates a raw transaction, sending {@code amount} from a single address to a destination, whereby no new change</span>
+<span class="source-line-no">282</span><span id="line-282">     * address is created, and remaining amounts are returned to {@code fromAddress}.</span>
+<span class="source-line-no">283</span><span id="line-283">     * &lt;p&gt;</span>
+<span class="source-line-no">284</span><span id="line-284">     * Note: the transaction inputs are not signed, and the transaction is not stored in the wallet or transmitted to</span>
+<span class="source-line-no">285</span><span id="line-285">     * the network.</span>
+<span class="source-line-no">286</span><span id="line-286">     *</span>
+<span class="source-line-no">287</span><span id="line-287">     * @param fromAddress The source to spent from</span>
+<span class="source-line-no">288</span><span id="line-288">     * @param toAddress The destination</span>
+<span class="source-line-no">289</span><span id="line-289">     * @param amount The amount</span>
+<span class="source-line-no">290</span><span id="line-290">     * @return The hex-encoded raw transaction</span>
+<span class="source-line-no">291</span><span id="line-291">     */</span>
+<span class="source-line-no">292</span><span id="line-292">    public String createRawTransaction(Address fromAddress, Address toAddress, Coin amount) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">293</span><span id="line-293">        return createRawTransaction(fromAddress, Map.of(toAddress, amount));</span>
 <span class="source-line-no">294</span><span id="line-294">    }</span>
 <span class="source-line-no">295</span><span id="line-295"></span>
 <span class="source-line-no">296</span><span id="line-296">    /**</span>
-<span class="source-line-no">297</span><span id="line-297">     * Creates a raw transaction, sending {@code amount} from a single address to a destination, whereby no new change</span>
-<span class="source-line-no">298</span><span id="line-298">     * address is created, and remaining amounts are returned to {@code fromAddress}.</span>
-<span class="source-line-no">299</span><span id="line-299">     * &lt;p&gt;</span>
-<span class="source-line-no">300</span><span id="line-300">     * Note: the transaction inputs are not signed, and the transaction is not stored in the wallet or transmitted to</span>
-<span class="source-line-no">301</span><span id="line-301">     * the network.</span>
-<span class="source-line-no">302</span><span id="line-302">     *</span>
-<span class="source-line-no">303</span><span id="line-303">     * @param fromAddress The source to spent from</span>
-<span class="source-line-no">304</span><span id="line-304">     * @param toAddress The destination</span>
-<span class="source-line-no">305</span><span id="line-305">     * @param amount The amount</span>
-<span class="source-line-no">306</span><span id="line-306">     * @return The hex-encoded raw transaction</span>
-<span class="source-line-no">307</span><span id="line-307">     */</span>
-<span class="source-line-no">308</span><span id="line-308">    public String createRawTransaction(Address fromAddress, Address toAddress, Coin amount) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">309</span><span id="line-309">        return createRawTransaction(fromAddress, Map.of(toAddress, amount));</span>
-<span class="source-line-no">310</span><span id="line-310">    }</span>
-<span class="source-line-no">311</span><span id="line-311"></span>
-<span class="source-line-no">312</span><span id="line-312">    /**</span>
-<span class="source-line-no">313</span><span id="line-313">     * Returns the Bitcoin balance of an address (in the server-side wallet.)</span>
-<span class="source-line-no">314</span><span id="line-314">     *</span>
-<span class="source-line-no">315</span><span id="line-315">     * @param address The address</span>
+<span class="source-line-no">297</span><span id="line-297">     * Returns the Bitcoin balance of an address (in the server-side wallet.)</span>
+<span class="source-line-no">298</span><span id="line-298">     *</span>
+<span class="source-line-no">299</span><span id="line-299">     * @param address The address</span>
+<span class="source-line-no">300</span><span id="line-300">     * @return The balance</span>
+<span class="source-line-no">301</span><span id="line-301">     */</span>
+<span class="source-line-no">302</span><span id="line-302">    public Coin getBitcoinBalance(Address address) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">303</span><span id="line-303">        // NOTE: because null is currently removed from the argument lists passed via RPC, using it here for default</span>
+<span class="source-line-no">304</span><span id="line-304">        // values would result in the RPC call "listunspent" with arguments [["address"]], which is invalid, similar</span>
+<span class="source-line-no">305</span><span id="line-305">        // to a call with arguments [null, null, ["address"]], as expected arguments are either [], [int], [int, int]</span>
+<span class="source-line-no">306</span><span id="line-306">        // or [int, int, array]</span>
+<span class="source-line-no">307</span><span id="line-307">        return getBitcoinBalance(address, 1, defaultMaxConf);</span>
+<span class="source-line-no">308</span><span id="line-308">    }</span>
+<span class="source-line-no">309</span><span id="line-309"></span>
+<span class="source-line-no">310</span><span id="line-310">    /**</span>
+<span class="source-line-no">311</span><span id="line-311">     * Returns the Bitcoin balance of an address (in the server-side wallet) where spendable outputs have at least</span>
+<span class="source-line-no">312</span><span id="line-312">     * {@code minConf} confirmations.</span>
+<span class="source-line-no">313</span><span id="line-313">     *</span>
+<span class="source-line-no">314</span><span id="line-314">     * @param address The address</span>
+<span class="source-line-no">315</span><span id="line-315">     * @param minConf Minimum amount of confirmations</span>
 <span class="source-line-no">316</span><span id="line-316">     * @return The balance</span>
 <span class="source-line-no">317</span><span id="line-317">     */</span>
-<span class="source-line-no">318</span><span id="line-318">    public Coin getBitcoinBalance(Address address) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">319</span><span id="line-319">        // NOTE: because null is currently removed from the argument lists passed via RPC, using it here for default</span>
-<span class="source-line-no">320</span><span id="line-320">        // values would result in the RPC call "listunspent" with arguments [["address"]], which is invalid, similar</span>
-<span class="source-line-no">321</span><span id="line-321">        // to a call with arguments [null, null, ["address"]], as expected arguments are either [], [int], [int, int]</span>
-<span class="source-line-no">322</span><span id="line-322">        // or [int, int, array]</span>
-<span class="source-line-no">323</span><span id="line-323">        return getBitcoinBalance(address, 1, defaultMaxConf);</span>
-<span class="source-line-no">324</span><span id="line-324">    }</span>
-<span class="source-line-no">325</span><span id="line-325"></span>
-<span class="source-line-no">326</span><span id="line-326">    /**</span>
-<span class="source-line-no">327</span><span id="line-327">     * Returns the Bitcoin balance of an address (in the server-side wallet) where spendable outputs have at least</span>
-<span class="source-line-no">328</span><span id="line-328">     * {@code minConf} confirmations.</span>
-<span class="source-line-no">329</span><span id="line-329">     *</span>
-<span class="source-line-no">330</span><span id="line-330">     * @param address The address</span>
-<span class="source-line-no">331</span><span id="line-331">     * @param minConf Minimum amount of confirmations</span>
-<span class="source-line-no">332</span><span id="line-332">     * @return The balance</span>
-<span class="source-line-no">333</span><span id="line-333">     */</span>
-<span class="source-line-no">334</span><span id="line-334">    public Coin getBitcoinBalance(Address address, Integer minConf) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">335</span><span id="line-335">        return getBitcoinBalance(address, minConf, defaultMaxConf);</span>
+<span class="source-line-no">318</span><span id="line-318">    public Coin getBitcoinBalance(Address address, Integer minConf) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">319</span><span id="line-319">        return getBitcoinBalance(address, minConf, defaultMaxConf);</span>
+<span class="source-line-no">320</span><span id="line-320">    }</span>
+<span class="source-line-no">321</span><span id="line-321"></span>
+<span class="source-line-no">322</span><span id="line-322">    /**</span>
+<span class="source-line-no">323</span><span id="line-323">     * Returns the Bitcoin balance of an address (in the server-side wallet) where spendable outputs have at least</span>
+<span class="source-line-no">324</span><span id="line-324">     * {@code minConf} and not more than {@code maxConf} confirmations.</span>
+<span class="source-line-no">325</span><span id="line-325">     *</span>
+<span class="source-line-no">326</span><span id="line-326">     * @param address The address (must be in wallet)</span>
+<span class="source-line-no">327</span><span id="line-327">     * @param minConf Minimum amount of confirmations</span>
+<span class="source-line-no">328</span><span id="line-328">     * @param maxConf Maximum amount of confirmations</span>
+<span class="source-line-no">329</span><span id="line-329">     * @return The balance</span>
+<span class="source-line-no">330</span><span id="line-330">     */</span>
+<span class="source-line-no">331</span><span id="line-331">    public Coin getBitcoinBalance(Address address, Integer minConf, Integer maxConf) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">332</span><span id="line-332">        return listUnspent(minConf, maxConf, address)</span>
+<span class="source-line-no">333</span><span id="line-333">                .stream()</span>
+<span class="source-line-no">334</span><span id="line-334">                .map(UnspentOutput::getAmount)</span>
+<span class="source-line-no">335</span><span id="line-335">                .reduce(Coin.ZERO, Coin::add);</span>
 <span class="source-line-no">336</span><span id="line-336">    }</span>
 <span class="source-line-no">337</span><span id="line-337"></span>
 <span class="source-line-no">338</span><span id="line-338">    /**</span>
-<span class="source-line-no">339</span><span id="line-339">     * Returns the Bitcoin balance of an address (in the server-side wallet) where spendable outputs have at least</span>
-<span class="source-line-no">340</span><span id="line-340">     * {@code minConf} and not more than {@code maxConf} confirmations.</span>
+<span class="source-line-no">339</span><span id="line-339">     * Sends BTC from an address to a destination, whereby no new change address is created, and any leftover is</span>
+<span class="source-line-no">340</span><span id="line-340">     * returned to the sending address.</span>
 <span class="source-line-no">341</span><span id="line-341">     *</span>
-<span class="source-line-no">342</span><span id="line-342">     * @param address The address (must be in wallet)</span>
-<span class="source-line-no">343</span><span id="line-343">     * @param minConf Minimum amount of confirmations</span>
-<span class="source-line-no">344</span><span id="line-344">     * @param maxConf Maximum amount of confirmations</span>
-<span class="source-line-no">345</span><span id="line-345">     * @return The balance</span>
+<span class="source-line-no">342</span><span id="line-342">     * @param fromAddress The source to spent from</span>
+<span class="source-line-no">343</span><span id="line-343">     * @param toAddress   The destination address</span>
+<span class="source-line-no">344</span><span id="line-344">     * @param amount      The amount to transfer</span>
+<span class="source-line-no">345</span><span id="line-345">     * @return The transaction hash</span>
 <span class="source-line-no">346</span><span id="line-346">     */</span>
-<span class="source-line-no">347</span><span id="line-347">    public Coin getBitcoinBalance(Address address, Integer minConf, Integer maxConf) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">348</span><span id="line-348">        return listUnspent(minConf, maxConf, address)</span>
-<span class="source-line-no">349</span><span id="line-349">                .stream()</span>
-<span class="source-line-no">350</span><span id="line-350">                .map(UnspentOutput::getAmount)</span>
-<span class="source-line-no">351</span><span id="line-351">                .reduce(Coin.ZERO, Coin::add);</span>
-<span class="source-line-no">352</span><span id="line-352">    }</span>
-<span class="source-line-no">353</span><span id="line-353"></span>
-<span class="source-line-no">354</span><span id="line-354">    /**</span>
-<span class="source-line-no">355</span><span id="line-355">     * Sends BTC from an address to a destination, whereby no new change address is created, and any leftover is</span>
-<span class="source-line-no">356</span><span id="line-356">     * returned to the sending address.</span>
-<span class="source-line-no">357</span><span id="line-357">     *</span>
-<span class="source-line-no">358</span><span id="line-358">     * @param fromAddress The source to spent from</span>
-<span class="source-line-no">359</span><span id="line-359">     * @param toAddress   The destination address</span>
-<span class="source-line-no">360</span><span id="line-360">     * @param amount      The amount to transfer</span>
-<span class="source-line-no">361</span><span id="line-361">     * @return The transaction hash</span>
-<span class="source-line-no">362</span><span id="line-362">     */</span>
-<span class="source-line-no">363</span><span id="line-363">    public Sha256Hash sendBitcoin(Address fromAddress, Address toAddress, Coin amount) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">364</span><span id="line-364">        Map&lt;Address, Coin&gt; outputs = Map.of(toAddress, amount);</span>
-<span class="source-line-no">365</span><span id="line-365">        return sendBitcoin(fromAddress, outputs);</span>
-<span class="source-line-no">366</span><span id="line-366">    }</span>
-<span class="source-line-no">367</span><span id="line-367"></span>
-<span class="source-line-no">368</span><span id="line-368">    /**</span>
-<span class="source-line-no">369</span><span id="line-369">     * Sends BTC from an address to the destinations, whereby no new change address is created, and any leftover is</span>
-<span class="source-line-no">370</span><span id="line-370">     * returned to the sending address.</span>
-<span class="source-line-no">371</span><span id="line-371">     *</span>
-<span class="source-line-no">372</span><span id="line-372">     * @param fromAddress The source to spent from</span>
-<span class="source-line-no">373</span><span id="line-373">     * @param outputs     The destinations and amounts to transfer</span>
-<span class="source-line-no">374</span><span id="line-374">     * @return The transaction hash</span>
-<span class="source-line-no">375</span><span id="line-375">     */</span>
-<span class="source-line-no">376</span><span id="line-376">    public Sha256Hash sendBitcoin(Address fromAddress, Map&lt;Address, Coin&gt; outputs) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">377</span><span id="line-377">        String unsignedTxHex = createRawTransaction(fromAddress, outputs);</span>
-<span class="source-line-no">378</span><span id="line-378">        SignedRawTransaction signingResult = signRawTransactionWithWallet(unsignedTxHex);</span>
-<span class="source-line-no">379</span><span id="line-379"></span>
-<span class="source-line-no">380</span><span id="line-380">        boolean complete = signingResult.isComplete();</span>
-<span class="source-line-no">381</span><span id="line-381">        assert complete;</span>
-<span class="source-line-no">382</span><span id="line-382"></span>
-<span class="source-line-no">383</span><span id="line-383">        String signedTxHex = signingResult.getHex();</span>
-<span class="source-line-no">384</span><span id="line-384">        Sha256Hash txid = sendRawTransaction(signedTxHex);</span>
+<span class="source-line-no">347</span><span id="line-347">    public Sha256Hash sendBitcoin(Address fromAddress, Address toAddress, Coin amount) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">348</span><span id="line-348">        Map&lt;Address, Coin&gt; outputs = Map.of(toAddress, amount);</span>
+<span class="source-line-no">349</span><span id="line-349">        return sendBitcoin(fromAddress, outputs);</span>
+<span class="source-line-no">350</span><span id="line-350">    }</span>
+<span class="source-line-no">351</span><span id="line-351"></span>
+<span class="source-line-no">352</span><span id="line-352">    /**</span>
+<span class="source-line-no">353</span><span id="line-353">     * Sends BTC from an address to the destinations, whereby no new change address is created, and any leftover is</span>
+<span class="source-line-no">354</span><span id="line-354">     * returned to the sending address.</span>
+<span class="source-line-no">355</span><span id="line-355">     *</span>
+<span class="source-line-no">356</span><span id="line-356">     * @param fromAddress The source to spent from</span>
+<span class="source-line-no">357</span><span id="line-357">     * @param outputs     The destinations and amounts to transfer</span>
+<span class="source-line-no">358</span><span id="line-358">     * @return The transaction hash</span>
+<span class="source-line-no">359</span><span id="line-359">     */</span>
+<span class="source-line-no">360</span><span id="line-360">    public Sha256Hash sendBitcoin(Address fromAddress, Map&lt;Address, Coin&gt; outputs) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">361</span><span id="line-361">        String unsignedTxHex = createRawTransaction(fromAddress, outputs);</span>
+<span class="source-line-no">362</span><span id="line-362">        SignedRawTransaction signingResult = signRawTransactionWithWallet(unsignedTxHex);</span>
+<span class="source-line-no">363</span><span id="line-363"></span>
+<span class="source-line-no">364</span><span id="line-364">        boolean complete = signingResult.isComplete();</span>
+<span class="source-line-no">365</span><span id="line-365">        assert complete;</span>
+<span class="source-line-no">366</span><span id="line-366"></span>
+<span class="source-line-no">367</span><span id="line-367">        String signedTxHex = signingResult.getHex();</span>
+<span class="source-line-no">368</span><span id="line-368">        Sha256Hash txid = sendRawTransaction(signedTxHex);</span>
+<span class="source-line-no">369</span><span id="line-369"></span>
+<span class="source-line-no">370</span><span id="line-370">        return txid;</span>
+<span class="source-line-no">371</span><span id="line-371">    }</span>
+<span class="source-line-no">372</span><span id="line-372"></span>
+<span class="source-line-no">373</span><span id="line-373">    /**</span>
+<span class="source-line-no">374</span><span id="line-374">     * Create a signed transaction locally (i.e. with a client-side key.) Finds UTXOs this</span>
+<span class="source-line-no">375</span><span id="line-375">     * key can spend (assuming they are ScriptType.P2PKH UTXOs)</span>
+<span class="source-line-no">376</span><span id="line-376">     *</span>
+<span class="source-line-no">377</span><span id="line-377">     * @param fromKey Signing key</span>
+<span class="source-line-no">378</span><span id="line-378">     * @param outputs Outputs to sign</span>
+<span class="source-line-no">379</span><span id="line-379">     * @return A bitcoinj Transaction objects that is properly signed</span>
+<span class="source-line-no">380</span><span id="line-380">     * @throws JsonRpcStatusException A JSON-RPC error was returned</span>
+<span class="source-line-no">381</span><span id="line-381">     * @throws IOException            An I/O error occured</span>
+<span class="source-line-no">382</span><span id="line-382">     */</span>
+<span class="source-line-no">383</span><span id="line-383">    public Transaction createSignedTransaction(ECKey fromKey, List&lt;TransactionOutput&gt; outputs) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">384</span><span id="line-384">        Address fromAddress = fromKey.toAddress(ScriptType.P2PKH, getNetwork());</span>
 <span class="source-line-no">385</span><span id="line-385"></span>
-<span class="source-line-no">386</span><span id="line-386">        return txid;</span>
-<span class="source-line-no">387</span><span id="line-387">    }</span>
+<span class="source-line-no">386</span><span id="line-386">        Transaction tx = new Transaction();   // Create a new transaction</span>
+<span class="source-line-no">387</span><span id="line-387">        outputs.forEach(tx::addOutput);                     // Add all requested outputs to it</span>
 <span class="source-line-no">388</span><span id="line-388"></span>
-<span class="source-line-no">389</span><span id="line-389">    /**</span>
-<span class="source-line-no">390</span><span id="line-390">     * Create a signed transaction locally (i.e. with a client-side key.) Finds UTXOs this</span>
-<span class="source-line-no">391</span><span id="line-391">     * key can spend (assuming they are ScriptType.P2PKH UTXOs)</span>
-<span class="source-line-no">392</span><span id="line-392">     *</span>
-<span class="source-line-no">393</span><span id="line-393">     * @param fromKey Signing key</span>
-<span class="source-line-no">394</span><span id="line-394">     * @param outputs Outputs to sign</span>
-<span class="source-line-no">395</span><span id="line-395">     * @return A bitcoinj Transaction objects that is properly signed</span>
-<span class="source-line-no">396</span><span id="line-396">     * @throws JsonRpcStatusException A JSON-RPC error was returned</span>
-<span class="source-line-no">397</span><span id="line-397">     * @throws IOException            An I/O error occured</span>
-<span class="source-line-no">398</span><span id="line-398">     */</span>
-<span class="source-line-no">399</span><span id="line-399">    public Transaction createSignedTransaction(ECKey fromKey, List&lt;TransactionOutput&gt; outputs) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">400</span><span id="line-400">        Address fromAddress = fromKey.toAddress(ScriptType.P2PKH, getNetwork());</span>
-<span class="source-line-no">401</span><span id="line-401"></span>
-<span class="source-line-no">402</span><span id="line-402">        Transaction tx = new Transaction();   // Create a new transaction</span>
-<span class="source-line-no">403</span><span id="line-403">        outputs.forEach(tx::addOutput);                     // Add all requested outputs to it</span>
-<span class="source-line-no">404</span><span id="line-404"></span>
-<span class="source-line-no">405</span><span id="line-405">        // Fetch all UTXOs for the sending Address</span>
-<span class="source-line-no">406</span><span id="line-406">        List&lt;TransactionOutput&gt; unspentOutputs = listUnspentJ(fromAddress);</span>
-<span class="source-line-no">407</span><span id="line-407"></span>
-<span class="source-line-no">408</span><span id="line-408">        // Calculate change (units are satoshis)</span>
-<span class="source-line-no">409</span><span id="line-409">        // First sum all available UTXOs</span>
-<span class="source-line-no">410</span><span id="line-410">        final Coin amountIn = unspentOutputs.stream()</span>
-<span class="source-line-no">411</span><span id="line-411">                .map(TransactionOutput::getValue)</span>
-<span class="source-line-no">412</span><span id="line-412">                .reduce(Coin.ZERO, Coin::add);</span>
-<span class="source-line-no">413</span><span id="line-413">        // Then sum the requested outputs for this transaction</span>
-<span class="source-line-no">414</span><span id="line-414">        final Coin amountOut = outputs.stream()</span>
-<span class="source-line-no">415</span><span id="line-415">                .map(TransactionOutput::getValue)</span>
-<span class="source-line-no">416</span><span id="line-416">                .reduce(Coin.ZERO, Coin::add);</span>
-<span class="source-line-no">417</span><span id="line-417">        // Change is the difference less the standard transaction fee</span>
-<span class="source-line-no">418</span><span id="line-418">        final long amountChange = amountIn.value - amountOut.value - stdTxFeeSatoshis;</span>
-<span class="source-line-no">419</span><span id="line-419">        if (amountChange &lt; 0) {</span>
-<span class="source-line-no">420</span><span id="line-420">            // TODO: Throw Exception</span>
-<span class="source-line-no">421</span><span id="line-421">            System.out.println("Insufficient funds"); // + ": ${amountIn} &lt; ${amountOut + stdTxFeeSatoshis}"</span>
-<span class="source-line-no">422</span><span id="line-422">        }</span>
-<span class="source-line-no">423</span><span id="line-423">        if (amountChange &gt; 0) {</span>
-<span class="source-line-no">424</span><span id="line-424">            // Add a change output that returns change to sending address</span>
-<span class="source-line-no">425</span><span id="line-425">            tx.addOutput(Coin.valueOf(amountChange), fromAddress);</span>
-<span class="source-line-no">426</span><span id="line-426">        }</span>
-<span class="source-line-no">427</span><span id="line-427"></span>
-<span class="source-line-no">428</span><span id="line-428">        // Add *all* UTXOs for fromAddress as inputs (this perhaps unnecessarily consolidates coins, with</span>
-<span class="source-line-no">429</span><span id="line-429">        // a higher tx fee and some loss of privacy) and sign them</span>
-<span class="source-line-no">430</span><span id="line-430">        unspentOutputs.forEach(unspent -&gt; tx.addSignedInput(unspent, fromKey));</span>
-<span class="source-line-no">431</span><span id="line-431">        return tx;</span>
-<span class="source-line-no">432</span><span id="line-432">    }</span>
-<span class="source-line-no">433</span><span id="line-433"></span>
-<span class="source-line-no">434</span><span id="line-434">    /**</span>
-<span class="source-line-no">435</span><span id="line-435">     * Create a signed transaction locally (i.e. with a client-side key.) Finds UTXOs this</span>
-<span class="source-line-no">436</span><span id="line-436">     * key can spend (assuming they are org.bitcoinj.base.ScriptType.P2PKH UTXOs)</span>
-<span class="source-line-no">437</span><span id="line-437">     *</span>
-<span class="source-line-no">438</span><span id="line-438">     * @param fromKey   Signing key</span>
-<span class="source-line-no">439</span><span id="line-439">     * @param toAddress Destination address</span>
-<span class="source-line-no">440</span><span id="line-440">     * @param amount    Amount to send</span>
-<span class="source-line-no">441</span><span id="line-441">     * @return A bitcoinj Transaction objects that is properly signed</span>
-<span class="source-line-no">442</span><span id="line-442">     * @throws JsonRpcStatusException A JSON-RPC error was returned</span>
-<span class="source-line-no">443</span><span id="line-443">     * @throws IOException            An I/O error occured</span>
-<span class="source-line-no">444</span><span id="line-444">     */</span>
-<span class="source-line-no">445</span><span id="line-445">    public Transaction createSignedTransaction(ECKey fromKey, Address toAddress, Coin amount) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">446</span><span id="line-446">        List&lt;TransactionOutput&gt; outputs = List.of(</span>
-<span class="source-line-no">447</span><span id="line-447">                new TransactionOutput(null, amount, toAddress));</span>
-<span class="source-line-no">448</span><span id="line-448">        return createSignedTransaction(fromKey, outputs);</span>
-<span class="source-line-no">449</span><span id="line-449">    }</span>
-<span class="source-line-no">450</span><span id="line-450"></span>
-<span class="source-line-no">451</span><span id="line-451">    /**</span>
-<span class="source-line-no">452</span><span id="line-452">     * Build a list of bitcoinj {@link TransactionOutput}s using {@link BitcoinClient#listUnspent}</span>
-<span class="source-line-no">453</span><span id="line-453">     * and {@link BitcoinClient#getRawTransaction} RPCs.</span>
-<span class="source-line-no">454</span><span id="line-454">     *</span>
-<span class="source-line-no">455</span><span id="line-455">     * @param fromAddress Address to get UTXOs for</span>
-<span class="source-line-no">456</span><span id="line-456">     * @return All unspent TransactionOutputs for fromAddress</span>
-<span class="source-line-no">457</span><span id="line-457">     */</span>
-<span class="source-line-no">458</span><span id="line-458">    public List&lt;TransactionOutput&gt; listUnspentJ(Address fromAddress) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">459</span><span id="line-459">        List&lt;UnspentOutput&gt; unspentOutputs = listUnspent(0, defaultMaxConf, fromAddress); // RPC UnspentOutput objects</span>
-<span class="source-line-no">460</span><span id="line-460">        return unspentOutputs.stream()</span>
-<span class="source-line-no">461</span><span id="line-461">                .map(this::unspentToTransactionOutput)</span>
-<span class="source-line-no">462</span><span id="line-462">                .collect(Collectors.toList());</span>
-<span class="source-line-no">463</span><span id="line-463">    }</span>
-<span class="source-line-no">464</span><span id="line-464"></span>
-<span class="source-line-no">465</span><span id="line-465">    /**</span>
-<span class="source-line-no">466</span><span id="line-466">     * Build a list of bitcoinj {@link TransactionOutPoint}s using {@link BitcoinClient#listUnspent}.</span>
-<span class="source-line-no">467</span><span id="line-467">     *</span>
-<span class="source-line-no">468</span><span id="line-468">     * @param fromAddress Address to get UTXOs for</span>
-<span class="source-line-no">469</span><span id="line-469">     * @return All unspent TransactionOutPoints for fromAddress</span>
-<span class="source-line-no">470</span><span id="line-470">     */</span>
-<span class="source-line-no">471</span><span id="line-471">    public List&lt;TransactionOutPoint&gt; listUnspentOutPoints(Address fromAddress) throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">472</span><span id="line-472">        List&lt;UnspentOutput&gt; unspentOutputsRPC = listUnspent(0, defaultMaxConf, fromAddress); // RPC UnspentOutput objects</span>
-<span class="source-line-no">473</span><span id="line-473">        return unspentOutputsRPC.stream()</span>
-<span class="source-line-no">474</span><span id="line-474">                .map(this::unspentToTransactionOutpoint)</span>
-<span class="source-line-no">475</span><span id="line-475">                .collect(Collectors.toList());</span>
-<span class="source-line-no">476</span><span id="line-476">    }</span>
-<span class="source-line-no">477</span><span id="line-477">    </span>
-<span class="source-line-no">478</span><span id="line-478">    /**</span>
-<span class="source-line-no">479</span><span id="line-479">     * Convert an {@link UnspentOutput} JSONRPC-POJO to a *bitcoinj* {@link TransactionOutput} (that's out-PUT).</span>
-<span class="source-line-no">480</span><span id="line-480">     * Calls {@link BitcoinClient#getRawTransaction(Sha256Hash)}</span>
-<span class="source-line-no">481</span><span id="line-481">     * for every item. Throws {@link RuntimeException} if any of those RPC calls fails.</span>
-<span class="source-line-no">482</span><span id="line-482">     *</span>
-<span class="source-line-no">483</span><span id="line-483">     * @param unspentOutput The input POJO</span>
-<span class="source-line-no">484</span><span id="line-484">     * @return The *bitcoinj* object  (that's out-PUT)</span>
-<span class="source-line-no">485</span><span id="line-485">     */</span>
-<span class="source-line-no">486</span><span id="line-486">    private TransactionOutput unspentToTransactionOutput(UnspentOutput unspentOutput) {</span>
-<span class="source-line-no">487</span><span id="line-487">        try {</span>
-<span class="source-line-no">488</span><span id="line-488">            return getRawTransaction(unspentOutput.getTxid())</span>
-<span class="source-line-no">489</span><span id="line-489">                    .getOutput(unspentOutput.getVout());</span>
-<span class="source-line-no">490</span><span id="line-490">        } catch (IOException e) {</span>
-<span class="source-line-no">491</span><span id="line-491">            throw new RuntimeException(e);</span>
-<span class="source-line-no">492</span><span id="line-492">        }</span>
-<span class="source-line-no">493</span><span id="line-493">    }</span>
-<span class="source-line-no">494</span><span id="line-494"></span>
-<span class="source-line-no">495</span><span id="line-495">    /**</span>
-<span class="source-line-no">496</span><span id="line-496">     * Convert an {@link UnspentOutput} JSONRPC-POJO to a *bitcoinj* {@link TransactionOutPoint} (that's out-POINT).</span>
-<span class="source-line-no">497</span><span id="line-497">     *</span>
-<span class="source-line-no">498</span><span id="line-498">     * @param unspentOutput The input POJO</span>
-<span class="source-line-no">499</span><span id="line-499">     * @return The *bitcoinj* object  (that's out-POINT)</span>
-<span class="source-line-no">500</span><span id="line-500">     */</span>
-<span class="source-line-no">501</span><span id="line-501">    private TransactionOutPoint unspentToTransactionOutpoint(UnspentOutput unspentOutput) {</span>
-<span class="source-line-no">502</span><span id="line-502">        return new TransactionOutPoint(unspentOutput.getVout(), unspentOutput.getTxid());</span>
-<span class="source-line-no">503</span><span id="line-503">    }</span>
-<span class="source-line-no">504</span><span id="line-504"></span>
-<span class="source-line-no">505</span><span id="line-505">    /**</span>
-<span class="source-line-no">506</span><span id="line-506">     * Convert an {@link UnspentOutput} JSONRPC-POJO to a JSONRPC-POJO {@link Outpoint} .</span>
-<span class="source-line-no">507</span><span id="line-507">     *</span>
-<span class="source-line-no">508</span><span id="line-508">     * @param unspentOutput The input UnspentOutput POJO</span>
-<span class="source-line-no">509</span><span id="line-509">     * @return the Outpoint POJO</span>
-<span class="source-line-no">510</span><span id="line-510">     */</span>
-<span class="source-line-no">511</span><span id="line-511">    private Outpoint unspentToOutpoint(UnspentOutput unspentOutput) {</span>
-<span class="source-line-no">512</span><span id="line-512">        return new Outpoint(unspentOutput.getTxid(), unspentOutput.getVout());</span>
-<span class="source-line-no">513</span><span id="line-513">    }</span>
-<span class="source-line-no">514</span><span id="line-514">}</span>
+<span class="source-line-no">389</span><span id="line-389">        // Fetch all UTXOs for the sending Address</span>
+<span class="source-line-no">390</span><span id="line-390">        List&lt;TransactionOutput&gt; unspentOutputs = listUnspentJ(fromAddress);</span>
+<span class="source-line-no">391</span><span id="line-391"></span>
+<span class="source-line-no">392</span><span id="line-392">        // Calculate change (units are satoshis)</span>
+<span class="source-line-no">393</span><span id="line-393">        // First sum all available UTXOs</span>
+<span class="source-line-no">394</span><span id="line-394">        final Coin amountIn = unspentOutputs.stream()</span>
+<span class="source-line-no">395</span><span id="line-395">                .map(TransactionOutput::getValue)</span>
+<span class="source-line-no">396</span><span id="line-396">                .reduce(Coin.ZERO, Coin::add);</span>
+<span class="source-line-no">397</span><span id="line-397">        // Then sum the requested outputs for this transaction</span>
+<span class="source-line-no">398</span><span id="line-398">        final Coin amountOut = outputs.stream()</span>
+<span class="source-line-no">399</span><span id="line-399">                .map(TransactionOutput::getValue)</span>
+<span class="source-line-no">400</span><span id="line-400">                .reduce(Coin.ZERO, Coin::add);</span>
+<span class="source-line-no">401</span><span id="line-401">        // Change is the difference less the standard transaction fee</span>
+<span class="source-line-no">402</span><span id="line-402">        final long amountChange = amountIn.value - amountOut.value - stdTxFeeSatoshis;</span>
+<span class="source-line-no">403</span><span id="line-403">        if (amountChange &lt; 0) {</span>
+<span class="source-line-no">404</span><span id="line-404">            // TODO: Throw Exception</span>
+<span class="source-line-no">405</span><span id="line-405">            System.out.println("Insufficient funds"); // + ": ${amountIn} &lt; ${amountOut + stdTxFeeSatoshis}"</span>
+<span class="source-line-no">406</span><span id="line-406">        }</span>
+<span class="source-line-no">407</span><span id="line-407">        if (amountChange &gt; 0) {</span>
+<span class="source-line-no">408</span><span id="line-408">            // Add a change output that returns change to sending address</span>
+<span class="source-line-no">409</span><span id="line-409">            tx.addOutput(Coin.valueOf(amountChange), fromAddress);</span>
+<span class="source-line-no">410</span><span id="line-410">        }</span>
+<span class="source-line-no">411</span><span id="line-411"></span>
+<span class="source-line-no">412</span><span id="line-412">        // Add *all* UTXOs for fromAddress as inputs (this perhaps unnecessarily consolidates coins, with</span>
+<span class="source-line-no">413</span><span id="line-413">        // a higher tx fee and some loss of privacy) and sign them</span>
+<span class="source-line-no">414</span><span id="line-414">        unspentOutputs.forEach(unspent -&gt; tx.addSignedInput(unspent, fromKey));</span>
+<span class="source-line-no">415</span><span id="line-415">        return tx;</span>
+<span class="source-line-no">416</span><span id="line-416">    }</span>
+<span class="source-line-no">417</span><span id="line-417"></span>
+<span class="source-line-no">418</span><span id="line-418">    /**</span>
+<span class="source-line-no">419</span><span id="line-419">     * Create a signed transaction locally (i.e. with a client-side key.) Finds UTXOs this</span>
+<span class="source-line-no">420</span><span id="line-420">     * key can spend (assuming they are org.bitcoinj.base.ScriptType.P2PKH UTXOs)</span>
+<span class="source-line-no">421</span><span id="line-421">     *</span>
+<span class="source-line-no">422</span><span id="line-422">     * @param fromKey   Signing key</span>
+<span class="source-line-no">423</span><span id="line-423">     * @param toAddress Destination address</span>
+<span class="source-line-no">424</span><span id="line-424">     * @param amount    Amount to send</span>
+<span class="source-line-no">425</span><span id="line-425">     * @return A bitcoinj Transaction objects that is properly signed</span>
+<span class="source-line-no">426</span><span id="line-426">     * @throws JsonRpcStatusException A JSON-RPC error was returned</span>
+<span class="source-line-no">427</span><span id="line-427">     * @throws IOException            An I/O error occured</span>
+<span class="source-line-no">428</span><span id="line-428">     */</span>
+<span class="source-line-no">429</span><span id="line-429">    public Transaction createSignedTransaction(ECKey fromKey, Address toAddress, Coin amount) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">430</span><span id="line-430">        List&lt;TransactionOutput&gt; outputs = List.of(</span>
+<span class="source-line-no">431</span><span id="line-431">                new TransactionOutput(null, amount, toAddress));</span>
+<span class="source-line-no">432</span><span id="line-432">        return createSignedTransaction(fromKey, outputs);</span>
+<span class="source-line-no">433</span><span id="line-433">    }</span>
+<span class="source-line-no">434</span><span id="line-434"></span>
+<span class="source-line-no">435</span><span id="line-435">    /**</span>
+<span class="source-line-no">436</span><span id="line-436">     * Build a list of bitcoinj {@link TransactionOutput}s using {@link BitcoinClient#listUnspent}</span>
+<span class="source-line-no">437</span><span id="line-437">     * and {@link BitcoinClient#getRawTransaction} RPCs.</span>
+<span class="source-line-no">438</span><span id="line-438">     *</span>
+<span class="source-line-no">439</span><span id="line-439">     * @param fromAddress Address to get UTXOs for</span>
+<span class="source-line-no">440</span><span id="line-440">     * @return All unspent TransactionOutputs for fromAddress</span>
+<span class="source-line-no">441</span><span id="line-441">     */</span>
+<span class="source-line-no">442</span><span id="line-442">    public List&lt;TransactionOutput&gt; listUnspentJ(Address fromAddress) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">443</span><span id="line-443">        List&lt;UnspentOutput&gt; unspentOutputs = listUnspent(0, defaultMaxConf, fromAddress); // RPC UnspentOutput objects</span>
+<span class="source-line-no">444</span><span id="line-444">        return unspentOutputs.stream()</span>
+<span class="source-line-no">445</span><span id="line-445">                .map(this::unspentToTransactionOutput)</span>
+<span class="source-line-no">446</span><span id="line-446">                .collect(Collectors.toList());</span>
+<span class="source-line-no">447</span><span id="line-447">    }</span>
+<span class="source-line-no">448</span><span id="line-448"></span>
+<span class="source-line-no">449</span><span id="line-449">    /**</span>
+<span class="source-line-no">450</span><span id="line-450">     * Build a list of bitcoinj {@link TransactionOutPoint}s using {@link BitcoinClient#listUnspent}.</span>
+<span class="source-line-no">451</span><span id="line-451">     *</span>
+<span class="source-line-no">452</span><span id="line-452">     * @param fromAddress Address to get UTXOs for</span>
+<span class="source-line-no">453</span><span id="line-453">     * @return All unspent TransactionOutPoints for fromAddress</span>
+<span class="source-line-no">454</span><span id="line-454">     */</span>
+<span class="source-line-no">455</span><span id="line-455">    public List&lt;TransactionOutPoint&gt; listUnspentOutPoints(Address fromAddress) throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">456</span><span id="line-456">        List&lt;UnspentOutput&gt; unspentOutputsRPC = listUnspent(0, defaultMaxConf, fromAddress); // RPC UnspentOutput objects</span>
+<span class="source-line-no">457</span><span id="line-457">        return unspentOutputsRPC.stream()</span>
+<span class="source-line-no">458</span><span id="line-458">                .map(this::unspentToTransactionOutpoint)</span>
+<span class="source-line-no">459</span><span id="line-459">                .collect(Collectors.toList());</span>
+<span class="source-line-no">460</span><span id="line-460">    }</span>
+<span class="source-line-no">461</span><span id="line-461">    </span>
+<span class="source-line-no">462</span><span id="line-462">    /**</span>
+<span class="source-line-no">463</span><span id="line-463">     * Convert an {@link UnspentOutput} JSONRPC-POJO to a *bitcoinj* {@link TransactionOutput} (that's out-PUT).</span>
+<span class="source-line-no">464</span><span id="line-464">     * Calls {@link BitcoinClient#getRawTransaction(Sha256Hash)}</span>
+<span class="source-line-no">465</span><span id="line-465">     * for every item. Throws {@link RuntimeException} if any of those RPC calls fails.</span>
+<span class="source-line-no">466</span><span id="line-466">     *</span>
+<span class="source-line-no">467</span><span id="line-467">     * @param unspentOutput The input POJO</span>
+<span class="source-line-no">468</span><span id="line-468">     * @return The *bitcoinj* object  (that's out-PUT)</span>
+<span class="source-line-no">469</span><span id="line-469">     */</span>
+<span class="source-line-no">470</span><span id="line-470">    private TransactionOutput unspentToTransactionOutput(UnspentOutput unspentOutput) {</span>
+<span class="source-line-no">471</span><span id="line-471">        try {</span>
+<span class="source-line-no">472</span><span id="line-472">            return getRawTransaction(unspentOutput.getTxid())</span>
+<span class="source-line-no">473</span><span id="line-473">                    .getOutput(unspentOutput.getVout());</span>
+<span class="source-line-no">474</span><span id="line-474">        } catch (IOException e) {</span>
+<span class="source-line-no">475</span><span id="line-475">            throw new RuntimeException(e);</span>
+<span class="source-line-no">476</span><span id="line-476">        }</span>
+<span class="source-line-no">477</span><span id="line-477">    }</span>
+<span class="source-line-no">478</span><span id="line-478"></span>
+<span class="source-line-no">479</span><span id="line-479">    /**</span>
+<span class="source-line-no">480</span><span id="line-480">     * Convert an {@link UnspentOutput} JSONRPC-POJO to a *bitcoinj* {@link TransactionOutPoint} (that's out-POINT).</span>
+<span class="source-line-no">481</span><span id="line-481">     *</span>
+<span class="source-line-no">482</span><span id="line-482">     * @param unspentOutput The input POJO</span>
+<span class="source-line-no">483</span><span id="line-483">     * @return The *bitcoinj* object  (that's out-POINT)</span>
+<span class="source-line-no">484</span><span id="line-484">     */</span>
+<span class="source-line-no">485</span><span id="line-485">    private TransactionOutPoint unspentToTransactionOutpoint(UnspentOutput unspentOutput) {</span>
+<span class="source-line-no">486</span><span id="line-486">        return new TransactionOutPoint(unspentOutput.getVout(), unspentOutput.getTxid());</span>
+<span class="source-line-no">487</span><span id="line-487">    }</span>
+<span class="source-line-no">488</span><span id="line-488"></span>
+<span class="source-line-no">489</span><span id="line-489">    /**</span>
+<span class="source-line-no">490</span><span id="line-490">     * Convert an {@link UnspentOutput} JSONRPC-POJO to a JSONRPC-POJO {@link Outpoint} .</span>
+<span class="source-line-no">491</span><span id="line-491">     *</span>
+<span class="source-line-no">492</span><span id="line-492">     * @param unspentOutput The input UnspentOutput POJO</span>
+<span class="source-line-no">493</span><span id="line-493">     * @return the Outpoint POJO</span>
+<span class="source-line-no">494</span><span id="line-494">     */</span>
+<span class="source-line-no">495</span><span id="line-495">    private Outpoint unspentToOutpoint(UnspentOutput unspentOutput) {</span>
+<span class="source-line-no">496</span><span id="line-496">        return new Outpoint(unspentOutput.getTxid(), unspentOutput.getVout());</span>
+<span class="source-line-no">497</span><span id="line-497">    }</span>
+<span class="source-line-no">498</span><span id="line-498">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html
index fd6d1164f..5b1a2b696 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/ChainTipClient.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc, interface: ChainTipClient">
@@ -18,17 +18,23 @@
 <span class="source-line-no">005</span><span id="line-5"></span>
 <span class="source-line-no">006</span><span id="line-6">import java.io.IOException;</span>
 <span class="source-line-no">007</span><span id="line-7">import java.util.List;</span>
-<span class="source-line-no">008</span><span id="line-8"></span>
-<span class="source-line-no">009</span><span id="line-9">/**</span>
-<span class="source-line-no">010</span><span id="line-10"> * Interface for a Bitcoin JSON-RPC client that implements {@code getchaintips}.</span>
-<span class="source-line-no">011</span><span id="line-11"> * &lt;p&gt;</span>
-<span class="source-line-no">012</span><span id="line-12"> * (This is needed to provide reactive Bitcoin JSON-RPC interfaces since we can't</span>
-<span class="source-line-no">013</span><span id="line-13"> * use BitcoinClient itself because it is concrete. In the future we may want to create</span>
-<span class="source-line-no">014</span><span id="line-14"> * interfaces with more Bitcoin RPC methods, but for now this is all we need.)</span>
-<span class="source-line-no">015</span><span id="line-15"> */</span>
-<span class="source-line-no">016</span><span id="line-16">public interface ChainTipClient {</span>
-<span class="source-line-no">017</span><span id="line-17">    List&lt;ChainTip&gt; getChainTips() throws JsonRpcStatusException, IOException;</span>
-<span class="source-line-no">018</span><span id="line-18">}</span>
+<span class="source-line-no">008</span><span id="line-8">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">009</span><span id="line-9"></span>
+<span class="source-line-no">010</span><span id="line-10">/**</span>
+<span class="source-line-no">011</span><span id="line-11"> * Interface for a Bitcoin JSON-RPC client that implements {@code getchaintips}.</span>
+<span class="source-line-no">012</span><span id="line-12"> * &lt;p&gt;</span>
+<span class="source-line-no">013</span><span id="line-13"> * (This is needed to provide reactive Bitcoin JSON-RPC interfaces because we can't</span>
+<span class="source-line-no">014</span><span id="line-14"> * subclass BitcoinClient itself (because it is concrete.) In the future we may want to create</span>
+<span class="source-line-no">015</span><span id="line-15"> * interfaces with more Bitcoin RPC methods, but for now this is all we need.)</span>
+<span class="source-line-no">016</span><span id="line-16"> */</span>
+<span class="source-line-no">017</span><span id="line-17">public interface ChainTipClient {</span>
+<span class="source-line-no">018</span><span id="line-18">    @Deprecated</span>
+<span class="source-line-no">019</span><span id="line-19">    List&lt;ChainTip&gt; getChainTips() throws JsonRpcStatusException, IOException;</span>
+<span class="source-line-no">020</span><span id="line-20">    CompletableFuture&lt;List&lt;ChainTip&gt;&gt; getChainTipsAsync();</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">    // TODO: Consider using Flow.Publisher to provide some reactive publishers directly in BitcoinClient?</span>
+<span class="source-line-no">023</span><span id="line-23">    //Flow.Publisher&lt;ChainTip&gt; chainTipFlowPublisher();</span>
+<span class="source-line-no">024</span><span id="line-24">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html
index 36eedcbd3..12eb52a27 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/RpcConfig.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc, class: RpcConfig">
@@ -18,81 +18,66 @@
 <span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.annotation.JsonProperty;</span>
 <span class="source-line-no">006</span><span id="line-6">import org.bitcoinj.base.BitcoinNetwork;</span>
 <span class="source-line-no">007</span><span id="line-7">import org.bitcoinj.base.Network;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.bitcoinj.core.NetworkParameters;</span>
-<span class="source-line-no">009</span><span id="line-9"></span>
-<span class="source-line-no">010</span><span id="line-10">import java.net.URI;</span>
-<span class="source-line-no">011</span><span id="line-11"></span>
-<span class="source-line-no">012</span><span id="line-12">/**</span>
-<span class="source-line-no">013</span><span id="line-13"> * Configuration class for JSON-RPC client. Contains complete URL, username, and password.</span>
-<span class="source-line-no">014</span><span id="line-14"> */</span>
-<span class="source-line-no">015</span><span id="line-15">public class RpcConfig {</span>
-<span class="source-line-no">016</span><span id="line-16"></span>
-<span class="source-line-no">017</span><span id="line-17">    private final Network network;</span>
-<span class="source-line-no">018</span><span id="line-18">    private final URI uri;</span>
-<span class="source-line-no">019</span><span id="line-19">    private final String   username;</span>
-<span class="source-line-no">020</span><span id="line-20">    private final String   password;</span>
-<span class="source-line-no">021</span><span id="line-21"></span>
-<span class="source-line-no">022</span><span id="line-22">    @Deprecated</span>
-<span class="source-line-no">023</span><span id="line-23">    public RpcConfig(NetworkParameters netParams, URI uri, String username, String password) {</span>
-<span class="source-line-no">024</span><span id="line-24">        this(netParams.network(), uri, username, password);</span>
-<span class="source-line-no">025</span><span id="line-25">    }</span>
-<span class="source-line-no">026</span><span id="line-26"></span>
-<span class="source-line-no">027</span><span id="line-27">    public RpcConfig(Network network, URI uri, String username, String password) {</span>
-<span class="source-line-no">028</span><span id="line-28">        this.network = network;</span>
-<span class="source-line-no">029</span><span id="line-29">        this.uri = uri;</span>
-<span class="source-line-no">030</span><span id="line-30">        this.username = username;</span>
-<span class="source-line-no">031</span><span id="line-31">        this.password = password;</span>
-<span class="source-line-no">032</span><span id="line-32">    }</span>
-<span class="source-line-no">033</span><span id="line-33"></span>
-<span class="source-line-no">034</span><span id="line-34">    public RpcConfig(String netIdString,  URI uri, String username, String password) {</span>
-<span class="source-line-no">035</span><span id="line-35">        this(BitcoinNetwork.fromIdString(netIdString).orElseThrow(() -&gt; new IllegalArgumentException("invalid network string")),</span>
-<span class="source-line-no">036</span><span id="line-36">                uri,</span>
-<span class="source-line-no">037</span><span id="line-37">                username,</span>
-<span class="source-line-no">038</span><span id="line-38">                password);</span>
-<span class="source-line-no">039</span><span id="line-39">    }</span>
-<span class="source-line-no">040</span><span id="line-40"></span>
-<span class="source-line-no">041</span><span id="line-41">    @JsonCreator</span>
-<span class="source-line-no">042</span><span id="line-42">    public RpcConfig(@JsonProperty("netid")     String netIdString,</span>
-<span class="source-line-no">043</span><span id="line-43">                     @JsonProperty("uri")       String uri,</span>
-<span class="source-line-no">044</span><span id="line-44">                     @JsonProperty("username")  String username,</span>
-<span class="source-line-no">045</span><span id="line-45">                     @JsonProperty("password")  String password)  {</span>
-<span class="source-line-no">046</span><span id="line-46">        this(BitcoinNetwork.fromIdString(netIdString).orElseThrow(() -&gt; new IllegalArgumentException("invalid network string")),</span>
-<span class="source-line-no">047</span><span id="line-47">                URI.create(uri),</span>
-<span class="source-line-no">048</span><span id="line-48">                username,</span>
-<span class="source-line-no">049</span><span id="line-49">                password);</span>
-<span class="source-line-no">050</span><span id="line-50">    }</span>
-<span class="source-line-no">051</span><span id="line-51"></span>
-<span class="source-line-no">052</span><span id="line-52">    @JsonIgnore</span>
-<span class="source-line-no">053</span><span id="line-53">    public Network network() {</span>
-<span class="source-line-no">054</span><span id="line-54">        return network;</span>
-<span class="source-line-no">055</span><span id="line-55">    }</span>
-<span class="source-line-no">056</span><span id="line-56"></span>
-<span class="source-line-no">057</span><span id="line-57">    /**</span>
-<span class="source-line-no">058</span><span id="line-58">     * @deprecated Use {@link #network()}</span>
-<span class="source-line-no">059</span><span id="line-59">     */</span>
-<span class="source-line-no">060</span><span id="line-60">    @Deprecated</span>
-<span class="source-line-no">061</span><span id="line-61">    @JsonIgnore</span>
-<span class="source-line-no">062</span><span id="line-62">    public NetworkParameters getNetParams() {</span>
-<span class="source-line-no">063</span><span id="line-63">        return NetworkParameters.of(network);</span>
-<span class="source-line-no">064</span><span id="line-64">    }</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66">    @JsonProperty("netid")</span>
-<span class="source-line-no">067</span><span id="line-67">    public String getNetIdString() {</span>
-<span class="source-line-no">068</span><span id="line-68">        return network.id();</span>
-<span class="source-line-no">069</span><span id="line-69">    }</span>
-<span class="source-line-no">070</span><span id="line-70"></span>
-<span class="source-line-no">071</span><span id="line-71">    public URI getURI() {</span>
-<span class="source-line-no">072</span><span id="line-72">        return uri;</span>
-<span class="source-line-no">073</span><span id="line-73">    }</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75">    public String getUsername() {</span>
-<span class="source-line-no">076</span><span id="line-76">        return username;</span>
-<span class="source-line-no">077</span><span id="line-77">    }</span>
-<span class="source-line-no">078</span><span id="line-78"></span>
-<span class="source-line-no">079</span><span id="line-79">    public String getPassword() {</span>
-<span class="source-line-no">080</span><span id="line-80">        return password;</span>
-<span class="source-line-no">081</span><span id="line-81">    }</span>
-<span class="source-line-no">082</span><span id="line-82">}</span>
+<span class="source-line-no">008</span><span id="line-8"></span>
+<span class="source-line-no">009</span><span id="line-9">import java.net.URI;</span>
+<span class="source-line-no">010</span><span id="line-10"></span>
+<span class="source-line-no">011</span><span id="line-11">/**</span>
+<span class="source-line-no">012</span><span id="line-12"> * Configuration class for JSON-RPC client. Contains complete URL, username, and password.</span>
+<span class="source-line-no">013</span><span id="line-13"> */</span>
+<span class="source-line-no">014</span><span id="line-14">public class RpcConfig {</span>
+<span class="source-line-no">015</span><span id="line-15"></span>
+<span class="source-line-no">016</span><span id="line-16">    private final Network network;</span>
+<span class="source-line-no">017</span><span id="line-17">    private final URI uri;</span>
+<span class="source-line-no">018</span><span id="line-18">    private final String   username;</span>
+<span class="source-line-no">019</span><span id="line-19">    private final String   password;</span>
+<span class="source-line-no">020</span><span id="line-20"></span>
+<span class="source-line-no">021</span><span id="line-21">    public RpcConfig(Network network, URI uri, String username, String password) {</span>
+<span class="source-line-no">022</span><span id="line-22">        this.network = network;</span>
+<span class="source-line-no">023</span><span id="line-23">        this.uri = uri;</span>
+<span class="source-line-no">024</span><span id="line-24">        this.username = username;</span>
+<span class="source-line-no">025</span><span id="line-25">        this.password = password;</span>
+<span class="source-line-no">026</span><span id="line-26">    }</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    public RpcConfig(String netIdString,  URI uri, String username, String password) {</span>
+<span class="source-line-no">029</span><span id="line-29">        this(BitcoinNetwork.fromIdString(netIdString).orElseThrow(() -&gt; new IllegalArgumentException("invalid network string")),</span>
+<span class="source-line-no">030</span><span id="line-30">                uri,</span>
+<span class="source-line-no">031</span><span id="line-31">                username,</span>
+<span class="source-line-no">032</span><span id="line-32">                password);</span>
+<span class="source-line-no">033</span><span id="line-33">    }</span>
+<span class="source-line-no">034</span><span id="line-34"></span>
+<span class="source-line-no">035</span><span id="line-35">    @JsonCreator</span>
+<span class="source-line-no">036</span><span id="line-36">    public RpcConfig(@JsonProperty("netid")     String netIdString,</span>
+<span class="source-line-no">037</span><span id="line-37">                     @JsonProperty("uri")       String uri,</span>
+<span class="source-line-no">038</span><span id="line-38">                     @JsonProperty("username")  String username,</span>
+<span class="source-line-no">039</span><span id="line-39">                     @JsonProperty("password")  String password)  {</span>
+<span class="source-line-no">040</span><span id="line-40">        this(BitcoinNetwork.fromIdString(netIdString).orElseThrow(() -&gt; new IllegalArgumentException("invalid network string")),</span>
+<span class="source-line-no">041</span><span id="line-41">                URI.create(uri),</span>
+<span class="source-line-no">042</span><span id="line-42">                username,</span>
+<span class="source-line-no">043</span><span id="line-43">                password);</span>
+<span class="source-line-no">044</span><span id="line-44">    }</span>
+<span class="source-line-no">045</span><span id="line-45"></span>
+<span class="source-line-no">046</span><span id="line-46">    @JsonIgnore</span>
+<span class="source-line-no">047</span><span id="line-47">    public Network network() {</span>
+<span class="source-line-no">048</span><span id="line-48">        return network;</span>
+<span class="source-line-no">049</span><span id="line-49">    }</span>
+<span class="source-line-no">050</span><span id="line-50"></span>
+<span class="source-line-no">051</span><span id="line-51">    @JsonProperty("netid")</span>
+<span class="source-line-no">052</span><span id="line-52">    public String getNetIdString() {</span>
+<span class="source-line-no">053</span><span id="line-53">        return network.id();</span>
+<span class="source-line-no">054</span><span id="line-54">    }</span>
+<span class="source-line-no">055</span><span id="line-55"></span>
+<span class="source-line-no">056</span><span id="line-56">    public URI getURI() {</span>
+<span class="source-line-no">057</span><span id="line-57">        return uri;</span>
+<span class="source-line-no">058</span><span id="line-58">    }</span>
+<span class="source-line-no">059</span><span id="line-59"></span>
+<span class="source-line-no">060</span><span id="line-60">    public String getUsername() {</span>
+<span class="source-line-no">061</span><span id="line-61">        return username;</span>
+<span class="source-line-no">062</span><span id="line-62">    }</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64">    public String getPassword() {</span>
+<span class="source-line-no">065</span><span id="line-65">        return password;</span>
+<span class="source-line-no">066</span><span id="line-66">    }</span>
+<span class="source-line-no">067</span><span id="line-67">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/RpcURI.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/RpcURI.html
index 4fea30714..4a395cdce 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/RpcURI.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/RpcURI.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc, interface: RpcURI">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html
index 1863a00bf..1893e95de 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConf.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.bitcoind, class: BitcoinConf">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConfFile.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConfFile.html
index d3800fda1..2dbff92d1 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConfFile.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/bitcoind/BitcoinConfFile.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.bitcoind, class: BitcoinConfFile">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/internal/BitcoinClientThreadFactory.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/internal/BitcoinClientThreadFactory.html
index 3372c1231..8db3c463c 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/internal/BitcoinClientThreadFactory.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/internal/BitcoinClientThreadFactory.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.internal, class: BitcoinClientThreadFactory">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html
new file mode 100644
index 000000000..d0120e312
--- /dev/null
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BTCTestSupport.html
@@ -0,0 +1,106 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Source code</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, interface: BTCTestSupport">
+<meta name="generator" content="javadoc/SourceToHTMLConverter">
+<link rel="stylesheet" type="text/css" href="../../../../../../stylesheet.css" title="Style">
+</head>
+<body class="source-page">
+<main role="main">
+<div class="source-container">
+<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.jsonrpc.test;</span>
+<span class="source-line-no">002</span><span id="line-2"></span>
+<span class="source-line-no">003</span><span id="line-3">import org.bitcoinj.base.Network;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.consensusj.jsonrpc.JsonRpcException;</span>
+<span class="source-line-no">005</span><span id="line-5"></span>
+<span class="source-line-no">006</span><span id="line-6">import java.time.Duration;</span>
+<span class="source-line-no">007</span><span id="line-7"></span>
+<span class="source-line-no">008</span><span id="line-8">/**</span>
+<span class="source-line-no">009</span><span id="line-9"> * Test support functions intended to be mixed-in to Spock test specs</span>
+<span class="source-line-no">010</span><span id="line-10"> */</span>
+<span class="source-line-no">011</span><span id="line-11">public interface BTCTestSupport extends BitcoinClientAccessor {</span>
+<span class="source-line-no">012</span><span id="line-12"></span>
+<span class="source-line-no">013</span><span id="line-13">    /**</span>
+<span class="source-line-no">014</span><span id="line-14">     * Wait for the server to become ready and validate the Bitcoin network it is running on</span>
+<span class="source-line-no">015</span><span id="line-15">     * @param expectedNetwork The network the server is expected to be running on</span>
+<span class="source-line-no">016</span><span id="line-16">     */</span>
+<span class="source-line-no">017</span><span id="line-17">    default void serverReady(Network expectedNetwork) throws JsonRpcException {</span>
+<span class="source-line-no">018</span><span id="line-18">        Boolean ready = client().waitForServer(Duration.ofSeconds(60));   // Wait up to 1 minute</span>
+<span class="source-line-no">019</span><span id="line-19">        if (!ready) {</span>
+<span class="source-line-no">020</span><span id="line-20">            throw new RuntimeException("Timeout waiting for server");</span>
+<span class="source-line-no">021</span><span id="line-21">        }</span>
+<span class="source-line-no">022</span><span id="line-22">        // As soon as the server is ready we must initialize network parameters in the client (by querying them)</span>
+<span class="source-line-no">023</span><span id="line-23">        Network network = client().getNetwork();</span>
+<span class="source-line-no">024</span><span id="line-24">        if (!network.equals(expectedNetwork)) {</span>
+<span class="source-line-no">025</span><span id="line-25">            throw new IllegalStateException("Server reports unexpected Bitcoin network.");</span>
+<span class="source-line-no">026</span><span id="line-26">        }</span>
+<span class="source-line-no">027</span><span id="line-27">    }</span>
+<span class="source-line-no">028</span><span id="line-28">}</span>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</main>
+</body>
+</html>
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html
index fd62b2573..b3042d175 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BitcoinClientAccessor.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, interface: BitcoinClientAccessor">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html
index 4051fd89b..4e12cb073 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BlockChainEnvironment.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, interface: BlockChainEnvironment">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html
index b7ea49362..2f1ecba0f 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/BlockchainSyncing.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, interface: BlockchainSyncing">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/FundingSource.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/FundingSource.html
index 1f837a858..0f4e756bb 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/FundingSource.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/FundingSource.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, interface: FundingSource">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/FundingSourceAccessor.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/FundingSourceAccessor.html
index 1c68888b7..b01b08b7c 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/FundingSourceAccessor.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/FundingSourceAccessor.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, interface: FundingSourceAccessor">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html
index c8d550691..6671ec86b 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestEnvironment.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, class: RegTestEnvironment">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestFundingSource.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestFundingSource.html
index 40b52ea40..7fa7ae20d 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestFundingSource.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/RegTestFundingSource.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, class: RegTestFundingSource">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/TestServers.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/TestServers.html
index 34e88436b..5add2d171 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/TestServers.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/TestServers.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, class: TestServers">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/TransactionIngredients.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/TransactionIngredients.html
index 47af50c6d..e9be950b1 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/TransactionIngredients.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/TransactionIngredients.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, class: TransactionIngredients">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/WalletTestUtil.html b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/WalletTestUtil.html
index af6f47b09..d19ab60cf 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/WalletTestUtil.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/jsonrpc/test/WalletTestUtil.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.jsonrpc.test, class: WalletTestUtil">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html b/apidoc/src-html/org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html
new file mode 100644
index 000000000..00a4dc99f
--- /dev/null
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/ChainTipPublisher.Wrapper.html
@@ -0,0 +1,111 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Source code</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="source: package: org.consensusj.bitcoin.rx, interface: ChainTipPublisher, class: Wrapper">
+<meta name="generator" content="javadoc/SourceToHTMLConverter">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body class="source-page">
+<main role="main">
+<div class="source-container">
+<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx;</span>
+<span class="source-line-no">002</span><span id="line-2"></span>
+<span class="source-line-no">003</span><span id="line-3">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">005</span><span id="line-5">import org.reactivestreams.Subscriber;</span>
+<span class="source-line-no">006</span><span id="line-6"></span>
+<span class="source-line-no">007</span><span id="line-7">/**</span>
+<span class="source-line-no">008</span><span id="line-8"> * Marker type for {@code Publisher&lt;ChainTip&gt;}. In a future release this may use {@link java.util.concurrent.Flow.Publisher}.</span>
+<span class="source-line-no">009</span><span id="line-9"> * Because of type erasure in Java generics we need this to strongly type parameters that require a {@code Publisher&lt;ChainTip&gt;}.</span>
+<span class="source-line-no">010</span><span id="line-10"> */</span>
+<span class="source-line-no">011</span><span id="line-11">public interface ChainTipPublisher extends Publisher&lt;ChainTip&gt; {</span>
+<span class="source-line-no">012</span><span id="line-12">    /**</span>
+<span class="source-line-no">013</span><span id="line-13">     * Adapt a {@code Publisher&lt;ChainTip}</span>
+<span class="source-line-no">014</span><span id="line-14">     * @param publisher to wrap</span>
+<span class="source-line-no">015</span><span id="line-15">     * @return wrapped publisher</span>
+<span class="source-line-no">016</span><span id="line-16">     */</span>
+<span class="source-line-no">017</span><span id="line-17">    static ChainTipPublisher of(Publisher&lt;ChainTip&gt; publisher) {</span>
+<span class="source-line-no">018</span><span id="line-18">        return new Wrapper(publisher);</span>
+<span class="source-line-no">019</span><span id="line-19">    }</span>
+<span class="source-line-no">020</span><span id="line-20">    </span>
+<span class="source-line-no">021</span><span id="line-21">    class Wrapper implements ChainTipPublisher {</span>
+<span class="source-line-no">022</span><span id="line-22">        private final Publisher&lt;ChainTip&gt; publisher;</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">        Wrapper(Publisher&lt;ChainTip&gt; publisher) {</span>
+<span class="source-line-no">025</span><span id="line-25">            this.publisher = publisher;</span>
+<span class="source-line-no">026</span><span id="line-26">        }</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">        @Override</span>
+<span class="source-line-no">029</span><span id="line-29">        public void subscribe(Subscriber&lt;? super ChainTip&gt; s) {</span>
+<span class="source-line-no">030</span><span id="line-30">            publisher.subscribe(s);</span>
+<span class="source-line-no">031</span><span id="line-31">        }</span>
+<span class="source-line-no">032</span><span id="line-32">    }</span>
+<span class="source-line-no">033</span><span id="line-33">}</span>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</main>
+</body>
+</html>
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/ChainTipPublisher.html b/apidoc/src-html/org/consensusj/bitcoin/rx/ChainTipPublisher.html
new file mode 100644
index 000000000..bbef0f91a
--- /dev/null
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/ChainTipPublisher.html
@@ -0,0 +1,111 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Source code</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="source: package: org.consensusj.bitcoin.rx, interface: ChainTipPublisher">
+<meta name="generator" content="javadoc/SourceToHTMLConverter">
+<link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
+</head>
+<body class="source-page">
+<main role="main">
+<div class="source-container">
+<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx;</span>
+<span class="source-line-no">002</span><span id="line-2"></span>
+<span class="source-line-no">003</span><span id="line-3">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">005</span><span id="line-5">import org.reactivestreams.Subscriber;</span>
+<span class="source-line-no">006</span><span id="line-6"></span>
+<span class="source-line-no">007</span><span id="line-7">/**</span>
+<span class="source-line-no">008</span><span id="line-8"> * Marker type for {@code Publisher&lt;ChainTip&gt;}. In a future release this may use {@link java.util.concurrent.Flow.Publisher}.</span>
+<span class="source-line-no">009</span><span id="line-9"> * Because of type erasure in Java generics we need this to strongly type parameters that require a {@code Publisher&lt;ChainTip&gt;}.</span>
+<span class="source-line-no">010</span><span id="line-10"> */</span>
+<span class="source-line-no">011</span><span id="line-11">public interface ChainTipPublisher extends Publisher&lt;ChainTip&gt; {</span>
+<span class="source-line-no">012</span><span id="line-12">    /**</span>
+<span class="source-line-no">013</span><span id="line-13">     * Adapt a {@code Publisher&lt;ChainTip}</span>
+<span class="source-line-no">014</span><span id="line-14">     * @param publisher to wrap</span>
+<span class="source-line-no">015</span><span id="line-15">     * @return wrapped publisher</span>
+<span class="source-line-no">016</span><span id="line-16">     */</span>
+<span class="source-line-no">017</span><span id="line-17">    static ChainTipPublisher of(Publisher&lt;ChainTip&gt; publisher) {</span>
+<span class="source-line-no">018</span><span id="line-18">        return new Wrapper(publisher);</span>
+<span class="source-line-no">019</span><span id="line-19">    }</span>
+<span class="source-line-no">020</span><span id="line-20">    </span>
+<span class="source-line-no">021</span><span id="line-21">    class Wrapper implements ChainTipPublisher {</span>
+<span class="source-line-no">022</span><span id="line-22">        private final Publisher&lt;ChainTip&gt; publisher;</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">        Wrapper(Publisher&lt;ChainTip&gt; publisher) {</span>
+<span class="source-line-no">025</span><span id="line-25">            this.publisher = publisher;</span>
+<span class="source-line-no">026</span><span id="line-26">        }</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">        @Override</span>
+<span class="source-line-no">029</span><span id="line-29">        public void subscribe(Subscriber&lt;? super ChainTip&gt; s) {</span>
+<span class="source-line-no">030</span><span id="line-30">            publisher.subscribe(s);</span>
+<span class="source-line-no">031</span><span id="line-31">        }</span>
+<span class="source-line-no">032</span><span id="line-32">    }</span>
+<span class="source-line-no">033</span><span id="line-33">}</span>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</main>
+</body>
+</html>
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/ChainTipService.html b/apidoc/src-html/org/consensusj/bitcoin/rx/ChainTipService.html
index 3891aac40..ddf5916ac 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/ChainTipService.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/ChainTipService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx, interface: ChainTipService">
@@ -25,7 +25,7 @@
 <span class="source-line-no">012</span><span id="line-12">     *</span>
 <span class="source-line-no">013</span><span id="line-13">     * @return A Publisher for the sequence</span>
 <span class="source-line-no">014</span><span id="line-14">     */</span>
-<span class="source-line-no">015</span><span id="line-15">    Publisher&lt;ChainTip&gt; chainTipPublisher();</span>
+<span class="source-line-no">015</span><span id="line-15">    ChainTipPublisher chainTipPublisher();</span>
 <span class="source-line-no">016</span><span id="line-16">}</span>
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/RxBlockchainBinaryService.html b/apidoc/src-html/org/consensusj/bitcoin/rx/RxBlockchainBinaryService.html
index 3b31432ee..48a8d2796 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/RxBlockchainBinaryService.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/RxBlockchainBinaryService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx, interface: RxBlockchainBinaryService">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/RxBlockchainService.html b/apidoc/src-html/org/consensusj/bitcoin/rx/RxBlockchainService.html
index 04b46fe6c..5a98c1d11 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/RxBlockchainService.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/RxBlockchainService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx, interface: RxBlockchainService">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html
index 61b3a94ed..59b643bfe 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.jsonrpc, interface: PollingChainTipService">
@@ -14,42 +14,58 @@
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.BackpressureStrategy;</span>
-<span class="source-line-no">004</span><span id="line-4">import io.reactivex.rxjava3.core.Flowable;</span>
+<span class="source-line-no">004</span><span id="line-4">import io.reactivex.rxjava3.core.Maybe;</span>
 <span class="source-line-no">005</span><span id="line-5">import io.reactivex.rxjava3.core.Observable;</span>
 <span class="source-line-no">006</span><span id="line-6">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
-<span class="source-line-no">007</span><span id="line-7">import org.slf4j.Logger;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">009</span><span id="line-9"></span>
-<span class="source-line-no">010</span><span id="line-10">/**</span>
-<span class="source-line-no">011</span><span id="line-11"> * Interface with {@link PollingChainTipService#pollForDistinctChainTip()} method.</span>
-<span class="source-line-no">012</span><span id="line-12"> */</span>
-<span class="source-line-no">013</span><span id="line-13">public interface PollingChainTipService extends RxJsonChainTipClient {</span>
-<span class="source-line-no">014</span><span id="line-14">    Logger log = LoggerFactory.getLogger(PollingChainTipService.class);</span>
-<span class="source-line-no">015</span><span id="line-15"></span>
-<span class="source-line-no">016</span><span id="line-16">    /**</span>
-<span class="source-line-no">017</span><span id="line-17">     * Implement this method to provide a polling interval</span>
-<span class="source-line-no">018</span><span id="line-18">     *</span>
-<span class="source-line-no">019</span><span id="line-19">     * @return polling interval with desired frequency for polling for new ChainTips.</span>
-<span class="source-line-no">020</span><span id="line-20">     */</span>
-<span class="source-line-no">021</span><span id="line-21">    Observable&lt;Long&gt; getPollingInterval();</span>
-<span class="source-line-no">022</span><span id="line-22"></span>
-<span class="source-line-no">023</span><span id="line-23">    /**</span>
-<span class="source-line-no">024</span><span id="line-24">     * Using a polling interval provided by {@link PollingChainTipService#getPollingInterval()} provide a</span>
-<span class="source-line-no">025</span><span id="line-25">     * stream of distinct {@link ChainTip}s.</span>
-<span class="source-line-no">026</span><span id="line-26">     *</span>
-<span class="source-line-no">027</span><span id="line-27">     * @return A stream of distinct {@code ChainTip}s.</span>
-<span class="source-line-no">028</span><span id="line-28">     */</span>
-<span class="source-line-no">029</span><span id="line-29">    default Flowable&lt;ChainTip&gt; pollForDistinctChainTip() {</span>
-<span class="source-line-no">030</span><span id="line-30">        return getPollingInterval()</span>
-<span class="source-line-no">031</span><span id="line-31">                .doOnNext(t -&gt; log.debug("got interval"))</span>
-<span class="source-line-no">032</span><span id="line-32">                .flatMapMaybe(t -&gt; this.currentChainTipMaybe())</span>
-<span class="source-line-no">033</span><span id="line-33">                .doOnNext(tip -&gt; log.debug("blockheight, blockhash = {}, {}", tip.getHeight(), tip.getHash()))</span>
-<span class="source-line-no">034</span><span id="line-34">                .distinctUntilChanged(ChainTip::getHash)</span>
-<span class="source-line-no">035</span><span id="line-35">                .doOnNext(tip -&gt; log.info("** NEW ** blockheight, blockhash = {}, {}", tip.getHeight(), tip.getHash()))</span>
-<span class="source-line-no">036</span><span id="line-36">                // ERROR backpressure strategy is compatible with BehaviorProcessor since it subscribes to MAX items</span>
-<span class="source-line-no">037</span><span id="line-37">                .toFlowable(BackpressureStrategy.ERROR);</span>
-<span class="source-line-no">038</span><span id="line-38">    }</span>
-<span class="source-line-no">039</span><span id="line-39">}</span>
+<span class="source-line-no">007</span><span id="line-7">import org.consensusj.bitcoin.jsonrpc.ChainTipClient;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.consensusj.bitcoin.rx.ChainTipService;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.consensusj.rx.jsonrpc.RxJsonRpcClient;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">011</span><span id="line-11">import org.slf4j.Logger;</span>
+<span class="source-line-no">012</span><span id="line-12">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">013</span><span id="line-13"></span>
+<span class="source-line-no">014</span><span id="line-14">/**</span>
+<span class="source-line-no">015</span><span id="line-15"> * Interface with {@link PollingChainTipService#pollForDistinctChainTip()} method.</span>
+<span class="source-line-no">016</span><span id="line-16"> * @deprecated Use the {@link PollingChainTipServiceImpl} implementation</span>
+<span class="source-line-no">017</span><span id="line-17"> */</span>
+<span class="source-line-no">018</span><span id="line-18">@Deprecated</span>
+<span class="source-line-no">019</span><span id="line-19">public interface PollingChainTipService extends ChainTipService, ChainTipClient, RxJsonRpcClient {</span>
+<span class="source-line-no">020</span><span id="line-20">    Logger log = LoggerFactory.getLogger(PollingChainTipService.class);</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">    /**</span>
+<span class="source-line-no">023</span><span id="line-23">     * Implement this method to provide a polling interval</span>
+<span class="source-line-no">024</span><span id="line-24">     *</span>
+<span class="source-line-no">025</span><span id="line-25">     * @return polling interval with desired frequency for polling for new ChainTips.</span>
+<span class="source-line-no">026</span><span id="line-26">     */</span>
+<span class="source-line-no">027</span><span id="line-27">    Observable&lt;Long&gt; getPollingInterval();</span>
+<span class="source-line-no">028</span><span id="line-28"></span>
+<span class="source-line-no">029</span><span id="line-29">    /**</span>
+<span class="source-line-no">030</span><span id="line-30">     * Using a polling interval provided by {@link PollingChainTipService#getPollingInterval()} provide a</span>
+<span class="source-line-no">031</span><span id="line-31">     * stream of distinct {@link ChainTip}s.</span>
+<span class="source-line-no">032</span><span id="line-32">     *</span>
+<span class="source-line-no">033</span><span id="line-33">     * @return A stream of distinct {@code ChainTip}s.</span>
+<span class="source-line-no">034</span><span id="line-34">     */</span>
+<span class="source-line-no">035</span><span id="line-35">    default Publisher&lt;ChainTip&gt; pollForDistinctChainTip() {</span>
+<span class="source-line-no">036</span><span id="line-36">        return getPollingInterval()</span>
+<span class="source-line-no">037</span><span id="line-37">                .doOnNext(t -&gt; log.debug("got interval"))</span>
+<span class="source-line-no">038</span><span id="line-38">                .flatMapMaybe(t -&gt; this.currentChainTipMaybe())</span>
+<span class="source-line-no">039</span><span id="line-39">                .doOnNext(tip -&gt; log.debug("blockheight, blockhash = {}, {}", tip.getHeight(), tip.getHash()))</span>
+<span class="source-line-no">040</span><span id="line-40">                .distinctUntilChanged(ChainTip::getHash)</span>
+<span class="source-line-no">041</span><span id="line-41">                .doOnNext(tip -&gt; log.info("** NEW ** blockheight, blockhash = {}, {}", tip.getHeight(), tip.getHash()))</span>
+<span class="source-line-no">042</span><span id="line-42">                // ERROR backpressure strategy is compatible with BehaviorProcessor since it subscribes to MAX items</span>
+<span class="source-line-no">043</span><span id="line-43">                .toFlowable(BackpressureStrategy.ERROR);</span>
+<span class="source-line-no">044</span><span id="line-44">    }</span>
+<span class="source-line-no">045</span><span id="line-45"></span>
+<span class="source-line-no">046</span><span id="line-46">    /**</span>
+<span class="source-line-no">047</span><span id="line-47">     * Get the active chain tip if there is one (useful for polling clients)</span>
+<span class="source-line-no">048</span><span id="line-48">     *</span>
+<span class="source-line-no">049</span><span id="line-49">     * @return The active ChainTip if available (onSuccess) otherwise onComplete (if not available) or onError (if error occurred)</span>
+<span class="source-line-no">050</span><span id="line-50">     */</span>
+<span class="source-line-no">051</span><span id="line-51">    private Maybe&lt;ChainTip&gt; currentChainTipMaybe() {</span>
+<span class="source-line-no">052</span><span id="line-52">        return pollOnceAsync(this::getChainTipsAsync)</span>
+<span class="source-line-no">053</span><span id="line-53">                .mapOptional(ChainTip::findActiveChainTip);</span>
+<span class="source-line-no">054</span><span id="line-54">    }</span>
+<span class="source-line-no">055</span><span id="line-55">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html
index 7fdf6c0d3..5619e98f4 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/PollingChainTipServiceImpl.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.jsonrpc, class: PollingChainTipServiceImpl">
@@ -13,79 +13,134 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
+<span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.BackpressureStrategy;</span>
 <span class="source-line-no">004</span><span id="line-4">import io.reactivex.rxjava3.core.Flowable;</span>
 <span class="source-line-no">005</span><span id="line-5">import io.reactivex.rxjava3.core.Observable;</span>
 <span class="source-line-no">006</span><span id="line-6">import io.reactivex.rxjava3.disposables.Disposable;</span>
 <span class="source-line-no">007</span><span id="line-7">import io.reactivex.rxjava3.processors.BehaviorProcessor;</span>
 <span class="source-line-no">008</span><span id="line-8">import io.reactivex.rxjava3.processors.FlowableProcessor;</span>
-<span class="source-line-no">009</span><span id="line-9">import org.consensusj.bitcoin.jsonrpc.BitcoinClient;</span>
-<span class="source-line-no">010</span><span id="line-10">import org.consensusj.jsonrpc.JsonRpcStatusException;</span>
-<span class="source-line-no">011</span><span id="line-11">import org.reactivestreams.Publisher;</span>
-<span class="source-line-no">012</span><span id="line-12">import org.slf4j.Logger;</span>
-<span class="source-line-no">013</span><span id="line-13">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">014</span><span id="line-14"></span>
-<span class="source-line-no">015</span><span id="line-15">import java.io.Closeable;</span>
-<span class="source-line-no">016</span><span id="line-16">import java.io.IOException;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.util.List;</span>
-<span class="source-line-no">018</span><span id="line-18">import java.util.concurrent.TimeUnit;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.consensusj.bitcoin.jsonrpc.BitcoinClient;</span>
+<span class="source-line-no">011</span><span id="line-11">import org.consensusj.bitcoin.jsonrpc.ChainTipClient;</span>
+<span class="source-line-no">012</span><span id="line-12">import org.consensusj.bitcoin.rx.ChainTipPublisher;</span>
+<span class="source-line-no">013</span><span id="line-13">import org.consensusj.bitcoin.rx.ChainTipService;</span>
+<span class="source-line-no">014</span><span id="line-14">import org.consensusj.jsonrpc.JsonRpcStatusException;</span>
+<span class="source-line-no">015</span><span id="line-15">import org.consensusj.rx.jsonrpc.RxJsonRpcClient;</span>
+<span class="source-line-no">016</span><span id="line-16">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">017</span><span id="line-17">import org.slf4j.Logger;</span>
+<span class="source-line-no">018</span><span id="line-18">import org.slf4j.LoggerFactory;</span>
 <span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">/**</span>
-<span class="source-line-no">021</span><span id="line-21"> * Implementation of {@link PollingChainTipService} using a {@link BitcoinClient} and a polling interval.</span>
-<span class="source-line-no">022</span><span id="line-22"> * This can be used as a fallback if ZeroMQ is not available</span>
-<span class="source-line-no">023</span><span id="line-23"> */</span>
-<span class="source-line-no">024</span><span id="line-24">public class PollingChainTipServiceImpl implements Closeable, PollingChainTipService {</span>
-<span class="source-line-no">025</span><span id="line-25">    private static final Logger log = LoggerFactory.getLogger(PollingChainTipServiceImpl.class);</span>
-<span class="source-line-no">026</span><span id="line-26">    private final BitcoinClient client;</span>
-<span class="source-line-no">027</span><span id="line-27">    private final Observable&lt;Long&gt; interval;</span>
-<span class="source-line-no">028</span><span id="line-28">    // How will we properly use backpressure here?</span>
-<span class="source-line-no">029</span><span id="line-29">    private final Flowable&lt;ChainTip&gt; chainTipSource;</span>
-<span class="source-line-no">030</span><span id="line-30">    private Disposable chainTipSubscription;</span>
-<span class="source-line-no">031</span><span id="line-31">    private final FlowableProcessor&lt;ChainTip&gt; chainTipProcessor = BehaviorProcessor.create();</span>
-<span class="source-line-no">032</span><span id="line-32"></span>
-<span class="source-line-no">033</span><span id="line-33">    /**</span>
-<span class="source-line-no">034</span><span id="line-34">     * Construct from a {@link BitcoinClient} or subclass and a polling interval</span>
-<span class="source-line-no">035</span><span id="line-35">     * @param bitcoinClient a client instance</span>
-<span class="source-line-no">036</span><span id="line-36">     * @param interval a polling interval</span>
-<span class="source-line-no">037</span><span id="line-37">     */</span>
-<span class="source-line-no">038</span><span id="line-38">    public PollingChainTipServiceImpl(BitcoinClient bitcoinClient, Observable&lt;Long&gt; interval) {</span>
-<span class="source-line-no">039</span><span id="line-39">        client = bitcoinClient;</span>
-<span class="source-line-no">040</span><span id="line-40">        this.interval = interval;</span>
-<span class="source-line-no">041</span><span id="line-41">        log.info("Constructing polling ChainTipService: {}, {}", client.getNetwork().id(), client.getServerURI());</span>
-<span class="source-line-no">042</span><span id="line-42">        chainTipSource = pollForDistinctChainTip();</span>
-<span class="source-line-no">043</span><span id="line-43">    }</span>
-<span class="source-line-no">044</span><span id="line-44"></span>
-<span class="source-line-no">045</span><span id="line-45">    public PollingChainTipServiceImpl(BitcoinClient bitcoinClient) {</span>
-<span class="source-line-no">046</span><span id="line-46">        this(bitcoinClient, Observable.interval(2,10, TimeUnit.SECONDS));</span>
-<span class="source-line-no">047</span><span id="line-47">    }</span>
-<span class="source-line-no">048</span><span id="line-48"></span>
-<span class="source-line-no">049</span><span id="line-49">    public synchronized void start() {</span>
-<span class="source-line-no">050</span><span id="line-50">        if (chainTipSubscription == null) {</span>
-<span class="source-line-no">051</span><span id="line-51">            chainTipSubscription = chainTipSource.subscribe(chainTipProcessor::onNext, chainTipProcessor::onError, chainTipProcessor::onComplete);</span>
-<span class="source-line-no">052</span><span id="line-52">        }</span>
-<span class="source-line-no">053</span><span id="line-53">    }</span>
-<span class="source-line-no">054</span><span id="line-54"></span>
-<span class="source-line-no">055</span><span id="line-55">    @Override</span>
-<span class="source-line-no">056</span><span id="line-56">    public Publisher&lt;ChainTip&gt; chainTipPublisher() {</span>
-<span class="source-line-no">057</span><span id="line-57">        start();</span>
-<span class="source-line-no">058</span><span id="line-58">        return chainTipProcessor;</span>
-<span class="source-line-no">059</span><span id="line-59">    }</span>
-<span class="source-line-no">060</span><span id="line-60"></span>
-<span class="source-line-no">061</span><span id="line-61">    @Override</span>
-<span class="source-line-no">062</span><span id="line-62">    public Observable&lt;Long&gt; getPollingInterval() {</span>
-<span class="source-line-no">063</span><span id="line-63">        return interval;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.io.Closeable;</span>
+<span class="source-line-no">021</span><span id="line-21">import java.io.IOError;</span>
+<span class="source-line-no">022</span><span id="line-22">import java.io.IOException;</span>
+<span class="source-line-no">023</span><span id="line-23">import java.util.List;</span>
+<span class="source-line-no">024</span><span id="line-24">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">025</span><span id="line-25">import java.util.concurrent.Flow;</span>
+<span class="source-line-no">026</span><span id="line-26">import java.util.concurrent.TimeUnit;</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">// TODO: Rewrite using ScheduledThreadExecutor (instead of an Observable interval) and SubmissionPublisher instead of FlowableProcessor.</span>
+<span class="source-line-no">029</span><span id="line-29">//  Then we can merge it into BitcoinClient (as a default component.)</span>
+<span class="source-line-no">030</span><span id="line-30">//  We may need to use atomic object (or something else?) to replace distinctUntilChanged</span>
+<span class="source-line-no">031</span><span id="line-31">/**</span>
+<span class="source-line-no">032</span><span id="line-32"> * Provides {@link ChainTipService} a using a {@link BitcoinClient} and a polling interval.</span>
+<span class="source-line-no">033</span><span id="line-33"> * This can be used as a fallback if ZeroMQ is not available.</span>
+<span class="source-line-no">034</span><span id="line-34"> */</span>
+<span class="source-line-no">035</span><span id="line-35">public class PollingChainTipServiceImpl implements ChainTipService, ChainTipClient, RxJsonRpcClient, Closeable {</span>
+<span class="source-line-no">036</span><span id="line-36">    private static final Logger log = LoggerFactory.getLogger(PollingChainTipServiceImpl.class);</span>
+<span class="source-line-no">037</span><span id="line-37">    private final BitcoinClient client;</span>
+<span class="source-line-no">038</span><span id="line-38">    private final Observable&lt;Long&gt; interval;</span>
+<span class="source-line-no">039</span><span id="line-39">    // How will we properly use backpressure here?</span>
+<span class="source-line-no">040</span><span id="line-40">    private final Flowable&lt;ChainTip&gt; chainTipSource;</span>
+<span class="source-line-no">041</span><span id="line-41">    private Disposable chainTipSubscription;</span>
+<span class="source-line-no">042</span><span id="line-42">    private final FlowableProcessor&lt;ChainTip&gt; chainTipProcessor = BehaviorProcessor.create();</span>
+<span class="source-line-no">043</span><span id="line-43"></span>
+<span class="source-line-no">044</span><span id="line-44">    /**</span>
+<span class="source-line-no">045</span><span id="line-45">     * Construct from a {@link BitcoinClient} or subclass and a polling interval</span>
+<span class="source-line-no">046</span><span id="line-46">     * @param bitcoinClient a client instance</span>
+<span class="source-line-no">047</span><span id="line-47">     * @param interval a polling interval</span>
+<span class="source-line-no">048</span><span id="line-48">     */</span>
+<span class="source-line-no">049</span><span id="line-49">    public PollingChainTipServiceImpl(BitcoinClient bitcoinClient, Observable&lt;Long&gt; interval) {</span>
+<span class="source-line-no">050</span><span id="line-50">        client = bitcoinClient;</span>
+<span class="source-line-no">051</span><span id="line-51">        this.interval = interval;</span>
+<span class="source-line-no">052</span><span id="line-52">        log.info("Constructing polling ChainTipService: {}, {}", client.getNetwork().id(), client.getServerURI());</span>
+<span class="source-line-no">053</span><span id="line-53">        chainTipSource = Flowable.fromPublisher(pollForDistinctChainTip());</span>
+<span class="source-line-no">054</span><span id="line-54">    }</span>
+<span class="source-line-no">055</span><span id="line-55"></span>
+<span class="source-line-no">056</span><span id="line-56">    public PollingChainTipServiceImpl(BitcoinClient bitcoinClient) {</span>
+<span class="source-line-no">057</span><span id="line-57">        this(bitcoinClient, Observable.interval(2,10, TimeUnit.SECONDS));</span>
+<span class="source-line-no">058</span><span id="line-58">    }</span>
+<span class="source-line-no">059</span><span id="line-59"></span>
+<span class="source-line-no">060</span><span id="line-60">    public synchronized void start() {</span>
+<span class="source-line-no">061</span><span id="line-61">        if (chainTipSubscription == null) {</span>
+<span class="source-line-no">062</span><span id="line-62">            chainTipSubscription = chainTipSource.subscribe(chainTipProcessor::onNext, chainTipProcessor::onError, chainTipProcessor::onComplete);</span>
+<span class="source-line-no">063</span><span id="line-63">        }</span>
 <span class="source-line-no">064</span><span id="line-64">    }</span>
 <span class="source-line-no">065</span><span id="line-65"></span>
 <span class="source-line-no">066</span><span id="line-66">    @Override</span>
-<span class="source-line-no">067</span><span id="line-67">    public void close() {</span>
-<span class="source-line-no">068</span><span id="line-68">        chainTipSubscription.dispose();</span>
-<span class="source-line-no">069</span><span id="line-69">    }</span>
-<span class="source-line-no">070</span><span id="line-70"></span>
-<span class="source-line-no">071</span><span id="line-71">    @Override</span>
-<span class="source-line-no">072</span><span id="line-72">    public List&lt;ChainTip&gt; getChainTips() throws JsonRpcStatusException, IOException {</span>
-<span class="source-line-no">073</span><span id="line-73">        return client.getChainTips();</span>
-<span class="source-line-no">074</span><span id="line-74">    }</span>
-<span class="source-line-no">075</span><span id="line-75">}</span>
+<span class="source-line-no">067</span><span id="line-67">    public ChainTipPublisher chainTipPublisher() {</span>
+<span class="source-line-no">068</span><span id="line-68">        start();</span>
+<span class="source-line-no">069</span><span id="line-69">        return ChainTipPublisher.of(chainTipProcessor);</span>
+<span class="source-line-no">070</span><span id="line-70">    }</span>
+<span class="source-line-no">071</span><span id="line-71"></span>
+<span class="source-line-no">072</span><span id="line-72">    /**</span>
+<span class="source-line-no">073</span><span id="line-73">     * Provide a polling interval</span>
+<span class="source-line-no">074</span><span id="line-74">     *</span>
+<span class="source-line-no">075</span><span id="line-75">     * @return polling interval with desired frequency for polling for new ChainTips.</span>
+<span class="source-line-no">076</span><span id="line-76">     */</span>
+<span class="source-line-no">077</span><span id="line-77">    public Observable&lt;Long&gt; getPollingInterval() {</span>
+<span class="source-line-no">078</span><span id="line-78">        return interval;</span>
+<span class="source-line-no">079</span><span id="line-79">    }</span>
+<span class="source-line-no">080</span><span id="line-80"></span>
+<span class="source-line-no">081</span><span id="line-81">    /**</span>
+<span class="source-line-no">082</span><span id="line-82">     * Using a polling interval provided by {@link #getPollingInterval()} provide a</span>
+<span class="source-line-no">083</span><span id="line-83">     * stream of distinct {@link ChainTip}s.</span>
+<span class="source-line-no">084</span><span id="line-84">     *</span>
+<span class="source-line-no">085</span><span id="line-85">     * @return A stream of distinct {@code ChainTip}s.</span>
+<span class="source-line-no">086</span><span id="line-86">     */</span>
+<span class="source-line-no">087</span><span id="line-87">    Publisher&lt;ChainTip&gt; pollForDistinctChainTip() {</span>
+<span class="source-line-no">088</span><span id="line-88">        return getPollingInterval()</span>
+<span class="source-line-no">089</span><span id="line-89">                // ERROR backpressure strategy is compatible with BehaviorProcessor since it subscribes to MAX items</span>
+<span class="source-line-no">090</span><span id="line-90">                .toFlowable(BackpressureStrategy.ERROR)</span>
+<span class="source-line-no">091</span><span id="line-91">                .doOnNext(t -&gt; log.debug("got interval"))</span>
+<span class="source-line-no">092</span><span id="line-92">                .flatMap(t -&gt; this.currentChainTipMaybe())</span>
+<span class="source-line-no">093</span><span id="line-93">                .doOnNext(tip -&gt; log.debug("blockheight, blockhash = {}, {}", tip.getHeight(), tip.getHash()))</span>
+<span class="source-line-no">094</span><span id="line-94">                .distinctUntilChanged(ChainTip::getHash)</span>
+<span class="source-line-no">095</span><span id="line-95">                .doOnNext(tip -&gt; log.info("** NEW ** blockheight, blockhash = {}, {}", tip.getHeight(), tip.getHash()));</span>
+<span class="source-line-no">096</span><span id="line-96">    }</span>
+<span class="source-line-no">097</span><span id="line-97"></span>
+<span class="source-line-no">098</span><span id="line-98">    /**</span>
+<span class="source-line-no">099</span><span id="line-99">     * Get the active chain tip if there is one (useful for polling clients)</span>
+<span class="source-line-no">100</span><span id="line-100">     *</span>
+<span class="source-line-no">101</span><span id="line-101">     * @return The active ChainTip if available (onSuccess) otherwise onComplete (if not available) or onError (if error occurred)</span>
+<span class="source-line-no">102</span><span id="line-102">     */</span>
+<span class="source-line-no">103</span><span id="line-103">    private Publisher&lt;ChainTip&gt; currentChainTipMaybe() {</span>
+<span class="source-line-no">104</span><span id="line-104">        return Flowable.fromPublisher(pollOnceAsPublisher(client::getChainTipsAsync, TransientErrorFilter.of(this::isTransientError, this::logError)))</span>
+<span class="source-line-no">105</span><span id="line-105">                .mapOptional(ChainTip::findActiveChainTip);</span>
+<span class="source-line-no">106</span><span id="line-106">    }</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108">    @Override</span>
+<span class="source-line-no">109</span><span id="line-109">    public void close() {</span>
+<span class="source-line-no">110</span><span id="line-110">        chainTipSubscription.dispose();</span>
+<span class="source-line-no">111</span><span id="line-111">    }</span>
+<span class="source-line-no">112</span><span id="line-112"></span>
+<span class="source-line-no">113</span><span id="line-113">    @Override</span>
+<span class="source-line-no">114</span><span id="line-114">    public CompletableFuture&lt;List&lt;ChainTip&gt;&gt; getChainTipsAsync() {</span>
+<span class="source-line-no">115</span><span id="line-115">        return client.getChainTipsAsync();</span>
+<span class="source-line-no">116</span><span id="line-116">    }</span>
+<span class="source-line-no">117</span><span id="line-117"></span>
+<span class="source-line-no">118</span><span id="line-118">    @Override</span>
+<span class="source-line-no">119</span><span id="line-119">    @Deprecated</span>
+<span class="source-line-no">120</span><span id="line-120">    public List&lt;ChainTip&gt; getChainTips() throws JsonRpcStatusException, IOException {</span>
+<span class="source-line-no">121</span><span id="line-121">        return client.syncGet(client.getChainTipsAsync());</span>
+<span class="source-line-no">122</span><span id="line-122">    }</span>
+<span class="source-line-no">123</span><span id="line-123"></span>
+<span class="source-line-no">124</span><span id="line-124">    private boolean isTransientError(Throwable t) {</span>
+<span class="source-line-no">125</span><span id="line-125">        return t instanceof IOError;</span>
+<span class="source-line-no">126</span><span id="line-126">    }</span>
+<span class="source-line-no">127</span><span id="line-127">    private void logError(Throwable throwable) {</span>
+<span class="source-line-no">128</span><span id="line-128">        log.error("Exception in RPCCall", throwable);</span>
+<span class="source-line-no">129</span><span id="line-129">    }</span>
+<span class="source-line-no">130</span><span id="line-130">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html
index ede315d14..80bc05ae5 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/RxBitcoinClient.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.jsonrpc, class: RxBitcoinClient">
@@ -13,110 +13,90 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.Single;</span>
-<span class="source-line-no">004</span><span id="line-4">import org.bitcoinj.base.Network;</span>
-<span class="source-line-no">005</span><span id="line-5">import org.bitcoinj.core.Block;</span>
-<span class="source-line-no">006</span><span id="line-6">import org.bitcoinj.base.Sha256Hash;</span>
-<span class="source-line-no">007</span><span id="line-7">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.consensusj.bitcoin.jsonrpc.BitcoinClient;</span>
-<span class="source-line-no">009</span><span id="line-9">import io.reactivex.rxjava3.core.Flowable;</span>
-<span class="source-line-no">010</span><span id="line-10">import org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient;</span>
-<span class="source-line-no">011</span><span id="line-11">import org.consensusj.bitcoin.rx.ChainTipService;</span>
-<span class="source-line-no">012</span><span id="line-12">import org.consensusj.bitcoin.rx.zeromq.RxBitcoinZmqService;</span>
-<span class="source-line-no">013</span><span id="line-13">import org.consensusj.bitcoinj.util.BlockUtil;</span>
+<span class="source-line-no">003</span><span id="line-3">import org.bitcoinj.base.Network;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
+<span class="source-line-no">005</span><span id="line-5">import org.consensusj.bitcoin.jsonrpc.BitcoinClient;</span>
+<span class="source-line-no">006</span><span id="line-6">import io.reactivex.rxjava3.core.Flowable;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.consensusj.bitcoin.rx.ChainTipPublisher;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.consensusj.bitcoin.rx.ChainTipService;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.consensusj.bitcoin.rx.zeromq.RxBitcoinZmqService;</span>
+<span class="source-line-no">011</span><span id="line-11">import org.consensusj.jsonrpc.JsonRpcTransport;</span>
+<span class="source-line-no">012</span><span id="line-12">import org.consensusj.rx.jsonrpc.RxJsonRpcClient;</span>
+<span class="source-line-no">013</span><span id="line-13">import org.reactivestreams.Publisher;</span>
 <span class="source-line-no">014</span><span id="line-14"></span>
 <span class="source-line-no">015</span><span id="line-15">import javax.net.ssl.SSLContext;</span>
-<span class="source-line-no">016</span><span id="line-16">import javax.net.ssl.SSLSocketFactory;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.net.URI;</span>
-<span class="source-line-no">018</span><span id="line-18"></span>
-<span class="source-line-no">019</span><span id="line-19">/**</span>
-<span class="source-line-no">020</span><span id="line-20"> * A {@link BitcoinClient} enhanced with Reactive features. Can use either ZeroMQ or polling</span>
-<span class="source-line-no">021</span><span id="line-21"> * to implement {@link RxJsonChainTipClient}.</span>
-<span class="source-line-no">022</span><span id="line-22"> * &lt;p&gt;</span>
-<span class="source-line-no">023</span><span id="line-23"> * TODO: answer the below questions</span>
-<span class="source-line-no">024</span><span id="line-24"> * &lt;p&gt;</span>
-<span class="source-line-no">025</span><span id="line-25"> * Should this class eventually implement {@link org.consensusj.bitcoin.rx.RxBlockchainService}</span>
-<span class="source-line-no">026</span><span id="line-26"> * or {@link org.consensusj.bitcoin.rx.RxBlockchainBinaryService}?</span>
+<span class="source-line-no">016</span><span id="line-16">import java.net.URI;</span>
+<span class="source-line-no">017</span><span id="line-17">import java.time.Duration;</span>
+<span class="source-line-no">018</span><span id="line-18">import java.util.concurrent.CompletionStage;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.util.concurrent.TimeUnit;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.util.function.Supplier;</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">/**</span>
+<span class="source-line-no">023</span><span id="line-23"> * A {@link BitcoinClient} enhanced with Reactive features. Can use either ZeroMQ or polling</span>
+<span class="source-line-no">024</span><span id="line-24"> * to implement {@link ChainTipService}.</span>
+<span class="source-line-no">025</span><span id="line-25"> * &lt;p&gt;</span>
+<span class="source-line-no">026</span><span id="line-26"> * TODO: answer the below questions</span>
 <span class="source-line-no">027</span><span id="line-27"> * &lt;p&gt;</span>
-<span class="source-line-no">028</span><span id="line-28"> * Should this class be renamed to {@code RxBitcoinJsonRpcClient} and the {@code RxBitcoinClient} interface be moved</span>
-<span class="source-line-no">029</span><span id="line-29"> * to {@code cj-btc-rx?}</span>
-<span class="source-line-no">030</span><span id="line-30"> */</span>
-<span class="source-line-no">031</span><span id="line-31">public class RxBitcoinClient extends BitcoinExtendedClient implements RxJsonChainTipClient {</span>
-<span class="source-line-no">032</span><span id="line-32">    ChainTipService chainTipService;</span>
-<span class="source-line-no">033</span><span id="line-33"></span>
-<span class="source-line-no">034</span><span id="line-34">    public RxBitcoinClient(Network network, URI server, String rpcuser, String rpcpassword) {</span>
-<span class="source-line-no">035</span><span id="line-35">        this(network, server, rpcuser, rpcpassword, true);</span>
-<span class="source-line-no">036</span><span id="line-36">    }</span>
+<span class="source-line-no">028</span><span id="line-28"> * Should this class eventually implement {@link org.consensusj.bitcoin.rx.RxBlockchainService}</span>
+<span class="source-line-no">029</span><span id="line-29"> * or {@link org.consensusj.bitcoin.rx.RxBlockchainBinaryService}?</span>
+<span class="source-line-no">030</span><span id="line-30"> * &lt;p&gt;</span>
+<span class="source-line-no">031</span><span id="line-31"> * Should this class be renamed to {@code RxBitcoinJsonRpcClient} and the {@code RxBitcoinClient} interface be moved</span>
+<span class="source-line-no">032</span><span id="line-32"> * to {@code cj-btc-rx?}</span>
+<span class="source-line-no">033</span><span id="line-33"> */</span>
+<span class="source-line-no">034</span><span id="line-34">public class RxBitcoinClient extends BitcoinExtendedClient implements ChainTipService, RxJsonRpcClient {</span>
+<span class="source-line-no">035</span><span id="line-35">    private final boolean useZmq;</span>
+<span class="source-line-no">036</span><span id="line-36">    private /* Lazy */ ChainTipService chainTipService;</span>
 <span class="source-line-no">037</span><span id="line-37"></span>
-<span class="source-line-no">038</span><span id="line-38">    public RxBitcoinClient(Network network, URI server, String rpcuser, String rpcpassword, boolean useZmq) {</span>
-<span class="source-line-no">039</span><span id="line-39">        this(getDefaultSSLContext(), network, server, rpcuser, rpcpassword, useZmq);</span>
+<span class="source-line-no">038</span><span id="line-38">    public RxBitcoinClient(Network network, URI server, String rpcuser, String rpcpassword) {</span>
+<span class="source-line-no">039</span><span id="line-39">        this(network, server, rpcuser, rpcpassword, true);</span>
 <span class="source-line-no">040</span><span id="line-40">    }</span>
 <span class="source-line-no">041</span><span id="line-41"></span>
-<span class="source-line-no">042</span><span id="line-42">    public RxBitcoinClient(SSLContext sslContext, Network network, URI server, String rpcuser, String rpcpassword, boolean useZmq) {</span>
-<span class="source-line-no">043</span><span id="line-43">        super(sslContext, network, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">044</span><span id="line-44">        // TODO: Determine if ZMQ is available by querying the server</span>
-<span class="source-line-no">045</span><span id="line-45">        // TODO: Determine whether server is up or down -- add a session re-establishment service</span>
-<span class="source-line-no">046</span><span id="line-46">        if (useZmq) {</span>
-<span class="source-line-no">047</span><span id="line-47">            chainTipService = new RxBitcoinZmqService(this);</span>
-<span class="source-line-no">048</span><span id="line-48">        } else {</span>
-<span class="source-line-no">049</span><span id="line-49">            chainTipService = new PollingChainTipServiceImpl(this);</span>
-<span class="source-line-no">050</span><span id="line-50">        }</span>
+<span class="source-line-no">042</span><span id="line-42">    public RxBitcoinClient(Network network, URI server, String rpcuser, String rpcpassword, boolean useZmq) {</span>
+<span class="source-line-no">043</span><span id="line-43">        this(JsonRpcTransport.getDefaultSSLContext(), network, server, rpcuser, rpcpassword, useZmq);</span>
+<span class="source-line-no">044</span><span id="line-44">    }</span>
+<span class="source-line-no">045</span><span id="line-45"></span>
+<span class="source-line-no">046</span><span id="line-46">    public RxBitcoinClient(SSLContext sslContext, Network network, URI server, String rpcuser, String rpcpassword, boolean useZmq) {</span>
+<span class="source-line-no">047</span><span id="line-47">        super(sslContext, network, server, rpcuser, rpcpassword);</span>
+<span class="source-line-no">048</span><span id="line-48">        // TODO: Determine if ZMQ is available by querying the server</span>
+<span class="source-line-no">049</span><span id="line-49">        this.useZmq = useZmq;</span>
+<span class="source-line-no">050</span><span id="line-50">        // TODO: Determine whether server is up or down -- add a session re-establishment service</span>
 <span class="source-line-no">051</span><span id="line-51">    }</span>
 <span class="source-line-no">052</span><span id="line-52"></span>
-<span class="source-line-no">053</span><span id="line-53">    @Deprecated</span>
-<span class="source-line-no">054</span><span id="line-54">    public RxBitcoinClient(SSLSocketFactory sslSocketFactory, Network network, URI server, String rpcuser, String rpcpassword, boolean useZmq) {</span>
-<span class="source-line-no">055</span><span id="line-55">        super(sslSocketFactory, network, server, rpcuser, rpcpassword);</span>
-<span class="source-line-no">056</span><span id="line-56">        if (useZmq) {</span>
-<span class="source-line-no">057</span><span id="line-57">            chainTipService = new RxBitcoinZmqService(this);</span>
-<span class="source-line-no">058</span><span id="line-58">        } else {</span>
-<span class="source-line-no">059</span><span id="line-59">            chainTipService = new PollingChainTipServiceImpl(this);</span>
-<span class="source-line-no">060</span><span id="line-60">        }</span>
-<span class="source-line-no">061</span><span id="line-61">    }</span>
-<span class="source-line-no">062</span><span id="line-62"></span>
-<span class="source-line-no">063</span><span id="line-63">    @Override</span>
-<span class="source-line-no">064</span><span id="line-64">    public Flowable&lt;ChainTip&gt; chainTipPublisher() {</span>
-<span class="source-line-no">065</span><span id="line-65">        return Flowable.fromPublisher(chainTipService.chainTipPublisher());</span>
-<span class="source-line-no">066</span><span id="line-66">    }</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68">    /**</span>
-<span class="source-line-no">069</span><span id="line-69">     * Convert best {@link Block} to active {@link ChainTip}. If BIP34 is activated this</span>
-<span class="source-line-no">070</span><span id="line-70">     * is purely computational, otherwise I/O is required to fetch the {@code ChainTip}</span>
-<span class="source-line-no">071</span><span id="line-71">     *</span>
-<span class="source-line-no">072</span><span id="line-72">     * @param block Input best block</span>
-<span class="source-line-no">073</span><span id="line-73">     * @return active ChainTip assuming this block is the "best block"</span>
-<span class="source-line-no">074</span><span id="line-74">     */</span>
-<span class="source-line-no">075</span><span id="line-75">    public Single&lt;ChainTip&gt; activeChainTipFromBestBlock(Block block) {</span>
-<span class="source-line-no">076</span><span id="line-76">        int height = BlockUtil.blockHeightFromCoinbase(block);</span>
-<span class="source-line-no">077</span><span id="line-77">        if (height != -1) {</span>
-<span class="source-line-no">078</span><span id="line-78">            return Single.just(ChainTip.ofActive(height, block.getHash()));</span>
-<span class="source-line-no">079</span><span id="line-79">        } else {</span>
-<span class="source-line-no">080</span><span id="line-80">            return getActiveChainTipViaRpc();</span>
-<span class="source-line-no">081</span><span id="line-81">        }</span>
-<span class="source-line-no">082</span><span id="line-82">    }</span>
-<span class="source-line-no">083</span><span id="line-83"></span>
-<span class="source-line-no">084</span><span id="line-84">    /**</span>
-<span class="source-line-no">085</span><span id="line-85">     * Get the latest (aka "best") {@link Block} via JSON-RPC.</span>
-<span class="source-line-no">086</span><span id="line-86">     * &lt;p&gt;</span>
-<span class="source-line-no">087</span><span id="line-87">     * Generally, you should use the {@link org.consensusj.bitcoin.rx.RxBlockchainService} or</span>
-<span class="source-line-no">088</span><span id="line-88">     * {@link org.consensusj.bitcoin.rx.RxBlockchainBinaryService} interface if you</span>
-<span class="source-line-no">089</span><span id="line-89">     * are looking for a reactive interface to blocks, because those interfaces will</span>
-<span class="source-line-no">090</span><span id="line-90">     * be more efficient. This method &lt;b&gt;always&lt;/b&gt; composes two unique RPC calls to the server.</span>
-<span class="source-line-no">091</span><span id="line-91">     *</span>
-<span class="source-line-no">092</span><span id="line-92">     * @return A "hot" {@code Single} that will fetch the "best" block via JSON-RPC</span>
-<span class="source-line-no">093</span><span id="line-93">     */</span>
-<span class="source-line-no">094</span><span id="line-94">    public Single&lt;Block&gt; getBestBlockViaRpc() {</span>
-<span class="source-line-no">095</span><span id="line-95">        return getActiveChainTipViaRpc().flatMap(tip -&gt; getBlockSingle(tip.getHash()));</span>
-<span class="source-line-no">096</span><span id="line-96">    }</span>
-<span class="source-line-no">097</span><span id="line-97"></span>
-<span class="source-line-no">098</span><span id="line-98">    private Single&lt;ChainTip&gt; getActiveChainTipViaRpc() {</span>
-<span class="source-line-no">099</span><span id="line-99">        return call(this::getChainTips)</span>
-<span class="source-line-no">100</span><span id="line-100">                .map(ChainTip::findActiveChainTipOrElseThrow);</span>
-<span class="source-line-no">101</span><span id="line-101">    }</span>
-<span class="source-line-no">102</span><span id="line-102"></span>
-<span class="source-line-no">103</span><span id="line-103">    private Single&lt;Block&gt; getBlockSingle(Sha256Hash blockHash) {</span>
-<span class="source-line-no">104</span><span id="line-104">        return call(() -&gt; getBlock(blockHash));</span>
-<span class="source-line-no">105</span><span id="line-105">    }</span>
-<span class="source-line-no">106</span><span id="line-106">}</span>
+<span class="source-line-no">053</span><span id="line-53">    private void initChainTipService(Duration timeout) {</span>
+<span class="source-line-no">054</span><span id="line-54">        if (chainTipService == null) {</span>
+<span class="source-line-no">055</span><span id="line-55">            if (useZmq) {</span>
+<span class="source-line-no">056</span><span id="line-56">                log.warn("(useZmq enabled) Initiating server connection (with timeout of {} seconds)", timeout.toSeconds());</span>
+<span class="source-line-no">057</span><span id="line-57">                this.connectToServer(timeout).join();</span>
+<span class="source-line-no">058</span><span id="line-58">                chainTipService = new RxBitcoinZmqService(this);</span>
+<span class="source-line-no">059</span><span id="line-59">            } else {</span>
+<span class="source-line-no">060</span><span id="line-60">                chainTipService = new PollingChainTipServiceImpl(this);</span>
+<span class="source-line-no">061</span><span id="line-61">            }</span>
+<span class="source-line-no">062</span><span id="line-62">        }</span>
+<span class="source-line-no">063</span><span id="line-63">    }</span>
+<span class="source-line-no">064</span><span id="line-64"></span>
+<span class="source-line-no">065</span><span id="line-65">    /**</span>
+<span class="source-line-no">066</span><span id="line-66">     * Repeatedly once-per-new-block poll an async method</span>
+<span class="source-line-no">067</span><span id="line-67">     *</span>
+<span class="source-line-no">068</span><span id="line-68">     * @param supplier A supplier (should be an RPC Method) of a CompletionStage</span>
+<span class="source-line-no">069</span><span id="line-69">     * @param &lt;RSLT&gt; The type of the expected result</span>
+<span class="source-line-no">070</span><span id="line-70">     * @return An Observable for the expected result type, so we can expect one call to {@code onNext} per block.</span>
+<span class="source-line-no">071</span><span id="line-71">     */</span>
+<span class="source-line-no">072</span><span id="line-72">    public &lt;RSLT&gt; Publisher&lt;RSLT&gt; pollOnNewBlockAsync(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt; supplier) {</span>
+<span class="source-line-no">073</span><span id="line-73">        return Flowable.fromPublisher(chainTipPublisher()).flatMap(tip -&gt; pollOnceAsPublisher(supplier));</span>
+<span class="source-line-no">074</span><span id="line-74">    }</span>
+<span class="source-line-no">075</span><span id="line-75"></span>
+<span class="source-line-no">076</span><span id="line-76">    /**</span>
+<span class="source-line-no">077</span><span id="line-77">     * The BitcoinClient must have "connected once" before this is called. This means something else</span>
+<span class="source-line-no">078</span><span id="line-78">     * needs to have called something to do that.</span>
+<span class="source-line-no">079</span><span id="line-79">     * @return a publisher of Chain Tips</span>
+<span class="source-line-no">080</span><span id="line-80">     */</span>
+<span class="source-line-no">081</span><span id="line-81">    @Override</span>
+<span class="source-line-no">082</span><span id="line-82">    public ChainTipPublisher chainTipPublisher() {</span>
+<span class="source-line-no">083</span><span id="line-83">        initChainTipService(Duration.ofMinutes(60));</span>
+<span class="source-line-no">084</span><span id="line-84">        return chainTipService.chainTipPublisher();</span>
+<span class="source-line-no">085</span><span id="line-85">    }</span>
+<span class="source-line-no">086</span><span id="line-86">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html
index d704b89a6..1eea271c1 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/RxJsonChainTipClient.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.jsonrpc, interface: RxJsonChainTipClient">
@@ -14,39 +14,43 @@
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.Flowable;</span>
-<span class="source-line-no">004</span><span id="line-4">import io.reactivex.rxjava3.core.Maybe;</span>
-<span class="source-line-no">005</span><span id="line-5">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
-<span class="source-line-no">006</span><span id="line-6">import org.consensusj.bitcoin.jsonrpc.ChainTipClient;</span>
-<span class="source-line-no">007</span><span id="line-7">import org.consensusj.bitcoin.rx.ChainTipService;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.consensusj.jsonrpc.AsyncSupport;</span>
-<span class="source-line-no">009</span><span id="line-9">import org.consensusj.rx.jsonrpc.RxJsonRpcClient;</span>
-<span class="source-line-no">010</span><span id="line-10"></span>
-<span class="source-line-no">011</span><span id="line-11">/**</span>
-<span class="source-line-no">012</span><span id="line-12"> * A JSON-RPC client interface that provides ChainTipService</span>
-<span class="source-line-no">013</span><span id="line-13"> */</span>
-<span class="source-line-no">014</span><span id="line-14">public interface RxJsonChainTipClient extends ChainTipService, ChainTipClient, RxJsonRpcClient {</span>
-<span class="source-line-no">015</span><span id="line-15"></span>
-<span class="source-line-no">016</span><span id="line-16">    /**</span>
-<span class="source-line-no">017</span><span id="line-17">     * Repeatedly once-per-new-block poll a method</span>
-<span class="source-line-no">018</span><span id="line-18">     *</span>
-<span class="source-line-no">019</span><span id="line-19">     * @param method A supplier (should be an RPC Method) that can throw {@link Exception}.</span>
-<span class="source-line-no">020</span><span id="line-20">     * @param &lt;RSLT&gt; The type of the expected result</span>
-<span class="source-line-no">021</span><span id="line-21">     * @return An Observable for the expected result type, so we can expect one call to {@code onNext} per block.</span>
-<span class="source-line-no">022</span><span id="line-22">     */</span>
-<span class="source-line-no">023</span><span id="line-23">    default &lt;RSLT&gt; Flowable&lt;RSLT&gt; pollOnNewBlock(AsyncSupport.ThrowingSupplier&lt;RSLT&gt; method) {</span>
-<span class="source-line-no">024</span><span id="line-24">        return Flowable.fromPublisher(chainTipPublisher()).flatMapMaybe(tip -&gt; pollOnce(method));</span>
-<span class="source-line-no">025</span><span id="line-25">    }</span>
-<span class="source-line-no">026</span><span id="line-26"></span>
-<span class="source-line-no">027</span><span id="line-27">    /**</span>
-<span class="source-line-no">028</span><span id="line-28">     * Get the active chain tip if there is one (useful for polling clients)</span>
-<span class="source-line-no">029</span><span id="line-29">     *</span>
-<span class="source-line-no">030</span><span id="line-30">     * @return The active ChainTip if available (onSuccess) otherwise onComplete (if not available) or onError (if error occurred)</span>
-<span class="source-line-no">031</span><span id="line-31">     */</span>
-<span class="source-line-no">032</span><span id="line-32">    default Maybe&lt;ChainTip&gt; currentChainTipMaybe() {</span>
-<span class="source-line-no">033</span><span id="line-33">        return pollOnce(this::getChainTips)</span>
-<span class="source-line-no">034</span><span id="line-34">                .mapOptional(ChainTip::findActiveChainTip);</span>
-<span class="source-line-no">035</span><span id="line-35">    }</span>
-<span class="source-line-no">036</span><span id="line-36">}</span>
+<span class="source-line-no">004</span><span id="line-4">import org.consensusj.bitcoin.rx.ChainTipService;</span>
+<span class="source-line-no">005</span><span id="line-5">import org.consensusj.jsonrpc.AsyncSupport;</span>
+<span class="source-line-no">006</span><span id="line-6">import org.consensusj.rx.jsonrpc.RxJsonRpcClient;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">008</span><span id="line-8"></span>
+<span class="source-line-no">009</span><span id="line-9">import java.util.concurrent.CompletionStage;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.util.function.Supplier;</span>
+<span class="source-line-no">011</span><span id="line-11"></span>
+<span class="source-line-no">012</span><span id="line-12">/**</span>
+<span class="source-line-no">013</span><span id="line-13"> * A JSON-RPC client interface that provides ChainTipService</span>
+<span class="source-line-no">014</span><span id="line-14"> */</span>
+<span class="source-line-no">015</span><span id="line-15">@Deprecated</span>
+<span class="source-line-no">016</span><span id="line-16">public interface RxJsonChainTipClient extends ChainTipService, RxJsonRpcClient {</span>
+<span class="source-line-no">017</span><span id="line-17"></span>
+<span class="source-line-no">018</span><span id="line-18">    /**</span>
+<span class="source-line-no">019</span><span id="line-19">     * Repeatedly once-per-new-block poll a method</span>
+<span class="source-line-no">020</span><span id="line-20">     *</span>
+<span class="source-line-no">021</span><span id="line-21">     * @param method A supplier (should be an RPC Method) that can throw {@link Exception}.</span>
+<span class="source-line-no">022</span><span id="line-22">     * @param &lt;RSLT&gt; The type of the expected result</span>
+<span class="source-line-no">023</span><span id="line-23">     * @return An Observable for the expected result type, so we can expect one call to {@code onNext} per block.</span>
+<span class="source-line-no">024</span><span id="line-24">     */</span>
+<span class="source-line-no">025</span><span id="line-25">    @Deprecated</span>
+<span class="source-line-no">026</span><span id="line-26">    default &lt;RSLT&gt; Publisher&lt;RSLT&gt; pollOnNewBlock(AsyncSupport.ThrowingSupplier&lt;RSLT&gt; method) {</span>
+<span class="source-line-no">027</span><span id="line-27">        return Flowable.fromPublisher(chainTipPublisher()).flatMapMaybe(tip -&gt; pollOnce(method));</span>
+<span class="source-line-no">028</span><span id="line-28">    }</span>
+<span class="source-line-no">029</span><span id="line-29"></span>
+<span class="source-line-no">030</span><span id="line-30">    /**</span>
+<span class="source-line-no">031</span><span id="line-31">     * Repeatedly once-per-new-block poll an async method</span>
+<span class="source-line-no">032</span><span id="line-32">     *</span>
+<span class="source-line-no">033</span><span id="line-33">     * @param supplier A supplier (should be an RPC Method) of a CompletionStage</span>
+<span class="source-line-no">034</span><span id="line-34">     * @param &lt;RSLT&gt; The type of the expected result</span>
+<span class="source-line-no">035</span><span id="line-35">     * @return An Observable for the expected result type, so we can expect one call to {@code onNext} per block.</span>
+<span class="source-line-no">036</span><span id="line-36">     */</span>
+<span class="source-line-no">037</span><span id="line-37">    default &lt;RSLT&gt; Publisher&lt;RSLT&gt; pollOnNewBlockAsync(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt; supplier) {</span>
+<span class="source-line-no">038</span><span id="line-38">        return Flowable.fromPublisher(chainTipPublisher()).flatMapMaybe(tip -&gt; pollOnceAsync(supplier));</span>
+<span class="source-line-no">039</span><span id="line-39">    }</span>
+<span class="source-line-no">040</span><span id="line-40">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html
index 1ea1f554e..7f1d2a751 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/TxOutSetWatcherSample.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.jsonrpc, class: TxOutSetWatcherSample">
@@ -13,57 +13,60 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import org.bitcoinj.base.BitcoinNetwork;</span>
-<span class="source-line-no">004</span><span id="line-4">import org.bitcoinj.base.Network;</span>
-<span class="source-line-no">005</span><span id="line-5">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
-<span class="source-line-no">006</span><span id="line-6">import org.consensusj.bitcoin.json.pojo.TxOutSetInfo;</span>
-<span class="source-line-no">007</span><span id="line-7">import org.consensusj.bitcoin.rx.jsonrpc.service.TxOutSetService;</span>
-<span class="source-line-no">008</span><span id="line-8"></span>
-<span class="source-line-no">009</span><span id="line-9">import java.net.URI;</span>
-<span class="source-line-no">010</span><span id="line-10"></span>
-<span class="source-line-no">011</span><span id="line-11">import static java.lang.System.out;</span>
+<span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.Flowable;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.bitcoinj.base.BitcoinNetwork;</span>
+<span class="source-line-no">005</span><span id="line-5">import org.bitcoinj.base.Network;</span>
+<span class="source-line-no">006</span><span id="line-6">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.consensusj.bitcoin.json.pojo.TxOutSetInfo;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.consensusj.bitcoin.rx.jsonrpc.service.TxOutSetService;</span>
+<span class="source-line-no">009</span><span id="line-9"></span>
+<span class="source-line-no">010</span><span id="line-10">import java.net.URI;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.time.Duration;</span>
 <span class="source-line-no">012</span><span id="line-12"></span>
-<span class="source-line-no">013</span><span id="line-13">/**</span>
-<span class="source-line-no">014</span><span id="line-14"> * Sample command-line tool that subscribes to ChainTip and TxOutSetInfo</span>
-<span class="source-line-no">015</span><span id="line-15"> */</span>
-<span class="source-line-no">016</span><span id="line-16">public class TxOutSetWatcherSample {</span>
-<span class="source-line-no">017</span><span id="line-17">    public static void main(String[] args) throws InterruptedException {</span>
-<span class="source-line-no">018</span><span id="line-18">        Network network = BitcoinNetwork.MAINNET;</span>
-<span class="source-line-no">019</span><span id="line-19">        String rpcUser = "bitcoinrpc";</span>
-<span class="source-line-no">020</span><span id="line-20">        String rpcPassword = "pass";</span>
-<span class="source-line-no">021</span><span id="line-21">        URI rpcUri = URI.create("http://localhost:8332");</span>
-<span class="source-line-no">022</span><span id="line-22">        boolean useZmq = true;</span>
-<span class="source-line-no">023</span><span id="line-23"></span>
-<span class="source-line-no">024</span><span id="line-24">        try (   RxBitcoinClient client = new RxBitcoinClient(network, rpcUri, rpcUser, rpcPassword, useZmq);</span>
-<span class="source-line-no">025</span><span id="line-25">                TxOutSetService txOutSetService = new TxOutSetService(client) ) {</span>
-<span class="source-line-no">026</span><span id="line-26"></span>
-<span class="source-line-no">027</span><span id="line-27">            // Subscribe to ChainTips</span>
-<span class="source-line-no">028</span><span id="line-28">            client.chainTipPublisher()</span>
-<span class="source-line-no">029</span><span id="line-29">                    .subscribe(TxOutSetWatcherSample::onChainTip, TxOutSetWatcherSample::onError);</span>
-<span class="source-line-no">030</span><span id="line-30"></span>
-<span class="source-line-no">031</span><span id="line-31">            // Blocking subscribe to TxOutSetInfo</span>
-<span class="source-line-no">032</span><span id="line-32">            txOutSetService.getTxOutSetPublisher()</span>
-<span class="source-line-no">033</span><span id="line-33">                    .blockingSubscribe(TxOutSetWatcherSample::onTxOutSetInfo, TxOutSetWatcherSample::onError);</span>
-<span class="source-line-no">034</span><span id="line-34"></span>
-<span class="source-line-no">035</span><span id="line-35">        }</span>
-<span class="source-line-no">036</span><span id="line-36">    }</span>
+<span class="source-line-no">013</span><span id="line-13">import static java.lang.System.out;</span>
+<span class="source-line-no">014</span><span id="line-14"></span>
+<span class="source-line-no">015</span><span id="line-15">/**</span>
+<span class="source-line-no">016</span><span id="line-16"> * Sample command-line tool that subscribes to ChainTip and TxOutSetInfo</span>
+<span class="source-line-no">017</span><span id="line-17"> */</span>
+<span class="source-line-no">018</span><span id="line-18">public class TxOutSetWatcherSample {</span>
+<span class="source-line-no">019</span><span id="line-19">    public static void main(String[] args) throws InterruptedException {</span>
+<span class="source-line-no">020</span><span id="line-20">        Network network = BitcoinNetwork.MAINNET;</span>
+<span class="source-line-no">021</span><span id="line-21">        String rpcUser = "bitcoinrpc";</span>
+<span class="source-line-no">022</span><span id="line-22">        String rpcPassword = "pass";</span>
+<span class="source-line-no">023</span><span id="line-23">        URI rpcUri = URI.create("http://localhost:8332");</span>
+<span class="source-line-no">024</span><span id="line-24">        boolean useZmq = true;</span>
+<span class="source-line-no">025</span><span id="line-25"></span>
+<span class="source-line-no">026</span><span id="line-26">        try (   RxBitcoinClient client = new RxBitcoinClient(network, rpcUri, rpcUser, rpcPassword, useZmq);</span>
+<span class="source-line-no">027</span><span id="line-27">                TxOutSetService txOutSetService = new TxOutSetService(client, client.chainTipPublisher()) ) {</span>
+<span class="source-line-no">028</span><span id="line-28"></span>
+<span class="source-line-no">029</span><span id="line-29">            client.connectToServer(Duration.ofMinutes(5)).join();</span>
+<span class="source-line-no">030</span><span id="line-30">            // Subscribe to ChainTips</span>
+<span class="source-line-no">031</span><span id="line-31">            Flowable.fromPublisher(client.chainTipPublisher())</span>
+<span class="source-line-no">032</span><span id="line-32">                    .subscribe(TxOutSetWatcherSample::onChainTip, TxOutSetWatcherSample::onError);</span>
+<span class="source-line-no">033</span><span id="line-33"></span>
+<span class="source-line-no">034</span><span id="line-34">            // Blocking subscribe to TxOutSetInfo</span>
+<span class="source-line-no">035</span><span id="line-35">            Flowable.fromPublisher(txOutSetService.getTxOutSetPublisher())</span>
+<span class="source-line-no">036</span><span id="line-36">                    .blockingSubscribe(TxOutSetWatcherSample::onTxOutSetInfo, TxOutSetWatcherSample::onError);</span>
 <span class="source-line-no">037</span><span id="line-37"></span>
-<span class="source-line-no">038</span><span id="line-38">    static void onChainTip(ChainTip tip) {</span>
-<span class="source-line-no">039</span><span id="line-39">        out.printf("Chain tip: %s/%s\n", tip.getHeight(), tip.getHash());</span>
-<span class="source-line-no">040</span><span id="line-40">    }</span>
-<span class="source-line-no">041</span><span id="line-41"></span>
-<span class="source-line-no">042</span><span id="line-42">    static void onTxOutSetInfo(TxOutSetInfo info) {</span>
-<span class="source-line-no">043</span><span id="line-43">        out.printf("TxOutSetInfo: %s/%s, utxos: %s, total BTC: %s\n",</span>
-<span class="source-line-no">044</span><span id="line-44">                info.getHeight(),</span>
-<span class="source-line-no">045</span><span id="line-45">                info.getBestBlock(),</span>
-<span class="source-line-no">046</span><span id="line-46">                info.getTxOuts(),</span>
-<span class="source-line-no">047</span><span id="line-47">                info.getTotalAmount().toFriendlyString());</span>
-<span class="source-line-no">048</span><span id="line-48">    }</span>
-<span class="source-line-no">049</span><span id="line-49"></span>
-<span class="source-line-no">050</span><span id="line-50">    static void onError(Throwable t) {</span>
-<span class="source-line-no">051</span><span id="line-51">        out.println("Error: " + t);</span>
-<span class="source-line-no">052</span><span id="line-52">    }</span>
-<span class="source-line-no">053</span><span id="line-53">}</span>
+<span class="source-line-no">038</span><span id="line-38">        }</span>
+<span class="source-line-no">039</span><span id="line-39">    }</span>
+<span class="source-line-no">040</span><span id="line-40"></span>
+<span class="source-line-no">041</span><span id="line-41">    static void onChainTip(ChainTip tip) {</span>
+<span class="source-line-no">042</span><span id="line-42">        out.printf("Chain tip: %s/%s\n", tip.getHeight(), tip.getHash());</span>
+<span class="source-line-no">043</span><span id="line-43">    }</span>
+<span class="source-line-no">044</span><span id="line-44"></span>
+<span class="source-line-no">045</span><span id="line-45">    static void onTxOutSetInfo(TxOutSetInfo info) {</span>
+<span class="source-line-no">046</span><span id="line-46">        out.printf("TxOutSetInfo: %s/%s, utxos: %s, total BTC: %s\n",</span>
+<span class="source-line-no">047</span><span id="line-47">                info.getHeight(),</span>
+<span class="source-line-no">048</span><span id="line-48">                info.getBestBlock(),</span>
+<span class="source-line-no">049</span><span id="line-49">                info.getTxOuts(),</span>
+<span class="source-line-no">050</span><span id="line-50">                info.getTotalAmount().toFriendlyString());</span>
+<span class="source-line-no">051</span><span id="line-51">    }</span>
+<span class="source-line-no">052</span><span id="line-52"></span>
+<span class="source-line-no">053</span><span id="line-53">    static void onError(Throwable t) {</span>
+<span class="source-line-no">054</span><span id="line-54">        out.println("Error: " + t);</span>
+<span class="source-line-no">055</span><span id="line-55">    }</span>
+<span class="source-line-no">056</span><span id="line-56">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html
index 8f0757c4a..73b6dc47c 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/service/TxOutSetService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.jsonrpc.service, class: TxOutSetService">
@@ -14,113 +14,139 @@
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx.jsonrpc.service;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.Flowable;</span>
-<span class="source-line-no">004</span><span id="line-4">import io.reactivex.rxjava3.core.Single;</span>
-<span class="source-line-no">005</span><span id="line-5">import io.reactivex.rxjava3.disposables.Disposable;</span>
-<span class="source-line-no">006</span><span id="line-6">import io.reactivex.rxjava3.processors.BehaviorProcessor;</span>
-<span class="source-line-no">007</span><span id="line-7">import io.reactivex.rxjava3.processors.FlowableProcessor;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.bitcoinj.base.Sha256Hash;</span>
-<span class="source-line-no">009</span><span id="line-9">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
-<span class="source-line-no">010</span><span id="line-10">import org.consensusj.bitcoin.json.pojo.TxOutSetInfo;</span>
+<span class="source-line-no">004</span><span id="line-4">import io.reactivex.rxjava3.disposables.Disposable;</span>
+<span class="source-line-no">005</span><span id="line-5">import io.reactivex.rxjava3.processors.BehaviorProcessor;</span>
+<span class="source-line-no">006</span><span id="line-6">import io.reactivex.rxjava3.processors.FlowableProcessor;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.bitcoinj.base.Sha256Hash;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.consensusj.bitcoin.json.pojo.TxOutSetInfo;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.consensusj.bitcoin.rx.ChainTipPublisher;</span>
 <span class="source-line-no">011</span><span id="line-11">import org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient;</span>
-<span class="source-line-no">012</span><span id="line-12">import org.slf4j.Logger;</span>
-<span class="source-line-no">013</span><span id="line-13">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">014</span><span id="line-14"></span>
-<span class="source-line-no">015</span><span id="line-15">import java.io.Closeable;</span>
-<span class="source-line-no">016</span><span id="line-16">import java.util.concurrent.CompletableFuture;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.util.concurrent.ConcurrentHashMap;</span>
-<span class="source-line-no">018</span><span id="line-18">import java.util.concurrent.atomic.AtomicInteger;</span>
-<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">/**</span>
-<span class="source-line-no">021</span><span id="line-21"> * Service to return a stream of TxOutSetInfos for a given blockchain/client.</span>
-<span class="source-line-no">022</span><span id="line-22"> * Updates are triggered on new blocks (via {@link org.consensusj.bitcoin.rx.ChainTipService} a cache</span>
-<span class="source-line-no">023</span><span id="line-23"> * is used to prevent fetches of TxOutSetInfos already fetched (e.g. on blockchain re-org) and</span>
-<span class="source-line-no">024</span><span id="line-24"> * {@code MAX_OUTSTANDING_CALLS} is used to prevent overloading the server (e.g. during blockchain sync)</span>
-<span class="source-line-no">025</span><span id="line-25"> */</span>
-<span class="source-line-no">026</span><span id="line-26">public class TxOutSetService implements Closeable {</span>
-<span class="source-line-no">027</span><span id="line-27">    private static final Logger log = LoggerFactory.getLogger(TxOutSetService.class);</span>
-<span class="source-line-no">028</span><span id="line-28">    private final RxBitcoinClient client;</span>
-<span class="source-line-no">029</span><span id="line-29">    private final FlowableProcessor&lt;TxOutSetInfo&gt; txOutSetProcessor = BehaviorProcessor.create();</span>
-<span class="source-line-no">030</span><span id="line-30">    private final int CACHE_BLOCK_DEPTH = 1;</span>
-<span class="source-line-no">031</span><span id="line-31">    private final int MAX_OUTSTANDING_CALLS = 2;</span>
-<span class="source-line-no">032</span><span id="line-32">    private final AtomicInteger outstandingCalls = new AtomicInteger(0);</span>
-<span class="source-line-no">033</span><span id="line-33">    private final ConcurrentHashMap&lt;Sha256Hash, TxOutSetInfo&gt; txOutSetCache = new ConcurrentHashMap&lt;&gt;();</span>
-<span class="source-line-no">034</span><span id="line-34">    private Disposable txOutSetSubscription;</span>
-<span class="source-line-no">035</span><span id="line-35">    private CompletableFuture&lt;TxOutSetInfo&gt; lastCall;</span>
-<span class="source-line-no">036</span><span id="line-36"></span>
-<span class="source-line-no">037</span><span id="line-37">    public TxOutSetService(RxBitcoinClient client) {</span>
-<span class="source-line-no">038</span><span id="line-38">        this.client = client;</span>
-<span class="source-line-no">039</span><span id="line-39">    }</span>
-<span class="source-line-no">040</span><span id="line-40"></span>
-<span class="source-line-no">041</span><span id="line-41">    private synchronized void start() {</span>
-<span class="source-line-no">042</span><span id="line-42">        if (txOutSetSubscription == null) {</span>
-<span class="source-line-no">043</span><span id="line-43">            txOutSetSubscription = client</span>
-<span class="source-line-no">044</span><span id="line-44">                    .chainTipPublisher()</span>
-<span class="source-line-no">045</span><span id="line-45">                    .doOnNext(this::onNewBlock)</span>
-<span class="source-line-no">046</span><span id="line-46">                    .flatMapSingle(this::fetchSingle)</span>
-<span class="source-line-no">047</span><span id="line-47">                    .subscribe(txOutSetProcessor::onNext, txOutSetProcessor::onError, txOutSetProcessor::onComplete);</span>
-<span class="source-line-no">048</span><span id="line-48">        }</span>
-<span class="source-line-no">049</span><span id="line-49">    }</span>
-<span class="source-line-no">050</span><span id="line-50"></span>
-<span class="source-line-no">051</span><span id="line-51">    public Flowable&lt;TxOutSetInfo&gt; getTxOutSetPublisher() {</span>
-<span class="source-line-no">052</span><span id="line-52">        start();</span>
-<span class="source-line-no">053</span><span id="line-53">        return txOutSetProcessor;</span>
-<span class="source-line-no">054</span><span id="line-54">    }</span>
-<span class="source-line-no">055</span><span id="line-55">    </span>
-<span class="source-line-no">056</span><span id="line-56">    private void onNewBlock(ChainTip tip) {</span>
-<span class="source-line-no">057</span><span id="line-57">        // Remove all cache entries with txOutSetInfo.height &lt; tip.height - CACHE_BLOCK_DEPTH;</span>
-<span class="source-line-no">058</span><span id="line-58">        log.info("TxOutSetCache: checking {} entries for entries more than {} blocks old", txOutSetCache.size(), CACHE_BLOCK_DEPTH);</span>
-<span class="source-line-no">059</span><span id="line-59">        txOutSetCache.values().removeIf(txOutSetInfo -&gt; {</span>
-<span class="source-line-no">060</span><span id="line-60">            boolean remove = txOutSetInfo.getHeight() &lt; (tip.getHeight() - CACHE_BLOCK_DEPTH);</span>
-<span class="source-line-no">061</span><span id="line-61">            if (remove) {</span>
-<span class="source-line-no">062</span><span id="line-62">                log.info("Removing TxOutSetInfo For {}/{}", txOutSetInfo.getHeight(), txOutSetInfo.getBestBlock());</span>
-<span class="source-line-no">063</span><span id="line-63">            }</span>
-<span class="source-line-no">064</span><span id="line-64">            return remove;</span>
-<span class="source-line-no">065</span><span id="line-65">        });</span>
-<span class="source-line-no">066</span><span id="line-66">    }</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68">    private CompletableFuture&lt;TxOutSetInfo&gt; fetchCache(ChainTip tip) {</span>
-<span class="source-line-no">069</span><span id="line-69">        TxOutSetInfo cached = txOutSetCache.get(tip.getHash());</span>
-<span class="source-line-no">070</span><span id="line-70">        if (cached != null) {</span>
-<span class="source-line-no">071</span><span id="line-71">            return CompletableFuture.completedFuture(cached);</span>
-<span class="source-line-no">072</span><span id="line-72">        } else {</span>
-<span class="source-line-no">073</span><span id="line-73">            return fetch(tip);</span>
-<span class="source-line-no">074</span><span id="line-74">        }</span>
-<span class="source-line-no">075</span><span id="line-75">    }</span>
-<span class="source-line-no">076</span><span id="line-76"></span>
-<span class="source-line-no">077</span><span id="line-77">    private CompletableFuture&lt;TxOutSetInfo&gt; fetch(ChainTip tip) {</span>
-<span class="source-line-no">078</span><span id="line-78">        if (outstandingCalls.intValue() &gt;= MAX_OUTSTANDING_CALLS) {</span>
-<span class="source-line-no">079</span><span id="line-79">            // TODO: Use a synthesized totalCoins (e.g. lastValue + blockreward * delta_blocks)</span>
-<span class="source-line-no">080</span><span id="line-80">            log.info("Re-using last call because {} outstanding calls. ", MAX_OUTSTANDING_CALLS);</span>
-<span class="source-line-no">081</span><span id="line-81">        } else {</span>
-<span class="source-line-no">082</span><span id="line-82">            int calls = outstandingCalls.incrementAndGet();</span>
-<span class="source-line-no">083</span><span id="line-83">            log.info("Fetching TxOutSetInfo For {}/{} ({} outstanding calls)", tip.getHeight(), tip.getHash(), calls);</span>
-<span class="source-line-no">084</span><span id="line-84">            lastCall = client.supplyAsync(client::getTxOutSetInfo)</span>
-<span class="source-line-no">085</span><span id="line-85">                    .whenComplete(this::fetchCompletion);</span>
-<span class="source-line-no">086</span><span id="line-86">        }</span>
-<span class="source-line-no">087</span><span id="line-87">        return lastCall;</span>
-<span class="source-line-no">088</span><span id="line-88">    }</span>
-<span class="source-line-no">089</span><span id="line-89"></span>
-<span class="source-line-no">090</span><span id="line-90">    private void fetchCompletion(TxOutSetInfo info, Throwable t) {</span>
-<span class="source-line-no">091</span><span id="line-91">        int calls = outstandingCalls.decrementAndGet();</span>
-<span class="source-line-no">092</span><span id="line-92">        if (info != null) {</span>
-<span class="source-line-no">093</span><span id="line-93">            log.info("Completion result for: {}/{} ({} outstanding calls)", info.getHeight(), info.getBestBlock(), calls);</span>
-<span class="source-line-no">094</span><span id="line-94">            txOutSetCache.put(info.getBestBlock(), info);</span>
-<span class="source-line-no">095</span><span id="line-95">        } else {</span>
-<span class="source-line-no">096</span><span id="line-96">            log.info("Completion throwable: {} ({} outstanding calls)", t, calls);</span>
-<span class="source-line-no">097</span><span id="line-97">        }</span>
-<span class="source-line-no">098</span><span id="line-98">    }</span>
-<span class="source-line-no">099</span><span id="line-99">    </span>
-<span class="source-line-no">100</span><span id="line-100">    private Single&lt;TxOutSetInfo&gt; fetchSingle(ChainTip tip) {</span>
-<span class="source-line-no">101</span><span id="line-101">        return Single.defer(() -&gt; Single.fromCompletionStage(fetchCache(tip)));</span>
-<span class="source-line-no">102</span><span id="line-102">    }</span>
-<span class="source-line-no">103</span><span id="line-103">    </span>
-<span class="source-line-no">104</span><span id="line-104">    @Override</span>
-<span class="source-line-no">105</span><span id="line-105">    public void close()  {</span>
-<span class="source-line-no">106</span><span id="line-106">        if (txOutSetSubscription != null) {</span>
-<span class="source-line-no">107</span><span id="line-107">            txOutSetSubscription.dispose();</span>
-<span class="source-line-no">108</span><span id="line-108">        }</span>
-<span class="source-line-no">109</span><span id="line-109">    }</span>
-<span class="source-line-no">110</span><span id="line-110">}</span>
+<span class="source-line-no">012</span><span id="line-12">import org.consensusj.jsonrpc.DefaultRpcClient;</span>
+<span class="source-line-no">013</span><span id="line-13">import org.consensusj.jsonrpc.AsyncSupport;</span>
+<span class="source-line-no">014</span><span id="line-14">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">015</span><span id="line-15">import org.slf4j.Logger;</span>
+<span class="source-line-no">016</span><span id="line-16">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">017</span><span id="line-17"></span>
+<span class="source-line-no">018</span><span id="line-18">import java.io.Closeable;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.io.IOError;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">021</span><span id="line-21">import java.util.concurrent.ConcurrentHashMap;</span>
+<span class="source-line-no">022</span><span id="line-22">import java.util.concurrent.atomic.AtomicInteger;</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">/**</span>
+<span class="source-line-no">025</span><span id="line-25"> * Service to return a stream of TxOutSetInfos for a given blockchain/client.</span>
+<span class="source-line-no">026</span><span id="line-26"> * Updates are triggered on new blocks (via {@link org.consensusj.bitcoin.rx.ChainTipService} a cache</span>
+<span class="source-line-no">027</span><span id="line-27"> * is used to prevent fetches of TxOutSetInfos already fetched (e.g. on blockchain re-org) and</span>
+<span class="source-line-no">028</span><span id="line-28"> * {@code MAX_OUTSTANDING_CALLS} is used to prevent overloading the server (e.g. during blockchain sync)</span>
+<span class="source-line-no">029</span><span id="line-29"> */</span>
+<span class="source-line-no">030</span><span id="line-30">public class TxOutSetService implements Closeable {</span>
+<span class="source-line-no">031</span><span id="line-31">    private static final Logger log = LoggerFactory.getLogger(TxOutSetService.class);</span>
+<span class="source-line-no">032</span><span id="line-32">    private final RxBitcoinClient client;</span>
+<span class="source-line-no">033</span><span id="line-33">    private final ChainTipPublisher chainTipPublisher;</span>
+<span class="source-line-no">034</span><span id="line-34">    private final FlowableProcessor&lt;TxOutSetInfo&gt; txOutSetProcessor = BehaviorProcessor.create();</span>
+<span class="source-line-no">035</span><span id="line-35">    private final int CACHE_BLOCK_DEPTH = 1;</span>
+<span class="source-line-no">036</span><span id="line-36">    private final int MAX_OUTSTANDING_CALLS = 2;</span>
+<span class="source-line-no">037</span><span id="line-37">    private final AtomicInteger outstandingCalls = new AtomicInteger(0);</span>
+<span class="source-line-no">038</span><span id="line-38">    // TODO: Combine lastCall with cache and with in-memory SPV blockchain</span>
+<span class="source-line-no">039</span><span id="line-39">    private CompletableFuture&lt;TxOutSetInfo&gt; lastCall;</span>
+<span class="source-line-no">040</span><span id="line-40">    private final ConcurrentHashMap&lt;Sha256Hash, TxOutSetInfo&gt; txOutSetCache = new ConcurrentHashMap&lt;&gt;();</span>
+<span class="source-line-no">041</span><span id="line-41">    private volatile Disposable txOutSetSubscription;</span>
+<span class="source-line-no">042</span><span id="line-42"></span>
+<span class="source-line-no">043</span><span id="line-43">    // TODO: Use BitcoinClient not RxBitcoinClient</span>
+<span class="source-line-no">044</span><span id="line-44">    /**</span>
+<span class="source-line-no">045</span><span id="line-45">     * @param client Client for requesting {@link TxOutSetInfo} objects.</span>
+<span class="source-line-no">046</span><span id="line-46">     * @param chainTipPublisher Publisher telling us when new blocks are available.</span>
+<span class="source-line-no">047</span><span id="line-47">     */</span>
+<span class="source-line-no">048</span><span id="line-48">    public TxOutSetService(RxBitcoinClient client, ChainTipPublisher chainTipPublisher) {</span>
+<span class="source-line-no">049</span><span id="line-49">        this.client = client;</span>
+<span class="source-line-no">050</span><span id="line-50">        this.chainTipPublisher = chainTipPublisher;</span>
+<span class="source-line-no">051</span><span id="line-51">    }</span>
+<span class="source-line-no">052</span><span id="line-52"></span>
+<span class="source-line-no">053</span><span id="line-53">    private synchronized void start() {</span>
+<span class="source-line-no">054</span><span id="line-54">        if (txOutSetSubscription == null) {</span>
+<span class="source-line-no">055</span><span id="line-55">            txOutSetSubscription = Flowable.fromPublisher(chainTipPublisher)</span>
+<span class="source-line-no">056</span><span id="line-56">                    .doOnNext(this::onNewBlock)</span>
+<span class="source-line-no">057</span><span id="line-57">                    .flatMap(this::fetchCacheMaybe)</span>
+<span class="source-line-no">058</span><span id="line-58">                    .subscribe(txOutSetProcessor::onNext, txOutSetProcessor::onError, txOutSetProcessor::onComplete);</span>
+<span class="source-line-no">059</span><span id="line-59">        }</span>
+<span class="source-line-no">060</span><span id="line-60">    }</span>
+<span class="source-line-no">061</span><span id="line-61"></span>
+<span class="source-line-no">062</span><span id="line-62">    public Publisher&lt;TxOutSetInfo&gt; getTxOutSetPublisher() {</span>
+<span class="source-line-no">063</span><span id="line-63">        start();</span>
+<span class="source-line-no">064</span><span id="line-64">        return txOutSetProcessor;</span>
+<span class="source-line-no">065</span><span id="line-65">    }</span>
+<span class="source-line-no">066</span><span id="line-66">    </span>
+<span class="source-line-no">067</span><span id="line-67">    private void onNewBlock(ChainTip tip) {</span>
+<span class="source-line-no">068</span><span id="line-68">        // Remove all cache entries with txOutSetInfo.height &lt; tip.height - CACHE_BLOCK_DEPTH;</span>
+<span class="source-line-no">069</span><span id="line-69">        log.info("TxOutSetCache: checking {} entries for entries more than {} blocks old", txOutSetCache.size(), CACHE_BLOCK_DEPTH);</span>
+<span class="source-line-no">070</span><span id="line-70">        txOutSetCache.values().removeIf(txOutSetInfo -&gt; {</span>
+<span class="source-line-no">071</span><span id="line-71">            boolean remove = txOutSetInfo.getHeight() &lt; (tip.getHeight() - CACHE_BLOCK_DEPTH);</span>
+<span class="source-line-no">072</span><span id="line-72">            if (remove) {</span>
+<span class="source-line-no">073</span><span id="line-73">                log.info("Removing TxOutSetInfo For {}/{}", txOutSetInfo.getHeight(), txOutSetInfo.getBestBlock());</span>
+<span class="source-line-no">074</span><span id="line-74">            }</span>
+<span class="source-line-no">075</span><span id="line-75">            return remove;</span>
+<span class="source-line-no">076</span><span id="line-76">        });</span>
+<span class="source-line-no">077</span><span id="line-77">    }</span>
+<span class="source-line-no">078</span><span id="line-78"></span>
+<span class="source-line-no">079</span><span id="line-79">    // TODO: Ignoring all IOError is too broad</span>
+<span class="source-line-no">080</span><span id="line-80">    final DefaultRpcClient.TransientErrorFilter errorFilter = AsyncSupport.TransientErrorFilter.of(</span>
+<span class="source-line-no">081</span><span id="line-81">            (t) -&gt; t instanceof IOError,                        // Ignore if IOError</span>
+<span class="source-line-no">082</span><span id="line-82">            (t) -&gt; log.warn("Ignoring transient error: ", t)    // Log if ignored</span>
+<span class="source-line-no">083</span><span id="line-83">    );</span>
+<span class="source-line-no">084</span><span id="line-84"></span>
+<span class="source-line-no">085</span><span id="line-85">    // TODO: Convert to using CompletableFuture to drop dependency on RxBitcoinClient and RxJava</span>
+<span class="source-line-no">086</span><span id="line-86">    /**</span>
+<span class="source-line-no">087</span><span id="line-87">     * Try to fetch a TxOutSetInfo from the cache or from the network. Returning an empty stream if a transient error occurs.</span>
+<span class="source-line-no">088</span><span id="line-88">     * To use this you will typically call {@link Flowable#flatMap(io.reactivex.rxjava3.functions.Function)}.</span>
+<span class="source-line-no">089</span><span id="line-89">     * @param tip ChainTip we are looking for</span>
+<span class="source-line-no">090</span><span id="line-90">     * @return An Observable that returns 0 or 1 (behaves as a Maybe) TxOutSetInfo</span>
+<span class="source-line-no">091</span><span id="line-91">     */</span>
+<span class="source-line-no">092</span><span id="line-92">    private Publisher&lt;TxOutSetInfo&gt; fetchCacheMaybe(ChainTip tip) {</span>
+<span class="source-line-no">093</span><span id="line-93">        return client.pollOnceAsPublisher(() -&gt; fetchCache(tip), errorFilter);</span>
+<span class="source-line-no">094</span><span id="line-94">    }</span>
+<span class="source-line-no">095</span><span id="line-95"></span>
+<span class="source-line-no">096</span><span id="line-96">    // Try to fetch a TxOutSetInfo from the cache or from the network.</span>
+<span class="source-line-no">097</span><span id="line-97">    private CompletableFuture&lt;TxOutSetInfo&gt; fetchCache(ChainTip tip) {</span>
+<span class="source-line-no">098</span><span id="line-98">        TxOutSetInfo cached = txOutSetCache.get(tip.getHash());</span>
+<span class="source-line-no">099</span><span id="line-99">        if (cached != null) {</span>
+<span class="source-line-no">100</span><span id="line-100">            return CompletableFuture.completedFuture(cached);</span>
+<span class="source-line-no">101</span><span id="line-101">        } else {</span>
+<span class="source-line-no">102</span><span id="line-102">            return fetch(tip);</span>
+<span class="source-line-no">103</span><span id="line-103">        }</span>
+<span class="source-line-no">104</span><span id="line-104">    }</span>
+<span class="source-line-no">105</span><span id="line-105"></span>
+<span class="source-line-no">106</span><span id="line-106">    // Fetch a TxOutSetInfo or return last one if too many calls are outstanding</span>
+<span class="source-line-no">107</span><span id="line-107">    private CompletableFuture&lt;TxOutSetInfo&gt; fetch(ChainTip tip) {</span>
+<span class="source-line-no">108</span><span id="line-108">        if (outstandingCalls.intValue() &gt;= MAX_OUTSTANDING_CALLS) {</span>
+<span class="source-line-no">109</span><span id="line-109">            // TODO: Use a synthesized totalCoins (e.g. lastValue + block_reward * delta_blocks)</span>
+<span class="source-line-no">110</span><span id="line-110">            log.info("Re-using last call because {} outstanding calls. ", MAX_OUTSTANDING_CALLS);</span>
+<span class="source-line-no">111</span><span id="line-111">        } else {</span>
+<span class="source-line-no">112</span><span id="line-112">            int calls = outstandingCalls.incrementAndGet();</span>
+<span class="source-line-no">113</span><span id="line-113">            log.info("Fetching TxOutSetInfo For {}/{} ({} outstanding calls)", tip.getHeight(), tip.getHash(), calls);</span>
+<span class="source-line-no">114</span><span id="line-114">            lastCall = client.supplyAsync(client::getTxOutSetInfo)</span>
+<span class="source-line-no">115</span><span id="line-115">                    .whenComplete(this::fetchCompletion);</span>
+<span class="source-line-no">116</span><span id="line-116">        }</span>
+<span class="source-line-no">117</span><span id="line-117">        return lastCall;</span>
+<span class="source-line-no">118</span><span id="line-118">    }</span>
+<span class="source-line-no">119</span><span id="line-119"></span>
+<span class="source-line-no">120</span><span id="line-120">    private void fetchCompletion(TxOutSetInfo info, Throwable t) {</span>
+<span class="source-line-no">121</span><span id="line-121">        int calls = outstandingCalls.decrementAndGet();</span>
+<span class="source-line-no">122</span><span id="line-122">        if (info != null) {</span>
+<span class="source-line-no">123</span><span id="line-123">            log.info("Completion result for: {}/{} ({} outstanding calls)", info.getHeight(), info.getBestBlock(), calls);</span>
+<span class="source-line-no">124</span><span id="line-124">            txOutSetCache.put(info.getBestBlock(), info);</span>
+<span class="source-line-no">125</span><span id="line-125">        } else {</span>
+<span class="source-line-no">126</span><span id="line-126">            log.info("Completion throwable: {} ({} outstanding calls)", t, calls);</span>
+<span class="source-line-no">127</span><span id="line-127">        }</span>
+<span class="source-line-no">128</span><span id="line-128">    }</span>
+<span class="source-line-no">129</span><span id="line-129">    </span>
+<span class="source-line-no">130</span><span id="line-130">    @Override</span>
+<span class="source-line-no">131</span><span id="line-131">    public void close()  {</span>
+<span class="source-line-no">132</span><span id="line-132">        if (txOutSetSubscription != null) {</span>
+<span class="source-line-no">133</span><span id="line-133">            txOutSetSubscription.dispose();</span>
+<span class="source-line-no">134</span><span id="line-134">        }</span>
+<span class="source-line-no">135</span><span id="line-135">    }</span>
+<span class="source-line-no">136</span><span id="line-136">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html
new file mode 100644
index 000000000..b10ed27e6
--- /dev/null
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/jsonrpc/test/TestChainTipPublishers.html
@@ -0,0 +1,94 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Source code</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="source: package: org.consensusj.bitcoin.rx.jsonrpc.test, class: TestChainTipPublishers">
+<meta name="generator" content="javadoc/SourceToHTMLConverter">
+<link rel="stylesheet" type="text/css" href="../../../../../../../stylesheet.css" title="Style">
+</head>
+<body class="source-page">
+<main role="main">
+<div class="source-container">
+<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx.jsonrpc.test;</span>
+<span class="source-line-no">002</span><span id="line-2"></span>
+<span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.Flowable;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.consensusj.bitcoin.rx.ChainTipPublisher;</span>
+<span class="source-line-no">005</span><span id="line-5"></span>
+<span class="source-line-no">006</span><span id="line-6">/**</span>
+<span class="source-line-no">007</span><span id="line-7"> *  Useful for testing.</span>
+<span class="source-line-no">008</span><span id="line-8"> */</span>
+<span class="source-line-no">009</span><span id="line-9">public class TestChainTipPublishers {</span>
+<span class="source-line-no">010</span><span id="line-10">    /**</span>
+<span class="source-line-no">011</span><span id="line-11">     * @return A {@link ChainTipPublisher} that never emits items and never closes.</span>
+<span class="source-line-no">012</span><span id="line-12">     */</span>
+<span class="source-line-no">013</span><span id="line-13">    public static ChainTipPublisher never() {</span>
+<span class="source-line-no">014</span><span id="line-14">        return ChainTipPublisher.of(Flowable.never());</span>
+<span class="source-line-no">015</span><span id="line-15">    }</span>
+<span class="source-line-no">016</span><span id="line-16">}</span>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</main>
+</body>
+</html>
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/peergroup/RxPeerGroup.html b/apidoc/src-html/org/consensusj/bitcoin/rx/peergroup/RxPeerGroup.html
index 4c6b81509..d85b0c403 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/peergroup/RxPeerGroup.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/peergroup/RxPeerGroup.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.peergroup, class: RxPeerGroup">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.Topic.html b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.Topic.html
index 8a07cfd22..58bf9d336 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.Topic.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.Topic.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.zeromq, class: BitcoinZmqMessage, enum: Topic">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html
index fa438951c..093469e30 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqMessage.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.zeromq, class: BitcoinZmqMessage">
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html
index 61b8b5a45..fcaff48dc 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/BitcoinZmqPortFinder.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.zeromq, class: BitcoinZmqPortFinder">
@@ -19,66 +19,67 @@
 <span class="source-line-no">006</span><span id="line-6">import java.io.IOException;</span>
 <span class="source-line-no">007</span><span id="line-7">import java.net.URI;</span>
 <span class="source-line-no">008</span><span id="line-8">import java.net.URISyntaxException;</span>
-<span class="source-line-no">009</span><span id="line-9">import java.util.List;</span>
-<span class="source-line-no">010</span><span id="line-10">import java.util.Optional;</span>
-<span class="source-line-no">011</span><span id="line-11"></span>
-<span class="source-line-no">012</span><span id="line-12">/**</span>
-<span class="source-line-no">013</span><span id="line-13"> * Utility to use Bitcoin Core JSON-RPC to find configured ZMQ notification ports.</span>
-<span class="source-line-no">014</span><span id="line-14"> */</span>
-<span class="source-line-no">015</span><span id="line-15">public class BitcoinZmqPortFinder {</span>
-<span class="source-line-no">016</span><span id="line-16">    private final BitcoinClient client;</span>
-<span class="source-line-no">017</span><span id="line-17">    private final URI rpcUri;</span>
-<span class="source-line-no">018</span><span id="line-18">    private List&lt;ZmqNotification&gt; notifications;</span>
-<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">    public BitcoinZmqPortFinder(BitcoinClient client) {</span>
-<span class="source-line-no">021</span><span id="line-21">        this.client = client;</span>
-<span class="source-line-no">022</span><span id="line-22">        rpcUri = client.getServerURI();</span>
-<span class="source-line-no">023</span><span id="line-23">    }</span>
-<span class="source-line-no">024</span><span id="line-24"></span>
-<span class="source-line-no">025</span><span id="line-25">    public Optional&lt;URI&gt; findPort(BitcoinZmqMessage.Topic topic) {</span>
-<span class="source-line-no">026</span><span id="line-26">        getNotifications();</span>
-<span class="source-line-no">027</span><span id="line-27">        return notifications.stream()</span>
-<span class="source-line-no">028</span><span id="line-28">                .filter(n -&gt; n.type().equals("pub" + topic.toString()))</span>
-<span class="source-line-no">029</span><span id="line-29">                .findFirst()</span>
-<span class="source-line-no">030</span><span id="line-30">                .map(ZmqNotification::address)</span>
-<span class="source-line-no">031</span><span id="line-31">                .map(this::mapUri);</span>
-<span class="source-line-no">032</span><span id="line-32">    }</span>
-<span class="source-line-no">033</span><span id="line-33">    </span>
-<span class="source-line-no">034</span><span id="line-34">    private synchronized void getNotifications() {</span>
-<span class="source-line-no">035</span><span id="line-35">        if (notifications == null) {</span>
-<span class="source-line-no">036</span><span id="line-36">            try {</span>
-<span class="source-line-no">037</span><span id="line-37">                // TODO: We don't want to hang here for 120 seconds or so waiting for a server</span>
-<span class="source-line-no">038</span><span id="line-38">                client.waitForServer(1);</span>
-<span class="source-line-no">039</span><span id="line-39">                notifications = client.getZmqNotifications();</span>
-<span class="source-line-no">040</span><span id="line-40">            } catch (IOException e) {</span>
-<span class="source-line-no">041</span><span id="line-41">                // TODO: Handle this more gracefully, without runtime exception</span>
-<span class="source-line-no">042</span><span id="line-42">                throw new RuntimeException(e);</span>
-<span class="source-line-no">043</span><span id="line-43">            }</span>
-<span class="source-line-no">044</span><span id="line-44">        }</span>
-<span class="source-line-no">045</span><span id="line-45">    }</span>
-<span class="source-line-no">046</span><span id="line-46"></span>
-<span class="source-line-no">047</span><span id="line-47">    private URI mapUri(URI configuredZmqUri) {</span>
-<span class="source-line-no">048</span><span id="line-48">        return zmqPort(rpcUri, configuredZmqUri);</span>
-<span class="source-line-no">049</span><span id="line-49">    }</span>
-<span class="source-line-no">050</span><span id="line-50"></span>
-<span class="source-line-no">051</span><span id="line-51">    /**</span>
-<span class="source-line-no">052</span><span id="line-52">     * Create tcp URI for ZMQ using host of JSON-RPC client and port of URI returned with zmqnotifications</span>
-<span class="source-line-no">053</span><span id="line-53">     *</span>
-<span class="source-line-no">054</span><span id="line-54">     * @param client http URI of JSON-RPC server</span>
-<span class="source-line-no">055</span><span id="line-55">     * @param zmqPubURI ZMQ tcp URI returned with getzmqnotifications</span>
-<span class="source-line-no">056</span><span id="line-56">     * @return A tcp URI for ZMQ using host from client port from zmqPubURI</span>
-<span class="source-line-no">057</span><span id="line-57">     */</span>
-<span class="source-line-no">058</span><span id="line-58">    private static URI zmqPort(URI client, URI zmqPubURI) {</span>
-<span class="source-line-no">059</span><span id="line-59">        URI updated;</span>
-<span class="source-line-no">060</span><span id="line-60">        try {</span>
-<span class="source-line-no">061</span><span id="line-61">            updated = new URI("tcp", null, client.getHost(), zmqPubURI.getPort(), null, null, null);</span>
-<span class="source-line-no">062</span><span id="line-62">        } catch (URISyntaxException e) {</span>
-<span class="source-line-no">063</span><span id="line-63">            throw new RuntimeException(e);</span>
-<span class="source-line-no">064</span><span id="line-64">        }</span>
-<span class="source-line-no">065</span><span id="line-65">        return updated;</span>
-<span class="source-line-no">066</span><span id="line-66">    }</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68">}</span>
+<span class="source-line-no">009</span><span id="line-9">import java.time.Duration;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.util.List;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.util.Optional;</span>
+<span class="source-line-no">012</span><span id="line-12"></span>
+<span class="source-line-no">013</span><span id="line-13">/**</span>
+<span class="source-line-no">014</span><span id="line-14"> * Utility to use Bitcoin Core JSON-RPC to find configured ZMQ notification ports.</span>
+<span class="source-line-no">015</span><span id="line-15"> */</span>
+<span class="source-line-no">016</span><span id="line-16">public class BitcoinZmqPortFinder {</span>
+<span class="source-line-no">017</span><span id="line-17">    private final BitcoinClient client;</span>
+<span class="source-line-no">018</span><span id="line-18">    private final URI rpcUri;</span>
+<span class="source-line-no">019</span><span id="line-19">    private List&lt;ZmqNotification&gt; notifications;</span>
+<span class="source-line-no">020</span><span id="line-20"></span>
+<span class="source-line-no">021</span><span id="line-21">    public BitcoinZmqPortFinder(BitcoinClient client) {</span>
+<span class="source-line-no">022</span><span id="line-22">        this.client = client;</span>
+<span class="source-line-no">023</span><span id="line-23">        rpcUri = client.getServerURI();</span>
+<span class="source-line-no">024</span><span id="line-24">    }</span>
+<span class="source-line-no">025</span><span id="line-25"></span>
+<span class="source-line-no">026</span><span id="line-26">    public Optional&lt;URI&gt; findPort(BitcoinZmqMessage.Topic topic) {</span>
+<span class="source-line-no">027</span><span id="line-27">        getNotifications();</span>
+<span class="source-line-no">028</span><span id="line-28">        return notifications.stream()</span>
+<span class="source-line-no">029</span><span id="line-29">                .filter(n -&gt; n.type().equals("pub" + topic.toString()))</span>
+<span class="source-line-no">030</span><span id="line-30">                .findFirst()</span>
+<span class="source-line-no">031</span><span id="line-31">                .map(ZmqNotification::address)</span>
+<span class="source-line-no">032</span><span id="line-32">                .map(this::mapUri);</span>
+<span class="source-line-no">033</span><span id="line-33">    }</span>
+<span class="source-line-no">034</span><span id="line-34">    </span>
+<span class="source-line-no">035</span><span id="line-35">    private synchronized void getNotifications() {</span>
+<span class="source-line-no">036</span><span id="line-36">        if (notifications == null) {</span>
+<span class="source-line-no">037</span><span id="line-37">            try {</span>
+<span class="source-line-no">038</span><span id="line-38">                // TODO: We don't want to hang here for 120 seconds or so waiting for a server</span>
+<span class="source-line-no">039</span><span id="line-39">                // client.waitForServer(Duration.ofSeconds(1));</span>
+<span class="source-line-no">040</span><span id="line-40">                notifications = client.getZmqNotifications();</span>
+<span class="source-line-no">041</span><span id="line-41">            } catch (IOException e) {</span>
+<span class="source-line-no">042</span><span id="line-42">                // TODO: Handle this more gracefully, without runtime exception</span>
+<span class="source-line-no">043</span><span id="line-43">                throw new RuntimeException(e);</span>
+<span class="source-line-no">044</span><span id="line-44">            }</span>
+<span class="source-line-no">045</span><span id="line-45">        }</span>
+<span class="source-line-no">046</span><span id="line-46">    }</span>
+<span class="source-line-no">047</span><span id="line-47"></span>
+<span class="source-line-no">048</span><span id="line-48">    private URI mapUri(URI configuredZmqUri) {</span>
+<span class="source-line-no">049</span><span id="line-49">        return zmqPort(rpcUri, configuredZmqUri);</span>
+<span class="source-line-no">050</span><span id="line-50">    }</span>
+<span class="source-line-no">051</span><span id="line-51"></span>
+<span class="source-line-no">052</span><span id="line-52">    /**</span>
+<span class="source-line-no">053</span><span id="line-53">     * Create tcp URI for ZMQ using host of JSON-RPC client and port of URI returned with zmqnotifications</span>
+<span class="source-line-no">054</span><span id="line-54">     *</span>
+<span class="source-line-no">055</span><span id="line-55">     * @param client http URI of JSON-RPC server</span>
+<span class="source-line-no">056</span><span id="line-56">     * @param zmqPubURI ZMQ tcp URI returned with getzmqnotifications</span>
+<span class="source-line-no">057</span><span id="line-57">     * @return A tcp URI for ZMQ using host from client port from zmqPubURI</span>
+<span class="source-line-no">058</span><span id="line-58">     */</span>
+<span class="source-line-no">059</span><span id="line-59">    private static URI zmqPort(URI client, URI zmqPubURI) {</span>
+<span class="source-line-no">060</span><span id="line-60">        URI updated;</span>
+<span class="source-line-no">061</span><span id="line-61">        try {</span>
+<span class="source-line-no">062</span><span id="line-62">            updated = new URI("tcp", null, client.getHost(), zmqPubURI.getPort(), null, null, null);</span>
+<span class="source-line-no">063</span><span id="line-63">        } catch (URISyntaxException e) {</span>
+<span class="source-line-no">064</span><span id="line-64">            throw new RuntimeException(e);</span>
+<span class="source-line-no">065</span><span id="line-65">        }</span>
+<span class="source-line-no">066</span><span id="line-66">        return updated;</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html
index 6c7ae79ef..63a111074 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinSinglePortZmqService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.zeromq, class: RxBitcoinSinglePortZmqService">
@@ -18,232 +18,243 @@
 <span class="source-line-no">005</span><span id="line-5">import io.reactivex.rxjava3.processors.PublishProcessor;</span>
 <span class="source-line-no">006</span><span id="line-6">import org.consensusj.bitcoin.rx.RxBlockchainBinaryService;</span>
 <span class="source-line-no">007</span><span id="line-7">import org.consensusj.rx.zeromq.RxZmqContext;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.slf4j.Logger;</span>
-<span class="source-line-no">009</span><span id="line-9">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">010</span><span id="line-10">import org.zeromq.ZMsg;</span>
-<span class="source-line-no">011</span><span id="line-11"></span>
-<span class="source-line-no">012</span><span id="line-12">import java.io.Closeable;</span>
-<span class="source-line-no">013</span><span id="line-13">import java.net.URI;</span>
-<span class="source-line-no">014</span><span id="line-14">import java.util.Collections;</span>
-<span class="source-line-no">015</span><span id="line-15">import java.util.List;</span>
-<span class="source-line-no">016</span><span id="line-16">import java.util.Optional;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.util.Set;</span>
-<span class="source-line-no">018</span><span id="line-18">import java.util.concurrent.ThreadFactory;</span>
-<span class="source-line-no">019</span><span id="line-19">import java.util.stream.Collectors;</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">/**</span>
-<span class="source-line-no">022</span><span id="line-22"> * Bitcoin Zmq &lt;b&gt;binary&lt;/b&gt; service that connects to a single port.</span>
-<span class="source-line-no">023</span><span id="line-23"> * Use {@code RxBitcoinZmqBinaryService} if Bitcoin Core is configured to run ZMQ on multiple ports.</span>
-<span class="source-line-no">024</span><span id="line-24"> * See: &lt;a href="https://github.com/bitcoin/bitcoin/pull/19572"&gt;PR 19752&lt;/a&gt; for sequence topic information</span>
-<span class="source-line-no">025</span><span id="line-25"> */</span>
-<span class="source-line-no">026</span><span id="line-26">public class RxBitcoinSinglePortZmqService implements RxBlockchainBinaryService, Closeable {</span>
-<span class="source-line-no">027</span><span id="line-27">    private static final Logger log = LoggerFactory.getLogger(RxBitcoinSinglePortZmqService.class);</span>
-<span class="source-line-no">028</span><span id="line-28"></span>
-<span class="source-line-no">029</span><span id="line-29">    private final URI tcpAddress;</span>
-<span class="source-line-no">030</span><span id="line-30">    private final Set&lt;BitcoinZmqMessage.Topic&gt; topicSet;</span>
-<span class="source-line-no">031</span><span id="line-31"></span>
-<span class="source-line-no">032</span><span id="line-32">    private final RxZmqContext zmqContext;</span>
-<span class="source-line-no">033</span><span id="line-33"></span>
-<span class="source-line-no">034</span><span id="line-34">    private final FlowableProcessor&lt;byte[]&gt; rawTxProcessor = PublishProcessor.create();</span>
-<span class="source-line-no">035</span><span id="line-35">    private final FlowableProcessor&lt;byte[]&gt; rawBlockProcessor = PublishProcessor.create();</span>
-<span class="source-line-no">036</span><span id="line-36">    private final FlowableProcessor&lt;byte[]&gt; hashTxProcessor = PublishProcessor.create();</span>
-<span class="source-line-no">037</span><span id="line-37">    private final FlowableProcessor&lt;byte[]&gt; hashBlockProcessor = PublishProcessor.create();</span>
-<span class="source-line-no">038</span><span id="line-38"></span>
-<span class="source-line-no">039</span><span id="line-39">    private long hashBlockSeq = -1;</span>
-<span class="source-line-no">040</span><span id="line-40">    private long hashTxSeq = -1;</span>
-<span class="source-line-no">041</span><span id="line-41">    private long rawBlockSeq = -1;</span>
-<span class="source-line-no">042</span><span id="line-42">    private long rawTxSeq = -1;</span>
-<span class="source-line-no">043</span><span id="line-43"></span>
+<span class="source-line-no">008</span><span id="line-8">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.slf4j.Logger;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">011</span><span id="line-11">import org.zeromq.ZMsg;</span>
+<span class="source-line-no">012</span><span id="line-12"></span>
+<span class="source-line-no">013</span><span id="line-13">import java.io.Closeable;</span>
+<span class="source-line-no">014</span><span id="line-14">import java.net.URI;</span>
+<span class="source-line-no">015</span><span id="line-15">import java.util.Collections;</span>
+<span class="source-line-no">016</span><span id="line-16">import java.util.List;</span>
+<span class="source-line-no">017</span><span id="line-17">import java.util.Optional;</span>
+<span class="source-line-no">018</span><span id="line-18">import java.util.Set;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.util.concurrent.ThreadFactory;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.util.stream.Collectors;</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">/**</span>
+<span class="source-line-no">023</span><span id="line-23"> * Bitcoin Zmq &lt;b&gt;binary&lt;/b&gt; service that connects to a single port.</span>
+<span class="source-line-no">024</span><span id="line-24"> * Use {@code RxBitcoinZmqBinaryService} if Bitcoin Core is configured to run ZMQ on multiple ports.</span>
+<span class="source-line-no">025</span><span id="line-25"> * See: &lt;a href="https://github.com/bitcoin/bitcoin/pull/19572"&gt;PR 19752&lt;/a&gt; for sequence topic information</span>
+<span class="source-line-no">026</span><span id="line-26"> */</span>
+<span class="source-line-no">027</span><span id="line-27">public class RxBitcoinSinglePortZmqService implements RxBlockchainBinaryService, Closeable {</span>
+<span class="source-line-no">028</span><span id="line-28">    private static final Logger log = LoggerFactory.getLogger(RxBitcoinSinglePortZmqService.class);</span>
+<span class="source-line-no">029</span><span id="line-29"></span>
+<span class="source-line-no">030</span><span id="line-30">    private final URI tcpAddress;</span>
+<span class="source-line-no">031</span><span id="line-31">    private final Set&lt;BitcoinZmqMessage.Topic&gt; topicSet;</span>
+<span class="source-line-no">032</span><span id="line-32"></span>
+<span class="source-line-no">033</span><span id="line-33">    private final RxZmqContext zmqContext;</span>
+<span class="source-line-no">034</span><span id="line-34"></span>
+<span class="source-line-no">035</span><span id="line-35">    private final FlowableProcessor&lt;byte[]&gt; rawTxProcessor = PublishProcessor.create();</span>
+<span class="source-line-no">036</span><span id="line-36">    private final FlowableProcessor&lt;byte[]&gt; rawBlockProcessor = PublishProcessor.create();</span>
+<span class="source-line-no">037</span><span id="line-37">    private final FlowableProcessor&lt;byte[]&gt; hashTxProcessor = PublishProcessor.create();</span>
+<span class="source-line-no">038</span><span id="line-38">    private final FlowableProcessor&lt;byte[]&gt; hashBlockProcessor = PublishProcessor.create();</span>
+<span class="source-line-no">039</span><span id="line-39"></span>
+<span class="source-line-no">040</span><span id="line-40">    private long hashBlockSeq = -1;</span>
+<span class="source-line-no">041</span><span id="line-41">    private long hashTxSeq = -1;</span>
+<span class="source-line-no">042</span><span id="line-42">    private long rawBlockSeq = -1;</span>
+<span class="source-line-no">043</span><span id="line-43">    private long rawTxSeq = -1;</span>
 <span class="source-line-no">044</span><span id="line-44"></span>
-<span class="source-line-no">045</span><span id="line-45">    public RxBitcoinSinglePortZmqService(URI tcpAddress, ThreadFactory threadFactory, BitcoinZmqMessage.Topic... topics) {</span>
-<span class="source-line-no">046</span><span id="line-46">        this(tcpAddress, threadFactory, Set.of(topics));</span>
-<span class="source-line-no">047</span><span id="line-47">    }</span>
-<span class="source-line-no">048</span><span id="line-48"></span>
-<span class="source-line-no">049</span><span id="line-49">    private RxBitcoinSinglePortZmqService(URI tcpAddress, ThreadFactory threadFactory, Set&lt;BitcoinZmqMessage.Topic&gt; topics) {</span>
-<span class="source-line-no">050</span><span id="line-50">        this.tcpAddress = tcpAddress;</span>
-<span class="source-line-no">051</span><span id="line-51">        topicSet = Collections.unmodifiableSet(topics);</span>
-<span class="source-line-no">052</span><span id="line-52">        List&lt;String&gt; stringTopics = topics.stream().map(BitcoinZmqMessage.Topic::toString).collect(Collectors.toList());</span>
-<span class="source-line-no">053</span><span id="line-53">        zmqContext = new RxZmqContext(tcpAddress, stringTopics, threadFactory);</span>
-<span class="source-line-no">054</span><span id="line-54">        for (BitcoinZmqMessage.Topic topic : topics) {</span>
-<span class="source-line-no">055</span><span id="line-55">            // Subscribe to each topic</span>
-<span class="source-line-no">056</span><span id="line-56">            switch (topic) {</span>
-<span class="source-line-no">057</span><span id="line-57">                case hashblock:</span>
-<span class="source-line-no">058</span><span id="line-58">                    zmqContext.topicPublisher(topic.toString()).subscribe(this::onNextHashBlock, hashBlockProcessor::onError, hashBlockProcessor::onComplete);</span>
-<span class="source-line-no">059</span><span id="line-59">                    break;</span>
-<span class="source-line-no">060</span><span id="line-60">                case hashtx:</span>
-<span class="source-line-no">061</span><span id="line-61">                    zmqContext.topicPublisher(topic.toString()).subscribe(this::onNextHashTx, hashTxProcessor::onError, hashTxProcessor::onComplete);</span>
-<span class="source-line-no">062</span><span id="line-62">                    break;</span>
-<span class="source-line-no">063</span><span id="line-63">                case rawblock:</span>
-<span class="source-line-no">064</span><span id="line-64">                    zmqContext.topicPublisher(topic.toString()).subscribe(this::onNextRawBlock, rawBlockProcessor::onError, rawBlockProcessor::onComplete);</span>
+<span class="source-line-no">045</span><span id="line-45"></span>
+<span class="source-line-no">046</span><span id="line-46">    public RxBitcoinSinglePortZmqService(URI tcpAddress, ThreadFactory threadFactory, BitcoinZmqMessage.Topic... topics) {</span>
+<span class="source-line-no">047</span><span id="line-47">        this(tcpAddress, threadFactory, Set.of(topics));</span>
+<span class="source-line-no">048</span><span id="line-48">    }</span>
+<span class="source-line-no">049</span><span id="line-49"></span>
+<span class="source-line-no">050</span><span id="line-50">    private RxBitcoinSinglePortZmqService(URI tcpAddress, ThreadFactory threadFactory, Set&lt;BitcoinZmqMessage.Topic&gt; topics) {</span>
+<span class="source-line-no">051</span><span id="line-51">        this.tcpAddress = tcpAddress;</span>
+<span class="source-line-no">052</span><span id="line-52">        topicSet = Collections.unmodifiableSet(topics);</span>
+<span class="source-line-no">053</span><span id="line-53">        List&lt;String&gt; stringTopics = topics.stream().map(BitcoinZmqMessage.Topic::toString).collect(Collectors.toList());</span>
+<span class="source-line-no">054</span><span id="line-54">        zmqContext = new RxZmqContext(tcpAddress, stringTopics, threadFactory);</span>
+<span class="source-line-no">055</span><span id="line-55">        for (BitcoinZmqMessage.Topic topic : topics) {</span>
+<span class="source-line-no">056</span><span id="line-56">            // Subscribe to each topic</span>
+<span class="source-line-no">057</span><span id="line-57">            switch (topic) {</span>
+<span class="source-line-no">058</span><span id="line-58">                case hashblock:</span>
+<span class="source-line-no">059</span><span id="line-59">                    getTopicPublisher(topic)</span>
+<span class="source-line-no">060</span><span id="line-60">                            .subscribe(this::onNextHashBlock, hashBlockProcessor::onError, hashBlockProcessor::onComplete);</span>
+<span class="source-line-no">061</span><span id="line-61">                    break;</span>
+<span class="source-line-no">062</span><span id="line-62">                case hashtx:</span>
+<span class="source-line-no">063</span><span id="line-63">                    getTopicPublisher(topic)</span>
+<span class="source-line-no">064</span><span id="line-64">                            .subscribe(this::onNextHashTx, hashTxProcessor::onError, hashTxProcessor::onComplete);</span>
 <span class="source-line-no">065</span><span id="line-65">                    break;</span>
-<span class="source-line-no">066</span><span id="line-66">                case rawtx:</span>
-<span class="source-line-no">067</span><span id="line-67">                    zmqContext.topicPublisher(topic.toString()).subscribe(this::onNextRawTx, rawTxProcessor::onError, rawTxProcessor::onComplete);</span>
-<span class="source-line-no">068</span><span id="line-68">                    break;</span>
-<span class="source-line-no">069</span><span id="line-69">                case sequence:</span>
-<span class="source-line-no">070</span><span id="line-70">                    zmqContext.topicPublisher(topic.toString()).subscribe(this::onNextSequence, this::onError, this::onComplete);</span>
-<span class="source-line-no">071</span><span id="line-71">                    break;</span>
-<span class="source-line-no">072</span><span id="line-72">                default:</span>
-<span class="source-line-no">073</span><span id="line-73">                    throw new RuntimeException("Unknown topic");</span>
-<span class="source-line-no">074</span><span id="line-74">            }</span>
-<span class="source-line-no">075</span><span id="line-75">        }</span>
-<span class="source-line-no">076</span><span id="line-76">    }</span>
-<span class="source-line-no">077</span><span id="line-77"></span>
-<span class="source-line-no">078</span><span id="line-78">    @Override</span>
-<span class="source-line-no">079</span><span id="line-79">    public Flowable&lt;byte[]&gt; transactionBinaryPublisher() {</span>
-<span class="source-line-no">080</span><span id="line-80">        return rawTxProcessor;</span>
-<span class="source-line-no">081</span><span id="line-81">    }</span>
-<span class="source-line-no">082</span><span id="line-82"></span>
-<span class="source-line-no">083</span><span id="line-83">    @Override</span>
-<span class="source-line-no">084</span><span id="line-84">    public Flowable&lt;byte[]&gt; transactionHashBinaryPublisher() {</span>
-<span class="source-line-no">085</span><span id="line-85">        return hashTxProcessor;</span>
-<span class="source-line-no">086</span><span id="line-86">    }</span>
-<span class="source-line-no">087</span><span id="line-87"></span>
-<span class="source-line-no">088</span><span id="line-88">    @Override</span>
-<span class="source-line-no">089</span><span id="line-89">    public Flowable&lt;byte[]&gt; blockBinaryPublisher() {</span>
-<span class="source-line-no">090</span><span id="line-90">        return rawBlockProcessor;</span>
-<span class="source-line-no">091</span><span id="line-91">    }</span>
-<span class="source-line-no">092</span><span id="line-92"></span>
-<span class="source-line-no">093</span><span id="line-93">    @Override</span>
-<span class="source-line-no">094</span><span id="line-94">    public Flowable&lt;byte[]&gt; blockHashBinaryPublisher() {</span>
-<span class="source-line-no">095</span><span id="line-95">        return hashBlockProcessor;</span>
-<span class="source-line-no">096</span><span id="line-96">    }</span>
-<span class="source-line-no">097</span><span id="line-97"></span>
+<span class="source-line-no">066</span><span id="line-66">                case rawblock:</span>
+<span class="source-line-no">067</span><span id="line-67">                    getTopicPublisher(topic)</span>
+<span class="source-line-no">068</span><span id="line-68">                            .subscribe(this::onNextRawBlock, rawBlockProcessor::onError, rawBlockProcessor::onComplete);</span>
+<span class="source-line-no">069</span><span id="line-69">                    break;</span>
+<span class="source-line-no">070</span><span id="line-70">                case rawtx:</span>
+<span class="source-line-no">071</span><span id="line-71">                    getTopicPublisher(topic)</span>
+<span class="source-line-no">072</span><span id="line-72">                            .subscribe(this::onNextRawTx, rawTxProcessor::onError, rawTxProcessor::onComplete);</span>
+<span class="source-line-no">073</span><span id="line-73">                    break;</span>
+<span class="source-line-no">074</span><span id="line-74">                case sequence:</span>
+<span class="source-line-no">075</span><span id="line-75">                    getTopicPublisher(topic)</span>
+<span class="source-line-no">076</span><span id="line-76">                            .subscribe(this::onNextSequence, this::onError, this::onComplete);</span>
+<span class="source-line-no">077</span><span id="line-77">                    break;</span>
+<span class="source-line-no">078</span><span id="line-78">                default:</span>
+<span class="source-line-no">079</span><span id="line-79">                    throw new RuntimeException("Unknown topic");</span>
+<span class="source-line-no">080</span><span id="line-80">            }</span>
+<span class="source-line-no">081</span><span id="line-81">        }</span>
+<span class="source-line-no">082</span><span id="line-82">    }</span>
+<span class="source-line-no">083</span><span id="line-83"></span>
+<span class="source-line-no">084</span><span id="line-84">    @Override</span>
+<span class="source-line-no">085</span><span id="line-85">    public Publisher&lt;byte[]&gt; transactionBinaryPublisher() {</span>
+<span class="source-line-no">086</span><span id="line-86">        return rawTxProcessor;</span>
+<span class="source-line-no">087</span><span id="line-87">    }</span>
+<span class="source-line-no">088</span><span id="line-88"></span>
+<span class="source-line-no">089</span><span id="line-89">    @Override</span>
+<span class="source-line-no">090</span><span id="line-90">    public Publisher&lt;byte[]&gt; transactionHashBinaryPublisher() {</span>
+<span class="source-line-no">091</span><span id="line-91">        return hashTxProcessor;</span>
+<span class="source-line-no">092</span><span id="line-92">    }</span>
+<span class="source-line-no">093</span><span id="line-93"></span>
+<span class="source-line-no">094</span><span id="line-94">    @Override</span>
+<span class="source-line-no">095</span><span id="line-95">    public Publisher&lt;byte[]&gt; blockBinaryPublisher() {</span>
+<span class="source-line-no">096</span><span id="line-96">        return rawBlockProcessor;</span>
+<span class="source-line-no">097</span><span id="line-97">    }</span>
 <span class="source-line-no">098</span><span id="line-98"></span>
 <span class="source-line-no">099</span><span id="line-99">    @Override</span>
-<span class="source-line-no">100</span><span id="line-100">    public void close() {</span>
-<span class="source-line-no">101</span><span id="line-101">        zmqContext.close();</span>
+<span class="source-line-no">100</span><span id="line-100">    public Publisher&lt;byte[]&gt; blockHashBinaryPublisher() {</span>
+<span class="source-line-no">101</span><span id="line-101">        return hashBlockProcessor;</span>
 <span class="source-line-no">102</span><span id="line-102">    }</span>
-<span class="source-line-no">103</span><span id="line-103">    </span>
-<span class="source-line-no">104</span><span id="line-104">    private Optional&lt;ParsedMessage&gt; parseMessage(ZMsg message) {</span>
-<span class="source-line-no">105</span><span id="line-105">        log.debug("New message received.");</span>
-<span class="source-line-no">106</span><span id="line-106"></span>
-<span class="source-line-no">107</span><span id="line-107">        Optional&lt;ParsedMessage&gt; parsedMessage;</span>
-<span class="source-line-no">108</span><span id="line-108">        if (message.size() &gt;= 2) {</span>
-<span class="source-line-no">109</span><span id="line-109">            BitcoinZmqMessage.Topic topic = BitcoinZmqMessage.Topic.valueOf(new String(message.remove().getData()));</span>
-<span class="source-line-no">110</span><span id="line-110">            log.debug("Received {} message.", topic);</span>
-<span class="source-line-no">111</span><span id="line-111">            byte[] dataBytes = message.remove().getData();</span>
-<span class="source-line-no">112</span><span id="line-112">            if (topic != BitcoinZmqMessage.Topic.sequence)</span>
-<span class="source-line-no">113</span><span id="line-113">            {</span>
-<span class="source-line-no">114</span><span id="line-114">                long seqNumber = fromByteArray(message.remove().getData());</span>
-<span class="source-line-no">115</span><span id="line-115">                log.trace("sequence number {}:{}", topic, seqNumber);</span>
-<span class="source-line-no">116</span><span id="line-116">                parsedMessage = Optional.of(new ParsedMessage(topic, dataBytes, seqNumber));</span>
-<span class="source-line-no">117</span><span id="line-117">            } else {</span>
-<span class="source-line-no">118</span><span id="line-118">                // TODO: Additional sequence parsing?</span>
-<span class="source-line-no">119</span><span id="line-119">                parsedMessage = Optional.of(new ParsedMessage(topic, dataBytes, -1));</span>
-<span class="source-line-no">120</span><span id="line-120">            }</span>
-<span class="source-line-no">121</span><span id="line-121">        } else {</span>
-<span class="source-line-no">122</span><span id="line-122">            log.warn("Ignoring message with less than 3 frames");</span>
-<span class="source-line-no">123</span><span id="line-123">            parsedMessage = Optional.empty();</span>
-<span class="source-line-no">124</span><span id="line-124">        }</span>
-<span class="source-line-no">125</span><span id="line-125">        return parsedMessage;</span>
-<span class="source-line-no">126</span><span id="line-126">    }</span>
-<span class="source-line-no">127</span><span id="line-127"></span>
-<span class="source-line-no">128</span><span id="line-128">    private void onError(Throwable error) {</span>
-<span class="source-line-no">129</span><span id="line-129">        log.error("Seq Error: ", error);</span>
-<span class="source-line-no">130</span><span id="line-130">    }</span>
-<span class="source-line-no">131</span><span id="line-131"></span>
-<span class="source-line-no">132</span><span id="line-132">    private void onComplete() {</span>
-<span class="source-line-no">133</span><span id="line-133">        log.error("Seq Complete");</span>
-<span class="source-line-no">134</span><span id="line-134">    }</span>
-<span class="source-line-no">135</span><span id="line-135"></span>
-<span class="source-line-no">136</span><span id="line-136">    private static class ParsedMessage {</span>
-<span class="source-line-no">137</span><span id="line-137">        final BitcoinZmqMessage.Topic topic;</span>
-<span class="source-line-no">138</span><span id="line-138">        final byte[] dataBytes;</span>
-<span class="source-line-no">139</span><span id="line-139">        final long seqNumber;</span>
-<span class="source-line-no">140</span><span id="line-140"></span>
-<span class="source-line-no">141</span><span id="line-141">        private ParsedMessage(BitcoinZmqMessage.Topic topic, byte[] dataBytes, long seqNumber) {</span>
-<span class="source-line-no">142</span><span id="line-142">            this.topic = topic;</span>
-<span class="source-line-no">143</span><span id="line-143">            this.dataBytes = dataBytes;</span>
-<span class="source-line-no">144</span><span id="line-144">            this.seqNumber = seqNumber;</span>
-<span class="source-line-no">145</span><span id="line-145">        }</span>
-<span class="source-line-no">146</span><span id="line-146">    }</span>
-<span class="source-line-no">147</span><span id="line-147"></span>
-<span class="source-line-no">148</span><span id="line-148">    private void onNextHashBlock(ZMsg message) {</span>
-<span class="source-line-no">149</span><span id="line-149">        Optional&lt;ParsedMessage&gt; opt = parseMessage(message);</span>
-<span class="source-line-no">150</span><span id="line-150">        if (opt.isPresent()) {</span>
-<span class="source-line-no">151</span><span id="line-151">            ParsedMessage parsed = opt.get();</span>
-<span class="source-line-no">152</span><span id="line-152">            processHashBlock(parsed.dataBytes, parsed.seqNumber);</span>
-<span class="source-line-no">153</span><span id="line-153">        }</span>
-<span class="source-line-no">154</span><span id="line-154">    }</span>
-<span class="source-line-no">155</span><span id="line-155"></span>
-<span class="source-line-no">156</span><span id="line-156">    private void onNextHashTx(ZMsg message) {</span>
-<span class="source-line-no">157</span><span id="line-157">        Optional&lt;ParsedMessage&gt; opt = parseMessage(message);</span>
-<span class="source-line-no">158</span><span id="line-158">        if (opt.isPresent()) {</span>
-<span class="source-line-no">159</span><span id="line-159">            ParsedMessage parsed = opt.get();</span>
-<span class="source-line-no">160</span><span id="line-160">            processHashTx(parsed.dataBytes, parsed.seqNumber);</span>
-<span class="source-line-no">161</span><span id="line-161">        }</span>
-<span class="source-line-no">162</span><span id="line-162">    }</span>
-<span class="source-line-no">163</span><span id="line-163"></span>
-<span class="source-line-no">164</span><span id="line-164">    private void onNextRawBlock(ZMsg message) {</span>
-<span class="source-line-no">165</span><span id="line-165">        Optional&lt;ParsedMessage&gt; opt = parseMessage(message);</span>
-<span class="source-line-no">166</span><span id="line-166">        if (opt.isPresent()) {</span>
-<span class="source-line-no">167</span><span id="line-167">            ParsedMessage parsed = opt.get();</span>
-<span class="source-line-no">168</span><span id="line-168">            processRawBlock(parsed.dataBytes, parsed.seqNumber);</span>
-<span class="source-line-no">169</span><span id="line-169">        }</span>
-<span class="source-line-no">170</span><span id="line-170">    }</span>
-<span class="source-line-no">171</span><span id="line-171"></span>
-<span class="source-line-no">172</span><span id="line-172">    private void onNextRawTx(ZMsg message) {</span>
-<span class="source-line-no">173</span><span id="line-173">        Optional&lt;ParsedMessage&gt; opt = parseMessage(message);</span>
-<span class="source-line-no">174</span><span id="line-174">        if (opt.isPresent()) {</span>
-<span class="source-line-no">175</span><span id="line-175">            ParsedMessage parsed = opt.get();</span>
-<span class="source-line-no">176</span><span id="line-176">            processRawTx(parsed.dataBytes, parsed.seqNumber);</span>
-<span class="source-line-no">177</span><span id="line-177">        }</span>
-<span class="source-line-no">178</span><span id="line-178">    }</span>
-<span class="source-line-no">179</span><span id="line-179"></span>
-<span class="source-line-no">180</span><span id="line-180">    private void onNextSequence(ZMsg message) {</span>
-<span class="source-line-no">181</span><span id="line-181">        Optional&lt;ParsedMessage&gt; opt = parseMessage(message);</span>
-<span class="source-line-no">182</span><span id="line-182">        if (opt.isPresent()) {</span>
-<span class="source-line-no">183</span><span id="line-183">            processSequence(message);</span>
-<span class="source-line-no">184</span><span id="line-184">        }</span>
-<span class="source-line-no">185</span><span id="line-185">    }</span>
-<span class="source-line-no">186</span><span id="line-186"></span>
-<span class="source-line-no">187</span><span id="line-187">    private void processHashTx(byte[] dataBytes, long seqNumber) {</span>
-<span class="source-line-no">188</span><span id="line-188">        checkSequenceNumber(BitcoinZmqMessage.Topic.hashtx, hashTxSeq, seqNumber);</span>
-<span class="source-line-no">189</span><span id="line-189">        hashTxSeq = seqNumber;</span>
-<span class="source-line-no">190</span><span id="line-190">        hashTxProcessor.onNext(dataBytes);</span>
-<span class="source-line-no">191</span><span id="line-191">    }</span>
-<span class="source-line-no">192</span><span id="line-192"></span>
-<span class="source-line-no">193</span><span id="line-193">    private void processHashBlock(byte[] dataBytes, long seqNumber) {</span>
-<span class="source-line-no">194</span><span id="line-194">        checkSequenceNumber(BitcoinZmqMessage.Topic.hashblock, hashBlockSeq, seqNumber);</span>
-<span class="source-line-no">195</span><span id="line-195">        hashBlockSeq = seqNumber;</span>
-<span class="source-line-no">196</span><span id="line-196">        hashBlockProcessor.onNext(dataBytes);</span>
-<span class="source-line-no">197</span><span id="line-197">    }</span>
-<span class="source-line-no">198</span><span id="line-198"></span>
-<span class="source-line-no">199</span><span id="line-199">    private void processRawTx(byte[] dataBytes, long seqNumber) {</span>
-<span class="source-line-no">200</span><span id="line-200">        checkSequenceNumber(BitcoinZmqMessage.Topic.rawtx, rawTxSeq, seqNumber);</span>
-<span class="source-line-no">201</span><span id="line-201">        rawTxSeq = seqNumber;</span>
-<span class="source-line-no">202</span><span id="line-202">        rawTxProcessor.onNext(dataBytes);</span>
-<span class="source-line-no">203</span><span id="line-203">    }</span>
-<span class="source-line-no">204</span><span id="line-204"></span>
-<span class="source-line-no">205</span><span id="line-205">    private void processRawBlock(byte[] dataBytes, long seqNumber) {</span>
-<span class="source-line-no">206</span><span id="line-206">        checkSequenceNumber(BitcoinZmqMessage.Topic.rawblock, rawBlockSeq, seqNumber);</span>
-<span class="source-line-no">207</span><span id="line-207">        rawBlockSeq = seqNumber;</span>
-<span class="source-line-no">208</span><span id="line-208">        rawBlockProcessor.onNext(dataBytes);</span>
-<span class="source-line-no">209</span><span id="line-209">    }</span>
-<span class="source-line-no">210</span><span id="line-210"></span>
-<span class="source-line-no">211</span><span id="line-211">    // See: https://github.com/bitcoin/bitcoin/pull/19572</span>
-<span class="source-line-no">212</span><span id="line-212">    private static void processSequence(ZMsg message) {</span>
-<span class="source-line-no">213</span><span id="line-213">        //checkSequenceNumber(Topic.sequence, sequenceSeq, seqNumber);</span>
-<span class="source-line-no">214</span><span id="line-214">        log.warn("Got sequence: {}", message);</span>
-<span class="source-line-no">215</span><span id="line-215">    }</span>
-<span class="source-line-no">216</span><span id="line-216"></span>
-<span class="source-line-no">217</span><span id="line-217">    private static void checkSequenceNumber(BitcoinZmqMessage.Topic topic, long previous, long current) {</span>
-<span class="source-line-no">218</span><span id="line-218">        if ((previous != -1) &amp;&amp; (current != previous + 1)) {</span>
-<span class="source-line-no">219</span><span id="line-219">            log.warn("Topic {} missing {} sequence numbers: previous = {}, current = {}", topic, current - (previous + 1), previous, current);</span>
-<span class="source-line-no">220</span><span id="line-220">        }</span>
-<span class="source-line-no">221</span><span id="line-221">    }</span>
-<span class="source-line-no">222</span><span id="line-222"></span>
-<span class="source-line-no">223</span><span id="line-223">    private static long fromByteArray(byte[] bytes) {</span>
-<span class="source-line-no">224</span><span id="line-224">        long result = 0;</span>
-<span class="source-line-no">225</span><span id="line-225"></span>
-<span class="source-line-no">226</span><span id="line-226">        for (int i = 0; i &lt; bytes.length; i++) {</span>
-<span class="source-line-no">227</span><span id="line-227">            long ubyte = bytes[i] &amp; 0xff;</span>
-<span class="source-line-no">228</span><span id="line-228">            result += ubyte &lt;&lt; (8 * i);</span>
-<span class="source-line-no">229</span><span id="line-229">        }</span>
-<span class="source-line-no">230</span><span id="line-230">        return result;</span>
-<span class="source-line-no">231</span><span id="line-231">    }</span>
-<span class="source-line-no">232</span><span id="line-232"></span>
-<span class="source-line-no">233</span><span id="line-233">}</span>
+<span class="source-line-no">103</span><span id="line-103"></span>
+<span class="source-line-no">104</span><span id="line-104"></span>
+<span class="source-line-no">105</span><span id="line-105">    @Override</span>
+<span class="source-line-no">106</span><span id="line-106">    public void close() {</span>
+<span class="source-line-no">107</span><span id="line-107">        zmqContext.close();</span>
+<span class="source-line-no">108</span><span id="line-108">    }</span>
+<span class="source-line-no">109</span><span id="line-109"></span>
+<span class="source-line-no">110</span><span id="line-110">    // Get a Publisher for a topic (Flowable is used internally)</span>
+<span class="source-line-no">111</span><span id="line-111">    private Flowable&lt;ZMsg&gt; getTopicPublisher(BitcoinZmqMessage.Topic topic) {</span>
+<span class="source-line-no">112</span><span id="line-112">        return Flowable.fromPublisher(zmqContext.topicPublisher(topic.toString()));</span>
+<span class="source-line-no">113</span><span id="line-113">    }</span>
+<span class="source-line-no">114</span><span id="line-114">    </span>
+<span class="source-line-no">115</span><span id="line-115">    private Optional&lt;ParsedMessage&gt; parseMessage(ZMsg message) {</span>
+<span class="source-line-no">116</span><span id="line-116">        log.debug("New message received.");</span>
+<span class="source-line-no">117</span><span id="line-117"></span>
+<span class="source-line-no">118</span><span id="line-118">        Optional&lt;ParsedMessage&gt; parsedMessage;</span>
+<span class="source-line-no">119</span><span id="line-119">        if (message.size() &gt;= 2) {</span>
+<span class="source-line-no">120</span><span id="line-120">            BitcoinZmqMessage.Topic topic = BitcoinZmqMessage.Topic.valueOf(new String(message.remove().getData()));</span>
+<span class="source-line-no">121</span><span id="line-121">            log.debug("Received {} message.", topic);</span>
+<span class="source-line-no">122</span><span id="line-122">            byte[] dataBytes = message.remove().getData();</span>
+<span class="source-line-no">123</span><span id="line-123">            if (topic != BitcoinZmqMessage.Topic.sequence)</span>
+<span class="source-line-no">124</span><span id="line-124">            {</span>
+<span class="source-line-no">125</span><span id="line-125">                long seqNumber = fromByteArray(message.remove().getData());</span>
+<span class="source-line-no">126</span><span id="line-126">                log.trace("sequence number {}:{}", topic, seqNumber);</span>
+<span class="source-line-no">127</span><span id="line-127">                parsedMessage = Optional.of(new ParsedMessage(topic, dataBytes, seqNumber));</span>
+<span class="source-line-no">128</span><span id="line-128">            } else {</span>
+<span class="source-line-no">129</span><span id="line-129">                // TODO: Additional sequence parsing?</span>
+<span class="source-line-no">130</span><span id="line-130">                parsedMessage = Optional.of(new ParsedMessage(topic, dataBytes, -1));</span>
+<span class="source-line-no">131</span><span id="line-131">            }</span>
+<span class="source-line-no">132</span><span id="line-132">        } else {</span>
+<span class="source-line-no">133</span><span id="line-133">            log.warn("Ignoring message with less than 3 frames");</span>
+<span class="source-line-no">134</span><span id="line-134">            parsedMessage = Optional.empty();</span>
+<span class="source-line-no">135</span><span id="line-135">        }</span>
+<span class="source-line-no">136</span><span id="line-136">        return parsedMessage;</span>
+<span class="source-line-no">137</span><span id="line-137">    }</span>
+<span class="source-line-no">138</span><span id="line-138"></span>
+<span class="source-line-no">139</span><span id="line-139">    private void onError(Throwable error) {</span>
+<span class="source-line-no">140</span><span id="line-140">        log.error("Seq Error: ", error);</span>
+<span class="source-line-no">141</span><span id="line-141">    }</span>
+<span class="source-line-no">142</span><span id="line-142"></span>
+<span class="source-line-no">143</span><span id="line-143">    private void onComplete() {</span>
+<span class="source-line-no">144</span><span id="line-144">        log.error("Seq Complete");</span>
+<span class="source-line-no">145</span><span id="line-145">    }</span>
+<span class="source-line-no">146</span><span id="line-146"></span>
+<span class="source-line-no">147</span><span id="line-147">    private static class ParsedMessage {</span>
+<span class="source-line-no">148</span><span id="line-148">        final BitcoinZmqMessage.Topic topic;</span>
+<span class="source-line-no">149</span><span id="line-149">        final byte[] dataBytes;</span>
+<span class="source-line-no">150</span><span id="line-150">        final long seqNumber;</span>
+<span class="source-line-no">151</span><span id="line-151"></span>
+<span class="source-line-no">152</span><span id="line-152">        private ParsedMessage(BitcoinZmqMessage.Topic topic, byte[] dataBytes, long seqNumber) {</span>
+<span class="source-line-no">153</span><span id="line-153">            this.topic = topic;</span>
+<span class="source-line-no">154</span><span id="line-154">            this.dataBytes = dataBytes;</span>
+<span class="source-line-no">155</span><span id="line-155">            this.seqNumber = seqNumber;</span>
+<span class="source-line-no">156</span><span id="line-156">        }</span>
+<span class="source-line-no">157</span><span id="line-157">    }</span>
+<span class="source-line-no">158</span><span id="line-158"></span>
+<span class="source-line-no">159</span><span id="line-159">    private void onNextHashBlock(ZMsg message) {</span>
+<span class="source-line-no">160</span><span id="line-160">        Optional&lt;ParsedMessage&gt; opt = parseMessage(message);</span>
+<span class="source-line-no">161</span><span id="line-161">        if (opt.isPresent()) {</span>
+<span class="source-line-no">162</span><span id="line-162">            ParsedMessage parsed = opt.get();</span>
+<span class="source-line-no">163</span><span id="line-163">            processHashBlock(parsed.dataBytes, parsed.seqNumber);</span>
+<span class="source-line-no">164</span><span id="line-164">        }</span>
+<span class="source-line-no">165</span><span id="line-165">    }</span>
+<span class="source-line-no">166</span><span id="line-166"></span>
+<span class="source-line-no">167</span><span id="line-167">    private void onNextHashTx(ZMsg message) {</span>
+<span class="source-line-no">168</span><span id="line-168">        Optional&lt;ParsedMessage&gt; opt = parseMessage(message);</span>
+<span class="source-line-no">169</span><span id="line-169">        if (opt.isPresent()) {</span>
+<span class="source-line-no">170</span><span id="line-170">            ParsedMessage parsed = opt.get();</span>
+<span class="source-line-no">171</span><span id="line-171">            processHashTx(parsed.dataBytes, parsed.seqNumber);</span>
+<span class="source-line-no">172</span><span id="line-172">        }</span>
+<span class="source-line-no">173</span><span id="line-173">    }</span>
+<span class="source-line-no">174</span><span id="line-174"></span>
+<span class="source-line-no">175</span><span id="line-175">    private void onNextRawBlock(ZMsg message) {</span>
+<span class="source-line-no">176</span><span id="line-176">        Optional&lt;ParsedMessage&gt; opt = parseMessage(message);</span>
+<span class="source-line-no">177</span><span id="line-177">        if (opt.isPresent()) {</span>
+<span class="source-line-no">178</span><span id="line-178">            ParsedMessage parsed = opt.get();</span>
+<span class="source-line-no">179</span><span id="line-179">            processRawBlock(parsed.dataBytes, parsed.seqNumber);</span>
+<span class="source-line-no">180</span><span id="line-180">        }</span>
+<span class="source-line-no">181</span><span id="line-181">    }</span>
+<span class="source-line-no">182</span><span id="line-182"></span>
+<span class="source-line-no">183</span><span id="line-183">    private void onNextRawTx(ZMsg message) {</span>
+<span class="source-line-no">184</span><span id="line-184">        Optional&lt;ParsedMessage&gt; opt = parseMessage(message);</span>
+<span class="source-line-no">185</span><span id="line-185">        if (opt.isPresent()) {</span>
+<span class="source-line-no">186</span><span id="line-186">            ParsedMessage parsed = opt.get();</span>
+<span class="source-line-no">187</span><span id="line-187">            processRawTx(parsed.dataBytes, parsed.seqNumber);</span>
+<span class="source-line-no">188</span><span id="line-188">        }</span>
+<span class="source-line-no">189</span><span id="line-189">    }</span>
+<span class="source-line-no">190</span><span id="line-190"></span>
+<span class="source-line-no">191</span><span id="line-191">    private void onNextSequence(ZMsg message) {</span>
+<span class="source-line-no">192</span><span id="line-192">        Optional&lt;ParsedMessage&gt; opt = parseMessage(message);</span>
+<span class="source-line-no">193</span><span id="line-193">        if (opt.isPresent()) {</span>
+<span class="source-line-no">194</span><span id="line-194">            processSequence(message);</span>
+<span class="source-line-no">195</span><span id="line-195">        }</span>
+<span class="source-line-no">196</span><span id="line-196">    }</span>
+<span class="source-line-no">197</span><span id="line-197"></span>
+<span class="source-line-no">198</span><span id="line-198">    private void processHashTx(byte[] dataBytes, long seqNumber) {</span>
+<span class="source-line-no">199</span><span id="line-199">        checkSequenceNumber(BitcoinZmqMessage.Topic.hashtx, hashTxSeq, seqNumber);</span>
+<span class="source-line-no">200</span><span id="line-200">        hashTxSeq = seqNumber;</span>
+<span class="source-line-no">201</span><span id="line-201">        hashTxProcessor.onNext(dataBytes);</span>
+<span class="source-line-no">202</span><span id="line-202">    }</span>
+<span class="source-line-no">203</span><span id="line-203"></span>
+<span class="source-line-no">204</span><span id="line-204">    private void processHashBlock(byte[] dataBytes, long seqNumber) {</span>
+<span class="source-line-no">205</span><span id="line-205">        checkSequenceNumber(BitcoinZmqMessage.Topic.hashblock, hashBlockSeq, seqNumber);</span>
+<span class="source-line-no">206</span><span id="line-206">        hashBlockSeq = seqNumber;</span>
+<span class="source-line-no">207</span><span id="line-207">        hashBlockProcessor.onNext(dataBytes);</span>
+<span class="source-line-no">208</span><span id="line-208">    }</span>
+<span class="source-line-no">209</span><span id="line-209"></span>
+<span class="source-line-no">210</span><span id="line-210">    private void processRawTx(byte[] dataBytes, long seqNumber) {</span>
+<span class="source-line-no">211</span><span id="line-211">        checkSequenceNumber(BitcoinZmqMessage.Topic.rawtx, rawTxSeq, seqNumber);</span>
+<span class="source-line-no">212</span><span id="line-212">        rawTxSeq = seqNumber;</span>
+<span class="source-line-no">213</span><span id="line-213">        rawTxProcessor.onNext(dataBytes);</span>
+<span class="source-line-no">214</span><span id="line-214">    }</span>
+<span class="source-line-no">215</span><span id="line-215"></span>
+<span class="source-line-no">216</span><span id="line-216">    private void processRawBlock(byte[] dataBytes, long seqNumber) {</span>
+<span class="source-line-no">217</span><span id="line-217">        checkSequenceNumber(BitcoinZmqMessage.Topic.rawblock, rawBlockSeq, seqNumber);</span>
+<span class="source-line-no">218</span><span id="line-218">        rawBlockSeq = seqNumber;</span>
+<span class="source-line-no">219</span><span id="line-219">        rawBlockProcessor.onNext(dataBytes);</span>
+<span class="source-line-no">220</span><span id="line-220">    }</span>
+<span class="source-line-no">221</span><span id="line-221"></span>
+<span class="source-line-no">222</span><span id="line-222">    // See: https://github.com/bitcoin/bitcoin/pull/19572</span>
+<span class="source-line-no">223</span><span id="line-223">    private static void processSequence(ZMsg message) {</span>
+<span class="source-line-no">224</span><span id="line-224">        //checkSequenceNumber(Topic.sequence, sequenceSeq, seqNumber);</span>
+<span class="source-line-no">225</span><span id="line-225">        log.warn("Got sequence: {}", message);</span>
+<span class="source-line-no">226</span><span id="line-226">    }</span>
+<span class="source-line-no">227</span><span id="line-227"></span>
+<span class="source-line-no">228</span><span id="line-228">    private static void checkSequenceNumber(BitcoinZmqMessage.Topic topic, long previous, long current) {</span>
+<span class="source-line-no">229</span><span id="line-229">        if ((previous != -1) &amp;&amp; (current != previous + 1)) {</span>
+<span class="source-line-no">230</span><span id="line-230">            log.warn("Topic {} missing {} sequence numbers: previous = {}, current = {}", topic, current - (previous + 1), previous, current);</span>
+<span class="source-line-no">231</span><span id="line-231">        }</span>
+<span class="source-line-no">232</span><span id="line-232">    }</span>
+<span class="source-line-no">233</span><span id="line-233"></span>
+<span class="source-line-no">234</span><span id="line-234">    private static long fromByteArray(byte[] bytes) {</span>
+<span class="source-line-no">235</span><span id="line-235">        long result = 0;</span>
+<span class="source-line-no">236</span><span id="line-236"></span>
+<span class="source-line-no">237</span><span id="line-237">        for (int i = 0; i &lt; bytes.length; i++) {</span>
+<span class="source-line-no">238</span><span id="line-238">            long ubyte = bytes[i] &amp; 0xff;</span>
+<span class="source-line-no">239</span><span id="line-239">            result += ubyte &lt;&lt; (8 * i);</span>
+<span class="source-line-no">240</span><span id="line-240">        }</span>
+<span class="source-line-no">241</span><span id="line-241">        return result;</span>
+<span class="source-line-no">242</span><span id="line-242">    }</span>
+<span class="source-line-no">243</span><span id="line-243"></span>
+<span class="source-line-no">244</span><span id="line-244">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html
index 3ff81aabe..e3570f1c2 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqBinaryService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.zeromq, class: RxBitcoinZmqBinaryService">
@@ -14,98 +14,97 @@
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx.zeromq;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import org.bitcoinj.base.Network;</span>
-<span class="source-line-no">004</span><span id="line-4">import org.consensusj.bitcoin.jsonrpc.internal.BitcoinClientThreadFactory;</span>
-<span class="source-line-no">005</span><span id="line-5">import io.reactivex.rxjava3.core.Flowable;</span>
-<span class="source-line-no">006</span><span id="line-6">import org.bitcoinj.core.Context;</span>
-<span class="source-line-no">007</span><span id="line-7">import org.consensusj.bitcoin.rx.RxBlockchainBinaryService;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient;</span>
-<span class="source-line-no">009</span><span id="line-9"></span>
-<span class="source-line-no">010</span><span id="line-10">import java.io.Closeable;</span>
-<span class="source-line-no">011</span><span id="line-11">import java.net.URI;</span>
-<span class="source-line-no">012</span><span id="line-12">import java.util.Optional;</span>
-<span class="source-line-no">013</span><span id="line-13"></span>
-<span class="source-line-no">014</span><span id="line-14">import static org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic.*;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.consensusj.bitcoin.jsonrpc.BitcoinClient;</span>
+<span class="source-line-no">005</span><span id="line-5">import org.consensusj.bitcoin.jsonrpc.internal.BitcoinClientThreadFactory;</span>
+<span class="source-line-no">006</span><span id="line-6">import io.reactivex.rxjava3.core.Flowable;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.bitcoinj.core.Context;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.consensusj.bitcoin.rx.RxBlockchainBinaryService;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">011</span><span id="line-11"></span>
+<span class="source-line-no">012</span><span id="line-12">import java.io.Closeable;</span>
+<span class="source-line-no">013</span><span id="line-13">import java.net.URI;</span>
+<span class="source-line-no">014</span><span id="line-14">import java.util.Optional;</span>
 <span class="source-line-no">015</span><span id="line-15"></span>
-<span class="source-line-no">016</span><span id="line-16">/**</span>
-<span class="source-line-no">017</span><span id="line-17"> * Service to listen for ZMQ messages from multiple TCP ports. Uses Bitcoin Core JSON-RPC to find</span>
-<span class="source-line-no">018</span><span id="line-18"> * the TCP address of the required services.</span>
-<span class="source-line-no">019</span><span id="line-19"> * TODO: Support using all topics, notjust `rawblock` and `rawtx`.</span>
-<span class="source-line-no">020</span><span id="line-20"> */</span>
-<span class="source-line-no">021</span><span id="line-21">public class RxBitcoinZmqBinaryService implements RxBlockchainBinaryService, Closeable {</span>
-<span class="source-line-no">022</span><span id="line-22">    protected final RxBitcoinClient client;</span>
-<span class="source-line-no">023</span><span id="line-23">    private final RxBitcoinSinglePortZmqService blockService;</span>
-<span class="source-line-no">024</span><span id="line-24">    private final RxBitcoinSinglePortZmqService txService;</span>
-<span class="source-line-no">025</span><span id="line-25"></span>
-<span class="source-line-no">026</span><span id="line-26">    private final Flowable&lt;byte[]&gt; flowableRawTx;</span>
-<span class="source-line-no">027</span><span id="line-27">    private final Flowable&lt;byte[]&gt; flowableRawBlock;</span>
-<span class="source-line-no">028</span><span id="line-28"></span>
-<span class="source-line-no">029</span><span id="line-29">    private final BitcoinClientThreadFactory threadFactory;</span>
+<span class="source-line-no">016</span><span id="line-16">import static org.consensusj.bitcoin.rx.zeromq.BitcoinZmqMessage.Topic.*;</span>
+<span class="source-line-no">017</span><span id="line-17"></span>
+<span class="source-line-no">018</span><span id="line-18">/**</span>
+<span class="source-line-no">019</span><span id="line-19"> * Service to listen for ZMQ messages from multiple TCP ports. Uses Bitcoin Core JSON-RPC to find</span>
+<span class="source-line-no">020</span><span id="line-20"> * the TCP address of the required services.</span>
+<span class="source-line-no">021</span><span id="line-21"> * TODO: Support using all topics, notjust `rawblock` and `rawtx`.</span>
+<span class="source-line-no">022</span><span id="line-22"> */</span>
+<span class="source-line-no">023</span><span id="line-23">public class RxBitcoinZmqBinaryService implements RxBlockchainBinaryService, Closeable {</span>
+<span class="source-line-no">024</span><span id="line-24">    protected final BitcoinClient client;</span>
+<span class="source-line-no">025</span><span id="line-25">    private final RxBitcoinSinglePortZmqService blockService;</span>
+<span class="source-line-no">026</span><span id="line-26">    private final RxBitcoinSinglePortZmqService txService;</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    private final Flowable&lt;byte[]&gt; flowableRawTx;</span>
+<span class="source-line-no">029</span><span id="line-29">    private final Flowable&lt;byte[]&gt; flowableRawBlock;</span>
 <span class="source-line-no">030</span><span id="line-30"></span>
-<span class="source-line-no">031</span><span id="line-31">    public RxBitcoinZmqBinaryService(Network network, URI rpcUri, String rpcUser, String rpcPassword) {</span>
-<span class="source-line-no">032</span><span id="line-32">        this(new RxBitcoinClient(network, rpcUri, rpcUser, rpcPassword));</span>
-<span class="source-line-no">033</span><span id="line-33">    }</span>
-<span class="source-line-no">034</span><span id="line-34"></span>
-<span class="source-line-no">035</span><span id="line-35">    public RxBitcoinZmqBinaryService(RxBitcoinClient client) {</span>
-<span class="source-line-no">036</span><span id="line-36">        this.client = client;</span>
-<span class="source-line-no">037</span><span id="line-37">        threadFactory = new BitcoinClientThreadFactory(Context.getOrCreate(), "RxBitcoinZmq Thread");</span>
-<span class="source-line-no">038</span><span id="line-38"></span>
-<span class="source-line-no">039</span><span id="line-39">        // TODO: Create background thread to look for the ZMQ Ports</span>
-<span class="source-line-no">040</span><span id="line-40">        BitcoinZmqPortFinder portFinder = new BitcoinZmqPortFinder(client);</span>
-<span class="source-line-no">041</span><span id="line-41"></span>
-<span class="source-line-no">042</span><span id="line-42">        Optional&lt;URI&gt; blockServiceURI = portFinder.findPort(rawblock);</span>
-<span class="source-line-no">043</span><span id="line-43">        Optional&lt;URI&gt; txServiceURI = portFinder.findPort(rawtx);</span>
-<span class="source-line-no">044</span><span id="line-44"></span>
-<span class="source-line-no">045</span><span id="line-45">        if (!(blockServiceURI.isPresent() &amp;&amp; txServiceURI.isPresent())) {</span>
-<span class="source-line-no">046</span><span id="line-46">            throw new RuntimeException("Bitcoin Core configuration error");</span>
-<span class="source-line-no">047</span><span id="line-47">        }</span>
-<span class="source-line-no">048</span><span id="line-48"></span>
-<span class="source-line-no">049</span><span id="line-49">        if (blockServiceURI.get().equals(txServiceURI.get())) {</span>
-<span class="source-line-no">050</span><span id="line-50">            // URIs are the same we can use a single connection</span>
-<span class="source-line-no">051</span><span id="line-51">            blockService = new RxBitcoinSinglePortZmqService(blockServiceURI.get(), threadFactory, rawblock, rawtx);</span>
-<span class="source-line-no">052</span><span id="line-52">            txService = blockService;</span>
-<span class="source-line-no">053</span><span id="line-53">        } else {</span>
-<span class="source-line-no">054</span><span id="line-54">            blockService = new RxBitcoinSinglePortZmqService(blockServiceURI.get(), threadFactory, rawblock);</span>
-<span class="source-line-no">055</span><span id="line-55">            txService = new RxBitcoinSinglePortZmqService(txServiceURI.get(), threadFactory, rawtx);</span>
-<span class="source-line-no">056</span><span id="line-56">        }</span>
-<span class="source-line-no">057</span><span id="line-57"></span>
-<span class="source-line-no">058</span><span id="line-58">        flowableRawBlock = blockService.blockBinaryPublisher();</span>
-<span class="source-line-no">059</span><span id="line-59">        flowableRawTx = txService.transactionBinaryPublisher();</span>
-<span class="source-line-no">060</span><span id="line-60">    }</span>
-<span class="source-line-no">061</span><span id="line-61"></span>
-<span class="source-line-no">062</span><span id="line-62">    @Override</span>
-<span class="source-line-no">063</span><span id="line-63">    public Flowable&lt;byte[]&gt; transactionBinaryPublisher() {</span>
-<span class="source-line-no">064</span><span id="line-64">        return flowableRawTx;</span>
-<span class="source-line-no">065</span><span id="line-65">    }</span>
-<span class="source-line-no">066</span><span id="line-66"></span>
-<span class="source-line-no">067</span><span id="line-67">    @Override</span>
-<span class="source-line-no">068</span><span id="line-68">    public Flowable&lt;byte[]&gt; transactionHashBinaryPublisher() {</span>
-<span class="source-line-no">069</span><span id="line-69">        throw new UnsupportedOperationException("Not implemented");</span>
-<span class="source-line-no">070</span><span id="line-70">    }</span>
-<span class="source-line-no">071</span><span id="line-71"></span>
-<span class="source-line-no">072</span><span id="line-72">    @Override</span>
-<span class="source-line-no">073</span><span id="line-73">    public Flowable&lt;byte[]&gt; blockBinaryPublisher() {</span>
-<span class="source-line-no">074</span><span id="line-74">        return flowableRawBlock;</span>
-<span class="source-line-no">075</span><span id="line-75">    }</span>
-<span class="source-line-no">076</span><span id="line-76"></span>
-<span class="source-line-no">077</span><span id="line-77">    @Override</span>
-<span class="source-line-no">078</span><span id="line-78">    public Flowable&lt;byte[]&gt; blockHashBinaryPublisher() {</span>
-<span class="source-line-no">079</span><span id="line-79">        throw new UnsupportedOperationException("Not implemented");</span>
-<span class="source-line-no">080</span><span id="line-80">    }</span>
-<span class="source-line-no">081</span><span id="line-81"></span>
-<span class="source-line-no">082</span><span id="line-82">    @Override</span>
-<span class="source-line-no">083</span><span id="line-83">    public void close()  {</span>
-<span class="source-line-no">084</span><span id="line-84">        blockService.close();</span>
-<span class="source-line-no">085</span><span id="line-85">        txService.close();</span>
-<span class="source-line-no">086</span><span id="line-86">        try {</span>
-<span class="source-line-no">087</span><span id="line-87">            client.close();</span>
-<span class="source-line-no">088</span><span id="line-88">        } catch (InterruptedException e) {</span>
-<span class="source-line-no">089</span><span id="line-89">            throw new RuntimeException(e);</span>
-<span class="source-line-no">090</span><span id="line-90">        }</span>
-<span class="source-line-no">091</span><span id="line-91">    }</span>
-<span class="source-line-no">092</span><span id="line-92"></span>
-<span class="source-line-no">093</span><span id="line-93"></span>
-<span class="source-line-no">094</span><span id="line-94"></span>
-<span class="source-line-no">095</span><span id="line-95">}</span>
+<span class="source-line-no">031</span><span id="line-31">    private final BitcoinClientThreadFactory threadFactory;</span>
+<span class="source-line-no">032</span><span id="line-32"></span>
+<span class="source-line-no">033</span><span id="line-33">    public RxBitcoinZmqBinaryService(Network network, URI rpcUri, String rpcUser, String rpcPassword) {</span>
+<span class="source-line-no">034</span><span id="line-34">        this(new RxBitcoinClient(network, rpcUri, rpcUser, rpcPassword));</span>
+<span class="source-line-no">035</span><span id="line-35">    }</span>
+<span class="source-line-no">036</span><span id="line-36"></span>
+<span class="source-line-no">037</span><span id="line-37">    public RxBitcoinZmqBinaryService(BitcoinClient client) {</span>
+<span class="source-line-no">038</span><span id="line-38">        this.client = client;</span>
+<span class="source-line-no">039</span><span id="line-39">        threadFactory = new BitcoinClientThreadFactory(Context.getOrCreate(), "RxBitcoinZmq Thread");</span>
+<span class="source-line-no">040</span><span id="line-40"></span>
+<span class="source-line-no">041</span><span id="line-41">        // TODO: Create background thread to look for the ZMQ Ports</span>
+<span class="source-line-no">042</span><span id="line-42">        BitcoinZmqPortFinder portFinder = new BitcoinZmqPortFinder(client);</span>
+<span class="source-line-no">043</span><span id="line-43"></span>
+<span class="source-line-no">044</span><span id="line-44">        Optional&lt;URI&gt; blockServiceURI = portFinder.findPort(rawblock);</span>
+<span class="source-line-no">045</span><span id="line-45">        Optional&lt;URI&gt; txServiceURI = portFinder.findPort(rawtx);</span>
+<span class="source-line-no">046</span><span id="line-46"></span>
+<span class="source-line-no">047</span><span id="line-47">        if (!(blockServiceURI.isPresent() &amp;&amp; txServiceURI.isPresent())) {</span>
+<span class="source-line-no">048</span><span id="line-48">            throw new RuntimeException("Bitcoin Core configuration error");</span>
+<span class="source-line-no">049</span><span id="line-49">        }</span>
+<span class="source-line-no">050</span><span id="line-50"></span>
+<span class="source-line-no">051</span><span id="line-51">        if (blockServiceURI.get().equals(txServiceURI.get())) {</span>
+<span class="source-line-no">052</span><span id="line-52">            // URIs are the same we can use a single connection</span>
+<span class="source-line-no">053</span><span id="line-53">            blockService = new RxBitcoinSinglePortZmqService(blockServiceURI.get(), threadFactory, rawblock, rawtx);</span>
+<span class="source-line-no">054</span><span id="line-54">            txService = blockService;</span>
+<span class="source-line-no">055</span><span id="line-55">        } else {</span>
+<span class="source-line-no">056</span><span id="line-56">            blockService = new RxBitcoinSinglePortZmqService(blockServiceURI.get(), threadFactory, rawblock);</span>
+<span class="source-line-no">057</span><span id="line-57">            txService = new RxBitcoinSinglePortZmqService(txServiceURI.get(), threadFactory, rawtx);</span>
+<span class="source-line-no">058</span><span id="line-58">        }</span>
+<span class="source-line-no">059</span><span id="line-59"></span>
+<span class="source-line-no">060</span><span id="line-60">        flowableRawBlock = Flowable.fromPublisher(blockService.blockBinaryPublisher());</span>
+<span class="source-line-no">061</span><span id="line-61">        flowableRawTx = Flowable.fromPublisher(txService.transactionBinaryPublisher());</span>
+<span class="source-line-no">062</span><span id="line-62">    }</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64">    @Override</span>
+<span class="source-line-no">065</span><span id="line-65">    public Publisher&lt;byte[]&gt; transactionBinaryPublisher() {</span>
+<span class="source-line-no">066</span><span id="line-66">        return flowableRawTx;</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69">    @Override</span>
+<span class="source-line-no">070</span><span id="line-70">    public Publisher&lt;byte[]&gt; transactionHashBinaryPublisher() {</span>
+<span class="source-line-no">071</span><span id="line-71">        throw new UnsupportedOperationException("Not implemented");</span>
+<span class="source-line-no">072</span><span id="line-72">    }</span>
+<span class="source-line-no">073</span><span id="line-73"></span>
+<span class="source-line-no">074</span><span id="line-74">    @Override</span>
+<span class="source-line-no">075</span><span id="line-75">    public Publisher&lt;byte[]&gt; blockBinaryPublisher() {</span>
+<span class="source-line-no">076</span><span id="line-76">        return flowableRawBlock;</span>
+<span class="source-line-no">077</span><span id="line-77">    }</span>
+<span class="source-line-no">078</span><span id="line-78"></span>
+<span class="source-line-no">079</span><span id="line-79">    @Override</span>
+<span class="source-line-no">080</span><span id="line-80">    public Publisher&lt;byte[]&gt; blockHashBinaryPublisher() {</span>
+<span class="source-line-no">081</span><span id="line-81">        throw new UnsupportedOperationException("Not implemented");</span>
+<span class="source-line-no">082</span><span id="line-82">    }</span>
+<span class="source-line-no">083</span><span id="line-83"></span>
+<span class="source-line-no">084</span><span id="line-84">    @Override</span>
+<span class="source-line-no">085</span><span id="line-85">    public void close()  {</span>
+<span class="source-line-no">086</span><span id="line-86">        blockService.close();</span>
+<span class="source-line-no">087</span><span id="line-87">        txService.close();</span>
+<span class="source-line-no">088</span><span id="line-88">        try {</span>
+<span class="source-line-no">089</span><span id="line-89">            client.close();</span>
+<span class="source-line-no">090</span><span id="line-90">        } catch (InterruptedException e) {</span>
+<span class="source-line-no">091</span><span id="line-91">            throw new RuntimeException(e);</span>
+<span class="source-line-no">092</span><span id="line-92">        }</span>
+<span class="source-line-no">093</span><span id="line-93">    }</span>
+<span class="source-line-no">094</span><span id="line-94">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html
index 76f3adf71..8e23d4703 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/RxBitcoinZmqService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.zeromq, class: RxBitcoinZmqService">
@@ -13,94 +13,136 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx.zeromq;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import org.bitcoinj.base.Network;</span>
-<span class="source-line-no">004</span><span id="line-4">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
-<span class="source-line-no">005</span><span id="line-5">import io.reactivex.rxjava3.core.Flowable;</span>
-<span class="source-line-no">006</span><span id="line-6">import io.reactivex.rxjava3.disposables.Disposable;</span>
-<span class="source-line-no">007</span><span id="line-7">import io.reactivex.rxjava3.processors.BehaviorProcessor;</span>
-<span class="source-line-no">008</span><span id="line-8">import io.reactivex.rxjava3.processors.FlowableProcessor;</span>
-<span class="source-line-no">009</span><span id="line-9">import org.bitcoinj.core.Block;</span>
-<span class="source-line-no">010</span><span id="line-10">import org.bitcoinj.base.Sha256Hash;</span>
-<span class="source-line-no">011</span><span id="line-11">import org.bitcoinj.core.Transaction;</span>
-<span class="source-line-no">012</span><span id="line-12">import org.consensusj.bitcoin.rx.ChainTipService;</span>
-<span class="source-line-no">013</span><span id="line-13">import org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient;</span>
-<span class="source-line-no">014</span><span id="line-14">import org.consensusj.bitcoin.rx.RxBlockchainService;</span>
-<span class="source-line-no">015</span><span id="line-15"></span>
-<span class="source-line-no">016</span><span id="line-16">import java.io.Closeable;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.net.URI;</span>
-<span class="source-line-no">018</span><span id="line-18">import java.nio.ByteBuffer;</span>
-<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">/**</span>
-<span class="source-line-no">022</span><span id="line-22"> *  Add conversion to bitcoinj-types to {@code RxBitcoinZmqBinaryService}. Also</span>
-<span class="source-line-no">023</span><span id="line-23"> *  uses the JSON-RPC client to fetch an initial {@link Block} so subscribers don't</span>
-<span class="source-line-no">024</span><span id="line-24"> *  have to wait ~ten minutes for one.</span>
-<span class="source-line-no">025</span><span id="line-25"> */</span>
-<span class="source-line-no">026</span><span id="line-26">public class RxBitcoinZmqService extends RxBitcoinZmqBinaryService implements RxBlockchainService, ChainTipService, Closeable {</span>
-<span class="source-line-no">027</span><span id="line-27"></span>
-<span class="source-line-no">028</span><span id="line-28">    private final FlowableProcessor&lt;ChainTip&gt; flowableChainTip = BehaviorProcessor.create();</span>
-<span class="source-line-no">029</span><span id="line-29">    private final Disposable blockSubscription;</span>
-<span class="source-line-no">030</span><span id="line-30"></span>
-<span class="source-line-no">031</span><span id="line-31">    public RxBitcoinZmqService(Network network, URI rpcUri, String rpcUser, String rpcPassword) {</span>
-<span class="source-line-no">032</span><span id="line-32">        this(new RxBitcoinClient(network, rpcUri, rpcUser, rpcPassword));</span>
-<span class="source-line-no">033</span><span id="line-33">    }</span>
-<span class="source-line-no">034</span><span id="line-34"></span>
-<span class="source-line-no">035</span><span id="line-35">    public RxBitcoinZmqService(RxBitcoinClient client) {</span>
-<span class="source-line-no">036</span><span id="line-36">        super(client);</span>
-<span class="source-line-no">037</span><span id="line-37">        blockSubscription = blockPublisher()</span>
-<span class="source-line-no">038</span><span id="line-38">                .flatMapSingle(client::activeChainTipFromBestBlock)</span>
-<span class="source-line-no">039</span><span id="line-39">                .distinctUntilChanged(ChainTip::getHash)</span>
-<span class="source-line-no">040</span><span id="line-40">                .subscribe(this::onNextChainTip, flowableChainTip::onError, flowableChainTip::onComplete);</span>
+<span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.Single;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.bitcoinj.base.Network;</span>
+<span class="source-line-no">005</span><span id="line-5">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
+<span class="source-line-no">006</span><span id="line-6">import io.reactivex.rxjava3.core.Flowable;</span>
+<span class="source-line-no">007</span><span id="line-7">import io.reactivex.rxjava3.disposables.Disposable;</span>
+<span class="source-line-no">008</span><span id="line-8">import io.reactivex.rxjava3.processors.BehaviorProcessor;</span>
+<span class="source-line-no">009</span><span id="line-9">import io.reactivex.rxjava3.processors.FlowableProcessor;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.bitcoinj.core.Block;</span>
+<span class="source-line-no">011</span><span id="line-11">import org.bitcoinj.base.Sha256Hash;</span>
+<span class="source-line-no">012</span><span id="line-12">import org.bitcoinj.core.Transaction;</span>
+<span class="source-line-no">013</span><span id="line-13">import org.consensusj.bitcoin.jsonrpc.BitcoinClient;</span>
+<span class="source-line-no">014</span><span id="line-14">import org.consensusj.bitcoin.rx.ChainTipPublisher;</span>
+<span class="source-line-no">015</span><span id="line-15">import org.consensusj.bitcoin.rx.ChainTipService;</span>
+<span class="source-line-no">016</span><span id="line-16">import org.consensusj.bitcoin.rx.jsonrpc.RxBitcoinClient;</span>
+<span class="source-line-no">017</span><span id="line-17">import org.consensusj.bitcoin.rx.RxBlockchainService;</span>
+<span class="source-line-no">018</span><span id="line-18">import org.consensusj.bitcoinj.util.BlockUtil;</span>
+<span class="source-line-no">019</span><span id="line-19">import org.consensusj.rx.jsonrpc.RxJsonRpcClient;</span>
+<span class="source-line-no">020</span><span id="line-20">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">import java.io.Closeable;</span>
+<span class="source-line-no">023</span><span id="line-23">import java.net.URI;</span>
+<span class="source-line-no">024</span><span id="line-24">import java.nio.ByteBuffer;</span>
+<span class="source-line-no">025</span><span id="line-25">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">026</span><span id="line-26">import java.util.concurrent.CompletionStage;</span>
+<span class="source-line-no">027</span><span id="line-27">import java.util.function.Supplier;</span>
+<span class="source-line-no">028</span><span id="line-28"></span>
+<span class="source-line-no">029</span><span id="line-29">/**</span>
+<span class="source-line-no">030</span><span id="line-30"> *  Add conversion to bitcoinj-types to {@code RxBitcoinZmqBinaryService}. Also</span>
+<span class="source-line-no">031</span><span id="line-31"> *  uses the JSON-RPC client to fetch an initial {@link Block} so subscribers don't</span>
+<span class="source-line-no">032</span><span id="line-32"> *  have to wait ~ten minutes for one.</span>
+<span class="source-line-no">033</span><span id="line-33"> */</span>
+<span class="source-line-no">034</span><span id="line-34">public class RxBitcoinZmqService extends RxBitcoinZmqBinaryService implements RxBlockchainService, ChainTipService, Closeable {</span>
+<span class="source-line-no">035</span><span id="line-35"></span>
+<span class="source-line-no">036</span><span id="line-36">    private final FlowableProcessor&lt;ChainTip&gt; flowableChainTip = BehaviorProcessor.create();</span>
+<span class="source-line-no">037</span><span id="line-37">    private final Disposable blockSubscription;</span>
+<span class="source-line-no">038</span><span id="line-38"></span>
+<span class="source-line-no">039</span><span id="line-39">    public RxBitcoinZmqService(Network network, URI rpcUri, String rpcUser, String rpcPassword) {</span>
+<span class="source-line-no">040</span><span id="line-40">        this(new RxBitcoinClient(network, rpcUri, rpcUser, rpcPassword));</span>
 <span class="source-line-no">041</span><span id="line-41">    }</span>
 <span class="source-line-no">042</span><span id="line-42"></span>
-<span class="source-line-no">043</span><span id="line-43">    @Override</span>
-<span class="source-line-no">044</span><span id="line-44">    public Flowable&lt;Transaction&gt; transactionPublisher() {</span>
-<span class="source-line-no">045</span><span id="line-45">        return transactionBinaryPublisher()</span>
-<span class="source-line-no">046</span><span id="line-46">                .map(bytes -&gt; Transaction.read(ByteBuffer.wrap(bytes)));   // Deserialize to Transaction</span>
-<span class="source-line-no">047</span><span id="line-47">    }</span>
-<span class="source-line-no">048</span><span id="line-48"></span>
-<span class="source-line-no">049</span><span id="line-49">    @Override</span>
-<span class="source-line-no">050</span><span id="line-50">    public Flowable&lt;Sha256Hash&gt; transactionHashPublisher() {</span>
-<span class="source-line-no">051</span><span id="line-51">        return transactionHashBinaryPublisher()</span>
-<span class="source-line-no">052</span><span id="line-52">                .map(Sha256Hash::wrap);            // Deserialize to Sha256Hash</span>
-<span class="source-line-no">053</span><span id="line-53">    }</span>
-<span class="source-line-no">054</span><span id="line-54"></span>
-<span class="source-line-no">055</span><span id="line-55">    @Override</span>
-<span class="source-line-no">056</span><span id="line-56">    public Flowable&lt;Block&gt; blockPublisher() {</span>
-<span class="source-line-no">057</span><span id="line-57">        return blockBinaryPublisher()</span>
-<span class="source-line-no">058</span><span id="line-58">                .map(ByteBuffer::wrap)</span>
-<span class="source-line-no">059</span><span id="line-59">                .map(Block::read)  // Deserialize to bitcoinj Block</span>
-<span class="source-line-no">060</span><span id="line-60">                .startWith(client.getBestBlockViaRpc()); // Use JSON-RPC client to fetch an initial block</span>
+<span class="source-line-no">043</span><span id="line-43">    public RxBitcoinZmqService(BitcoinClient client) {</span>
+<span class="source-line-no">044</span><span id="line-44">        super(client);</span>
+<span class="source-line-no">045</span><span id="line-45">        blockSubscription = Flowable.fromPublisher(blockPublisher())</span>
+<span class="source-line-no">046</span><span id="line-46">                .flatMap(this::activeChainTipFromBestBlockPublisher)</span>
+<span class="source-line-no">047</span><span id="line-47">                .distinctUntilChanged(ChainTip::getHash)</span>
+<span class="source-line-no">048</span><span id="line-48">                .subscribe(this::onNextChainTip, flowableChainTip::onError, flowableChainTip::onComplete);</span>
+<span class="source-line-no">049</span><span id="line-49">    }</span>
+<span class="source-line-no">050</span><span id="line-50"></span>
+<span class="source-line-no">051</span><span id="line-51">    @Override</span>
+<span class="source-line-no">052</span><span id="line-52">    public Publisher&lt;Transaction&gt; transactionPublisher() {</span>
+<span class="source-line-no">053</span><span id="line-53">        return Flowable.fromPublisher(transactionBinaryPublisher())</span>
+<span class="source-line-no">054</span><span id="line-54">                .map(bytes -&gt; Transaction.read(ByteBuffer.wrap(bytes)));   // Deserialize to Transaction</span>
+<span class="source-line-no">055</span><span id="line-55">    }</span>
+<span class="source-line-no">056</span><span id="line-56"></span>
+<span class="source-line-no">057</span><span id="line-57">    @Override</span>
+<span class="source-line-no">058</span><span id="line-58">    public Publisher&lt;Sha256Hash&gt; transactionHashPublisher() {</span>
+<span class="source-line-no">059</span><span id="line-59">        return Flowable.fromPublisher(transactionHashBinaryPublisher())</span>
+<span class="source-line-no">060</span><span id="line-60">                .map(Sha256Hash::wrap);            // Deserialize to Sha256Hash</span>
 <span class="source-line-no">061</span><span id="line-61">    }</span>
-<span class="source-line-no">062</span><span id="line-62">    </span>
+<span class="source-line-no">062</span><span id="line-62"></span>
 <span class="source-line-no">063</span><span id="line-63">    @Override</span>
-<span class="source-line-no">064</span><span id="line-64">    public Flowable&lt;Sha256Hash&gt; blockHashPublisher() {</span>
-<span class="source-line-no">065</span><span id="line-65">        return blockHashBinaryPublisher()</span>
-<span class="source-line-no">066</span><span id="line-66">                .map(Sha256Hash::wrap);             // Deserialize to Sha256Hash</span>
-<span class="source-line-no">067</span><span id="line-67">    }</span>
-<span class="source-line-no">068</span><span id="line-68"></span>
-<span class="source-line-no">069</span><span id="line-69">    @Override</span>
-<span class="source-line-no">070</span><span id="line-70">    public Flowable&lt;Integer&gt; blockHeightPublisher() {</span>
-<span class="source-line-no">071</span><span id="line-71">        return chainTipPublisher()</span>
-<span class="source-line-no">072</span><span id="line-72">                .map(ChainTip::getHeight);          // Extract block height</span>
-<span class="source-line-no">073</span><span id="line-73">    }</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75">    @Override</span>
-<span class="source-line-no">076</span><span id="line-76">    public Flowable&lt;ChainTip&gt; chainTipPublisher() {</span>
-<span class="source-line-no">077</span><span id="line-77">        return flowableChainTip;</span>
-<span class="source-line-no">078</span><span id="line-78">    }</span>
-<span class="source-line-no">079</span><span id="line-79"></span>
-<span class="source-line-no">080</span><span id="line-80">    @Override</span>
-<span class="source-line-no">081</span><span id="line-81">    public void close()  {</span>
-<span class="source-line-no">082</span><span id="line-82">        super.close();</span>
-<span class="source-line-no">083</span><span id="line-83">        blockSubscription.dispose();</span>
-<span class="source-line-no">084</span><span id="line-84">    }</span>
-<span class="source-line-no">085</span><span id="line-85"></span>
-<span class="source-line-no">086</span><span id="line-86">    // For setting breakpoints</span>
-<span class="source-line-no">087</span><span id="line-87">    void onNextChainTip(ChainTip tip) {</span>
-<span class="source-line-no">088</span><span id="line-88">        flowableChainTip.onNext(tip);</span>
-<span class="source-line-no">089</span><span id="line-89">    }</span>
-<span class="source-line-no">090</span><span id="line-90">}</span>
+<span class="source-line-no">064</span><span id="line-64">    public Publisher&lt;Block&gt; blockPublisher() {</span>
+<span class="source-line-no">065</span><span id="line-65">        return Flowable.fromPublisher(blockBinaryPublisher())</span>
+<span class="source-line-no">066</span><span id="line-66">                .map(ByteBuffer::wrap)</span>
+<span class="source-line-no">067</span><span id="line-67">                .map(Block::read)  // Deserialize to bitcoinj Block</span>
+<span class="source-line-no">068</span><span id="line-68">                .startWith(defer(client::getBestBlock)); // Use JSON-RPC client to fetch an initial block</span>
+<span class="source-line-no">069</span><span id="line-69">    }</span>
+<span class="source-line-no">070</span><span id="line-70">    </span>
+<span class="source-line-no">071</span><span id="line-71">    @Override</span>
+<span class="source-line-no">072</span><span id="line-72">    public Publisher&lt;Sha256Hash&gt; blockHashPublisher() {</span>
+<span class="source-line-no">073</span><span id="line-73">        return Flowable.fromPublisher(blockHashBinaryPublisher())</span>
+<span class="source-line-no">074</span><span id="line-74">                .map(Sha256Hash::wrap);             // Deserialize to Sha256Hash</span>
+<span class="source-line-no">075</span><span id="line-75">    }</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">    @Override</span>
+<span class="source-line-no">078</span><span id="line-78">    public Publisher&lt;Integer&gt; blockHeightPublisher() {</span>
+<span class="source-line-no">079</span><span id="line-79">        return Flowable.fromPublisher(chainTipPublisher())</span>
+<span class="source-line-no">080</span><span id="line-80">                .map(ChainTip::getHeight);          // Extract block height</span>
+<span class="source-line-no">081</span><span id="line-81">    }</span>
+<span class="source-line-no">082</span><span id="line-82"></span>
+<span class="source-line-no">083</span><span id="line-83">    @Override</span>
+<span class="source-line-no">084</span><span id="line-84">    public ChainTipPublisher chainTipPublisher() {</span>
+<span class="source-line-no">085</span><span id="line-85">        return ChainTipPublisher.of(flowableChainTip);</span>
+<span class="source-line-no">086</span><span id="line-86">    }</span>
+<span class="source-line-no">087</span><span id="line-87"></span>
+<span class="source-line-no">088</span><span id="line-88">    @Override</span>
+<span class="source-line-no">089</span><span id="line-89">    public void close()  {</span>
+<span class="source-line-no">090</span><span id="line-90">        super.close();</span>
+<span class="source-line-no">091</span><span id="line-91">        blockSubscription.dispose();</span>
+<span class="source-line-no">092</span><span id="line-92">    }</span>
+<span class="source-line-no">093</span><span id="line-93"></span>
+<span class="source-line-no">094</span><span id="line-94">    /**</span>
+<span class="source-line-no">095</span><span id="line-95">     * Return a &lt;i&gt;cold&lt;/i&gt; {@link Single} for calling a provided &lt;b&gt;asynchronous&lt;/b&gt; JSON-RPC method.</span>
+<span class="source-line-no">096</span><span id="line-96">     * (Uses a supplier to make sure the async call isn't made until subscription time)</span>
+<span class="source-line-no">097</span><span id="line-97">     * &lt;p&gt;</span>
+<span class="source-line-no">098</span><span id="line-98">     *  A  &lt;i&gt;cold&lt;/i&gt; stream does not begin processing until someone subscribes to it.</span>
+<span class="source-line-no">099</span><span id="line-99">     * @param supplier of completable</span>
+<span class="source-line-no">100</span><span id="line-100">     * @param &lt;RSLT&gt; The type of the expected result</span>
+<span class="source-line-no">101</span><span id="line-101">     * @return A &lt;i&gt;cold&lt;/i&gt; {@link Single} for calling the method.</span>
+<span class="source-line-no">102</span><span id="line-102">     */</span>
+<span class="source-line-no">103</span><span id="line-103">    private &lt;RSLT&gt; Single&lt;RSLT&gt; defer(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt; supplier) {</span>
+<span class="source-line-no">104</span><span id="line-104">        return Single.defer(() -&gt; Single.fromCompletionStage(supplier.get()));</span>
+<span class="source-line-no">105</span><span id="line-105">    }</span>
+<span class="source-line-no">106</span><span id="line-106"></span>
+<span class="source-line-no">107</span><span id="line-107">    private Publisher&lt;ChainTip&gt; activeChainTipFromBestBlockPublisher(Block block) {</span>
+<span class="source-line-no">108</span><span id="line-108">        return Flowable.defer(() -&gt; Flowable.fromCompletionStage(activeChainTipFromBestBlock(block)));</span>
+<span class="source-line-no">109</span><span id="line-109">    }</span>
+<span class="source-line-no">110</span><span id="line-110"></span>
+<span class="source-line-no">111</span><span id="line-111">    /**</span>
+<span class="source-line-no">112</span><span id="line-112">     * Convert best {@link Block} to active {@link ChainTip}. If BIP34 is activated this</span>
+<span class="source-line-no">113</span><span id="line-113">     * is purely computational, otherwise I/O is required to fetch the {@code ChainTip}</span>
+<span class="source-line-no">114</span><span id="line-114">     *</span>
+<span class="source-line-no">115</span><span id="line-115">     * @param block Input best block</span>
+<span class="source-line-no">116</span><span id="line-116">     * @return active ChainTip assuming parameter block is the "best block"</span>
+<span class="source-line-no">117</span><span id="line-117">     */</span>
+<span class="source-line-no">118</span><span id="line-118">    private CompletableFuture&lt;ChainTip&gt; activeChainTipFromBestBlock(Block block) {</span>
+<span class="source-line-no">119</span><span id="line-119">        int height = BlockUtil.blockHeightFromCoinbase(block);</span>
+<span class="source-line-no">120</span><span id="line-120">        if (height != -1) {</span>
+<span class="source-line-no">121</span><span id="line-121">            return CompletableFuture.completedFuture(ChainTip.ofActive(height, block.getHash()));</span>
+<span class="source-line-no">122</span><span id="line-122">        } else {</span>
+<span class="source-line-no">123</span><span id="line-123">            return client.getChainTipsAsync()</span>
+<span class="source-line-no">124</span><span id="line-124">                    .thenApply(ChainTip::findActiveChainTipOrElseThrow);</span>
+<span class="source-line-no">125</span><span id="line-125">        }</span>
+<span class="source-line-no">126</span><span id="line-126">    }</span>
+<span class="source-line-no">127</span><span id="line-127"></span>
+<span class="source-line-no">128</span><span id="line-128">    // For setting breakpoints</span>
+<span class="source-line-no">129</span><span id="line-129">    void onNextChainTip(ChainTip tip) {</span>
+<span class="source-line-no">130</span><span id="line-130">        flowableChainTip.onNext(tip);</span>
+<span class="source-line-no">131</span><span id="line-131">    }</span>
+<span class="source-line-no">132</span><span id="line-132">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html
index b7ae69561..094874ac0 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/rx/zeromq/SampleBitcoinZmqClient.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.rx.zeromq, class: SampleBitcoinZmqClient">
@@ -13,72 +13,73 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoin.rx.zeromq;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import org.bitcoinj.base.BitcoinNetwork;</span>
-<span class="source-line-no">004</span><span id="line-4">import org.bitcoinj.base.Network;</span>
-<span class="source-line-no">005</span><span id="line-5">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
-<span class="source-line-no">006</span><span id="line-6">import io.reactivex.rxjava3.disposables.Disposable;</span>
-<span class="source-line-no">007</span><span id="line-7">import org.bitcoinj.core.Block;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.bitcoinj.core.Transaction;</span>
-<span class="source-line-no">009</span><span id="line-9">import org.consensusj.bitcoinj.util.BlockUtil;</span>
-<span class="source-line-no">010</span><span id="line-10"></span>
-<span class="source-line-no">011</span><span id="line-11">import java.net.URI;</span>
-<span class="source-line-no">012</span><span id="line-12"></span>
-<span class="source-line-no">013</span><span id="line-13">import static java.lang.System.out;</span>
-<span class="source-line-no">014</span><span id="line-14"></span>
-<span class="source-line-no">015</span><span id="line-15">/**</span>
-<span class="source-line-no">016</span><span id="line-16"> * Sample Bitcoin ZMQ client</span>
-<span class="source-line-no">017</span><span id="line-17"> */</span>
-<span class="source-line-no">018</span><span id="line-18">public class SampleBitcoinZmqClient {</span>
-<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">    public static void main(String[] args) {</span>
-<span class="source-line-no">021</span><span id="line-21">        Network network = BitcoinNetwork.MAINNET;</span>
-<span class="source-line-no">022</span><span id="line-22">        String rpcUser = "";</span>
-<span class="source-line-no">023</span><span id="line-23">        String rpcPassword = "";</span>
-<span class="source-line-no">024</span><span id="line-24">        URI rpcUri = URI.create("http://localhost:8332");</span>
-<span class="source-line-no">025</span><span id="line-25"></span>
-<span class="source-line-no">026</span><span id="line-26">        try (RxBitcoinZmqService client = new RxBitcoinZmqService(network, rpcUri, rpcUser, rpcPassword)) {</span>
-<span class="source-line-no">027</span><span id="line-27">            // Subscribe to Blocks</span>
-<span class="source-line-no">028</span><span id="line-28">            Disposable disposable = client.blockPublisher()</span>
-<span class="source-line-no">029</span><span id="line-29">                    .subscribe(SampleBitcoinZmqClient::onBlock, SampleBitcoinZmqClient::onError);</span>
-<span class="source-line-no">030</span><span id="line-30"></span>
-<span class="source-line-no">031</span><span id="line-31">            // Subscribe to ChainTips</span>
-<span class="source-line-no">032</span><span id="line-32">            Disposable disposable2 = client.chainTipPublisher()</span>
-<span class="source-line-no">033</span><span id="line-33">                    .subscribe(SampleBitcoinZmqClient::onChainTip, SampleBitcoinZmqClient::onError);</span>
-<span class="source-line-no">034</span><span id="line-34"></span>
+<span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.Flowable;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.bitcoinj.base.BitcoinNetwork;</span>
+<span class="source-line-no">005</span><span id="line-5">import org.bitcoinj.base.Network;</span>
+<span class="source-line-no">006</span><span id="line-6">import org.consensusj.bitcoin.json.pojo.ChainTip;</span>
+<span class="source-line-no">007</span><span id="line-7">import io.reactivex.rxjava3.disposables.Disposable;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.bitcoinj.core.Block;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.bitcoinj.core.Transaction;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.consensusj.bitcoinj.util.BlockUtil;</span>
+<span class="source-line-no">011</span><span id="line-11"></span>
+<span class="source-line-no">012</span><span id="line-12">import java.net.URI;</span>
+<span class="source-line-no">013</span><span id="line-13"></span>
+<span class="source-line-no">014</span><span id="line-14">import static java.lang.System.out;</span>
+<span class="source-line-no">015</span><span id="line-15"></span>
+<span class="source-line-no">016</span><span id="line-16">/**</span>
+<span class="source-line-no">017</span><span id="line-17"> * Sample Bitcoin ZMQ client</span>
+<span class="source-line-no">018</span><span id="line-18"> */</span>
+<span class="source-line-no">019</span><span id="line-19">public class SampleBitcoinZmqClient {</span>
+<span class="source-line-no">020</span><span id="line-20"></span>
+<span class="source-line-no">021</span><span id="line-21">    public static void main(String[] args) {</span>
+<span class="source-line-no">022</span><span id="line-22">        Network network = BitcoinNetwork.MAINNET;</span>
+<span class="source-line-no">023</span><span id="line-23">        String rpcUser = "";</span>
+<span class="source-line-no">024</span><span id="line-24">        String rpcPassword = "";</span>
+<span class="source-line-no">025</span><span id="line-25">        URI rpcUri = URI.create("http://localhost:8332");</span>
+<span class="source-line-no">026</span><span id="line-26"></span>
+<span class="source-line-no">027</span><span id="line-27">        try (RxBitcoinZmqService client = new RxBitcoinZmqService(network, rpcUri, rpcUser, rpcPassword)) {</span>
+<span class="source-line-no">028</span><span id="line-28">            // Subscribe to Blocks</span>
+<span class="source-line-no">029</span><span id="line-29">            Disposable disposable = Flowable.fromPublisher(client.blockPublisher())</span>
+<span class="source-line-no">030</span><span id="line-30">                    .subscribe(SampleBitcoinZmqClient::onBlock, SampleBitcoinZmqClient::onError);</span>
+<span class="source-line-no">031</span><span id="line-31"></span>
+<span class="source-line-no">032</span><span id="line-32">            // Subscribe to ChainTips</span>
+<span class="source-line-no">033</span><span id="line-33">            Disposable disposable2 = Flowable.fromPublisher(client.chainTipPublisher())</span>
+<span class="source-line-no">034</span><span id="line-34">                    .subscribe(SampleBitcoinZmqClient::onChainTip, SampleBitcoinZmqClient::onError);</span>
 <span class="source-line-no">035</span><span id="line-35"></span>
-<span class="source-line-no">036</span><span id="line-36">            // Blocking subscribe to Transactions (so main() doesn't finish)</span>
-<span class="source-line-no">037</span><span id="line-37">            client.transactionPublisher()</span>
-<span class="source-line-no">038</span><span id="line-38">                    .blockingSubscribe(SampleBitcoinZmqClient::onTx, SampleBitcoinZmqClient::onError);</span>
-<span class="source-line-no">039</span><span id="line-39"></span>
-<span class="source-line-no">040</span><span id="line-40">            disposable.dispose();</span>
-<span class="source-line-no">041</span><span id="line-41">        }</span>
-<span class="source-line-no">042</span><span id="line-42">    }</span>
-<span class="source-line-no">043</span><span id="line-43"></span>
-<span class="source-line-no">044</span><span id="line-44">    static void onBlock(Block block) {</span>
-<span class="source-line-no">045</span><span id="line-45">        out.println("Raw block");</span>
-<span class="source-line-no">046</span><span id="line-46">        out.printf("Block version: %s\n", block.getVersion());</span>
-<span class="source-line-no">047</span><span id="line-47">        out.printf("Raw Block: %s/%s containing %s transactions\n",</span>
-<span class="source-line-no">048</span><span id="line-48">                BlockUtil.blockHeightFromCoinbase(block),</span>
-<span class="source-line-no">049</span><span id="line-49">                block.getHash(),</span>
-<span class="source-line-no">050</span><span id="line-50">                block.getTransactions().size());</span>
-<span class="source-line-no">051</span><span id="line-51"></span>
-<span class="source-line-no">052</span><span id="line-52">    }</span>
-<span class="source-line-no">053</span><span id="line-53"></span>
-<span class="source-line-no">054</span><span id="line-54">    static void onChainTip(ChainTip tip) {</span>
-<span class="source-line-no">055</span><span id="line-55">        out.printf("Chain tip: %s/%s\n", tip.getHeight(), tip.getHash());</span>
-<span class="source-line-no">056</span><span id="line-56">    }</span>
-<span class="source-line-no">057</span><span id="line-57"></span>
-<span class="source-line-no">058</span><span id="line-58">    static void onTx(Transaction tx) {</span>
-<span class="source-line-no">059</span><span id="line-59">        out.printf("Raw Tx: %s, value: %s\n",</span>
-<span class="source-line-no">060</span><span id="line-60">                tx.getTxId(),</span>
-<span class="source-line-no">061</span><span id="line-61">                tx.getOutputSum().toPlainString());</span>
-<span class="source-line-no">062</span><span id="line-62">    }</span>
-<span class="source-line-no">063</span><span id="line-63"></span>
-<span class="source-line-no">064</span><span id="line-64">    static void onError(Throwable t) {</span>
-<span class="source-line-no">065</span><span id="line-65">        out.println("Error: " + t);</span>
-<span class="source-line-no">066</span><span id="line-66">    }</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68">}</span>
+<span class="source-line-no">036</span><span id="line-36"></span>
+<span class="source-line-no">037</span><span id="line-37">            // Blocking subscribe to Transactions (so main() doesn't finish)</span>
+<span class="source-line-no">038</span><span id="line-38">            Flowable.fromPublisher(client.transactionPublisher())</span>
+<span class="source-line-no">039</span><span id="line-39">                    .blockingSubscribe(SampleBitcoinZmqClient::onTx, SampleBitcoinZmqClient::onError);</span>
+<span class="source-line-no">040</span><span id="line-40"></span>
+<span class="source-line-no">041</span><span id="line-41">            disposable.dispose();</span>
+<span class="source-line-no">042</span><span id="line-42">        }</span>
+<span class="source-line-no">043</span><span id="line-43">    }</span>
+<span class="source-line-no">044</span><span id="line-44"></span>
+<span class="source-line-no">045</span><span id="line-45">    static void onBlock(Block block) {</span>
+<span class="source-line-no">046</span><span id="line-46">        out.println("Raw block");</span>
+<span class="source-line-no">047</span><span id="line-47">        out.printf("Block version: %s\n", block.getVersion());</span>
+<span class="source-line-no">048</span><span id="line-48">        out.printf("Raw Block: %s/%s containing %s transactions\n",</span>
+<span class="source-line-no">049</span><span id="line-49">                BlockUtil.blockHeightFromCoinbase(block),</span>
+<span class="source-line-no">050</span><span id="line-50">                block.getHash(),</span>
+<span class="source-line-no">051</span><span id="line-51">                block.getTransactions().size());</span>
+<span class="source-line-no">052</span><span id="line-52"></span>
+<span class="source-line-no">053</span><span id="line-53">    }</span>
+<span class="source-line-no">054</span><span id="line-54"></span>
+<span class="source-line-no">055</span><span id="line-55">    static void onChainTip(ChainTip tip) {</span>
+<span class="source-line-no">056</span><span id="line-56">        out.printf("Chain tip: %s/%s\n", tip.getHeight(), tip.getHash());</span>
+<span class="source-line-no">057</span><span id="line-57">    }</span>
+<span class="source-line-no">058</span><span id="line-58"></span>
+<span class="source-line-no">059</span><span id="line-59">    static void onTx(Transaction tx) {</span>
+<span class="source-line-no">060</span><span id="line-60">        out.printf("Raw Tx: %s, value: %s\n",</span>
+<span class="source-line-no">061</span><span id="line-61">                tx.getTxId(),</span>
+<span class="source-line-no">062</span><span id="line-62">                tx.getOutputSum().toPlainString());</span>
+<span class="source-line-no">063</span><span id="line-63">    }</span>
+<span class="source-line-no">064</span><span id="line-64"></span>
+<span class="source-line-no">065</span><span id="line-65">    static void onError(Throwable t) {</span>
+<span class="source-line-no">066</span><span id="line-66">        out.println("Error: " + t);</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/services/WalletAppKitService.html b/apidoc/src-html/org/consensusj/bitcoin/services/WalletAppKitService.html
index 0b9881cdb..9d373a62c 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/services/WalletAppKitService.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/services/WalletAppKitService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.services, class: WalletAppKitService">
@@ -287,7 +287,7 @@
 <span class="source-line-no">274</span><span id="line-274"></span>
 <span class="source-line-no">275</span><span id="line-275">    @Override</span>
 <span class="source-line-no">276</span><span id="line-276">    public CompletableFuture&lt;BlockChainInfo&gt; getblockchaininfo() {</span>
-<span class="source-line-no">277</span><span id="line-277">        return result(new BlockChainInfo(chainName(network),        // Chain ID</span>
+<span class="source-line-no">277</span><span id="line-277">        return result(new BlockChainInfo(BlockChainInfo.networkToChainName(network),   // Chain ID</span>
 <span class="source-line-no">278</span><span id="line-278">                kit.chain().getChainHead().getHeight(),             // Block processed (same as headers for SPV)</span>
 <span class="source-line-no">279</span><span id="line-279">                kit.chain().getChainHead().getHeight(),             // Headers validated</span>
 <span class="source-line-no">280</span><span id="line-280">                kit.chain().getChainHead().getHeader().getHash(),   // Best block hash</span>
@@ -296,298 +296,284 @@
 <span class="source-line-no">283</span><span id="line-283">                chainWork));</span>
 <span class="source-line-no">284</span><span id="line-284">    }</span>
 <span class="source-line-no">285</span><span id="line-285"></span>
-<span class="source-line-no">286</span><span id="line-286">    /**</span>
-<span class="source-line-no">287</span><span id="line-287">     * Map {@link BitcoinNetwork} to a chain-id string.</span>
-<span class="source-line-no">288</span><span id="line-288">     * Bitcoin Core returns strings that differ from {@link BitcoinNetwork#toString()}.</span>
-<span class="source-line-no">289</span><span id="line-289">     * @param network bitcoinj enum type</span>
-<span class="source-line-no">290</span><span id="line-290">     * @return Bitcoin Core-compatible &lt;q&gt;chain&lt;/q&gt; string</span>
-<span class="source-line-no">291</span><span id="line-291">     */</span>
-<span class="source-line-no">292</span><span id="line-292">    private String chainName(BitcoinNetwork network) {</span>
-<span class="source-line-no">293</span><span id="line-293">        return switch(network) {</span>
-<span class="source-line-no">294</span><span id="line-294">            case MAINNET -&gt; "main";</span>
-<span class="source-line-no">295</span><span id="line-295">            case TESTNET -&gt; "test";</span>
-<span class="source-line-no">296</span><span id="line-296">            case SIGNET, REGTEST -&gt; network.toString();</span>
-<span class="source-line-no">297</span><span id="line-297">        };</span>
-<span class="source-line-no">298</span><span id="line-298">    }</span>
-<span class="source-line-no">299</span><span id="line-299"></span>
-<span class="source-line-no">300</span><span id="line-300">    @Override</span>
-<span class="source-line-no">301</span><span id="line-301">    public CompletableFuture&lt;NetworkInfo&gt; getnetworkinfo() {</span>
-<span class="source-line-no">302</span><span id="line-302">        byte[] localServices = {};</span>
-<span class="source-line-no">303</span><span id="line-303">        Object[] network = {};</span>
-<span class="source-line-no">304</span><span id="line-304">        Object[] address = {};</span>
-<span class="source-line-no">305</span><span id="line-305">        return result(new NetworkInfo(version,</span>
-<span class="source-line-no">306</span><span id="line-306">                "",</span>
-<span class="source-line-no">307</span><span id="line-307">                ProtocolVersion.CURRENT.intValue(),</span>
-<span class="source-line-no">308</span><span id="line-308">                timeOffset,</span>
-<span class="source-line-no">309</span><span id="line-309">                getconnectioncount().join(),</span>
-<span class="source-line-no">310</span><span id="line-310">                "proxy",</span>
-<span class="source-line-no">311</span><span id="line-311">                (int) Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.getValue(),  // relayFee</span>
-<span class="source-line-no">312</span><span id="line-312">                localServices,</span>
-<span class="source-line-no">313</span><span id="line-313">                network,</span>
-<span class="source-line-no">314</span><span id="line-314">                address));</span>
-<span class="source-line-no">315</span><span id="line-315">    }</span>
-<span class="source-line-no">316</span><span id="line-316"></span>
-<span class="source-line-no">317</span><span id="line-317">    record outpoint(Sha256Hash txId, int vout) {</span>
-<span class="source-line-no">318</span><span id="line-318">        public outpoint(String idString, int vout) {</span>
-<span class="source-line-no">319</span><span id="line-319">            this(Sha256Hash.wrap(idString), vout);</span>
-<span class="source-line-no">320</span><span id="line-320">        }</span>
-<span class="source-line-no">321</span><span id="line-321">        public outpoint(Map&lt;String, Object&gt; json) {</span>
-<span class="source-line-no">322</span><span id="line-322">            this((String) json.get("txid"), ((Number) json.get("vout")).intValue());</span>
-<span class="source-line-no">323</span><span id="line-323">        }</span>
-<span class="source-line-no">324</span><span id="line-324"></span>
-<span class="source-line-no">325</span><span id="line-325">    }</span>
-<span class="source-line-no">326</span><span id="line-326">    record output(Address address, Coin amount) {</span>
-<span class="source-line-no">327</span><span id="line-327">        public output(String addString, String amountString) {</span>
-<span class="source-line-no">328</span><span id="line-328">            this(parser.parseAddress(addString),  Coin.parseCoin(amountString));</span>
-<span class="source-line-no">329</span><span id="line-329">        }</span>
-<span class="source-line-no">330</span><span id="line-330">        Script script() {</span>
-<span class="source-line-no">331</span><span id="line-331">            return ScriptBuilder.createP2PKHOutputScript(this.address().getHash());</span>
-<span class="source-line-no">332</span><span id="line-332">        }</span>
-<span class="source-line-no">333</span><span id="line-333">    }</span>
-<span class="source-line-no">334</span><span id="line-334"></span>
-<span class="source-line-no">335</span><span id="line-335">    @Override</span>
-<span class="source-line-no">336</span><span id="line-336">    public CompletableFuture&lt;String&gt; createrawtransaction(List&lt;Map&lt;String, Object&gt;&gt; inputs, List&lt;Map&lt;String, String&gt;&gt; outputs) {</span>
-<span class="source-line-no">337</span><span id="line-337">        try {</span>
-<span class="source-line-no">338</span><span id="line-338">            List&lt;TransactionInputData&gt; ins = inputs.stream()</span>
-<span class="source-line-no">339</span><span id="line-339">                    .map(outpoint::new)</span>
-<span class="source-line-no">340</span><span id="line-340">                    .flatMap(op -&gt; signingService.findUnspentOutput(op.txId, op.vout).stream())</span>
-<span class="source-line-no">341</span><span id="line-341">                    .map(TransactionInputData::fromTxOut)</span>
-<span class="source-line-no">342</span><span id="line-342">                    .toList();</span>
-<span class="source-line-no">343</span><span id="line-343">            List&lt;? extends TransactionOutputData&gt; outs = outputs.stream()</span>
-<span class="source-line-no">344</span><span id="line-344">                    .flatMap(map -&gt; map.entrySet().stream())</span>
-<span class="source-line-no">345</span><span id="line-345">                    .map(entry -&gt; new output(entry.getKey(), entry.getValue()))</span>
-<span class="source-line-no">346</span><span id="line-346">                    .map(o -&gt; new TransactionOutputDataScript(o.amount(), o.script()))</span>
-<span class="source-line-no">347</span><span id="line-347">                    .toList();</span>
-<span class="source-line-no">348</span><span id="line-348">            // TODO: Add a change output?</span>
-<span class="source-line-no">349</span><span id="line-349">            SigningRequest sr = SigningRequest.of(ins, (List&lt;TransactionOutputData&gt;) outs);</span>
-<span class="source-line-no">350</span><span id="line-350">            Transaction rawTx = sr.toUnsignedTransaction();</span>
-<span class="source-line-no">351</span><span id="line-351">            return CompletableFuture.completedFuture(HexFormat.of().formatHex(rawTx.serialize()));</span>
-<span class="source-line-no">352</span><span id="line-352">        } catch (Throwable t) {</span>
-<span class="source-line-no">353</span><span id="line-353">            return CompletableFuture.failedFuture(t);</span>
-<span class="source-line-no">354</span><span id="line-354">        }</span>
-<span class="source-line-no">355</span><span id="line-355">    }</span>
-<span class="source-line-no">356</span><span id="line-356"></span>
-<span class="source-line-no">357</span><span id="line-357">    @Override</span>
-<span class="source-line-no">358</span><span id="line-358">    public CompletableFuture&lt;Address&gt; getnewaddress() {</span>
-<span class="source-line-no">359</span><span id="line-359">        DeterministicKey key = kit.wallet().getActiveKeyChain().getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);</span>
-<span class="source-line-no">360</span><span id="line-360">        Address address = key.toAddress(ScriptType.P2PKH, network);</span>
-<span class="source-line-no">361</span><span id="line-361">        log.warn("address {} key path: {}", address, key.getPathAsString());</span>
-<span class="source-line-no">362</span><span id="line-362">        return CompletableFuture.completedFuture(address);</span>
-<span class="source-line-no">363</span><span id="line-363">    }</span>
-<span class="source-line-no">364</span><span id="line-364"></span>
-<span class="source-line-no">365</span><span id="line-365">    @Override</span>
-<span class="source-line-no">366</span><span id="line-366">    public CompletableFuture&lt;Coin&gt; getbalance() {</span>
-<span class="source-line-no">367</span><span id="line-367">        return CompletableFuture.completedFuture(kit.wallet().getBalance());</span>
-<span class="source-line-no">368</span><span id="line-368">    }</span>
-<span class="source-line-no">369</span><span id="line-369"></span>
-<span class="source-line-no">370</span><span id="line-370">    @Override</span>
-<span class="source-line-no">371</span><span id="line-371">    public CompletableFuture&lt;List&lt;UnspentOutput&gt;&gt; listunspent(Integer minConf, Integer maxConf, List&lt;String&gt; addresses, Boolean includeUnsafe) {</span>
-<span class="source-line-no">372</span><span id="line-372">        List&lt;Address&gt; addressList = addresses != null</span>
-<span class="source-line-no">373</span><span id="line-373">                ? addresses.stream().map(parser::parseAddress).toList()</span>
-<span class="source-line-no">374</span><span id="line-374">                : List.of();</span>
-<span class="source-line-no">375</span><span id="line-375">        List&lt;TransactionOutput&gt; outs = signingService.findUnspentOutputs(</span>
-<span class="source-line-no">376</span><span id="line-376">                                            minConf != null ? minConf : DEFAULT_MIN_CONF,</span>
-<span class="source-line-no">377</span><span id="line-377">                                            maxConf != null ? maxConf : DEFAULT_MAX_CONF,</span>
-<span class="source-line-no">378</span><span id="line-378">                                            addressList);</span>
-<span class="source-line-no">379</span><span id="line-379">        List&lt;UnspentOutput&gt; unspents = outs.stream()</span>
-<span class="source-line-no">380</span><span id="line-380">                .map(out -&gt; new UnspentOutput(</span>
-<span class="source-line-no">381</span><span id="line-381">                        out.getParentTransactionHash(),</span>
-<span class="source-line-no">382</span><span id="line-382">                        out.getIndex(),</span>
-<span class="source-line-no">383</span><span id="line-383">                        null, // Address (get from script?)</span>
-<span class="source-line-no">384</span><span id="line-384">                        "", // label</span>
-<span class="source-line-no">385</span><span id="line-385">                        hexFormat.formatHex(out.getScriptPubKey().program()), // scriptPubKey</span>
-<span class="source-line-no">386</span><span id="line-386">                        out.getValue(),     // amount</span>
-<span class="source-line-no">387</span><span id="line-387">                        out.getParentTransactionDepthInBlocks(),  // confirmations</span>
-<span class="source-line-no">388</span><span id="line-388">                        null,   // redeemScript</span>
-<span class="source-line-no">389</span><span id="line-389">                        null,   // witnessScript</span>
-<span class="source-line-no">390</span><span id="line-390">                        true,   // spendable</span>
-<span class="source-line-no">391</span><span id="line-391">                        true,   // solvable</span>
-<span class="source-line-no">392</span><span id="line-392">                        "description",  // description</span>
-<span class="source-line-no">393</span><span id="line-393">                        true)   // safe</span>
-<span class="source-line-no">394</span><span id="line-394">                )</span>
-<span class="source-line-no">395</span><span id="line-395">                .toList();</span>
-<span class="source-line-no">396</span><span id="line-396">        return CompletableFuture.completedFuture(unspents);</span>
-<span class="source-line-no">397</span><span id="line-397">    }</span>
-<span class="source-line-no">398</span><span id="line-398"></span>
-<span class="source-line-no">399</span><span id="line-399">    /**</span>
-<span class="source-line-no">400</span><span id="line-400">     * Send coins to an address</span>
-<span class="source-line-no">401</span><span id="line-401">     * @param toAddressString Address to send coins to</span>
-<span class="source-line-no">402</span><span id="line-402">     * @param amountDouble Amount to send</span>
-<span class="source-line-no">403</span><span id="line-403">     * @return future that completes with a transaction hash/id when the tx is successfully relayed</span>
-<span class="source-line-no">404</span><span id="line-404">     */</span>
-<span class="source-line-no">405</span><span id="line-405">    @Override</span>
-<span class="source-line-no">406</span><span id="line-406">    public CompletableFuture&lt;Sha256Hash&gt; sendtoaddress(String toAddressString, Double amountDouble) {</span>
-<span class="source-line-no">407</span><span id="line-407">        log.info("sendtoaddress {}, {}", toAddressString, amountDouble);</span>
-<span class="source-line-no">408</span><span id="line-408">        Address toAddress = parser.parseAddress(toAddressString);</span>
-<span class="source-line-no">409</span><span id="line-409">        Coin amount = Coin.ofBtc(BigDecimal.valueOf(amountDouble));</span>
-<span class="source-line-no">410</span><span id="line-410">        Transaction signedTx;</span>
-<span class="source-line-no">411</span><span id="line-411">        try {</span>
-<span class="source-line-no">412</span><span id="line-412">            signedTx = signingService.signSendToAddress(toAddress, amount).join();</span>
-<span class="source-line-no">413</span><span id="line-413">        } catch (IOException | InsufficientMoneyException e) {</span>
-<span class="source-line-no">414</span><span id="line-414">            return CompletableFuture.failedFuture(e);</span>
-<span class="source-line-no">415</span><span id="line-415">        }</span>
-<span class="source-line-no">416</span><span id="line-416">        return sendTransaction(signedTx)</span>
-<span class="source-line-no">417</span><span id="line-417">                .thenCompose(tb1 -&gt; tb1.awaitRelayed()</span>
-<span class="source-line-no">418</span><span id="line-418">                        .thenApply(tb2 -&gt; tb2.transaction()</span>
-<span class="source-line-no">419</span><span id="line-419">                                .getTxId()</span>
-<span class="source-line-no">420</span><span id="line-420">                        )</span>
-<span class="source-line-no">421</span><span id="line-421">                );</span>
-<span class="source-line-no">422</span><span id="line-422">    }</span>
-<span class="source-line-no">423</span><span id="line-423"></span>
-<span class="source-line-no">424</span><span id="line-424">    @Override</span>
-<span class="source-line-no">425</span><span id="line-425">    public CompletableFuture&lt;Sha256Hash&gt; sendrawtransaction(String hex) {</span>
-<span class="source-line-no">426</span><span id="line-426">        log.info("received raw tx: {}", hex);</span>
-<span class="source-line-no">427</span><span id="line-427">        ByteBuffer raw = ByteBuffer.wrap(hexFormat.parseHex(hex));</span>
-<span class="source-line-no">428</span><span id="line-428">        Transaction signedTx;</span>
-<span class="source-line-no">429</span><span id="line-429">        try {</span>
-<span class="source-line-no">430</span><span id="line-430">            signedTx = Transaction.read(raw);</span>
-<span class="source-line-no">431</span><span id="line-431">        } catch (ProtocolException pe) {</span>
-<span class="source-line-no">432</span><span id="line-432">            return CompletableFuture.failedFuture(new RuntimeException("Invalid raw (hex) transaction", pe));</span>
-<span class="source-line-no">433</span><span id="line-433">        }</span>
-<span class="source-line-no">434</span><span id="line-434">        log.info("received raw tx: {}", signedTx);</span>
-<span class="source-line-no">435</span><span id="line-435">        try {</span>
-<span class="source-line-no">436</span><span id="line-436">            Transaction.verify(network, signedTx);</span>
-<span class="source-line-no">437</span><span id="line-437">        } catch (VerificationException ve) {</span>
-<span class="source-line-no">438</span><span id="line-438">            // TODO: More validation?</span>
-<span class="source-line-no">439</span><span id="line-439">            return CompletableFuture.failedFuture(ve);</span>
-<span class="source-line-no">440</span><span id="line-440">        }</span>
-<span class="source-line-no">441</span><span id="line-441">        return sendTransaction(signedTx)</span>
-<span class="source-line-no">442</span><span id="line-442">                .whenComplete((bcast, error) -&gt; {</span>
-<span class="source-line-no">443</span><span id="line-443">                    if (error != null) {</span>
-<span class="source-line-no">444</span><span id="line-444">                        log.info("Broadcast {}, done: {}", bcast.transaction().getTxId(), bcast.awaitSent().isDone());</span>
-<span class="source-line-no">445</span><span id="line-445">                    } else {</span>
-<span class="source-line-no">446</span><span id="line-446">                        log.error("", error);</span>
-<span class="source-line-no">447</span><span id="line-447">                    }</span>
-<span class="source-line-no">448</span><span id="line-448">                })</span>
-<span class="source-line-no">449</span><span id="line-449">                .thenCompose(tb1 -&gt; tb1.awaitRelayed()</span>
-<span class="source-line-no">450</span><span id="line-450">                        .thenApply(tb2 -&gt; tb2.transaction()</span>
-<span class="source-line-no">451</span><span id="line-451">                                .getTxId()</span>
-<span class="source-line-no">452</span><span id="line-452">                        )</span>
-<span class="source-line-no">453</span><span id="line-453">                );</span>
-<span class="source-line-no">454</span><span id="line-454">    }</span>
-<span class="source-line-no">455</span><span id="line-455"></span>
-<span class="source-line-no">456</span><span id="line-456">    /**</span>
-<span class="source-line-no">457</span><span id="line-457">     * @param hex hex-encoded unsigned raw transaction</span>
-<span class="source-line-no">458</span><span id="line-458">     * @return signed raw transaction</span>
-<span class="source-line-no">459</span><span id="line-459">     */</span>
-<span class="source-line-no">460</span><span id="line-460">    @Override</span>
-<span class="source-line-no">461</span><span id="line-461">    public CompletableFuture&lt;SignedRawTransaction&gt; signrawtransactionwithwallet(String hex) {</span>
-<span class="source-line-no">462</span><span id="line-462">        ByteBuffer raw = ByteBuffer.wrap(hexFormat.parseHex(hex));</span>
-<span class="source-line-no">463</span><span id="line-463"></span>
-<span class="source-line-no">464</span><span id="line-464">        RawTransactionSigningRequest signingRequest;</span>
-<span class="source-line-no">465</span><span id="line-465">        try {</span>
-<span class="source-line-no">466</span><span id="line-466">            Transaction unsignedTx = Transaction.read(raw);</span>
-<span class="source-line-no">467</span><span id="line-467">            log.info("received tx: {}", unsignedTx);</span>
-<span class="source-line-no">468</span><span id="line-468">            signingRequest = RawTransactionSigningRequest.ofTransaction(unsignedTx);</span>
-<span class="source-line-no">469</span><span id="line-469">        } catch (BufferUnderflowException | ProtocolException e) {</span>
-<span class="source-line-no">470</span><span id="line-470">            return CompletableFuture.failedFuture(new RuntimeException("Invalid raw (hex) transaction", e));</span>
+<span class="source-line-no">286</span><span id="line-286">    @Override</span>
+<span class="source-line-no">287</span><span id="line-287">    public CompletableFuture&lt;NetworkInfo&gt; getnetworkinfo() {</span>
+<span class="source-line-no">288</span><span id="line-288">        byte[] localServices = {};</span>
+<span class="source-line-no">289</span><span id="line-289">        Object[] network = {};</span>
+<span class="source-line-no">290</span><span id="line-290">        Object[] address = {};</span>
+<span class="source-line-no">291</span><span id="line-291">        return result(new NetworkInfo(version,</span>
+<span class="source-line-no">292</span><span id="line-292">                "",</span>
+<span class="source-line-no">293</span><span id="line-293">                ProtocolVersion.CURRENT.intValue(),</span>
+<span class="source-line-no">294</span><span id="line-294">                timeOffset,</span>
+<span class="source-line-no">295</span><span id="line-295">                getconnectioncount().join(),</span>
+<span class="source-line-no">296</span><span id="line-296">                "proxy",</span>
+<span class="source-line-no">297</span><span id="line-297">                (int) Transaction.REFERENCE_DEFAULT_MIN_TX_FEE.getValue(),  // relayFee</span>
+<span class="source-line-no">298</span><span id="line-298">                localServices,</span>
+<span class="source-line-no">299</span><span id="line-299">                network,</span>
+<span class="source-line-no">300</span><span id="line-300">                address));</span>
+<span class="source-line-no">301</span><span id="line-301">    }</span>
+<span class="source-line-no">302</span><span id="line-302"></span>
+<span class="source-line-no">303</span><span id="line-303">    record outpoint(Sha256Hash txId, int vout) {</span>
+<span class="source-line-no">304</span><span id="line-304">        public outpoint(String idString, int vout) {</span>
+<span class="source-line-no">305</span><span id="line-305">            this(Sha256Hash.wrap(idString), vout);</span>
+<span class="source-line-no">306</span><span id="line-306">        }</span>
+<span class="source-line-no">307</span><span id="line-307">        public outpoint(Map&lt;String, Object&gt; json) {</span>
+<span class="source-line-no">308</span><span id="line-308">            this((String) json.get("txid"), ((Number) json.get("vout")).intValue());</span>
+<span class="source-line-no">309</span><span id="line-309">        }</span>
+<span class="source-line-no">310</span><span id="line-310"></span>
+<span class="source-line-no">311</span><span id="line-311">    }</span>
+<span class="source-line-no">312</span><span id="line-312">    record output(Address address, Coin amount) {</span>
+<span class="source-line-no">313</span><span id="line-313">        public output(String addString, String amountString) {</span>
+<span class="source-line-no">314</span><span id="line-314">            this(parser.parseAddress(addString),  Coin.parseCoin(amountString));</span>
+<span class="source-line-no">315</span><span id="line-315">        }</span>
+<span class="source-line-no">316</span><span id="line-316">        Script script() {</span>
+<span class="source-line-no">317</span><span id="line-317">            return ScriptBuilder.createP2PKHOutputScript(this.address().getHash());</span>
+<span class="source-line-no">318</span><span id="line-318">        }</span>
+<span class="source-line-no">319</span><span id="line-319">    }</span>
+<span class="source-line-no">320</span><span id="line-320"></span>
+<span class="source-line-no">321</span><span id="line-321">    @Override</span>
+<span class="source-line-no">322</span><span id="line-322">    public CompletableFuture&lt;String&gt; createrawtransaction(List&lt;Map&lt;String, Object&gt;&gt; inputs, List&lt;Map&lt;String, String&gt;&gt; outputs) {</span>
+<span class="source-line-no">323</span><span id="line-323">        try {</span>
+<span class="source-line-no">324</span><span id="line-324">            List&lt;TransactionInputData&gt; ins = inputs.stream()</span>
+<span class="source-line-no">325</span><span id="line-325">                    .map(outpoint::new)</span>
+<span class="source-line-no">326</span><span id="line-326">                    .flatMap(op -&gt; signingService.findUnspentOutput(op.txId, op.vout).stream())</span>
+<span class="source-line-no">327</span><span id="line-327">                    .map(TransactionInputData::fromTxOut)</span>
+<span class="source-line-no">328</span><span id="line-328">                    .toList();</span>
+<span class="source-line-no">329</span><span id="line-329">            List&lt;? extends TransactionOutputData&gt; outs = outputs.stream()</span>
+<span class="source-line-no">330</span><span id="line-330">                    .flatMap(map -&gt; map.entrySet().stream())</span>
+<span class="source-line-no">331</span><span id="line-331">                    .map(entry -&gt; new output(entry.getKey(), entry.getValue()))</span>
+<span class="source-line-no">332</span><span id="line-332">                    .map(o -&gt; new TransactionOutputDataScript(o.amount(), o.script()))</span>
+<span class="source-line-no">333</span><span id="line-333">                    .toList();</span>
+<span class="source-line-no">334</span><span id="line-334">            // TODO: Add a change output?</span>
+<span class="source-line-no">335</span><span id="line-335">            SigningRequest sr = SigningRequest.of(ins, (List&lt;TransactionOutputData&gt;) outs);</span>
+<span class="source-line-no">336</span><span id="line-336">            Transaction rawTx = sr.toUnsignedTransaction();</span>
+<span class="source-line-no">337</span><span id="line-337">            return CompletableFuture.completedFuture(HexFormat.of().formatHex(rawTx.serialize()));</span>
+<span class="source-line-no">338</span><span id="line-338">        } catch (Throwable t) {</span>
+<span class="source-line-no">339</span><span id="line-339">            return CompletableFuture.failedFuture(t);</span>
+<span class="source-line-no">340</span><span id="line-340">        }</span>
+<span class="source-line-no">341</span><span id="line-341">    }</span>
+<span class="source-line-no">342</span><span id="line-342"></span>
+<span class="source-line-no">343</span><span id="line-343">    @Override</span>
+<span class="source-line-no">344</span><span id="line-344">    public CompletableFuture&lt;Address&gt; getnewaddress() {</span>
+<span class="source-line-no">345</span><span id="line-345">        DeterministicKey key = kit.wallet().getActiveKeyChain().getKey(KeyChain.KeyPurpose.RECEIVE_FUNDS);</span>
+<span class="source-line-no">346</span><span id="line-346">        Address address = key.toAddress(ScriptType.P2PKH, network);</span>
+<span class="source-line-no">347</span><span id="line-347">        log.warn("address {} key path: {}", address, key.getPathAsString());</span>
+<span class="source-line-no">348</span><span id="line-348">        return CompletableFuture.completedFuture(address);</span>
+<span class="source-line-no">349</span><span id="line-349">    }</span>
+<span class="source-line-no">350</span><span id="line-350"></span>
+<span class="source-line-no">351</span><span id="line-351">    @Override</span>
+<span class="source-line-no">352</span><span id="line-352">    public CompletableFuture&lt;Coin&gt; getbalance() {</span>
+<span class="source-line-no">353</span><span id="line-353">        return CompletableFuture.completedFuture(kit.wallet().getBalance());</span>
+<span class="source-line-no">354</span><span id="line-354">    }</span>
+<span class="source-line-no">355</span><span id="line-355"></span>
+<span class="source-line-no">356</span><span id="line-356">    @Override</span>
+<span class="source-line-no">357</span><span id="line-357">    public CompletableFuture&lt;List&lt;UnspentOutput&gt;&gt; listunspent(Integer minConf, Integer maxConf, List&lt;String&gt; addresses, Boolean includeUnsafe) {</span>
+<span class="source-line-no">358</span><span id="line-358">        List&lt;Address&gt; addressList = addresses != null</span>
+<span class="source-line-no">359</span><span id="line-359">                ? addresses.stream().map(parser::parseAddress).toList()</span>
+<span class="source-line-no">360</span><span id="line-360">                : List.of();</span>
+<span class="source-line-no">361</span><span id="line-361">        List&lt;TransactionOutput&gt; outs = signingService.findUnspentOutputs(</span>
+<span class="source-line-no">362</span><span id="line-362">                                            minConf != null ? minConf : DEFAULT_MIN_CONF,</span>
+<span class="source-line-no">363</span><span id="line-363">                                            maxConf != null ? maxConf : DEFAULT_MAX_CONF,</span>
+<span class="source-line-no">364</span><span id="line-364">                                            addressList);</span>
+<span class="source-line-no">365</span><span id="line-365">        List&lt;UnspentOutput&gt; unspents = outs.stream()</span>
+<span class="source-line-no">366</span><span id="line-366">                .map(out -&gt; new UnspentOutput(</span>
+<span class="source-line-no">367</span><span id="line-367">                        out.getParentTransactionHash(),</span>
+<span class="source-line-no">368</span><span id="line-368">                        out.getIndex(),</span>
+<span class="source-line-no">369</span><span id="line-369">                        null, // Address (get from script?)</span>
+<span class="source-line-no">370</span><span id="line-370">                        "", // label</span>
+<span class="source-line-no">371</span><span id="line-371">                        hexFormat.formatHex(out.getScriptPubKey().program()), // scriptPubKey</span>
+<span class="source-line-no">372</span><span id="line-372">                        out.getValue(),     // amount</span>
+<span class="source-line-no">373</span><span id="line-373">                        out.getParentTransactionDepthInBlocks(),  // confirmations</span>
+<span class="source-line-no">374</span><span id="line-374">                        null,   // redeemScript</span>
+<span class="source-line-no">375</span><span id="line-375">                        null,   // witnessScript</span>
+<span class="source-line-no">376</span><span id="line-376">                        true,   // spendable</span>
+<span class="source-line-no">377</span><span id="line-377">                        true,   // solvable</span>
+<span class="source-line-no">378</span><span id="line-378">                        "description",  // description</span>
+<span class="source-line-no">379</span><span id="line-379">                        true)   // safe</span>
+<span class="source-line-no">380</span><span id="line-380">                )</span>
+<span class="source-line-no">381</span><span id="line-381">                .toList();</span>
+<span class="source-line-no">382</span><span id="line-382">        return CompletableFuture.completedFuture(unspents);</span>
+<span class="source-line-no">383</span><span id="line-383">    }</span>
+<span class="source-line-no">384</span><span id="line-384"></span>
+<span class="source-line-no">385</span><span id="line-385">    /**</span>
+<span class="source-line-no">386</span><span id="line-386">     * Send coins to an address</span>
+<span class="source-line-no">387</span><span id="line-387">     * @param toAddressString Address to send coins to</span>
+<span class="source-line-no">388</span><span id="line-388">     * @param amountDouble Amount to send</span>
+<span class="source-line-no">389</span><span id="line-389">     * @return future that completes with a transaction hash/id when the tx is successfully relayed</span>
+<span class="source-line-no">390</span><span id="line-390">     */</span>
+<span class="source-line-no">391</span><span id="line-391">    @Override</span>
+<span class="source-line-no">392</span><span id="line-392">    public CompletableFuture&lt;Sha256Hash&gt; sendtoaddress(String toAddressString, Double amountDouble) {</span>
+<span class="source-line-no">393</span><span id="line-393">        log.info("sendtoaddress {}, {}", toAddressString, amountDouble);</span>
+<span class="source-line-no">394</span><span id="line-394">        Address toAddress = parser.parseAddress(toAddressString);</span>
+<span class="source-line-no">395</span><span id="line-395">        Coin amount = Coin.ofBtc(BigDecimal.valueOf(amountDouble));</span>
+<span class="source-line-no">396</span><span id="line-396">        Transaction signedTx;</span>
+<span class="source-line-no">397</span><span id="line-397">        try {</span>
+<span class="source-line-no">398</span><span id="line-398">            signedTx = signingService.signSendToAddress(toAddress, amount).join();</span>
+<span class="source-line-no">399</span><span id="line-399">        } catch (IOException | InsufficientMoneyException e) {</span>
+<span class="source-line-no">400</span><span id="line-400">            return CompletableFuture.failedFuture(e);</span>
+<span class="source-line-no">401</span><span id="line-401">        }</span>
+<span class="source-line-no">402</span><span id="line-402">        return sendTransaction(signedTx)</span>
+<span class="source-line-no">403</span><span id="line-403">                .thenCompose(tb1 -&gt; tb1.awaitRelayed()</span>
+<span class="source-line-no">404</span><span id="line-404">                        .thenApply(tb2 -&gt; tb2.transaction()</span>
+<span class="source-line-no">405</span><span id="line-405">                                .getTxId()</span>
+<span class="source-line-no">406</span><span id="line-406">                        )</span>
+<span class="source-line-no">407</span><span id="line-407">                );</span>
+<span class="source-line-no">408</span><span id="line-408">    }</span>
+<span class="source-line-no">409</span><span id="line-409"></span>
+<span class="source-line-no">410</span><span id="line-410">    @Override</span>
+<span class="source-line-no">411</span><span id="line-411">    public CompletableFuture&lt;Sha256Hash&gt; sendrawtransaction(String hex) {</span>
+<span class="source-line-no">412</span><span id="line-412">        log.info("received raw tx: {}", hex);</span>
+<span class="source-line-no">413</span><span id="line-413">        ByteBuffer raw = ByteBuffer.wrap(hexFormat.parseHex(hex));</span>
+<span class="source-line-no">414</span><span id="line-414">        Transaction signedTx;</span>
+<span class="source-line-no">415</span><span id="line-415">        try {</span>
+<span class="source-line-no">416</span><span id="line-416">            signedTx = Transaction.read(raw);</span>
+<span class="source-line-no">417</span><span id="line-417">        } catch (ProtocolException pe) {</span>
+<span class="source-line-no">418</span><span id="line-418">            return CompletableFuture.failedFuture(new RuntimeException("Invalid raw (hex) transaction", pe));</span>
+<span class="source-line-no">419</span><span id="line-419">        }</span>
+<span class="source-line-no">420</span><span id="line-420">        log.info("received raw tx: {}", signedTx);</span>
+<span class="source-line-no">421</span><span id="line-421">        try {</span>
+<span class="source-line-no">422</span><span id="line-422">            Transaction.verify(network, signedTx);</span>
+<span class="source-line-no">423</span><span id="line-423">        } catch (VerificationException ve) {</span>
+<span class="source-line-no">424</span><span id="line-424">            // TODO: More validation?</span>
+<span class="source-line-no">425</span><span id="line-425">            return CompletableFuture.failedFuture(ve);</span>
+<span class="source-line-no">426</span><span id="line-426">        }</span>
+<span class="source-line-no">427</span><span id="line-427">        return sendTransaction(signedTx)</span>
+<span class="source-line-no">428</span><span id="line-428">                .whenComplete((bcast, error) -&gt; {</span>
+<span class="source-line-no">429</span><span id="line-429">                    if (error != null) {</span>
+<span class="source-line-no">430</span><span id="line-430">                        log.info("Broadcast {}, done: {}", bcast.transaction().getTxId(), bcast.awaitSent().isDone());</span>
+<span class="source-line-no">431</span><span id="line-431">                    } else {</span>
+<span class="source-line-no">432</span><span id="line-432">                        log.error("", error);</span>
+<span class="source-line-no">433</span><span id="line-433">                    }</span>
+<span class="source-line-no">434</span><span id="line-434">                })</span>
+<span class="source-line-no">435</span><span id="line-435">                .thenCompose(tb1 -&gt; tb1.awaitRelayed()</span>
+<span class="source-line-no">436</span><span id="line-436">                        .thenApply(tb2 -&gt; tb2.transaction()</span>
+<span class="source-line-no">437</span><span id="line-437">                                .getTxId()</span>
+<span class="source-line-no">438</span><span id="line-438">                        )</span>
+<span class="source-line-no">439</span><span id="line-439">                );</span>
+<span class="source-line-no">440</span><span id="line-440">    }</span>
+<span class="source-line-no">441</span><span id="line-441"></span>
+<span class="source-line-no">442</span><span id="line-442">    /**</span>
+<span class="source-line-no">443</span><span id="line-443">     * @param hex hex-encoded unsigned raw transaction</span>
+<span class="source-line-no">444</span><span id="line-444">     * @return signed raw transaction</span>
+<span class="source-line-no">445</span><span id="line-445">     */</span>
+<span class="source-line-no">446</span><span id="line-446">    @Override</span>
+<span class="source-line-no">447</span><span id="line-447">    public CompletableFuture&lt;SignedRawTransaction&gt; signrawtransactionwithwallet(String hex) {</span>
+<span class="source-line-no">448</span><span id="line-448">        ByteBuffer raw = ByteBuffer.wrap(hexFormat.parseHex(hex));</span>
+<span class="source-line-no">449</span><span id="line-449"></span>
+<span class="source-line-no">450</span><span id="line-450">        RawTransactionSigningRequest signingRequest;</span>
+<span class="source-line-no">451</span><span id="line-451">        try {</span>
+<span class="source-line-no">452</span><span id="line-452">            Transaction unsignedTx = Transaction.read(raw);</span>
+<span class="source-line-no">453</span><span id="line-453">            log.info("received tx: {}", unsignedTx);</span>
+<span class="source-line-no">454</span><span id="line-454">            signingRequest = RawTransactionSigningRequest.ofTransaction(unsignedTx);</span>
+<span class="source-line-no">455</span><span id="line-455">        } catch (BufferUnderflowException | ProtocolException e) {</span>
+<span class="source-line-no">456</span><span id="line-456">            return CompletableFuture.failedFuture(new RuntimeException("Invalid raw (hex) transaction", e));</span>
+<span class="source-line-no">457</span><span id="line-457">        }</span>
+<span class="source-line-no">458</span><span id="line-458"></span>
+<span class="source-line-no">459</span><span id="line-459">        return signingService.signTransaction(signingRequest)</span>
+<span class="source-line-no">460</span><span id="line-460">                .thenApply(SignedRawTransaction::of);</span>
+<span class="source-line-no">461</span><span id="line-461">    }</span>
+<span class="source-line-no">462</span><span id="line-462"></span>
+<span class="source-line-no">463</span><span id="line-463">    private CompletableFuture&lt;TransactionBroadcast&gt; sendTransaction(Transaction tx) {</span>
+<span class="source-line-no">464</span><span id="line-464">        try {</span>
+<span class="source-line-no">465</span><span id="line-465">            log.info("committing tx to wallet: {}", tx);</span>
+<span class="source-line-no">466</span><span id="line-466">            kit.wallet().commitTx(tx);</span>
+<span class="source-line-no">467</span><span id="line-467">            log.info("broadcasting tx: {}", tx);</span>
+<span class="source-line-no">468</span><span id="line-468">            return kit.peerGroup().broadcastTransaction(tx).awaitSent();</span>
+<span class="source-line-no">469</span><span id="line-469">        } catch (Throwable t) {</span>
+<span class="source-line-no">470</span><span id="line-470">            return CompletableFuture.failedFuture(t);</span>
 <span class="source-line-no">471</span><span id="line-471">        }</span>
-<span class="source-line-no">472</span><span id="line-472"></span>
-<span class="source-line-no">473</span><span id="line-473">        return signingService.signTransaction(signingRequest)</span>
-<span class="source-line-no">474</span><span id="line-474">                .thenApply(SignedRawTransaction::of);</span>
-<span class="source-line-no">475</span><span id="line-475">    }</span>
-<span class="source-line-no">476</span><span id="line-476"></span>
-<span class="source-line-no">477</span><span id="line-477">    private CompletableFuture&lt;TransactionBroadcast&gt; sendTransaction(Transaction tx) {</span>
-<span class="source-line-no">478</span><span id="line-478">        try {</span>
-<span class="source-line-no">479</span><span id="line-479">            log.info("committing tx to wallet: {}", tx);</span>
-<span class="source-line-no">480</span><span id="line-480">            kit.wallet().commitTx(tx);</span>
-<span class="source-line-no">481</span><span id="line-481">            log.info("broadcasting tx: {}", tx);</span>
-<span class="source-line-no">482</span><span id="line-482">            return kit.peerGroup().broadcastTransaction(tx).awaitSent();</span>
-<span class="source-line-no">483</span><span id="line-483">        } catch (Throwable t) {</span>
-<span class="source-line-no">484</span><span id="line-484">            return CompletableFuture.failedFuture(t);</span>
-<span class="source-line-no">485</span><span id="line-485">        }</span>
-<span class="source-line-no">486</span><span id="line-486">    }</span>
-<span class="source-line-no">487</span><span id="line-487"></span>
-<span class="source-line-no">488</span><span id="line-488">    private CompletableFuture&lt;byte[]&gt; getBlockBytes(Sha256Hash blockHash) {</span>
-<span class="source-line-no">489</span><span id="line-489">        // TODO: This block should have transactions</span>
-<span class="source-line-no">490</span><span id="line-490">        StoredBlock storedBlock;</span>
-<span class="source-line-no">491</span><span id="line-491">        try {</span>
-<span class="source-line-no">492</span><span id="line-492">            storedBlock = getStoredBlockByHash(kit.chain(), blockHash);</span>
-<span class="source-line-no">493</span><span id="line-493">        } catch (BlockStoreException e) {</span>
-<span class="source-line-no">494</span><span id="line-494">            return exception(e);</span>
-<span class="source-line-no">495</span><span id="line-495">        }</span>
-<span class="source-line-no">496</span><span id="line-496">        byte[] data = storedBlock.getHeader().serialize();</span>
-<span class="source-line-no">497</span><span id="line-497">        return result(data);</span>
-<span class="source-line-no">498</span><span id="line-498">    }</span>
-<span class="source-line-no">499</span><span id="line-499"></span>
-<span class="source-line-no">500</span><span id="line-500">    public CompletableFuture&lt;BlockInfo&gt; getBlockInfo(Sha256Hash blockHash, BlockInfo.IncludeTxFlag includeTx) {</span>
-<span class="source-line-no">501</span><span id="line-501">        BlockInfo blockInfo;</span>
-<span class="source-line-no">502</span><span id="line-502">        try {</span>
-<span class="source-line-no">503</span><span id="line-503">            blockInfo = getBlockInfoByHash(kit.chain(), blockHash, includeTx);</span>
-<span class="source-line-no">504</span><span id="line-504">            log.info("blockinfo: {}, {}", blockInfo.hash, blockInfo.height);</span>
-<span class="source-line-no">505</span><span id="line-505">        } catch (BlockStoreException e) {</span>
-<span class="source-line-no">506</span><span id="line-506">            return exception(e);</span>
-<span class="source-line-no">507</span><span id="line-507">        }</span>
-<span class="source-line-no">508</span><span id="line-508">        return result(blockInfo);</span>
-<span class="source-line-no">509</span><span id="line-509">    }</span>
-<span class="source-line-no">510</span><span id="line-510"></span>
-<span class="source-line-no">511</span><span id="line-511">    protected &lt;T&gt; CompletableFuture&lt;T&gt; result(T result) {</span>
-<span class="source-line-no">512</span><span id="line-512">        return CompletableFuture.completedFuture(result);</span>
-<span class="source-line-no">513</span><span id="line-513">    }</span>
-<span class="source-line-no">514</span><span id="line-514"></span>
-<span class="source-line-no">515</span><span id="line-515">    private &lt;T&gt; CompletableFuture&lt;T&gt; exception(Throwable exception) {</span>
-<span class="source-line-no">516</span><span id="line-516">        return CompletableFuture.failedFuture(exception);</span>
-<span class="source-line-no">517</span><span id="line-517">    }</span>
-<span class="source-line-no">518</span><span id="line-518"></span>
-<span class="source-line-no">519</span><span id="line-519">    private static StoredBlock getStoredBlockByHash(AbstractBlockChain blockChain, Sha256Hash blockHash) throws BlockStoreException {</span>
-<span class="source-line-no">520</span><span id="line-520">        return blockChain.getBlockStore().get(blockHash);</span>
-<span class="source-line-no">521</span><span id="line-521">    }</span>
-<span class="source-line-no">522</span><span id="line-522"></span>
-<span class="source-line-no">523</span><span id="line-523">    /**</span>
-<span class="source-line-no">524</span><span id="line-524">     * Get a BlockInfo for the specified hash</span>
-<span class="source-line-no">525</span><span id="line-525">     *</span>
-<span class="source-line-no">526</span><span id="line-526">     * @param blockChain The blockchain object to pull the data from</span>
-<span class="source-line-no">527</span><span id="line-527">     * @param blockHash The hash of the desired block</span>
-<span class="source-line-no">528</span><span id="line-528">     * @param includeTx whether to include transactions (currently must be false)</span>
-<span class="source-line-no">529</span><span id="line-529">     * @return block information (currently incomplete and untested)</span>
-<span class="source-line-no">530</span><span id="line-530">     * @throws BlockStoreException Something went wrong</span>
-<span class="source-line-no">531</span><span id="line-531">     */</span>
-<span class="source-line-no">532</span><span id="line-532">    private static BlockInfo getBlockInfoByHash(AbstractBlockChain blockChain, Sha256Hash blockHash, BlockInfo.IncludeTxFlag includeTx) throws BlockStoreException {</span>
-<span class="source-line-no">533</span><span id="line-533">        if (includeTx == BlockInfo.IncludeTxFlag.YES) {</span>
-<span class="source-line-no">534</span><span id="line-534">            throw new IllegalArgumentException("Including transactions not supported yet");</span>
-<span class="source-line-no">535</span><span id="line-535">        }</span>
-<span class="source-line-no">536</span><span id="line-536">        StoredBlock block = getStoredBlockByHash(blockChain, blockHash);</span>
-<span class="source-line-no">537</span><span id="line-537">        Block header = block.getHeader();</span>
-<span class="source-line-no">538</span><span id="line-538">        int blockHeight = block.getHeight();</span>
-<span class="source-line-no">539</span><span id="line-539">        int confirmations = blockChain.getBestChainHeight() - blockHeight;</span>
-<span class="source-line-no">540</span><span id="line-540">        log.trace("building BlockInfo for hash: {} height: {}", blockHash, blockHeight);</span>
-<span class="source-line-no">541</span><span id="line-541">        return new BlockInfo(header.getHash(),</span>
-<span class="source-line-no">542</span><span id="line-542">                confirmations,</span>
-<span class="source-line-no">543</span><span id="line-543">                header.messageSize(),</span>
-<span class="source-line-no">544</span><span id="line-544">                blockHeight,</span>
-<span class="source-line-no">545</span><span id="line-545">                (int) header.getVersion(),</span>
-<span class="source-line-no">546</span><span id="line-546">                header.getMerkleRoot(),</span>
-<span class="source-line-no">547</span><span id="line-547">                -1,     // Unknown number of Transactions</span>
-<span class="source-line-no">548</span><span id="line-548">                (includeTx == BlockInfo.IncludeTxFlag.IDONLY) ? hashListFromTxList(header.getTransactions()) : null,</span>
-<span class="source-line-no">549</span><span id="line-549">                (int) header.time().getEpochSecond(),</span>
-<span class="source-line-no">550</span><span id="line-550">                header.getNonce(),</span>
-<span class="source-line-no">551</span><span id="line-551">                null, // TODO: Return "bits" here</span>
-<span class="source-line-no">552</span><span id="line-552">                new BigDecimal(header.getDifficultyTargetAsInteger()),  // TODO: Verify this is correct</span>
-<span class="source-line-no">553</span><span id="line-553">                block.getChainWork().toString(),</span>
-<span class="source-line-no">554</span><span id="line-554">                block.getPrev(blockChain.getBlockStore()).getHeader().getHash(),</span>
-<span class="source-line-no">555</span><span id="line-555">                null);  // TODO: Extend BlockStore to make this information retrievable</span>
-<span class="source-line-no">556</span><span id="line-556">    }</span>
-<span class="source-line-no">557</span><span id="line-557"></span>
-<span class="source-line-no">558</span><span id="line-558">    private static BlockInfo.Sha256HashList hashListFromTxList(List&lt;Transaction&gt; txList) {</span>
-<span class="source-line-no">559</span><span id="line-559">        if (txList == null) {</span>
-<span class="source-line-no">560</span><span id="line-560">            return null;</span>
-<span class="source-line-no">561</span><span id="line-561">        } else {</span>
-<span class="source-line-no">562</span><span id="line-562">            List&lt;Sha256Hash&gt; list = txList.stream()</span>
-<span class="source-line-no">563</span><span id="line-563">                    .map(Transaction::getTxId)</span>
-<span class="source-line-no">564</span><span id="line-564">                    .collect(Collectors.toList());</span>
-<span class="source-line-no">565</span><span id="line-565">            return new BlockInfo.Sha256HashList(list);</span>
-<span class="source-line-no">566</span><span id="line-566">        }</span>
-<span class="source-line-no">567</span><span id="line-567">    }</span>
-<span class="source-line-no">568</span><span id="line-568"></span>
-<span class="source-line-no">569</span><span id="line-569">    @Override</span>
-<span class="source-line-no">570</span><span id="line-570">    @PreDestroy</span>
-<span class="source-line-no">571</span><span id="line-571">    public void close() {</span>
-<span class="source-line-no">572</span><span id="line-572">        log.info("Closing WalletAppKit...");</span>
-<span class="source-line-no">573</span><span id="line-573">        kit.close();</span>
-<span class="source-line-no">574</span><span id="line-574">        kit.awaitTerminated();  // This should be done by WalletAppKit itself, see https://github.com/bitcoinj/bitcoinj/pull/3028</span>
-<span class="source-line-no">575</span><span id="line-575">        log.info("WalletAppKit terminated");</span>
-<span class="source-line-no">576</span><span id="line-576">    }</span>
-<span class="source-line-no">577</span><span id="line-577">}</span>
+<span class="source-line-no">472</span><span id="line-472">    }</span>
+<span class="source-line-no">473</span><span id="line-473"></span>
+<span class="source-line-no">474</span><span id="line-474">    private CompletableFuture&lt;byte[]&gt; getBlockBytes(Sha256Hash blockHash) {</span>
+<span class="source-line-no">475</span><span id="line-475">        // TODO: This block should have transactions</span>
+<span class="source-line-no">476</span><span id="line-476">        StoredBlock storedBlock;</span>
+<span class="source-line-no">477</span><span id="line-477">        try {</span>
+<span class="source-line-no">478</span><span id="line-478">            storedBlock = getStoredBlockByHash(kit.chain(), blockHash);</span>
+<span class="source-line-no">479</span><span id="line-479">        } catch (BlockStoreException e) {</span>
+<span class="source-line-no">480</span><span id="line-480">            return exception(e);</span>
+<span class="source-line-no">481</span><span id="line-481">        }</span>
+<span class="source-line-no">482</span><span id="line-482">        byte[] data = storedBlock.getHeader().serialize();</span>
+<span class="source-line-no">483</span><span id="line-483">        return result(data);</span>
+<span class="source-line-no">484</span><span id="line-484">    }</span>
+<span class="source-line-no">485</span><span id="line-485"></span>
+<span class="source-line-no">486</span><span id="line-486">    public CompletableFuture&lt;BlockInfo&gt; getBlockInfo(Sha256Hash blockHash, BlockInfo.IncludeTxFlag includeTx) {</span>
+<span class="source-line-no">487</span><span id="line-487">        BlockInfo blockInfo;</span>
+<span class="source-line-no">488</span><span id="line-488">        try {</span>
+<span class="source-line-no">489</span><span id="line-489">            blockInfo = getBlockInfoByHash(kit.chain(), blockHash, includeTx);</span>
+<span class="source-line-no">490</span><span id="line-490">            log.info("blockinfo: {}, {}", blockInfo.hash, blockInfo.height);</span>
+<span class="source-line-no">491</span><span id="line-491">        } catch (BlockStoreException e) {</span>
+<span class="source-line-no">492</span><span id="line-492">            return exception(e);</span>
+<span class="source-line-no">493</span><span id="line-493">        }</span>
+<span class="source-line-no">494</span><span id="line-494">        return result(blockInfo);</span>
+<span class="source-line-no">495</span><span id="line-495">    }</span>
+<span class="source-line-no">496</span><span id="line-496"></span>
+<span class="source-line-no">497</span><span id="line-497">    protected &lt;T&gt; CompletableFuture&lt;T&gt; result(T result) {</span>
+<span class="source-line-no">498</span><span id="line-498">        return CompletableFuture.completedFuture(result);</span>
+<span class="source-line-no">499</span><span id="line-499">    }</span>
+<span class="source-line-no">500</span><span id="line-500"></span>
+<span class="source-line-no">501</span><span id="line-501">    private &lt;T&gt; CompletableFuture&lt;T&gt; exception(Throwable exception) {</span>
+<span class="source-line-no">502</span><span id="line-502">        return CompletableFuture.failedFuture(exception);</span>
+<span class="source-line-no">503</span><span id="line-503">    }</span>
+<span class="source-line-no">504</span><span id="line-504"></span>
+<span class="source-line-no">505</span><span id="line-505">    private static StoredBlock getStoredBlockByHash(AbstractBlockChain blockChain, Sha256Hash blockHash) throws BlockStoreException {</span>
+<span class="source-line-no">506</span><span id="line-506">        return blockChain.getBlockStore().get(blockHash);</span>
+<span class="source-line-no">507</span><span id="line-507">    }</span>
+<span class="source-line-no">508</span><span id="line-508"></span>
+<span class="source-line-no">509</span><span id="line-509">    /**</span>
+<span class="source-line-no">510</span><span id="line-510">     * Get a BlockInfo for the specified hash</span>
+<span class="source-line-no">511</span><span id="line-511">     *</span>
+<span class="source-line-no">512</span><span id="line-512">     * @param blockChain The blockchain object to pull the data from</span>
+<span class="source-line-no">513</span><span id="line-513">     * @param blockHash The hash of the desired block</span>
+<span class="source-line-no">514</span><span id="line-514">     * @param includeTx whether to include transactions (currently must be false)</span>
+<span class="source-line-no">515</span><span id="line-515">     * @return block information (currently incomplete and untested)</span>
+<span class="source-line-no">516</span><span id="line-516">     * @throws BlockStoreException Something went wrong</span>
+<span class="source-line-no">517</span><span id="line-517">     */</span>
+<span class="source-line-no">518</span><span id="line-518">    private static BlockInfo getBlockInfoByHash(AbstractBlockChain blockChain, Sha256Hash blockHash, BlockInfo.IncludeTxFlag includeTx) throws BlockStoreException {</span>
+<span class="source-line-no">519</span><span id="line-519">        if (includeTx == BlockInfo.IncludeTxFlag.YES) {</span>
+<span class="source-line-no">520</span><span id="line-520">            throw new IllegalArgumentException("Including transactions not supported yet");</span>
+<span class="source-line-no">521</span><span id="line-521">        }</span>
+<span class="source-line-no">522</span><span id="line-522">        StoredBlock block = getStoredBlockByHash(blockChain, blockHash);</span>
+<span class="source-line-no">523</span><span id="line-523">        Block header = block.getHeader();</span>
+<span class="source-line-no">524</span><span id="line-524">        int blockHeight = block.getHeight();</span>
+<span class="source-line-no">525</span><span id="line-525">        int confirmations = blockChain.getBestChainHeight() - blockHeight;</span>
+<span class="source-line-no">526</span><span id="line-526">        log.trace("building BlockInfo for hash: {} height: {}", blockHash, blockHeight);</span>
+<span class="source-line-no">527</span><span id="line-527">        return new BlockInfo(header.getHash(),</span>
+<span class="source-line-no">528</span><span id="line-528">                confirmations,</span>
+<span class="source-line-no">529</span><span id="line-529">                header.messageSize(),</span>
+<span class="source-line-no">530</span><span id="line-530">                blockHeight,</span>
+<span class="source-line-no">531</span><span id="line-531">                (int) header.getVersion(),</span>
+<span class="source-line-no">532</span><span id="line-532">                header.getMerkleRoot(),</span>
+<span class="source-line-no">533</span><span id="line-533">                -1,     // Unknown number of Transactions</span>
+<span class="source-line-no">534</span><span id="line-534">                (includeTx == BlockInfo.IncludeTxFlag.IDONLY) ? hashListFromTxList(header.getTransactions()) : null,</span>
+<span class="source-line-no">535</span><span id="line-535">                (int) header.time().getEpochSecond(),</span>
+<span class="source-line-no">536</span><span id="line-536">                header.getNonce(),</span>
+<span class="source-line-no">537</span><span id="line-537">                null, // TODO: Return "bits" here</span>
+<span class="source-line-no">538</span><span id="line-538">                new BigDecimal(header.getDifficultyTargetAsInteger()),  // TODO: Verify this is correct</span>
+<span class="source-line-no">539</span><span id="line-539">                block.getChainWork().toString(),</span>
+<span class="source-line-no">540</span><span id="line-540">                block.getPrev(blockChain.getBlockStore()).getHeader().getHash(),</span>
+<span class="source-line-no">541</span><span id="line-541">                null);  // TODO: Extend BlockStore to make this information retrievable</span>
+<span class="source-line-no">542</span><span id="line-542">    }</span>
+<span class="source-line-no">543</span><span id="line-543"></span>
+<span class="source-line-no">544</span><span id="line-544">    private static BlockInfo.Sha256HashList hashListFromTxList(List&lt;Transaction&gt; txList) {</span>
+<span class="source-line-no">545</span><span id="line-545">        if (txList == null) {</span>
+<span class="source-line-no">546</span><span id="line-546">            return null;</span>
+<span class="source-line-no">547</span><span id="line-547">        } else {</span>
+<span class="source-line-no">548</span><span id="line-548">            List&lt;Sha256Hash&gt; list = txList.stream()</span>
+<span class="source-line-no">549</span><span id="line-549">                    .map(Transaction::getTxId)</span>
+<span class="source-line-no">550</span><span id="line-550">                    .collect(Collectors.toList());</span>
+<span class="source-line-no">551</span><span id="line-551">            return new BlockInfo.Sha256HashList(list);</span>
+<span class="source-line-no">552</span><span id="line-552">        }</span>
+<span class="source-line-no">553</span><span id="line-553">    }</span>
+<span class="source-line-no">554</span><span id="line-554"></span>
+<span class="source-line-no">555</span><span id="line-555">    @Override</span>
+<span class="source-line-no">556</span><span id="line-556">    @PreDestroy</span>
+<span class="source-line-no">557</span><span id="line-557">    public void close() {</span>
+<span class="source-line-no">558</span><span id="line-558">        log.info("Closing WalletAppKit...");</span>
+<span class="source-line-no">559</span><span id="line-559">        kit.close();</span>
+<span class="source-line-no">560</span><span id="line-560">        kit.awaitTerminated();  // This should be done by WalletAppKit itself, see https://github.com/bitcoinj/bitcoinj/pull/3028</span>
+<span class="source-line-no">561</span><span id="line-561">        log.info("WalletAppKit terminated");</span>
+<span class="source-line-no">562</span><span id="line-562">    }</span>
+<span class="source-line-no">563</span><span id="line-563">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/bitcoin/services/WalletSigningService.html b/apidoc/src-html/org/consensusj/bitcoin/services/WalletSigningService.html
index dd82888d7..8d4fefa83 100644
--- a/apidoc/src-html/org/consensusj/bitcoin/services/WalletSigningService.html
+++ b/apidoc/src-html/org/consensusj/bitcoin/services/WalletSigningService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoin.services, class: WalletSigningService">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/dsl/js/Demo.html b/apidoc/src-html/org/consensusj/bitcoinj/dsl/js/Demo.html
index f230310a6..630b57af2 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/dsl/js/Demo.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/dsl/js/Demo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.dsl.js, class: Demo">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/dsl/js/ScriptRunner.html b/apidoc/src-html/org/consensusj/bitcoinj/dsl/js/ScriptRunner.html
index 3191acb63..9940e0724 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/dsl/js/ScriptRunner.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/dsl/js/ScriptRunner.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.dsl.js, class: ScriptRunner">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/service/SendTransactionService.html b/apidoc/src-html/org/consensusj/bitcoinj/service/SendTransactionService.html
index bb26aba1b..f9eb4dc5c 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/service/SendTransactionService.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/service/SendTransactionService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.service, interface: SendTransactionService">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/service/SignTransactionService.html b/apidoc/src-html/org/consensusj/bitcoinj/service/SignTransactionService.html
index ee8a5bd06..b3c8effed 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/service/SignTransactionService.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/service/SignTransactionService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.service, interface: SignTransactionService">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/BaseTransactionSigner.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/BaseTransactionSigner.html
index 7724db676..841b74b15 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/BaseTransactionSigner.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/BaseTransactionSigner.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: BaseTransactionSigner">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/DefaultSigningRequest.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/DefaultSigningRequest.html
index 090d6b9f6..efd1e5d26 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/DefaultSigningRequest.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/DefaultSigningRequest.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: DefaultSigningRequest">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/ECKeySigner.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/ECKeySigner.html
index a08f5434c..cb7bb1d35 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/ECKeySigner.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/ECKeySigner.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: ECKeySigner">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/FeeCalculator.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/FeeCalculator.html
index 18056ad74..84774aa9d 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/FeeCalculator.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/FeeCalculator.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: FeeCalculator">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/HDKeychainSigner.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/HDKeychainSigner.html
index cd9c62d3a..7eaaf150b 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/HDKeychainSigner.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/HDKeychainSigner.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: HDKeychainSigner">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.RawInput.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.RawInput.html
index 9b49df21d..adeb6dcc0 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.RawInput.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.RawInput.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: RawTransactionSigningRequest, class: RawInput">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html
index f5e8e4b5f..bb863cccb 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/RawTransactionSigningRequest.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: RawTransactionSigningRequest">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/SigningRequest.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/SigningRequest.html
index 05f5349a1..159d952e0 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/SigningRequest.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/SigningRequest.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: SigningRequest">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/SigningUtils.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/SigningUtils.html
index 01e1f5a12..2ef6bf010 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/SigningUtils.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/SigningUtils.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: SigningUtils">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html
index 952ad42a1..30b5d1c66 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/TestnetFeeCalculator.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: TestnetFeeCalculator">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionInputData.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionInputData.html
index 8628ed7a2..d4d01a09a 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionInputData.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionInputData.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: TransactionInputData">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html
index 9fdd2750a..878aaa162 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionInputDataUtxo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: TransactionInputDataUtxo">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputAddress.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputAddress.html
index eb30f3fc8..23f11a50c 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputAddress.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputAddress.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: TransactionOutputAddress">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputData.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputData.html
index 580f44edb..bee066d28 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputData.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputData.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: TransactionOutputData">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputDataScript.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputDataScript.html
index 4d745285d..cac325b01 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputDataScript.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputDataScript.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: TransactionOutputDataScript">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputOpReturn.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputOpReturn.html
index dec1abbab..2ea7034c2 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputOpReturn.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionOutputOpReturn.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: TransactionOutputOpReturn">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionSigner.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionSigner.html
index eb760ea79..028a1b37f 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionSigner.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionSigner.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: TransactionSigner">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionVerification.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionVerification.html
index e107297d3..8f5732295 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionVerification.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/TransactionVerification.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, class: TransactionVerification">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Basic.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Basic.html
index bb62f48ff..ed99aa616 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Basic.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Basic.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: Utxo, class: Basic">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Complete.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Complete.html
index 2e2d1b521..3599519e2 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Complete.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Complete.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: Utxo, class: Complete">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Signable.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Signable.html
index 5d315784f..23561374d 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Signable.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.Signable.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: Utxo, class: Signable">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.html b/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.html
index f825017f6..ac176eb88 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/signing/Utxo.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.signing, interface: Utxo">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/util/BlockUtil.html b/apidoc/src-html/org/consensusj/bitcoinj/util/BlockUtil.html
index 47e4b5cca..1a07b13c4 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/util/BlockUtil.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/util/BlockUtil.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.util, class: BlockUtil">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/wallet/BipStandardDeterministicKeyChain.html b/apidoc/src-html/org/consensusj/bitcoinj/wallet/BipStandardDeterministicKeyChain.html
index b2fddeb31..f68416d75 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/wallet/BipStandardDeterministicKeyChain.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/wallet/BipStandardDeterministicKeyChain.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.wallet, class: BipStandardDeterministicKeyChain">
diff --git a/apidoc/src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html b/apidoc/src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html
index 184842caf..5e85b9de8 100644
--- a/apidoc/src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html
+++ b/apidoc/src-html/org/consensusj/bitcoinj/wallet/BipStandardKeyChainGroupStructure.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.bitcoinj.wallet, interface: BipStandardKeyChainGroupStructure">
@@ -14,99 +14,88 @@
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.bitcoinj.wallet;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import org.bitcoinj.base.BitcoinNetwork;</span>
-<span class="source-line-no">004</span><span id="line-4">import org.bitcoinj.core.NetworkParameters;</span>
-<span class="source-line-no">005</span><span id="line-5">import org.bitcoinj.crypto.HDPath;</span>
-<span class="source-line-no">006</span><span id="line-6">import org.bitcoinj.crypto.ChildNumber;</span>
-<span class="source-line-no">007</span><span id="line-7"></span>
-<span class="source-line-no">008</span><span id="line-8">import static org.bitcoinj.base.ScriptType.P2PKH;</span>
-<span class="source-line-no">009</span><span id="line-9">import static org.bitcoinj.base.ScriptType.P2WPKH;</span>
-<span class="source-line-no">010</span><span id="line-10"></span>
-<span class="source-line-no">011</span><span id="line-11">/**</span>
-<span class="source-line-no">012</span><span id="line-12"> * Path builder that supports BIP44, BIP84, etc. This functionality will be in the next release of bitcoinj.</span>
-<span class="source-line-no">013</span><span id="line-13"> * This interface will be deprecated after the next release of bitcoinj.</span>
-<span class="source-line-no">014</span><span id="line-14"> * @deprecated Use {@link org.bitcoinj.wallet.KeyChainGroupStructure#BIP43} and constants in {@link org.bitcoinj.wallet.DeterministicKeyChain}</span>
-<span class="source-line-no">015</span><span id="line-15"> */</span>
-<span class="source-line-no">016</span><span id="line-16">@Deprecated</span>
-<span class="source-line-no">017</span><span id="line-17">public interface BipStandardKeyChainGroupStructure {</span>
-<span class="source-line-no">018</span><span id="line-18">    ChildNumber PURPOSE_BIP44 = ChildNumber.PURPOSE_BIP44;  // P2PKH</span>
-<span class="source-line-no">019</span><span id="line-19">    ChildNumber PURPOSE_BIP49 = ChildNumber.PURPOSE_BIP49;  // P2WPKH-nested-in-P2SH</span>
-<span class="source-line-no">020</span><span id="line-20">    ChildNumber PURPOSE_BIP84 = ChildNumber.PURPOSE_BIP84;  // P2WPKH</span>
-<span class="source-line-no">021</span><span id="line-21"></span>
-<span class="source-line-no">022</span><span id="line-22">    ChildNumber COINTYPE_BTC = ChildNumber.COINTYPE_BTC;</span>
-<span class="source-line-no">023</span><span id="line-23">    ChildNumber COINTYPE_TBTC = new ChildNumber(1, true);</span>
-<span class="source-line-no">024</span><span id="line-24"></span>
-<span class="source-line-no">025</span><span id="line-25">    ChildNumber CHANGE_RECEIVING = ChildNumber.ZERO;</span>
-<span class="source-line-no">026</span><span id="line-26">    ChildNumber CHANGE_CHANGE = ChildNumber.ONE;</span>
-<span class="source-line-no">027</span><span id="line-27"></span>
-<span class="source-line-no">028</span><span id="line-28">    HDPath BIP44_PARENT = HDPath.BIP44_PARENT;</span>
-<span class="source-line-no">029</span><span id="line-29">    HDPath BIP84_PARENT = HDPath.BIP84_PARENT;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.bitcoinj.crypto.HDPath;</span>
+<span class="source-line-no">005</span><span id="line-5">import org.bitcoinj.crypto.ChildNumber;</span>
+<span class="source-line-no">006</span><span id="line-6"></span>
+<span class="source-line-no">007</span><span id="line-7">import static org.bitcoinj.base.ScriptType.P2PKH;</span>
+<span class="source-line-no">008</span><span id="line-8">import static org.bitcoinj.base.ScriptType.P2WPKH;</span>
+<span class="source-line-no">009</span><span id="line-9"></span>
+<span class="source-line-no">010</span><span id="line-10">/**</span>
+<span class="source-line-no">011</span><span id="line-11"> * Path builder that supports BIP44, BIP84, etc. This functionality will be in the next release of bitcoinj.</span>
+<span class="source-line-no">012</span><span id="line-12"> * This interface will be deprecated after the next release of bitcoinj.</span>
+<span class="source-line-no">013</span><span id="line-13"> * @deprecated Use {@link org.bitcoinj.wallet.KeyChainGroupStructure#BIP43} and constants in {@link org.bitcoinj.wallet.DeterministicKeyChain}</span>
+<span class="source-line-no">014</span><span id="line-14"> */</span>
+<span class="source-line-no">015</span><span id="line-15">@Deprecated</span>
+<span class="source-line-no">016</span><span id="line-16">public interface BipStandardKeyChainGroupStructure {</span>
+<span class="source-line-no">017</span><span id="line-17">    ChildNumber PURPOSE_BIP44 = ChildNumber.PURPOSE_BIP44;  // P2PKH</span>
+<span class="source-line-no">018</span><span id="line-18">    ChildNumber PURPOSE_BIP49 = ChildNumber.PURPOSE_BIP49;  // P2WPKH-nested-in-P2SH</span>
+<span class="source-line-no">019</span><span id="line-19">    ChildNumber PURPOSE_BIP84 = ChildNumber.PURPOSE_BIP84;  // P2WPKH</span>
+<span class="source-line-no">020</span><span id="line-20"></span>
+<span class="source-line-no">021</span><span id="line-21">    ChildNumber COINTYPE_BTC = ChildNumber.COINTYPE_BTC;</span>
+<span class="source-line-no">022</span><span id="line-22">    ChildNumber COINTYPE_TBTC = new ChildNumber(1, true);</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">    ChildNumber CHANGE_RECEIVING = ChildNumber.ZERO;</span>
+<span class="source-line-no">025</span><span id="line-25">    ChildNumber CHANGE_CHANGE = ChildNumber.ONE;</span>
+<span class="source-line-no">026</span><span id="line-26"></span>
+<span class="source-line-no">027</span><span id="line-27">    HDPath BIP44_PARENT = HDPath.BIP44_PARENT;</span>
+<span class="source-line-no">028</span><span id="line-28">    HDPath BIP84_PARENT = HDPath.BIP84_PARENT;</span>
+<span class="source-line-no">029</span><span id="line-29"></span>
 <span class="source-line-no">030</span><span id="line-30"></span>
-<span class="source-line-no">031</span><span id="line-31"></span>
-<span class="source-line-no">032</span><span id="line-32">    /**</span>
-<span class="source-line-no">033</span><span id="line-33">     * Map desired output script type and account index to an account path</span>
-<span class="source-line-no">034</span><span id="line-34">     * @param outputScriptType output script type (purpose)</span>
-<span class="source-line-no">035</span><span id="line-35">     * @param netId network/coin type</span>
-<span class="source-line-no">036</span><span id="line-36">     * @return The HD Path: purpose / coinType / accountIndex</span>
-<span class="source-line-no">037</span><span id="line-37">     */</span>
-<span class="source-line-no">038</span><span id="line-38">    static HDPath pathFor(org.bitcoinj.base.ScriptType outputScriptType, String netId) {</span>
-<span class="source-line-no">039</span><span id="line-39">        return purpose(outputScriptType)</span>
-<span class="source-line-no">040</span><span id="line-40">                .extend(coinType(netId), account(0));</span>
-<span class="source-line-no">041</span><span id="line-41">    }</span>
-<span class="source-line-no">042</span><span id="line-42"></span>
-<span class="source-line-no">043</span><span id="line-43">    /**</span>
-<span class="source-line-no">044</span><span id="line-44">     * Map desired output script type and account index to an account path</span>
-<span class="source-line-no">045</span><span id="line-45">     * @param outputScriptType output script type (purpose)</span>
-<span class="source-line-no">046</span><span id="line-46">     * @param networkParameters network/coin type</span>
-<span class="source-line-no">047</span><span id="line-47">     * @return The HD Path: purpose / coinType / accountIndex</span>
-<span class="source-line-no">048</span><span id="line-48">     */</span>
-<span class="source-line-no">049</span><span id="line-49">    static HDPath pathFor(org.bitcoinj.base.ScriptType outputScriptType, NetworkParameters networkParameters) {</span>
-<span class="source-line-no">050</span><span id="line-50">        return pathFor(outputScriptType, networkParameters.getId());</span>
-<span class="source-line-no">051</span><span id="line-51">    }</span>
-<span class="source-line-no">052</span><span id="line-52"></span>
-<span class="source-line-no">053</span><span id="line-53">    /**</span>
-<span class="source-line-no">054</span><span id="line-54">     * Return the (root) path containing "purpose" for the specified scriptType</span>
-<span class="source-line-no">055</span><span id="line-55">     * @param scriptType script/address type</span>
-<span class="source-line-no">056</span><span id="line-56">     * @return An HDPath with a BIP44 "purpose" entry</span>
-<span class="source-line-no">057</span><span id="line-57">     */</span>
-<span class="source-line-no">058</span><span id="line-58">    static HDPath purpose(org.bitcoinj.base.ScriptType scriptType) {</span>
-<span class="source-line-no">059</span><span id="line-59">        if (scriptType == null || scriptType == P2PKH) {</span>
-<span class="source-line-no">060</span><span id="line-60">            return BIP44_PARENT;</span>
-<span class="source-line-no">061</span><span id="line-61">        } else if (scriptType == P2WPKH) {</span>
-<span class="source-line-no">062</span><span id="line-62">            return BIP84_PARENT;</span>
-<span class="source-line-no">063</span><span id="line-63">        } else {</span>
-<span class="source-line-no">064</span><span id="line-64">            throw new IllegalArgumentException(scriptType.toString());</span>
-<span class="source-line-no">065</span><span id="line-65">        }</span>
-<span class="source-line-no">066</span><span id="line-66">    }</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68">    /**</span>
-<span class="source-line-no">069</span><span id="line-69">     * Return coin type path component for a network id</span>
-<span class="source-line-no">070</span><span id="line-70">     * @param networkId network id string, eg. {@link BitcoinNetwork#ID_MAINNET}</span>
-<span class="source-line-no">071</span><span id="line-71">     */</span>
-<span class="source-line-no">072</span><span id="line-72">    static ChildNumber coinType(String networkId) {</span>
-<span class="source-line-no">073</span><span id="line-73">        BitcoinNetwork network = BitcoinNetwork.fromIdString(networkId)</span>
-<span class="source-line-no">074</span><span id="line-74">                .orElseThrow(() -&gt; new IllegalArgumentException("Unknown network id (coin type)"));</span>
-<span class="source-line-no">075</span><span id="line-75">        switch (network) {</span>
-<span class="source-line-no">076</span><span id="line-76">            case MAINNET:</span>
-<span class="source-line-no">077</span><span id="line-77">                return COINTYPE_BTC;</span>
-<span class="source-line-no">078</span><span id="line-78">            case TESTNET:</span>
-<span class="source-line-no">079</span><span id="line-79">                return COINTYPE_TBTC;</span>
-<span class="source-line-no">080</span><span id="line-80">            case SIGNET:</span>
-<span class="source-line-no">081</span><span id="line-81">                return COINTYPE_TBTC;</span>
-<span class="source-line-no">082</span><span id="line-82">            case REGTEST:</span>
-<span class="source-line-no">083</span><span id="line-83">            default:</span>
-<span class="source-line-no">084</span><span id="line-84">                return COINTYPE_TBTC;</span>
-<span class="source-line-no">085</span><span id="line-85">        }</span>
-<span class="source-line-no">086</span><span id="line-86">    }</span>
-<span class="source-line-no">087</span><span id="line-87"></span>
-<span class="source-line-no">088</span><span id="line-88">    /**</span>
-<span class="source-line-no">089</span><span id="line-89">     * Return path component for an account</span>
-<span class="source-line-no">090</span><span id="line-90">     * @param accountIndex account index</span>
-<span class="source-line-no">091</span><span id="line-91">     * @return A hardened path component</span>
-<span class="source-line-no">092</span><span id="line-92">     */</span>
-<span class="source-line-no">093</span><span id="line-93">    static ChildNumber account(int accountIndex) {</span>
-<span class="source-line-no">094</span><span id="line-94">        return new ChildNumber(accountIndex, true);</span>
-<span class="source-line-no">095</span><span id="line-95">    }</span>
-<span class="source-line-no">096</span><span id="line-96">}</span>
+<span class="source-line-no">031</span><span id="line-31">    /**</span>
+<span class="source-line-no">032</span><span id="line-32">     * Map desired output script type and account index to an account path</span>
+<span class="source-line-no">033</span><span id="line-33">     * @param outputScriptType output script type (purpose)</span>
+<span class="source-line-no">034</span><span id="line-34">     * @param netId network/coin type</span>
+<span class="source-line-no">035</span><span id="line-35">     * @return The HD Path: purpose / coinType / accountIndex</span>
+<span class="source-line-no">036</span><span id="line-36">     */</span>
+<span class="source-line-no">037</span><span id="line-37">    static HDPath pathFor(org.bitcoinj.base.ScriptType outputScriptType, String netId) {</span>
+<span class="source-line-no">038</span><span id="line-38">        return purpose(outputScriptType)</span>
+<span class="source-line-no">039</span><span id="line-39">                .extend(coinType(netId), account(0));</span>
+<span class="source-line-no">040</span><span id="line-40">    }</span>
+<span class="source-line-no">041</span><span id="line-41"></span>
+<span class="source-line-no">042</span><span id="line-42">    /**</span>
+<span class="source-line-no">043</span><span id="line-43">     * Return the (root) path containing "purpose" for the specified scriptType</span>
+<span class="source-line-no">044</span><span id="line-44">     * @param scriptType script/address type</span>
+<span class="source-line-no">045</span><span id="line-45">     * @return An HDPath with a BIP44 "purpose" entry</span>
+<span class="source-line-no">046</span><span id="line-46">     */</span>
+<span class="source-line-no">047</span><span id="line-47">    static HDPath purpose(org.bitcoinj.base.ScriptType scriptType) {</span>
+<span class="source-line-no">048</span><span id="line-48">        if (scriptType == null || scriptType == P2PKH) {</span>
+<span class="source-line-no">049</span><span id="line-49">            return BIP44_PARENT;</span>
+<span class="source-line-no">050</span><span id="line-50">        } else if (scriptType == P2WPKH) {</span>
+<span class="source-line-no">051</span><span id="line-51">            return BIP84_PARENT;</span>
+<span class="source-line-no">052</span><span id="line-52">        } else {</span>
+<span class="source-line-no">053</span><span id="line-53">            throw new IllegalArgumentException(scriptType.toString());</span>
+<span class="source-line-no">054</span><span id="line-54">        }</span>
+<span class="source-line-no">055</span><span id="line-55">    }</span>
+<span class="source-line-no">056</span><span id="line-56"></span>
+<span class="source-line-no">057</span><span id="line-57">    /**</span>
+<span class="source-line-no">058</span><span id="line-58">     * Return coin type path component for a network id</span>
+<span class="source-line-no">059</span><span id="line-59">     * @param networkId network id string, eg. {@link BitcoinNetwork#ID_MAINNET}</span>
+<span class="source-line-no">060</span><span id="line-60">     */</span>
+<span class="source-line-no">061</span><span id="line-61">    static ChildNumber coinType(String networkId) {</span>
+<span class="source-line-no">062</span><span id="line-62">        BitcoinNetwork network = BitcoinNetwork.fromIdString(networkId)</span>
+<span class="source-line-no">063</span><span id="line-63">                .orElseThrow(() -&gt; new IllegalArgumentException("Unknown network id (coin type)"));</span>
+<span class="source-line-no">064</span><span id="line-64">        switch (network) {</span>
+<span class="source-line-no">065</span><span id="line-65">            case MAINNET:</span>
+<span class="source-line-no">066</span><span id="line-66">                return COINTYPE_BTC;</span>
+<span class="source-line-no">067</span><span id="line-67">            case TESTNET:</span>
+<span class="source-line-no">068</span><span id="line-68">                return COINTYPE_TBTC;</span>
+<span class="source-line-no">069</span><span id="line-69">            case SIGNET:</span>
+<span class="source-line-no">070</span><span id="line-70">                return COINTYPE_TBTC;</span>
+<span class="source-line-no">071</span><span id="line-71">            case REGTEST:</span>
+<span class="source-line-no">072</span><span id="line-72">            default:</span>
+<span class="source-line-no">073</span><span id="line-73">                return COINTYPE_TBTC;</span>
+<span class="source-line-no">074</span><span id="line-74">        }</span>
+<span class="source-line-no">075</span><span id="line-75">    }</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">    /**</span>
+<span class="source-line-no">078</span><span id="line-78">     * Return path component for an account</span>
+<span class="source-line-no">079</span><span id="line-79">     * @param accountIndex account index</span>
+<span class="source-line-no">080</span><span id="line-80">     * @return A hardened path component</span>
+<span class="source-line-no">081</span><span id="line-81">     */</span>
+<span class="source-line-no">082</span><span id="line-82">    static ChildNumber account(int accountIndex) {</span>
+<span class="source-line-no">083</span><span id="line-83">        return new ChildNumber(accountIndex, true);</span>
+<span class="source-line-no">084</span><span id="line-84">    }</span>
+<span class="source-line-no">085</span><span id="line-85">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/currency/BitcoinCurrencyProvider.html b/apidoc/src-html/org/consensusj/currency/BitcoinCurrencyProvider.html
index cb928dea1..9bfbcea56 100644
--- a/apidoc/src-html/org/consensusj/currency/BitcoinCurrencyProvider.html
+++ b/apidoc/src-html/org/consensusj/currency/BitcoinCurrencyProvider.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.currency, class: BitcoinCurrencyProvider">
diff --git a/apidoc/src-html/org/consensusj/daemon/micronaut/Application.html b/apidoc/src-html/org/consensusj/daemon/micronaut/Application.html
index 584a60879..0919bad0e 100644
--- a/apidoc/src-html/org/consensusj/daemon/micronaut/Application.html
+++ b/apidoc/src-html/org/consensusj/daemon/micronaut/Application.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.daemon.micronaut, class: Application">
diff --git a/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html b/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html
index ee246f45c..52518afc7 100644
--- a/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html
+++ b/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinDaemonConfig.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.daemon.micronaut, record: BitcoinDaemonConfig">
diff --git a/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinFactory.html b/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinFactory.html
index 1e63ef4a7..9dfc2bd03 100644
--- a/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinFactory.html
+++ b/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinFactory.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.daemon.micronaut, class: BitcoinFactory">
diff --git a/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinRestController.html b/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinRestController.html
index 56f52a6a7..45b87458d 100644
--- a/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinRestController.html
+++ b/apidoc/src-html/org/consensusj/daemon/micronaut/BitcoinRestController.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.daemon.micronaut, class: BitcoinRestController">
diff --git a/apidoc/src-html/org/consensusj/daemon/micronaut/JsonRpcController.html b/apidoc/src-html/org/consensusj/daemon/micronaut/JsonRpcController.html
index fc01be3cc..c4f21e6b5 100644
--- a/apidoc/src-html/org/consensusj/daemon/micronaut/JsonRpcController.html
+++ b/apidoc/src-html/org/consensusj/daemon/micronaut/JsonRpcController.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.daemon.micronaut, class: JsonRpcController">
diff --git a/apidoc/src-html/org/consensusj/daemon/micronaut/MicronautWalletAppKitService.html b/apidoc/src-html/org/consensusj/daemon/micronaut/MicronautWalletAppKitService.html
index 632ec71eb..b1c4d1258 100644
--- a/apidoc/src-html/org/consensusj/daemon/micronaut/MicronautWalletAppKitService.html
+++ b/apidoc/src-html/org/consensusj/daemon/micronaut/MicronautWalletAppKitService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.daemon.micronaut, class: MicronautWalletAppKitService">
diff --git a/apidoc/src-html/org/consensusj/daemon/micronaut/WalletAppKitJsonRpcService.html b/apidoc/src-html/org/consensusj/daemon/micronaut/WalletAppKitJsonRpcService.html
index b89233267..355129549 100644
--- a/apidoc/src-html/org/consensusj/daemon/micronaut/WalletAppKitJsonRpcService.html
+++ b/apidoc/src-html/org/consensusj/daemon/micronaut/WalletAppKitJsonRpcService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.daemon.micronaut, class: WalletAppKitJsonRpcService">
diff --git a/apidoc/src-html/org/consensusj/decentralizedid/Did.html b/apidoc/src-html/org/consensusj/decentralizedid/Did.html
index ed1984b6f..f46c787b3 100644
--- a/apidoc/src-html/org/consensusj/decentralizedid/Did.html
+++ b/apidoc/src-html/org/consensusj/decentralizedid/Did.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.decentralizedid, class: Did">
diff --git a/apidoc/src-html/org/consensusj/decentralizedid/btcr/BtcrDid.html b/apidoc/src-html/org/consensusj/decentralizedid/btcr/BtcrDid.html
index 897e7aa35..c05669314 100644
--- a/apidoc/src-html/org/consensusj/decentralizedid/btcr/BtcrDid.html
+++ b/apidoc/src-html/org/consensusj/decentralizedid/btcr/BtcrDid.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.decentralizedid.btcr, class: BtcrDid">
diff --git a/apidoc/src-html/org/consensusj/decentralizedid/btcr/ExtendedTxRef.html b/apidoc/src-html/org/consensusj/decentralizedid/btcr/ExtendedTxRef.html
index 893641428..cd87b8240 100644
--- a/apidoc/src-html/org/consensusj/decentralizedid/btcr/ExtendedTxRef.html
+++ b/apidoc/src-html/org/consensusj/decentralizedid/btcr/ExtendedTxRef.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.decentralizedid.btcr, class: ExtendedTxRef">
diff --git a/apidoc/src-html/org/consensusj/ethereum/jsonrpc/EthTxCallObject.html b/apidoc/src-html/org/consensusj/ethereum/jsonrpc/EthTxCallObject.html
index 00a4b8558..4fe5ad154 100644
--- a/apidoc/src-html/org/consensusj/ethereum/jsonrpc/EthTxCallObject.html
+++ b/apidoc/src-html/org/consensusj/ethereum/jsonrpc/EthTxCallObject.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.ethereum.jsonrpc, class: EthTxCallObject">
diff --git a/apidoc/src-html/org/consensusj/ethereum/jsonrpc/EthereumClient.html b/apidoc/src-html/org/consensusj/ethereum/jsonrpc/EthereumClient.html
index b49c49d19..a58a4917a 100644
--- a/apidoc/src-html/org/consensusj/ethereum/jsonrpc/EthereumClient.html
+++ b/apidoc/src-html/org/consensusj/ethereum/jsonrpc/EthereumClient.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.ethereum.jsonrpc, class: EthereumClient">
@@ -13,9 +13,9 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.ethereum.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import org.consensusj.jsonrpc.JsonRpcMessage;</span>
-<span class="source-line-no">004</span><span id="line-4">import org.consensusj.jsonrpc.JsonRpcStatusException;</span>
-<span class="source-line-no">005</span><span id="line-5">import org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection;</span>
+<span class="source-line-no">003</span><span id="line-3">import org.consensusj.jsonrpc.DefaultRpcClient;</span>
+<span class="source-line-no">004</span><span id="line-4">import org.consensusj.jsonrpc.JsonRpcMessage;</span>
+<span class="source-line-no">005</span><span id="line-5">import org.consensusj.jsonrpc.JsonRpcStatusException;</span>
 <span class="source-line-no">006</span><span id="line-6"></span>
 <span class="source-line-no">007</span><span id="line-7">import java.io.IOException;</span>
 <span class="source-line-no">008</span><span id="line-8">import java.math.BigInteger;</span>
@@ -29,7 +29,7 @@
 <span class="source-line-no">016</span><span id="line-16"> * See also:</span>
 <span class="source-line-no">017</span><span id="line-17"> * https://github.com/ethereum/go-ethereum/wiki/Management-APIs</span>
 <span class="source-line-no">018</span><span id="line-18"> */</span>
-<span class="source-line-no">019</span><span id="line-19">public class EthereumClient extends JsonRpcClientHttpUrlConnection {</span>
+<span class="source-line-no">019</span><span id="line-19">public class EthereumClient extends DefaultRpcClient {</span>
 <span class="source-line-no">020</span><span id="line-20">    public static final URI DEFAULT_LOCALHOST = URI.create("http://localhost:8545");</span>
 <span class="source-line-no">021</span><span id="line-21">    </span>
 <span class="source-line-no">022</span><span id="line-22">    /**</span>
diff --git a/apidoc/src-html/org/consensusj/exchange/BaseXChangeExchangeRateProvider.html b/apidoc/src-html/org/consensusj/exchange/BaseXChangeExchangeRateProvider.html
index 7a127eec5..e8c5d6a3e 100644
--- a/apidoc/src-html/org/consensusj/exchange/BaseXChangeExchangeRateProvider.html
+++ b/apidoc/src-html/org/consensusj/exchange/BaseXChangeExchangeRateProvider.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange, class: BaseXChangeExchangeRateProvider">
@@ -143,7 +143,7 @@
 <span class="source-line-no">130</span><span id="line-130">    /**</span>
 <span class="source-line-no">131</span><span id="line-131">     * Poll the exchange for updated Tickers</span>
 <span class="source-line-no">132</span><span id="line-132">     */</span>
-<span class="source-line-no">133</span><span id="line-133">    protected void poll() {</span>
+<span class="source-line-no">133</span><span id="line-133">    void poll() {</span>
 <span class="source-line-no">134</span><span id="line-134">        monitoredCurrencies.forEach((key, monitor) -&gt; {</span>
 <span class="source-line-no">135</span><span id="line-135">            try {</span>
 <span class="source-line-no">136</span><span id="line-136">                monitor.setTicker(marketDataService.getTicker(monitor.exchangePair));</span>
diff --git a/apidoc/src-html/org/consensusj/exchange/CurrencyUnitPair.html b/apidoc/src-html/org/consensusj/exchange/CurrencyUnitPair.html
index 92e70fc2d..d8aa83185 100644
--- a/apidoc/src-html/org/consensusj/exchange/CurrencyUnitPair.html
+++ b/apidoc/src-html/org/consensusj/exchange/CurrencyUnitPair.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange, class: CurrencyUnitPair">
diff --git a/apidoc/src-html/org/consensusj/exchange/ExchangeRateChange.html b/apidoc/src-html/org/consensusj/exchange/ExchangeRateChange.html
index 964538a1e..8459fa2a9 100644
--- a/apidoc/src-html/org/consensusj/exchange/ExchangeRateChange.html
+++ b/apidoc/src-html/org/consensusj/exchange/ExchangeRateChange.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange, class: ExchangeRateChange">
diff --git a/apidoc/src-html/org/consensusj/exchange/ExchangeRateObserver.html b/apidoc/src-html/org/consensusj/exchange/ExchangeRateObserver.html
index c770503e1..4cbda3c0a 100644
--- a/apidoc/src-html/org/consensusj/exchange/ExchangeRateObserver.html
+++ b/apidoc/src-html/org/consensusj/exchange/ExchangeRateObserver.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange, interface: ExchangeRateObserver">
diff --git a/apidoc/src-html/org/consensusj/exchange/ExchangeUtils.html b/apidoc/src-html/org/consensusj/exchange/ExchangeUtils.html
index e62f57f85..34e2e847f 100644
--- a/apidoc/src-html/org/consensusj/exchange/ExchangeUtils.html
+++ b/apidoc/src-html/org/consensusj/exchange/ExchangeUtils.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange, interface: ExchangeUtils">
diff --git a/apidoc/src-html/org/consensusj/exchange/ObservableExchangeRateProvider.html b/apidoc/src-html/org/consensusj/exchange/ObservableExchangeRateProvider.html
index 81c8dd0ef..3ae2f5d7a 100644
--- a/apidoc/src-html/org/consensusj/exchange/ObservableExchangeRateProvider.html
+++ b/apidoc/src-html/org/consensusj/exchange/ObservableExchangeRateProvider.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange, interface: ObservableExchangeRateProvider">
diff --git a/apidoc/src-html/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html b/apidoc/src-html/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html
index 00aac0e0a..5538201a8 100644
--- a/apidoc/src-html/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html
+++ b/apidoc/src-html/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.MonitoredCurrency.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange.knowm, class: KnowmExchangeRateProvider, class: MonitoredCurrency">
diff --git a/apidoc/src-html/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html b/apidoc/src-html/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html
index 8ce335a03..7d8e6ca66 100644
--- a/apidoc/src-html/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html
+++ b/apidoc/src-html/org/consensusj/exchange/knowm/KnowmExchangeRateProvider.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange.knowm, class: KnowmExchangeRateProvider">
diff --git a/apidoc/src-html/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.MonitoredCurrency.html b/apidoc/src-html/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.MonitoredCurrency.html
index 69443028f..8423c3168 100644
--- a/apidoc/src-html/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.MonitoredCurrency.html
+++ b/apidoc/src-html/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.MonitoredCurrency.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange.knowm, class: ReactiveKnowmExchangeProvider, class: MonitoredCurrency">
diff --git a/apidoc/src-html/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.html b/apidoc/src-html/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.html
index 9c971fa41..380824480 100644
--- a/apidoc/src-html/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.html
+++ b/apidoc/src-html/org/consensusj/exchange/knowm/ReactiveKnowmExchangeProvider.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange.knowm, class: ReactiveKnowmExchangeProvider">
diff --git a/apidoc/src-html/org/consensusj/exchange/rx/ExchangeRateUpdate.html b/apidoc/src-html/org/consensusj/exchange/rx/ExchangeRateUpdate.html
index dbb4f07fd..67eaf8943 100644
--- a/apidoc/src-html/org/consensusj/exchange/rx/ExchangeRateUpdate.html
+++ b/apidoc/src-html/org/consensusj/exchange/rx/ExchangeRateUpdate.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange.rx, class: ExchangeRateUpdate">
diff --git a/apidoc/src-html/org/consensusj/exchange/rx/ObservablePair.html b/apidoc/src-html/org/consensusj/exchange/rx/ObservablePair.html
index 03ba7b9e3..5daa7fcaf 100644
--- a/apidoc/src-html/org/consensusj/exchange/rx/ObservablePair.html
+++ b/apidoc/src-html/org/consensusj/exchange/rx/ObservablePair.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange.rx, interface: ObservablePair">
diff --git a/apidoc/src-html/org/consensusj/exchange/rx/PolledObservablePair.html b/apidoc/src-html/org/consensusj/exchange/rx/PolledObservablePair.html
index fb67e6582..f888c611c 100644
--- a/apidoc/src-html/org/consensusj/exchange/rx/PolledObservablePair.html
+++ b/apidoc/src-html/org/consensusj/exchange/rx/PolledObservablePair.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange.rx, class: PolledObservablePair">
diff --git a/apidoc/src-html/org/consensusj/exchange/rx/ReactiveExchange.html b/apidoc/src-html/org/consensusj/exchange/rx/ReactiveExchange.html
index ba0762b3c..99b40b491 100644
--- a/apidoc/src-html/org/consensusj/exchange/rx/ReactiveExchange.html
+++ b/apidoc/src-html/org/consensusj/exchange/rx/ReactiveExchange.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.exchange.rx, interface: ReactiveExchange">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/AbstractRpcClient.html b/apidoc/src-html/org/consensusj/jsonrpc/AbstractRpcClient.html
deleted file mode 100644
index 10899795e..000000000
--- a/apidoc/src-html/org/consensusj/jsonrpc/AbstractRpcClient.html
+++ /dev/null
@@ -1,184 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>Source code</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="description" content="source: package: org.consensusj.jsonrpc, class: AbstractRpcClient">
-<meta name="generator" content="javadoc/SourceToHTMLConverter">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-</head>
-<body class="source-page">
-<main role="main">
-<div class="source-container">
-<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
-<span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.databind.DeserializationFeature;</span>
-<span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JavaType;</span>
-<span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.databind.ObjectMapper;</span>
-<span class="source-line-no">006</span><span id="line-6"></span>
-<span class="source-line-no">007</span><span id="line-7">import javax.net.ssl.SSLContext;</span>
-<span class="source-line-no">008</span><span id="line-8">import java.security.NoSuchAlgorithmException;</span>
-<span class="source-line-no">009</span><span id="line-9">import java.util.Base64;</span>
-<span class="source-line-no">010</span><span id="line-10"></span>
-<span class="source-line-no">011</span><span id="line-11">// TODO: Rather than implementing transport (HttpUrlConnection vs. java.net.http) with subclasses use composition</span>
-<span class="source-line-no">012</span><span id="line-12">// In other words, the constructor should take a transport implementation object.</span>
-<span class="source-line-no">013</span><span id="line-13">// We're overusing inheritance in this hierarchy. We are breaking Effective Java, Item 18: Favor composition over inheritance.</span>
-<span class="source-line-no">014</span><span id="line-14">// We're using inheritance to configure:</span>
-<span class="source-line-no">015</span><span id="line-15">// A. The set of JSON-RPC methods that are supported, e.g. `getblockcount()` (which creates potential conflicts with `send()` etc)</span>
-<span class="source-line-no">016</span><span id="line-16">// B. The JSON mapping implementation. Which for now and the foreseeable future is Jackson only.</span>
-<span class="source-line-no">017</span><span id="line-17">// C. The transport implementation.</span>
-<span class="source-line-no">018</span><span id="line-18">//</span>
-<span class="source-line-no">019</span><span id="line-19">// As we want to support both HttpUrlConnection vs. java.net.http while transitioning to java.net.http, we don't want to force</span>
-<span class="source-line-no">020</span><span id="line-20">// subclasses like `BitcoinClient` to choose one or the other. So making (C) transport implementation a separate, composable object</span>
-<span class="source-line-no">021</span><span id="line-21">// is the FIRST STEP. Later we can look at separating (A) and (B). My first thoughts on how to do this is:</span>
-<span class="source-line-no">022</span><span id="line-22">// (1) Create a JsonRpcClientTransport interface.</span>
-<span class="source-line-no">023</span><span id="line-23">// (2) Rename `AbstractRpcClient` to `DefaultJsonRpcClient`, make it concrete and have it take a JsonRpcClientTransport instance as</span>
-<span class="source-line-no">024</span><span id="line-24">//     a constructor parameter.</span>
-<span class="source-line-no">025</span><span id="line-25">// (3) Create two implementations of `JsonRpcClientTransport` based upon `JsonRpcClientHttpUrlConnection` and `JsonRpcClientJavaNet`.</span>
-<span class="source-line-no">026</span><span id="line-26">// (4) Optional. Maybe look at extracting a class with some common "mapper" functions between the two transport implementations</span>
-<span class="source-line-no">027</span><span id="line-27">//</span>
-<span class="source-line-no">028</span><span id="line-28">// To separate (C) the easiest way is probably via a constructor parameter.</span>
-<span class="source-line-no">029</span><span id="line-29">// The proper separation for (A) is probably a complete separation. There should be no required inheritance to implement</span>
-<span class="source-line-no">030</span><span id="line-30">// a client with a set of methods. Internally the client would have a transport and a mapper and those could optionally be made available</span>
-<span class="source-line-no">031</span><span id="line-31">// via some accessor methods if the client application deems necessary.</span>
-<span class="source-line-no">032</span><span id="line-32">// At the heart of (B) (at least as currently implemented) is the mapping from a Java (or Groovy) method name to (i) a JSON-RPC method</span>
-<span class="source-line-no">033</span><span id="line-33">// name, (ii) optional parameter type-conversion for JSON serialization in the request, and (iii) type mapping for the deserialization</span>
-<span class="source-line-no">034</span><span id="line-34">// of the `result` field in the JsonRpcResponse&lt;RSLT&gt;. It might be helpful to think of this as two functional mappings:</span>
-<span class="source-line-no">035</span><span id="line-35">// (1) Map Java method name and parameters to a JSON-RPC request (either map to set of Java Objects _or_ all the way to JSON)</span>
-<span class="source-line-no">036</span><span id="line-36">// (2) Map from received JSON-RPC response to JsonRpcResponse&lt;RSLT&gt; -- this response mapper function is configured as part of making the request.</span>
-<span class="source-line-no">037</span><span id="line-37">//</span>
-<span class="source-line-no">038</span><span id="line-38">// The SECOND STEP is to abstract the specifics of Jackson from the (two) transport implementations. Basically methods/functions to</span>
-<span class="source-line-no">039</span><span id="line-39">// map from request to string/stream and to map from string/stream to response.  The java.net.http implementation has already defined</span>
-<span class="source-line-no">040</span><span id="line-40">// some functional interfaces for this, so coming up with an interface that both the java.net.http implementation and the HttpUrlConnection</span>
-<span class="source-line-no">041</span><span id="line-41">// implementation can use will lead to this "SECOND STEP"</span>
-<span class="source-line-no">042</span><span id="line-42">/**</span>
-<span class="source-line-no">043</span><span id="line-43"> * Abstract Base class for a strongly-typed, Jackson-based JSON-RPC client. Most of the work is done</span>
-<span class="source-line-no">044</span><span id="line-44"> * in default methods in {@link JacksonRpcClient} This abstract class implements the constructors, static fields, and</span>
-<span class="source-line-no">045</span><span id="line-45"> * getters, but leaves the core {@code sendRequestForResponse} method as {@code abstract} to be implemented by subclasses</span>
-<span class="source-line-no">046</span><span id="line-46"> * allowing implementation with alternative HTTP client libraries.</span>
-<span class="source-line-no">047</span><span id="line-47"> */</span>
-<span class="source-line-no">048</span><span id="line-48">public abstract class AbstractRpcClient implements JacksonRpcClient {</span>
-<span class="source-line-no">049</span><span id="line-49">    /**</span>
-<span class="source-line-no">050</span><span id="line-50">     * The default JSON-RPC version in JsonRpcRequest is now '2.0', but since most</span>
-<span class="source-line-no">051</span><span id="line-51">     * requests are created inside {@code RpcClient} subclasses, we'll continue to default</span>
-<span class="source-line-no">052</span><span id="line-52">     * to '1.0' in this base class.</span>
-<span class="source-line-no">053</span><span id="line-53">     */</span>
-<span class="source-line-no">054</span><span id="line-54">    private static final JsonRpcMessage.Version DEFAULT_JSON_RPC_VERSION = JsonRpcMessage.Version.V1;</span>
-<span class="source-line-no">055</span><span id="line-55"></span>
-<span class="source-line-no">056</span><span id="line-56">    protected final JsonRpcMessage.Version jsonRpcVersion;</span>
-<span class="source-line-no">057</span><span id="line-57">    protected final ObjectMapper mapper;</span>
-<span class="source-line-no">058</span><span id="line-58">    private final JavaType defaultType;</span>
-<span class="source-line-no">059</span><span id="line-59"></span>
-<span class="source-line-no">060</span><span id="line-60">    public AbstractRpcClient(JsonRpcMessage.Version jsonRpcVersion) {</span>
-<span class="source-line-no">061</span><span id="line-61">        this.jsonRpcVersion = jsonRpcVersion;</span>
-<span class="source-line-no">062</span><span id="line-62">        mapper = new ObjectMapper();</span>
-<span class="source-line-no">063</span><span id="line-63">        // TODO: Provide external API to configure FAIL_ON_UNKNOWN_PROPERTIES</span>
-<span class="source-line-no">064</span><span id="line-64">        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);</span>
-<span class="source-line-no">065</span><span id="line-65">        defaultType = mapper.getTypeFactory().constructType(Object.class);</span>
-<span class="source-line-no">066</span><span id="line-66">    }</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68">    @Override</span>
-<span class="source-line-no">069</span><span id="line-69">    public JsonRpcMessage.Version getJsonRpcVersion() {</span>
-<span class="source-line-no">070</span><span id="line-70">        return jsonRpcVersion;</span>
-<span class="source-line-no">071</span><span id="line-71">    }</span>
-<span class="source-line-no">072</span><span id="line-72"></span>
-<span class="source-line-no">073</span><span id="line-73">    @Override</span>
-<span class="source-line-no">074</span><span id="line-74">    public ObjectMapper getMapper() {</span>
-<span class="source-line-no">075</span><span id="line-75">        return mapper;</span>
-<span class="source-line-no">076</span><span id="line-76">    }</span>
-<span class="source-line-no">077</span><span id="line-77"></span>
-<span class="source-line-no">078</span><span id="line-78">    @Override</span>
-<span class="source-line-no">079</span><span id="line-79">    public JavaType getDefaultType() {</span>
-<span class="source-line-no">080</span><span id="line-80">        return defaultType;</span>
-<span class="source-line-no">081</span><span id="line-81">    }</span>
-<span class="source-line-no">082</span><span id="line-82"></span>
-<span class="source-line-no">083</span><span id="line-83">    /**</span>
-<span class="source-line-no">084</span><span id="line-84">     * Return the default {@link SSLContext} without declaring a checked exception</span>
-<span class="source-line-no">085</span><span id="line-85">     * @return The default {@code SSLContext}</span>
-<span class="source-line-no">086</span><span id="line-86">     */</span>
-<span class="source-line-no">087</span><span id="line-87">    protected static SSLContext getDefaultSSLContext() {</span>
-<span class="source-line-no">088</span><span id="line-88">        try {</span>
-<span class="source-line-no">089</span><span id="line-89">            return SSLContext.getDefault();</span>
-<span class="source-line-no">090</span><span id="line-90">        } catch (NoSuchAlgorithmException e) {</span>
-<span class="source-line-no">091</span><span id="line-91">            throw new RuntimeException(e);</span>
-<span class="source-line-no">092</span><span id="line-92">        }</span>
-<span class="source-line-no">093</span><span id="line-93">    }</span>
-<span class="source-line-no">094</span><span id="line-94"></span>
-<span class="source-line-no">095</span><span id="line-95">    /**</span>
-<span class="source-line-no">096</span><span id="line-96">     * Encode username password as Base64 for basic authentication</span>
-<span class="source-line-no">097</span><span id="line-97">     * &lt;p&gt;</span>
-<span class="source-line-no">098</span><span id="line-98">     * We're using {@link java.util.Base64}, which requires Android 8.0 or later.</span>
-<span class="source-line-no">099</span><span id="line-99">     *</span>
-<span class="source-line-no">100</span><span id="line-100">     * @param authString An authorization string of the form `username:password`</span>
-<span class="source-line-no">101</span><span id="line-101">     * @return A compliant Base64 encoding of `authString`</span>
-<span class="source-line-no">102</span><span id="line-102">     */</span>
-<span class="source-line-no">103</span><span id="line-103">    protected static String base64Encode(String authString) {</span>
-<span class="source-line-no">104</span><span id="line-104">        return Base64.getEncoder().encodeToString(authString.getBytes()).trim();</span>
-<span class="source-line-no">105</span><span id="line-105">    }</span>
-<span class="source-line-no">106</span><span id="line-106">}</span>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</main>
-</body>
-</html>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html b/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html
index 8afcd7b74..b125dfa23 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.ThrowingSupplier.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, interface: AsyncSupport, interface: ThrowingSupplier">
@@ -14,101 +14,158 @@
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import java.io.IOException;</span>
-<span class="source-line-no">004</span><span id="line-4">import java.util.concurrent.CompletableFuture;</span>
-<span class="source-line-no">005</span><span id="line-5">import java.util.concurrent.Executor;</span>
-<span class="source-line-no">006</span><span id="line-6">import java.util.function.Supplier;</span>
-<span class="source-line-no">007</span><span id="line-7"></span>
-<span class="source-line-no">008</span><span id="line-8">/**</span>
-<span class="source-line-no">009</span><span id="line-9"> * Helper methods for creating asynchronous calls using {@link CompletableFuture}. Since the</span>
-<span class="source-line-no">010</span><span id="line-10"> * synchronous methods in {@link AbstractRpcClient} throw checked exceptions this interface</span>
-<span class="source-line-no">011</span><span id="line-11"> * provides wrapper support to make it easier to convert them to async calls.</span>
-<span class="source-line-no">012</span><span id="line-12"> */</span>
-<span class="source-line-no">013</span><span id="line-13">public interface AsyncSupport {</span>
-<span class="source-line-no">014</span><span id="line-14">    /**</span>
-<span class="source-line-no">015</span><span id="line-15">     * Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</span>
-<span class="source-line-no">016</span><span id="line-16">     *</span>
-<span class="source-line-no">017</span><span id="line-17">     * @param throwingSupplier Supplier of T that can throw an {@code IOException}</span>
-<span class="source-line-no">018</span><span id="line-18">     * @param &lt;T&gt; return type</span>
-<span class="source-line-no">019</span><span id="line-19">     * @return A completable future, returning T</span>
-<span class="source-line-no">020</span><span id="line-20">     */</span>
-<span class="source-line-no">021</span><span id="line-21">    default &lt;T&gt; CompletableFuture&lt;T&gt; supplyAsync(ThrowingSupplier&lt;T&gt; throwingSupplier) {</span>
-<span class="source-line-no">022</span><span id="line-22">        return supplyAsync(throwingSupplier, getDefaultAsyncExecutor());</span>
-<span class="source-line-no">023</span><span id="line-23">    }</span>
-<span class="source-line-no">024</span><span id="line-24"></span>
-<span class="source-line-no">025</span><span id="line-25">    /**</span>
-<span class="source-line-no">026</span><span id="line-26">     * Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</span>
-<span class="source-line-no">027</span><span id="line-27">     *</span>
-<span class="source-line-no">028</span><span id="line-28">     * @param throwingSupplier Supplier of T that can throw an {@code IOException}</span>
-<span class="source-line-no">029</span><span id="line-29">     * @param executor Executor to run the Supplier</span>
-<span class="source-line-no">030</span><span id="line-30">     * @param &lt;T&gt; return type</span>
-<span class="source-line-no">031</span><span id="line-31">     * @return A completable future, returning T</span>
-<span class="source-line-no">032</span><span id="line-32">     */</span>
-<span class="source-line-no">033</span><span id="line-33">    default &lt;T&gt; CompletableFuture&lt;T&gt; supplyAsync(ThrowingSupplier&lt;T&gt; throwingSupplier, Executor executor) {</span>
-<span class="source-line-no">034</span><span id="line-34">        return AsyncSupport.supplyCatchingAsync(throwingSupplier, executor);</span>
-<span class="source-line-no">035</span><span id="line-35">    }</span>
-<span class="source-line-no">036</span><span id="line-36"></span>
-<span class="source-line-no">037</span><span id="line-37">    /**</span>
-<span class="source-line-no">038</span><span id="line-38">     * Return the default executor for supplying asynchronicity.</span>
-<span class="source-line-no">039</span><span id="line-39">     *</span>
-<span class="source-line-no">040</span><span id="line-40">     * @return An executor.</span>
-<span class="source-line-no">041</span><span id="line-41">     */</span>
-<span class="source-line-no">042</span><span id="line-42">    default Executor getDefaultAsyncExecutor() {</span>
-<span class="source-line-no">043</span><span id="line-43">        return (Runnable r) -&gt; new Thread(r).start();</span>
-<span class="source-line-no">044</span><span id="line-44">    }</span>
-<span class="source-line-no">045</span><span id="line-45"></span>
-<span class="source-line-no">046</span><span id="line-46">    private static &lt;T&gt; CompletableFuture&lt;T&gt; supplyCatchingAsync(ThrowingSupplier&lt;T&gt; throwingSupplier, Executor executor) {</span>
-<span class="source-line-no">047</span><span id="line-47">        CompletableFuture&lt;T&gt; future = new CompletableFuture&lt;&gt;();</span>
-<span class="source-line-no">048</span><span id="line-48">        executor.execute(() -&gt; {</span>
-<span class="source-line-no">049</span><span id="line-49">            try {</span>
-<span class="source-line-no">050</span><span id="line-50">                T result = throwingSupplier.getThrows();</span>
-<span class="source-line-no">051</span><span id="line-51">                future.complete(result);</span>
-<span class="source-line-no">052</span><span id="line-52">            } catch (IOException e) {</span>
-<span class="source-line-no">053</span><span id="line-53">                future.completeExceptionally(e);</span>
-<span class="source-line-no">054</span><span id="line-54">            }</span>
-<span class="source-line-no">055</span><span id="line-55">        });</span>
-<span class="source-line-no">056</span><span id="line-56">        return future;</span>
-<span class="source-line-no">057</span><span id="line-57">    }</span>
-<span class="source-line-no">058</span><span id="line-58"></span>
-<span class="source-line-no">059</span><span id="line-59">    /**</span>
-<span class="source-line-no">060</span><span id="line-60">     * Subinterface of {@link Supplier} for Lambdas which throw {@link IOException}.</span>
-<span class="source-line-no">061</span><span id="line-61">     * Can be used for two purposes:</span>
-<span class="source-line-no">062</span><span id="line-62">     * &lt;ol&gt;</span>
-<span class="source-line-no">063</span><span id="line-63">     *     &lt;li&gt;To cast a lambda that throws an {@code IOException} to a {@link Supplier} while</span>
-<span class="source-line-no">064</span><span id="line-64">     *      automatically wrapping any exception thrown by the lambda with {@link RuntimeException}.&lt;/li&gt;</span>
-<span class="source-line-no">065</span><span id="line-65">     *     &lt;li&gt;As a {@code FunctionalInterface} where a lambda that throws exceptions is</span>
-<span class="source-line-no">066</span><span id="line-66">     *      expected or allowed.&lt;/li&gt;</span>
-<span class="source-line-no">067</span><span id="line-67">     * &lt;/ol&gt;</span>
-<span class="source-line-no">068</span><span id="line-68">     * This is intended to be used to wrap JSON-RPC I/O methods of {@link JsonRpcClient} that throw {@link IOException} and</span>
-<span class="source-line-no">069</span><span id="line-69">     * subclasses such as {@link JsonRpcException}, so we have narrowed the allowed exceptions in {@link #getThrows()} to</span>
-<span class="source-line-no">070</span><span id="line-70">     * {@link IOException}.</span>
-<span class="source-line-no">071</span><span id="line-71">     *</span>
-<span class="source-line-no">072</span><span id="line-72">     * @param &lt;T&gt;</span>
-<span class="source-line-no">073</span><span id="line-73">     */</span>
-<span class="source-line-no">074</span><span id="line-74">    @FunctionalInterface</span>
-<span class="source-line-no">075</span><span id="line-75">    interface ThrowingSupplier&lt;T&gt; extends Supplier&lt;T&gt; {</span>
-<span class="source-line-no">076</span><span id="line-76"></span>
-<span class="source-line-no">077</span><span id="line-77">        /**</span>
-<span class="source-line-no">078</span><span id="line-78">         * Gets a result wrapping checked Exceptions with {@link RuntimeException}</span>
-<span class="source-line-no">079</span><span id="line-79">         * @return a result</span>
-<span class="source-line-no">080</span><span id="line-80">         */</span>
-<span class="source-line-no">081</span><span id="line-81">        @Override</span>
-<span class="source-line-no">082</span><span id="line-82">        default T get() {</span>
-<span class="source-line-no">083</span><span id="line-83">            try {</span>
-<span class="source-line-no">084</span><span id="line-84">                return getThrows();</span>
-<span class="source-line-no">085</span><span id="line-85">            } catch (final Exception e) {</span>
-<span class="source-line-no">086</span><span id="line-86">                throw new RuntimeException(e);</span>
-<span class="source-line-no">087</span><span id="line-87">            }</span>
-<span class="source-line-no">088</span><span id="line-88">        }</span>
-<span class="source-line-no">089</span><span id="line-89"></span>
-<span class="source-line-no">090</span><span id="line-90">        /**</span>
-<span class="source-line-no">091</span><span id="line-91">         * Gets a result.</span>
-<span class="source-line-no">092</span><span id="line-92">         *</span>
-<span class="source-line-no">093</span><span id="line-93">         * @return a result</span>
-<span class="source-line-no">094</span><span id="line-94">         * @throws IOException A (checked) exception</span>
-<span class="source-line-no">095</span><span id="line-95">         */</span>
-<span class="source-line-no">096</span><span id="line-96">        T getThrows() throws IOException;</span>
-<span class="source-line-no">097</span><span id="line-97">    }</span>
-<span class="source-line-no">098</span><span id="line-98">}</span>
+<span class="source-line-no">004</span><span id="line-4">import java.util.Optional;</span>
+<span class="source-line-no">005</span><span id="line-5">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">006</span><span id="line-6">import java.util.concurrent.Executor;</span>
+<span class="source-line-no">007</span><span id="line-7">import java.util.function.BiFunction;</span>
+<span class="source-line-no">008</span><span id="line-8">import java.util.function.Consumer;</span>
+<span class="source-line-no">009</span><span id="line-9">import java.util.function.Function;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.util.function.Predicate;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.util.function.Supplier;</span>
+<span class="source-line-no">012</span><span id="line-12"></span>
+<span class="source-line-no">013</span><span id="line-13">/**</span>
+<span class="source-line-no">014</span><span id="line-14"> * Helper methods for creating asynchronous calls using {@link CompletableFuture}. Since the</span>
+<span class="source-line-no">015</span><span id="line-15"> * synchronous methods in {@link DefaultRpcClient} throw checked exceptions this interface</span>
+<span class="source-line-no">016</span><span id="line-16"> * provides wrapper support to make it easier to convert them to async calls.</span>
+<span class="source-line-no">017</span><span id="line-17"> */</span>
+<span class="source-line-no">018</span><span id="line-18">public interface AsyncSupport {</span>
+<span class="source-line-no">019</span><span id="line-19">    /**</span>
+<span class="source-line-no">020</span><span id="line-20">     * Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</span>
+<span class="source-line-no">021</span><span id="line-21">     *</span>
+<span class="source-line-no">022</span><span id="line-22">     * @param throwingSupplier Supplier of T that can throw an {@code IOException}</span>
+<span class="source-line-no">023</span><span id="line-23">     * @param &lt;T&gt; return type</span>
+<span class="source-line-no">024</span><span id="line-24">     * @return A completable future, returning T</span>
+<span class="source-line-no">025</span><span id="line-25">     */</span>
+<span class="source-line-no">026</span><span id="line-26">    default &lt;T&gt; CompletableFuture&lt;T&gt; supplyAsync(ThrowingSupplier&lt;T&gt; throwingSupplier) {</span>
+<span class="source-line-no">027</span><span id="line-27">        return supplyAsync(throwingSupplier, getDefaultAsyncExecutor());</span>
+<span class="source-line-no">028</span><span id="line-28">    }</span>
+<span class="source-line-no">029</span><span id="line-29"></span>
+<span class="source-line-no">030</span><span id="line-30">    /**</span>
+<span class="source-line-no">031</span><span id="line-31">     * Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</span>
+<span class="source-line-no">032</span><span id="line-32">     *</span>
+<span class="source-line-no">033</span><span id="line-33">     * @param throwingSupplier Supplier of T that can throw an {@code IOException}</span>
+<span class="source-line-no">034</span><span id="line-34">     * @param executor Executor to run the Supplier</span>
+<span class="source-line-no">035</span><span id="line-35">     * @param &lt;T&gt; return type</span>
+<span class="source-line-no">036</span><span id="line-36">     * @return A completable future, returning T</span>
+<span class="source-line-no">037</span><span id="line-37">     */</span>
+<span class="source-line-no">038</span><span id="line-38">    default &lt;T&gt; CompletableFuture&lt;T&gt; supplyAsync(ThrowingSupplier&lt;T&gt; throwingSupplier, Executor executor) {</span>
+<span class="source-line-no">039</span><span id="line-39">        return AsyncSupport.supplyCatchingAsync(throwingSupplier, executor);</span>
+<span class="source-line-no">040</span><span id="line-40">    }</span>
+<span class="source-line-no">041</span><span id="line-41"></span>
+<span class="source-line-no">042</span><span id="line-42">    /**</span>
+<span class="source-line-no">043</span><span id="line-43">     * Return the default executor for supplying asynchronicity.</span>
+<span class="source-line-no">044</span><span id="line-44">     *</span>
+<span class="source-line-no">045</span><span id="line-45">     * @return An executor.</span>
+<span class="source-line-no">046</span><span id="line-46">     */</span>
+<span class="source-line-no">047</span><span id="line-47">    default Executor getDefaultAsyncExecutor() {</span>
+<span class="source-line-no">048</span><span id="line-48">        return (Runnable r) -&gt; new Thread(r).start();</span>
+<span class="source-line-no">049</span><span id="line-49">    }</span>
+<span class="source-line-no">050</span><span id="line-50"></span>
+<span class="source-line-no">051</span><span id="line-51">    private static &lt;T&gt; CompletableFuture&lt;T&gt; supplyCatchingAsync(ThrowingSupplier&lt;T&gt; throwingSupplier, Executor executor) {</span>
+<span class="source-line-no">052</span><span id="line-52">        CompletableFuture&lt;T&gt; future = new CompletableFuture&lt;&gt;();</span>
+<span class="source-line-no">053</span><span id="line-53">        executor.execute(() -&gt; {</span>
+<span class="source-line-no">054</span><span id="line-54">            try {</span>
+<span class="source-line-no">055</span><span id="line-55">                T result = throwingSupplier.getThrows();</span>
+<span class="source-line-no">056</span><span id="line-56">                future.complete(result);</span>
+<span class="source-line-no">057</span><span id="line-57">            } catch (IOException e) {</span>
+<span class="source-line-no">058</span><span id="line-58">                future.completeExceptionally(e);</span>
+<span class="source-line-no">059</span><span id="line-59">            }</span>
+<span class="source-line-no">060</span><span id="line-60">        });</span>
+<span class="source-line-no">061</span><span id="line-61">        return future;</span>
+<span class="source-line-no">062</span><span id="line-62">    }</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64">    /**</span>
+<span class="source-line-no">065</span><span id="line-65">     * Subinterface of {@link Supplier} for Lambdas which throw {@link IOException}.</span>
+<span class="source-line-no">066</span><span id="line-66">     * Can be used for two purposes:</span>
+<span class="source-line-no">067</span><span id="line-67">     * &lt;ol&gt;</span>
+<span class="source-line-no">068</span><span id="line-68">     *     &lt;li&gt;To cast a lambda that throws an {@code IOException} to a {@link Supplier} while</span>
+<span class="source-line-no">069</span><span id="line-69">     *      automatically wrapping any exception thrown by the lambda with {@link RuntimeException}.&lt;/li&gt;</span>
+<span class="source-line-no">070</span><span id="line-70">     *     &lt;li&gt;As a {@code FunctionalInterface} where a lambda that throws exceptions is</span>
+<span class="source-line-no">071</span><span id="line-71">     *      expected or allowed.&lt;/li&gt;</span>
+<span class="source-line-no">072</span><span id="line-72">     * &lt;/ol&gt;</span>
+<span class="source-line-no">073</span><span id="line-73">     * This is intended to be used to wrap JSON-RPC I/O methods of {@link JsonRpcClient} that throw {@link IOException} and</span>
+<span class="source-line-no">074</span><span id="line-74">     * subclasses such as {@link JsonRpcException}, so we have narrowed the allowed exceptions in {@link #getThrows()} to</span>
+<span class="source-line-no">075</span><span id="line-75">     * {@link IOException}.</span>
+<span class="source-line-no">076</span><span id="line-76">     *</span>
+<span class="source-line-no">077</span><span id="line-77">     * @param &lt;T&gt;</span>
+<span class="source-line-no">078</span><span id="line-78">     */</span>
+<span class="source-line-no">079</span><span id="line-79">    @FunctionalInterface</span>
+<span class="source-line-no">080</span><span id="line-80">    interface ThrowingSupplier&lt;T&gt; extends Supplier&lt;T&gt; {</span>
+<span class="source-line-no">081</span><span id="line-81"></span>
+<span class="source-line-no">082</span><span id="line-82">        /**</span>
+<span class="source-line-no">083</span><span id="line-83">         * Gets a result wrapping checked Exceptions with {@link RuntimeException}</span>
+<span class="source-line-no">084</span><span id="line-84">         * @return a result</span>
+<span class="source-line-no">085</span><span id="line-85">         */</span>
+<span class="source-line-no">086</span><span id="line-86">        @Override</span>
+<span class="source-line-no">087</span><span id="line-87">        default T get() {</span>
+<span class="source-line-no">088</span><span id="line-88">            try {</span>
+<span class="source-line-no">089</span><span id="line-89">                return getThrows();</span>
+<span class="source-line-no">090</span><span id="line-90">            } catch (final Exception e) {</span>
+<span class="source-line-no">091</span><span id="line-91">                throw new RuntimeException(e);</span>
+<span class="source-line-no">092</span><span id="line-92">            }</span>
+<span class="source-line-no">093</span><span id="line-93">        }</span>
+<span class="source-line-no">094</span><span id="line-94"></span>
+<span class="source-line-no">095</span><span id="line-95">        /**</span>
+<span class="source-line-no">096</span><span id="line-96">         * Gets a result.</span>
+<span class="source-line-no">097</span><span id="line-97">         *</span>
+<span class="source-line-no">098</span><span id="line-98">         * @return a result</span>
+<span class="source-line-no">099</span><span id="line-99">         * @throws IOException A (checked) exception</span>
+<span class="source-line-no">100</span><span id="line-100">         */</span>
+<span class="source-line-no">101</span><span id="line-101">        T getThrows() throws IOException;</span>
+<span class="source-line-no">102</span><span id="line-102">    }</span>
+<span class="source-line-no">103</span><span id="line-103"></span>
+<span class="source-line-no">104</span><span id="line-104">    /**</span>
+<span class="source-line-no">105</span><span id="line-105">     * Error filter for resilient polling. Uses a Predicate to specify what to ignore and a Consumer to log</span>
+<span class="source-line-no">106</span><span id="line-106">     * what is ignored.</span>
+<span class="source-line-no">107</span><span id="line-107">     */</span>
+<span class="source-line-no">108</span><span id="line-108">    interface TransientErrorFilter {</span>
+<span class="source-line-no">109</span><span id="line-109">        static TransientErrorFilter of(Predicate&lt;Throwable&gt; filter, Consumer&lt;Throwable&gt; logger) {</span>
+<span class="source-line-no">110</span><span id="line-110">            return new TransientErrorFilter() {</span>
+<span class="source-line-no">111</span><span id="line-111">                @Override</span>
+<span class="source-line-no">112</span><span id="line-112">                public boolean isTransient(Throwable t) {</span>
+<span class="source-line-no">113</span><span id="line-113">                    return filter.test(t);</span>
+<span class="source-line-no">114</span><span id="line-114">                }</span>
+<span class="source-line-no">115</span><span id="line-115"></span>
+<span class="source-line-no">116</span><span id="line-116">                @Override</span>
+<span class="source-line-no">117</span><span id="line-117">                public void log(Throwable t) {</span>
+<span class="source-line-no">118</span><span id="line-118">                    logger.accept(t);</span>
+<span class="source-line-no">119</span><span id="line-119">                }</span>
+<span class="source-line-no">120</span><span id="line-120">            };</span>
+<span class="source-line-no">121</span><span id="line-121">        }</span>
+<span class="source-line-no">122</span><span id="line-122"></span>
+<span class="source-line-no">123</span><span id="line-123">        static TransientErrorFilter none() {</span>
+<span class="source-line-no">124</span><span id="line-124">            return of(</span>
+<span class="source-line-no">125</span><span id="line-125">                    (t) -&gt; false,   // No errors are consider transient</span>
+<span class="source-line-no">126</span><span id="line-126">                    (t) -&gt; {}       // Nothing to log because we're not swallowing anything.</span>
+<span class="source-line-no">127</span><span id="line-127">            );</span>
+<span class="source-line-no">128</span><span id="line-128">        }</span>
+<span class="source-line-no">129</span><span id="line-129"></span>
+<span class="source-line-no">130</span><span id="line-130">        /**</span>
+<span class="source-line-no">131</span><span id="line-131">         * Handler to transpose to a "future maybe". Use with {@link CompletableFuture#handle(BiFunction)}</span>
+<span class="source-line-no">132</span><span id="line-132">         * followed by {@code .thenCompose(Function.identity())} (or if JDK 12+ {@code CompletableFuture#exceptionallyCompose(Function)})</span>
+<span class="source-line-no">133</span><span id="line-133">         * to swallow transient errors.</span>
+<span class="source-line-no">134</span><span id="line-134">         * @param result T</span>
+<span class="source-line-no">135</span><span id="line-135">         * @param t An error, possibly transient</span>
+<span class="source-line-no">136</span><span id="line-136">         * @return A completable future of future maybe</span>
+<span class="source-line-no">137</span><span id="line-137">         * @param &lt;T&gt; The desired return type</span>
+<span class="source-line-no">138</span><span id="line-138">         */</span>
+<span class="source-line-no">139</span><span id="line-139">        default &lt;T&gt; CompletableFuture&lt;Optional&lt;T&gt;&gt; handle(T result, Throwable t) {</span>
+<span class="source-line-no">140</span><span id="line-140">            if (result != null) {</span>
+<span class="source-line-no">141</span><span id="line-141">                return CompletableFuture.completedFuture(Optional.of(result));</span>
+<span class="source-line-no">142</span><span id="line-142">            } else if (isTransient(t)) {</span>
+<span class="source-line-no">143</span><span id="line-143">                log(t);</span>
+<span class="source-line-no">144</span><span id="line-144">                return CompletableFuture.completedFuture(Optional.empty());</span>
+<span class="source-line-no">145</span><span id="line-145">            } else {</span>
+<span class="source-line-no">146</span><span id="line-146">                return CompletableFuture.failedFuture(t);</span>
+<span class="source-line-no">147</span><span id="line-147">            }</span>
+<span class="source-line-no">148</span><span id="line-148">        }</span>
+<span class="source-line-no">149</span><span id="line-149"></span>
+<span class="source-line-no">150</span><span id="line-150">        // TODO: Should this be flipped to isFatal()?</span>
+<span class="source-line-no">151</span><span id="line-151">        boolean isTransient(Throwable t);</span>
+<span class="source-line-no">152</span><span id="line-152">        void log(Throwable t);</span>
+<span class="source-line-no">153</span><span id="line-153"></span>
+<span class="source-line-no">154</span><span id="line-154">    }</span>
+<span class="source-line-no">155</span><span id="line-155">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html b/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html
new file mode 100644
index 000000000..93a332454
--- /dev/null
+++ b/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.TransientErrorFilter.html
@@ -0,0 +1,233 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Source code</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="source: package: org.consensusj.jsonrpc, interface: AsyncSupport, interface: TransientErrorFilter">
+<meta name="generator" content="javadoc/SourceToHTMLConverter">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+</head>
+<body class="source-page">
+<main role="main">
+<div class="source-container">
+<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
+<span class="source-line-no">002</span><span id="line-2"></span>
+<span class="source-line-no">003</span><span id="line-3">import java.io.IOException;</span>
+<span class="source-line-no">004</span><span id="line-4">import java.util.Optional;</span>
+<span class="source-line-no">005</span><span id="line-5">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">006</span><span id="line-6">import java.util.concurrent.Executor;</span>
+<span class="source-line-no">007</span><span id="line-7">import java.util.function.BiFunction;</span>
+<span class="source-line-no">008</span><span id="line-8">import java.util.function.Consumer;</span>
+<span class="source-line-no">009</span><span id="line-9">import java.util.function.Function;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.util.function.Predicate;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.util.function.Supplier;</span>
+<span class="source-line-no">012</span><span id="line-12"></span>
+<span class="source-line-no">013</span><span id="line-13">/**</span>
+<span class="source-line-no">014</span><span id="line-14"> * Helper methods for creating asynchronous calls using {@link CompletableFuture}. Since the</span>
+<span class="source-line-no">015</span><span id="line-15"> * synchronous methods in {@link DefaultRpcClient} throw checked exceptions this interface</span>
+<span class="source-line-no">016</span><span id="line-16"> * provides wrapper support to make it easier to convert them to async calls.</span>
+<span class="source-line-no">017</span><span id="line-17"> */</span>
+<span class="source-line-no">018</span><span id="line-18">public interface AsyncSupport {</span>
+<span class="source-line-no">019</span><span id="line-19">    /**</span>
+<span class="source-line-no">020</span><span id="line-20">     * Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</span>
+<span class="source-line-no">021</span><span id="line-21">     *</span>
+<span class="source-line-no">022</span><span id="line-22">     * @param throwingSupplier Supplier of T that can throw an {@code IOException}</span>
+<span class="source-line-no">023</span><span id="line-23">     * @param &lt;T&gt; return type</span>
+<span class="source-line-no">024</span><span id="line-24">     * @return A completable future, returning T</span>
+<span class="source-line-no">025</span><span id="line-25">     */</span>
+<span class="source-line-no">026</span><span id="line-26">    default &lt;T&gt; CompletableFuture&lt;T&gt; supplyAsync(ThrowingSupplier&lt;T&gt; throwingSupplier) {</span>
+<span class="source-line-no">027</span><span id="line-27">        return supplyAsync(throwingSupplier, getDefaultAsyncExecutor());</span>
+<span class="source-line-no">028</span><span id="line-28">    }</span>
+<span class="source-line-no">029</span><span id="line-29"></span>
+<span class="source-line-no">030</span><span id="line-30">    /**</span>
+<span class="source-line-no">031</span><span id="line-31">     * Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</span>
+<span class="source-line-no">032</span><span id="line-32">     *</span>
+<span class="source-line-no">033</span><span id="line-33">     * @param throwingSupplier Supplier of T that can throw an {@code IOException}</span>
+<span class="source-line-no">034</span><span id="line-34">     * @param executor Executor to run the Supplier</span>
+<span class="source-line-no">035</span><span id="line-35">     * @param &lt;T&gt; return type</span>
+<span class="source-line-no">036</span><span id="line-36">     * @return A completable future, returning T</span>
+<span class="source-line-no">037</span><span id="line-37">     */</span>
+<span class="source-line-no">038</span><span id="line-38">    default &lt;T&gt; CompletableFuture&lt;T&gt; supplyAsync(ThrowingSupplier&lt;T&gt; throwingSupplier, Executor executor) {</span>
+<span class="source-line-no">039</span><span id="line-39">        return AsyncSupport.supplyCatchingAsync(throwingSupplier, executor);</span>
+<span class="source-line-no">040</span><span id="line-40">    }</span>
+<span class="source-line-no">041</span><span id="line-41"></span>
+<span class="source-line-no">042</span><span id="line-42">    /**</span>
+<span class="source-line-no">043</span><span id="line-43">     * Return the default executor for supplying asynchronicity.</span>
+<span class="source-line-no">044</span><span id="line-44">     *</span>
+<span class="source-line-no">045</span><span id="line-45">     * @return An executor.</span>
+<span class="source-line-no">046</span><span id="line-46">     */</span>
+<span class="source-line-no">047</span><span id="line-47">    default Executor getDefaultAsyncExecutor() {</span>
+<span class="source-line-no">048</span><span id="line-48">        return (Runnable r) -&gt; new Thread(r).start();</span>
+<span class="source-line-no">049</span><span id="line-49">    }</span>
+<span class="source-line-no">050</span><span id="line-50"></span>
+<span class="source-line-no">051</span><span id="line-51">    private static &lt;T&gt; CompletableFuture&lt;T&gt; supplyCatchingAsync(ThrowingSupplier&lt;T&gt; throwingSupplier, Executor executor) {</span>
+<span class="source-line-no">052</span><span id="line-52">        CompletableFuture&lt;T&gt; future = new CompletableFuture&lt;&gt;();</span>
+<span class="source-line-no">053</span><span id="line-53">        executor.execute(() -&gt; {</span>
+<span class="source-line-no">054</span><span id="line-54">            try {</span>
+<span class="source-line-no">055</span><span id="line-55">                T result = throwingSupplier.getThrows();</span>
+<span class="source-line-no">056</span><span id="line-56">                future.complete(result);</span>
+<span class="source-line-no">057</span><span id="line-57">            } catch (IOException e) {</span>
+<span class="source-line-no">058</span><span id="line-58">                future.completeExceptionally(e);</span>
+<span class="source-line-no">059</span><span id="line-59">            }</span>
+<span class="source-line-no">060</span><span id="line-60">        });</span>
+<span class="source-line-no">061</span><span id="line-61">        return future;</span>
+<span class="source-line-no">062</span><span id="line-62">    }</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64">    /**</span>
+<span class="source-line-no">065</span><span id="line-65">     * Subinterface of {@link Supplier} for Lambdas which throw {@link IOException}.</span>
+<span class="source-line-no">066</span><span id="line-66">     * Can be used for two purposes:</span>
+<span class="source-line-no">067</span><span id="line-67">     * &lt;ol&gt;</span>
+<span class="source-line-no">068</span><span id="line-68">     *     &lt;li&gt;To cast a lambda that throws an {@code IOException} to a {@link Supplier} while</span>
+<span class="source-line-no">069</span><span id="line-69">     *      automatically wrapping any exception thrown by the lambda with {@link RuntimeException}.&lt;/li&gt;</span>
+<span class="source-line-no">070</span><span id="line-70">     *     &lt;li&gt;As a {@code FunctionalInterface} where a lambda that throws exceptions is</span>
+<span class="source-line-no">071</span><span id="line-71">     *      expected or allowed.&lt;/li&gt;</span>
+<span class="source-line-no">072</span><span id="line-72">     * &lt;/ol&gt;</span>
+<span class="source-line-no">073</span><span id="line-73">     * This is intended to be used to wrap JSON-RPC I/O methods of {@link JsonRpcClient} that throw {@link IOException} and</span>
+<span class="source-line-no">074</span><span id="line-74">     * subclasses such as {@link JsonRpcException}, so we have narrowed the allowed exceptions in {@link #getThrows()} to</span>
+<span class="source-line-no">075</span><span id="line-75">     * {@link IOException}.</span>
+<span class="source-line-no">076</span><span id="line-76">     *</span>
+<span class="source-line-no">077</span><span id="line-77">     * @param &lt;T&gt;</span>
+<span class="source-line-no">078</span><span id="line-78">     */</span>
+<span class="source-line-no">079</span><span id="line-79">    @FunctionalInterface</span>
+<span class="source-line-no">080</span><span id="line-80">    interface ThrowingSupplier&lt;T&gt; extends Supplier&lt;T&gt; {</span>
+<span class="source-line-no">081</span><span id="line-81"></span>
+<span class="source-line-no">082</span><span id="line-82">        /**</span>
+<span class="source-line-no">083</span><span id="line-83">         * Gets a result wrapping checked Exceptions with {@link RuntimeException}</span>
+<span class="source-line-no">084</span><span id="line-84">         * @return a result</span>
+<span class="source-line-no">085</span><span id="line-85">         */</span>
+<span class="source-line-no">086</span><span id="line-86">        @Override</span>
+<span class="source-line-no">087</span><span id="line-87">        default T get() {</span>
+<span class="source-line-no">088</span><span id="line-88">            try {</span>
+<span class="source-line-no">089</span><span id="line-89">                return getThrows();</span>
+<span class="source-line-no">090</span><span id="line-90">            } catch (final Exception e) {</span>
+<span class="source-line-no">091</span><span id="line-91">                throw new RuntimeException(e);</span>
+<span class="source-line-no">092</span><span id="line-92">            }</span>
+<span class="source-line-no">093</span><span id="line-93">        }</span>
+<span class="source-line-no">094</span><span id="line-94"></span>
+<span class="source-line-no">095</span><span id="line-95">        /**</span>
+<span class="source-line-no">096</span><span id="line-96">         * Gets a result.</span>
+<span class="source-line-no">097</span><span id="line-97">         *</span>
+<span class="source-line-no">098</span><span id="line-98">         * @return a result</span>
+<span class="source-line-no">099</span><span id="line-99">         * @throws IOException A (checked) exception</span>
+<span class="source-line-no">100</span><span id="line-100">         */</span>
+<span class="source-line-no">101</span><span id="line-101">        T getThrows() throws IOException;</span>
+<span class="source-line-no">102</span><span id="line-102">    }</span>
+<span class="source-line-no">103</span><span id="line-103"></span>
+<span class="source-line-no">104</span><span id="line-104">    /**</span>
+<span class="source-line-no">105</span><span id="line-105">     * Error filter for resilient polling. Uses a Predicate to specify what to ignore and a Consumer to log</span>
+<span class="source-line-no">106</span><span id="line-106">     * what is ignored.</span>
+<span class="source-line-no">107</span><span id="line-107">     */</span>
+<span class="source-line-no">108</span><span id="line-108">    interface TransientErrorFilter {</span>
+<span class="source-line-no">109</span><span id="line-109">        static TransientErrorFilter of(Predicate&lt;Throwable&gt; filter, Consumer&lt;Throwable&gt; logger) {</span>
+<span class="source-line-no">110</span><span id="line-110">            return new TransientErrorFilter() {</span>
+<span class="source-line-no">111</span><span id="line-111">                @Override</span>
+<span class="source-line-no">112</span><span id="line-112">                public boolean isTransient(Throwable t) {</span>
+<span class="source-line-no">113</span><span id="line-113">                    return filter.test(t);</span>
+<span class="source-line-no">114</span><span id="line-114">                }</span>
+<span class="source-line-no">115</span><span id="line-115"></span>
+<span class="source-line-no">116</span><span id="line-116">                @Override</span>
+<span class="source-line-no">117</span><span id="line-117">                public void log(Throwable t) {</span>
+<span class="source-line-no">118</span><span id="line-118">                    logger.accept(t);</span>
+<span class="source-line-no">119</span><span id="line-119">                }</span>
+<span class="source-line-no">120</span><span id="line-120">            };</span>
+<span class="source-line-no">121</span><span id="line-121">        }</span>
+<span class="source-line-no">122</span><span id="line-122"></span>
+<span class="source-line-no">123</span><span id="line-123">        static TransientErrorFilter none() {</span>
+<span class="source-line-no">124</span><span id="line-124">            return of(</span>
+<span class="source-line-no">125</span><span id="line-125">                    (t) -&gt; false,   // No errors are consider transient</span>
+<span class="source-line-no">126</span><span id="line-126">                    (t) -&gt; {}       // Nothing to log because we're not swallowing anything.</span>
+<span class="source-line-no">127</span><span id="line-127">            );</span>
+<span class="source-line-no">128</span><span id="line-128">        }</span>
+<span class="source-line-no">129</span><span id="line-129"></span>
+<span class="source-line-no">130</span><span id="line-130">        /**</span>
+<span class="source-line-no">131</span><span id="line-131">         * Handler to transpose to a "future maybe". Use with {@link CompletableFuture#handle(BiFunction)}</span>
+<span class="source-line-no">132</span><span id="line-132">         * followed by {@code .thenCompose(Function.identity())} (or if JDK 12+ {@code CompletableFuture#exceptionallyCompose(Function)})</span>
+<span class="source-line-no">133</span><span id="line-133">         * to swallow transient errors.</span>
+<span class="source-line-no">134</span><span id="line-134">         * @param result T</span>
+<span class="source-line-no">135</span><span id="line-135">         * @param t An error, possibly transient</span>
+<span class="source-line-no">136</span><span id="line-136">         * @return A completable future of future maybe</span>
+<span class="source-line-no">137</span><span id="line-137">         * @param &lt;T&gt; The desired return type</span>
+<span class="source-line-no">138</span><span id="line-138">         */</span>
+<span class="source-line-no">139</span><span id="line-139">        default &lt;T&gt; CompletableFuture&lt;Optional&lt;T&gt;&gt; handle(T result, Throwable t) {</span>
+<span class="source-line-no">140</span><span id="line-140">            if (result != null) {</span>
+<span class="source-line-no">141</span><span id="line-141">                return CompletableFuture.completedFuture(Optional.of(result));</span>
+<span class="source-line-no">142</span><span id="line-142">            } else if (isTransient(t)) {</span>
+<span class="source-line-no">143</span><span id="line-143">                log(t);</span>
+<span class="source-line-no">144</span><span id="line-144">                return CompletableFuture.completedFuture(Optional.empty());</span>
+<span class="source-line-no">145</span><span id="line-145">            } else {</span>
+<span class="source-line-no">146</span><span id="line-146">                return CompletableFuture.failedFuture(t);</span>
+<span class="source-line-no">147</span><span id="line-147">            }</span>
+<span class="source-line-no">148</span><span id="line-148">        }</span>
+<span class="source-line-no">149</span><span id="line-149"></span>
+<span class="source-line-no">150</span><span id="line-150">        // TODO: Should this be flipped to isFatal()?</span>
+<span class="source-line-no">151</span><span id="line-151">        boolean isTransient(Throwable t);</span>
+<span class="source-line-no">152</span><span id="line-152">        void log(Throwable t);</span>
+<span class="source-line-no">153</span><span id="line-153"></span>
+<span class="source-line-no">154</span><span id="line-154">    }</span>
+<span class="source-line-no">155</span><span id="line-155">}</span>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</main>
+</body>
+</html>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.html b/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.html
index 62a0448d8..a539e432d 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/AsyncSupport.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, interface: AsyncSupport">
@@ -14,101 +14,158 @@
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import java.io.IOException;</span>
-<span class="source-line-no">004</span><span id="line-4">import java.util.concurrent.CompletableFuture;</span>
-<span class="source-line-no">005</span><span id="line-5">import java.util.concurrent.Executor;</span>
-<span class="source-line-no">006</span><span id="line-6">import java.util.function.Supplier;</span>
-<span class="source-line-no">007</span><span id="line-7"></span>
-<span class="source-line-no">008</span><span id="line-8">/**</span>
-<span class="source-line-no">009</span><span id="line-9"> * Helper methods for creating asynchronous calls using {@link CompletableFuture}. Since the</span>
-<span class="source-line-no">010</span><span id="line-10"> * synchronous methods in {@link AbstractRpcClient} throw checked exceptions this interface</span>
-<span class="source-line-no">011</span><span id="line-11"> * provides wrapper support to make it easier to convert them to async calls.</span>
-<span class="source-line-no">012</span><span id="line-12"> */</span>
-<span class="source-line-no">013</span><span id="line-13">public interface AsyncSupport {</span>
-<span class="source-line-no">014</span><span id="line-14">    /**</span>
-<span class="source-line-no">015</span><span id="line-15">     * Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</span>
-<span class="source-line-no">016</span><span id="line-16">     *</span>
-<span class="source-line-no">017</span><span id="line-17">     * @param throwingSupplier Supplier of T that can throw an {@code IOException}</span>
-<span class="source-line-no">018</span><span id="line-18">     * @param &lt;T&gt; return type</span>
-<span class="source-line-no">019</span><span id="line-19">     * @return A completable future, returning T</span>
-<span class="source-line-no">020</span><span id="line-20">     */</span>
-<span class="source-line-no">021</span><span id="line-21">    default &lt;T&gt; CompletableFuture&lt;T&gt; supplyAsync(ThrowingSupplier&lt;T&gt; throwingSupplier) {</span>
-<span class="source-line-no">022</span><span id="line-22">        return supplyAsync(throwingSupplier, getDefaultAsyncExecutor());</span>
-<span class="source-line-no">023</span><span id="line-23">    }</span>
-<span class="source-line-no">024</span><span id="line-24"></span>
-<span class="source-line-no">025</span><span id="line-25">    /**</span>
-<span class="source-line-no">026</span><span id="line-26">     * Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</span>
-<span class="source-line-no">027</span><span id="line-27">     *</span>
-<span class="source-line-no">028</span><span id="line-28">     * @param throwingSupplier Supplier of T that can throw an {@code IOException}</span>
-<span class="source-line-no">029</span><span id="line-29">     * @param executor Executor to run the Supplier</span>
-<span class="source-line-no">030</span><span id="line-30">     * @param &lt;T&gt; return type</span>
-<span class="source-line-no">031</span><span id="line-31">     * @return A completable future, returning T</span>
-<span class="source-line-no">032</span><span id="line-32">     */</span>
-<span class="source-line-no">033</span><span id="line-33">    default &lt;T&gt; CompletableFuture&lt;T&gt; supplyAsync(ThrowingSupplier&lt;T&gt; throwingSupplier, Executor executor) {</span>
-<span class="source-line-no">034</span><span id="line-34">        return AsyncSupport.supplyCatchingAsync(throwingSupplier, executor);</span>
-<span class="source-line-no">035</span><span id="line-35">    }</span>
-<span class="source-line-no">036</span><span id="line-36"></span>
-<span class="source-line-no">037</span><span id="line-37">    /**</span>
-<span class="source-line-no">038</span><span id="line-38">     * Return the default executor for supplying asynchronicity.</span>
-<span class="source-line-no">039</span><span id="line-39">     *</span>
-<span class="source-line-no">040</span><span id="line-40">     * @return An executor.</span>
-<span class="source-line-no">041</span><span id="line-41">     */</span>
-<span class="source-line-no">042</span><span id="line-42">    default Executor getDefaultAsyncExecutor() {</span>
-<span class="source-line-no">043</span><span id="line-43">        return (Runnable r) -&gt; new Thread(r).start();</span>
-<span class="source-line-no">044</span><span id="line-44">    }</span>
-<span class="source-line-no">045</span><span id="line-45"></span>
-<span class="source-line-no">046</span><span id="line-46">    private static &lt;T&gt; CompletableFuture&lt;T&gt; supplyCatchingAsync(ThrowingSupplier&lt;T&gt; throwingSupplier, Executor executor) {</span>
-<span class="source-line-no">047</span><span id="line-47">        CompletableFuture&lt;T&gt; future = new CompletableFuture&lt;&gt;();</span>
-<span class="source-line-no">048</span><span id="line-48">        executor.execute(() -&gt; {</span>
-<span class="source-line-no">049</span><span id="line-49">            try {</span>
-<span class="source-line-no">050</span><span id="line-50">                T result = throwingSupplier.getThrows();</span>
-<span class="source-line-no">051</span><span id="line-51">                future.complete(result);</span>
-<span class="source-line-no">052</span><span id="line-52">            } catch (IOException e) {</span>
-<span class="source-line-no">053</span><span id="line-53">                future.completeExceptionally(e);</span>
-<span class="source-line-no">054</span><span id="line-54">            }</span>
-<span class="source-line-no">055</span><span id="line-55">        });</span>
-<span class="source-line-no">056</span><span id="line-56">        return future;</span>
-<span class="source-line-no">057</span><span id="line-57">    }</span>
-<span class="source-line-no">058</span><span id="line-58"></span>
-<span class="source-line-no">059</span><span id="line-59">    /**</span>
-<span class="source-line-no">060</span><span id="line-60">     * Subinterface of {@link Supplier} for Lambdas which throw {@link IOException}.</span>
-<span class="source-line-no">061</span><span id="line-61">     * Can be used for two purposes:</span>
-<span class="source-line-no">062</span><span id="line-62">     * &lt;ol&gt;</span>
-<span class="source-line-no">063</span><span id="line-63">     *     &lt;li&gt;To cast a lambda that throws an {@code IOException} to a {@link Supplier} while</span>
-<span class="source-line-no">064</span><span id="line-64">     *      automatically wrapping any exception thrown by the lambda with {@link RuntimeException}.&lt;/li&gt;</span>
-<span class="source-line-no">065</span><span id="line-65">     *     &lt;li&gt;As a {@code FunctionalInterface} where a lambda that throws exceptions is</span>
-<span class="source-line-no">066</span><span id="line-66">     *      expected or allowed.&lt;/li&gt;</span>
-<span class="source-line-no">067</span><span id="line-67">     * &lt;/ol&gt;</span>
-<span class="source-line-no">068</span><span id="line-68">     * This is intended to be used to wrap JSON-RPC I/O methods of {@link JsonRpcClient} that throw {@link IOException} and</span>
-<span class="source-line-no">069</span><span id="line-69">     * subclasses such as {@link JsonRpcException}, so we have narrowed the allowed exceptions in {@link #getThrows()} to</span>
-<span class="source-line-no">070</span><span id="line-70">     * {@link IOException}.</span>
-<span class="source-line-no">071</span><span id="line-71">     *</span>
-<span class="source-line-no">072</span><span id="line-72">     * @param &lt;T&gt;</span>
-<span class="source-line-no">073</span><span id="line-73">     */</span>
-<span class="source-line-no">074</span><span id="line-74">    @FunctionalInterface</span>
-<span class="source-line-no">075</span><span id="line-75">    interface ThrowingSupplier&lt;T&gt; extends Supplier&lt;T&gt; {</span>
-<span class="source-line-no">076</span><span id="line-76"></span>
-<span class="source-line-no">077</span><span id="line-77">        /**</span>
-<span class="source-line-no">078</span><span id="line-78">         * Gets a result wrapping checked Exceptions with {@link RuntimeException}</span>
-<span class="source-line-no">079</span><span id="line-79">         * @return a result</span>
-<span class="source-line-no">080</span><span id="line-80">         */</span>
-<span class="source-line-no">081</span><span id="line-81">        @Override</span>
-<span class="source-line-no">082</span><span id="line-82">        default T get() {</span>
-<span class="source-line-no">083</span><span id="line-83">            try {</span>
-<span class="source-line-no">084</span><span id="line-84">                return getThrows();</span>
-<span class="source-line-no">085</span><span id="line-85">            } catch (final Exception e) {</span>
-<span class="source-line-no">086</span><span id="line-86">                throw new RuntimeException(e);</span>
-<span class="source-line-no">087</span><span id="line-87">            }</span>
-<span class="source-line-no">088</span><span id="line-88">        }</span>
-<span class="source-line-no">089</span><span id="line-89"></span>
-<span class="source-line-no">090</span><span id="line-90">        /**</span>
-<span class="source-line-no">091</span><span id="line-91">         * Gets a result.</span>
-<span class="source-line-no">092</span><span id="line-92">         *</span>
-<span class="source-line-no">093</span><span id="line-93">         * @return a result</span>
-<span class="source-line-no">094</span><span id="line-94">         * @throws IOException A (checked) exception</span>
-<span class="source-line-no">095</span><span id="line-95">         */</span>
-<span class="source-line-no">096</span><span id="line-96">        T getThrows() throws IOException;</span>
-<span class="source-line-no">097</span><span id="line-97">    }</span>
-<span class="source-line-no">098</span><span id="line-98">}</span>
+<span class="source-line-no">004</span><span id="line-4">import java.util.Optional;</span>
+<span class="source-line-no">005</span><span id="line-5">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">006</span><span id="line-6">import java.util.concurrent.Executor;</span>
+<span class="source-line-no">007</span><span id="line-7">import java.util.function.BiFunction;</span>
+<span class="source-line-no">008</span><span id="line-8">import java.util.function.Consumer;</span>
+<span class="source-line-no">009</span><span id="line-9">import java.util.function.Function;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.util.function.Predicate;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.util.function.Supplier;</span>
+<span class="source-line-no">012</span><span id="line-12"></span>
+<span class="source-line-no">013</span><span id="line-13">/**</span>
+<span class="source-line-no">014</span><span id="line-14"> * Helper methods for creating asynchronous calls using {@link CompletableFuture}. Since the</span>
+<span class="source-line-no">015</span><span id="line-15"> * synchronous methods in {@link DefaultRpcClient} throw checked exceptions this interface</span>
+<span class="source-line-no">016</span><span id="line-16"> * provides wrapper support to make it easier to convert them to async calls.</span>
+<span class="source-line-no">017</span><span id="line-17"> */</span>
+<span class="source-line-no">018</span><span id="line-18">public interface AsyncSupport {</span>
+<span class="source-line-no">019</span><span id="line-19">    /**</span>
+<span class="source-line-no">020</span><span id="line-20">     * Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</span>
+<span class="source-line-no">021</span><span id="line-21">     *</span>
+<span class="source-line-no">022</span><span id="line-22">     * @param throwingSupplier Supplier of T that can throw an {@code IOException}</span>
+<span class="source-line-no">023</span><span id="line-23">     * @param &lt;T&gt; return type</span>
+<span class="source-line-no">024</span><span id="line-24">     * @return A completable future, returning T</span>
+<span class="source-line-no">025</span><span id="line-25">     */</span>
+<span class="source-line-no">026</span><span id="line-26">    default &lt;T&gt; CompletableFuture&lt;T&gt; supplyAsync(ThrowingSupplier&lt;T&gt; throwingSupplier) {</span>
+<span class="source-line-no">027</span><span id="line-27">        return supplyAsync(throwingSupplier, getDefaultAsyncExecutor());</span>
+<span class="source-line-no">028</span><span id="line-28">    }</span>
+<span class="source-line-no">029</span><span id="line-29"></span>
+<span class="source-line-no">030</span><span id="line-30">    /**</span>
+<span class="source-line-no">031</span><span id="line-31">     * Supply async for a ThrowingSupplier by catching exceptions and completing exceptionally.</span>
+<span class="source-line-no">032</span><span id="line-32">     *</span>
+<span class="source-line-no">033</span><span id="line-33">     * @param throwingSupplier Supplier of T that can throw an {@code IOException}</span>
+<span class="source-line-no">034</span><span id="line-34">     * @param executor Executor to run the Supplier</span>
+<span class="source-line-no">035</span><span id="line-35">     * @param &lt;T&gt; return type</span>
+<span class="source-line-no">036</span><span id="line-36">     * @return A completable future, returning T</span>
+<span class="source-line-no">037</span><span id="line-37">     */</span>
+<span class="source-line-no">038</span><span id="line-38">    default &lt;T&gt; CompletableFuture&lt;T&gt; supplyAsync(ThrowingSupplier&lt;T&gt; throwingSupplier, Executor executor) {</span>
+<span class="source-line-no">039</span><span id="line-39">        return AsyncSupport.supplyCatchingAsync(throwingSupplier, executor);</span>
+<span class="source-line-no">040</span><span id="line-40">    }</span>
+<span class="source-line-no">041</span><span id="line-41"></span>
+<span class="source-line-no">042</span><span id="line-42">    /**</span>
+<span class="source-line-no">043</span><span id="line-43">     * Return the default executor for supplying asynchronicity.</span>
+<span class="source-line-no">044</span><span id="line-44">     *</span>
+<span class="source-line-no">045</span><span id="line-45">     * @return An executor.</span>
+<span class="source-line-no">046</span><span id="line-46">     */</span>
+<span class="source-line-no">047</span><span id="line-47">    default Executor getDefaultAsyncExecutor() {</span>
+<span class="source-line-no">048</span><span id="line-48">        return (Runnable r) -&gt; new Thread(r).start();</span>
+<span class="source-line-no">049</span><span id="line-49">    }</span>
+<span class="source-line-no">050</span><span id="line-50"></span>
+<span class="source-line-no">051</span><span id="line-51">    private static &lt;T&gt; CompletableFuture&lt;T&gt; supplyCatchingAsync(ThrowingSupplier&lt;T&gt; throwingSupplier, Executor executor) {</span>
+<span class="source-line-no">052</span><span id="line-52">        CompletableFuture&lt;T&gt; future = new CompletableFuture&lt;&gt;();</span>
+<span class="source-line-no">053</span><span id="line-53">        executor.execute(() -&gt; {</span>
+<span class="source-line-no">054</span><span id="line-54">            try {</span>
+<span class="source-line-no">055</span><span id="line-55">                T result = throwingSupplier.getThrows();</span>
+<span class="source-line-no">056</span><span id="line-56">                future.complete(result);</span>
+<span class="source-line-no">057</span><span id="line-57">            } catch (IOException e) {</span>
+<span class="source-line-no">058</span><span id="line-58">                future.completeExceptionally(e);</span>
+<span class="source-line-no">059</span><span id="line-59">            }</span>
+<span class="source-line-no">060</span><span id="line-60">        });</span>
+<span class="source-line-no">061</span><span id="line-61">        return future;</span>
+<span class="source-line-no">062</span><span id="line-62">    }</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64">    /**</span>
+<span class="source-line-no">065</span><span id="line-65">     * Subinterface of {@link Supplier} for Lambdas which throw {@link IOException}.</span>
+<span class="source-line-no">066</span><span id="line-66">     * Can be used for two purposes:</span>
+<span class="source-line-no">067</span><span id="line-67">     * &lt;ol&gt;</span>
+<span class="source-line-no">068</span><span id="line-68">     *     &lt;li&gt;To cast a lambda that throws an {@code IOException} to a {@link Supplier} while</span>
+<span class="source-line-no">069</span><span id="line-69">     *      automatically wrapping any exception thrown by the lambda with {@link RuntimeException}.&lt;/li&gt;</span>
+<span class="source-line-no">070</span><span id="line-70">     *     &lt;li&gt;As a {@code FunctionalInterface} where a lambda that throws exceptions is</span>
+<span class="source-line-no">071</span><span id="line-71">     *      expected or allowed.&lt;/li&gt;</span>
+<span class="source-line-no">072</span><span id="line-72">     * &lt;/ol&gt;</span>
+<span class="source-line-no">073</span><span id="line-73">     * This is intended to be used to wrap JSON-RPC I/O methods of {@link JsonRpcClient} that throw {@link IOException} and</span>
+<span class="source-line-no">074</span><span id="line-74">     * subclasses such as {@link JsonRpcException}, so we have narrowed the allowed exceptions in {@link #getThrows()} to</span>
+<span class="source-line-no">075</span><span id="line-75">     * {@link IOException}.</span>
+<span class="source-line-no">076</span><span id="line-76">     *</span>
+<span class="source-line-no">077</span><span id="line-77">     * @param &lt;T&gt;</span>
+<span class="source-line-no">078</span><span id="line-78">     */</span>
+<span class="source-line-no">079</span><span id="line-79">    @FunctionalInterface</span>
+<span class="source-line-no">080</span><span id="line-80">    interface ThrowingSupplier&lt;T&gt; extends Supplier&lt;T&gt; {</span>
+<span class="source-line-no">081</span><span id="line-81"></span>
+<span class="source-line-no">082</span><span id="line-82">        /**</span>
+<span class="source-line-no">083</span><span id="line-83">         * Gets a result wrapping checked Exceptions with {@link RuntimeException}</span>
+<span class="source-line-no">084</span><span id="line-84">         * @return a result</span>
+<span class="source-line-no">085</span><span id="line-85">         */</span>
+<span class="source-line-no">086</span><span id="line-86">        @Override</span>
+<span class="source-line-no">087</span><span id="line-87">        default T get() {</span>
+<span class="source-line-no">088</span><span id="line-88">            try {</span>
+<span class="source-line-no">089</span><span id="line-89">                return getThrows();</span>
+<span class="source-line-no">090</span><span id="line-90">            } catch (final Exception e) {</span>
+<span class="source-line-no">091</span><span id="line-91">                throw new RuntimeException(e);</span>
+<span class="source-line-no">092</span><span id="line-92">            }</span>
+<span class="source-line-no">093</span><span id="line-93">        }</span>
+<span class="source-line-no">094</span><span id="line-94"></span>
+<span class="source-line-no">095</span><span id="line-95">        /**</span>
+<span class="source-line-no">096</span><span id="line-96">         * Gets a result.</span>
+<span class="source-line-no">097</span><span id="line-97">         *</span>
+<span class="source-line-no">098</span><span id="line-98">         * @return a result</span>
+<span class="source-line-no">099</span><span id="line-99">         * @throws IOException A (checked) exception</span>
+<span class="source-line-no">100</span><span id="line-100">         */</span>
+<span class="source-line-no">101</span><span id="line-101">        T getThrows() throws IOException;</span>
+<span class="source-line-no">102</span><span id="line-102">    }</span>
+<span class="source-line-no">103</span><span id="line-103"></span>
+<span class="source-line-no">104</span><span id="line-104">    /**</span>
+<span class="source-line-no">105</span><span id="line-105">     * Error filter for resilient polling. Uses a Predicate to specify what to ignore and a Consumer to log</span>
+<span class="source-line-no">106</span><span id="line-106">     * what is ignored.</span>
+<span class="source-line-no">107</span><span id="line-107">     */</span>
+<span class="source-line-no">108</span><span id="line-108">    interface TransientErrorFilter {</span>
+<span class="source-line-no">109</span><span id="line-109">        static TransientErrorFilter of(Predicate&lt;Throwable&gt; filter, Consumer&lt;Throwable&gt; logger) {</span>
+<span class="source-line-no">110</span><span id="line-110">            return new TransientErrorFilter() {</span>
+<span class="source-line-no">111</span><span id="line-111">                @Override</span>
+<span class="source-line-no">112</span><span id="line-112">                public boolean isTransient(Throwable t) {</span>
+<span class="source-line-no">113</span><span id="line-113">                    return filter.test(t);</span>
+<span class="source-line-no">114</span><span id="line-114">                }</span>
+<span class="source-line-no">115</span><span id="line-115"></span>
+<span class="source-line-no">116</span><span id="line-116">                @Override</span>
+<span class="source-line-no">117</span><span id="line-117">                public void log(Throwable t) {</span>
+<span class="source-line-no">118</span><span id="line-118">                    logger.accept(t);</span>
+<span class="source-line-no">119</span><span id="line-119">                }</span>
+<span class="source-line-no">120</span><span id="line-120">            };</span>
+<span class="source-line-no">121</span><span id="line-121">        }</span>
+<span class="source-line-no">122</span><span id="line-122"></span>
+<span class="source-line-no">123</span><span id="line-123">        static TransientErrorFilter none() {</span>
+<span class="source-line-no">124</span><span id="line-124">            return of(</span>
+<span class="source-line-no">125</span><span id="line-125">                    (t) -&gt; false,   // No errors are consider transient</span>
+<span class="source-line-no">126</span><span id="line-126">                    (t) -&gt; {}       // Nothing to log because we're not swallowing anything.</span>
+<span class="source-line-no">127</span><span id="line-127">            );</span>
+<span class="source-line-no">128</span><span id="line-128">        }</span>
+<span class="source-line-no">129</span><span id="line-129"></span>
+<span class="source-line-no">130</span><span id="line-130">        /**</span>
+<span class="source-line-no">131</span><span id="line-131">         * Handler to transpose to a "future maybe". Use with {@link CompletableFuture#handle(BiFunction)}</span>
+<span class="source-line-no">132</span><span id="line-132">         * followed by {@code .thenCompose(Function.identity())} (or if JDK 12+ {@code CompletableFuture#exceptionallyCompose(Function)})</span>
+<span class="source-line-no">133</span><span id="line-133">         * to swallow transient errors.</span>
+<span class="source-line-no">134</span><span id="line-134">         * @param result T</span>
+<span class="source-line-no">135</span><span id="line-135">         * @param t An error, possibly transient</span>
+<span class="source-line-no">136</span><span id="line-136">         * @return A completable future of future maybe</span>
+<span class="source-line-no">137</span><span id="line-137">         * @param &lt;T&gt; The desired return type</span>
+<span class="source-line-no">138</span><span id="line-138">         */</span>
+<span class="source-line-no">139</span><span id="line-139">        default &lt;T&gt; CompletableFuture&lt;Optional&lt;T&gt;&gt; handle(T result, Throwable t) {</span>
+<span class="source-line-no">140</span><span id="line-140">            if (result != null) {</span>
+<span class="source-line-no">141</span><span id="line-141">                return CompletableFuture.completedFuture(Optional.of(result));</span>
+<span class="source-line-no">142</span><span id="line-142">            } else if (isTransient(t)) {</span>
+<span class="source-line-no">143</span><span id="line-143">                log(t);</span>
+<span class="source-line-no">144</span><span id="line-144">                return CompletableFuture.completedFuture(Optional.empty());</span>
+<span class="source-line-no">145</span><span id="line-145">            } else {</span>
+<span class="source-line-no">146</span><span id="line-146">                return CompletableFuture.failedFuture(t);</span>
+<span class="source-line-no">147</span><span id="line-147">            }</span>
+<span class="source-line-no">148</span><span id="line-148">        }</span>
+<span class="source-line-no">149</span><span id="line-149"></span>
+<span class="source-line-no">150</span><span id="line-150">        // TODO: Should this be flipped to isFatal()?</span>
+<span class="source-line-no">151</span><span id="line-151">        boolean isTransient(Throwable t);</span>
+<span class="source-line-no">152</span><span id="line-152">        void log(Throwable t);</span>
+<span class="source-line-no">153</span><span id="line-153"></span>
+<span class="source-line-no">154</span><span id="line-154">    }</span>
+<span class="source-line-no">155</span><span id="line-155">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/CompositeTrustManager.html b/apidoc/src-html/org/consensusj/jsonrpc/CompositeTrustManager.html
index 8ffe5c03e..eb2de6fea 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/CompositeTrustManager.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/CompositeTrustManager.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: CompositeTrustManager">
@@ -17,198 +17,168 @@
 <span class="source-line-no">004</span><span id="line-4">import org.slf4j.LoggerFactory;</span>
 <span class="source-line-no">005</span><span id="line-5"></span>
 <span class="source-line-no">006</span><span id="line-6">import javax.net.ssl.SSLContext;</span>
-<span class="source-line-no">007</span><span id="line-7">import javax.net.ssl.SSLSocketFactory;</span>
-<span class="source-line-no">008</span><span id="line-8">import javax.net.ssl.TrustManager;</span>
-<span class="source-line-no">009</span><span id="line-9">import javax.net.ssl.TrustManagerFactory;</span>
-<span class="source-line-no">010</span><span id="line-10">import javax.net.ssl.X509TrustManager;</span>
-<span class="source-line-no">011</span><span id="line-11">import java.io.FileInputStream;</span>
-<span class="source-line-no">012</span><span id="line-12">import java.io.FileNotFoundException;</span>
-<span class="source-line-no">013</span><span id="line-13">import java.io.IOException;</span>
-<span class="source-line-no">014</span><span id="line-14">import java.io.InputStream;</span>
-<span class="source-line-no">015</span><span id="line-15">import java.nio.file.Path;</span>
-<span class="source-line-no">016</span><span id="line-16">import java.security.KeyManagementException;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.security.KeyStore;</span>
-<span class="source-line-no">018</span><span id="line-18">import java.security.KeyStoreException;</span>
-<span class="source-line-no">019</span><span id="line-19">import java.security.NoSuchAlgorithmException;</span>
-<span class="source-line-no">020</span><span id="line-20">import java.security.cert.CertificateException;</span>
-<span class="source-line-no">021</span><span id="line-21">import java.security.cert.X509Certificate;</span>
-<span class="source-line-no">022</span><span id="line-22">import java.util.ArrayList;</span>
-<span class="source-line-no">023</span><span id="line-23">import java.util.Arrays;</span>
-<span class="source-line-no">024</span><span id="line-24">import java.util.List;</span>
-<span class="source-line-no">025</span><span id="line-25"></span>
-<span class="source-line-no">026</span><span id="line-26">/**</span>
-<span class="source-line-no">027</span><span id="line-27"> * A Trust Manager that adds a second trust store (key store) to the default trust store.</span>
-<span class="source-line-no">028</span><span id="line-28"> * See: https://stackoverflow.com/questions/48790981/load-java-trust-store-at-runtime-after-jvm-have-been-launched/58695061#58695061</span>
-<span class="source-line-no">029</span><span id="line-29"> */</span>
-<span class="source-line-no">030</span><span id="line-30">public class CompositeTrustManager implements X509TrustManager {</span>
-<span class="source-line-no">031</span><span id="line-31">    private static final Logger log = LoggerFactory.getLogger(CompositeTrustManager.class);</span>
-<span class="source-line-no">032</span><span id="line-32">    private static final char[] password = new char[]{'c','h','a','n','g','e','i','t'};</span>
-<span class="source-line-no">033</span><span id="line-33"></span>
-<span class="source-line-no">034</span><span id="line-34">    private final List&lt;X509TrustManager&gt; trustManagerList;</span>
-<span class="source-line-no">035</span><span id="line-35"></span>
-<span class="source-line-no">036</span><span id="line-36">    /**</span>
-<span class="source-line-no">037</span><span id="line-37">     * @param trustStoreStream Input stream for Java keystore with additional certificates</span>
-<span class="source-line-no">038</span><span id="line-38">     */</span>
-<span class="source-line-no">039</span><span id="line-39">    public CompositeTrustManager(InputStream trustStoreStream) {</span>
-<span class="source-line-no">040</span><span id="line-40">        List&lt;X509TrustManager&gt; trustManagers = new ArrayList&lt;&gt;();</span>
-<span class="source-line-no">041</span><span id="line-41">        try {</span>
-<span class="source-line-no">042</span><span id="line-42">            trustManagers.add(getCustomTrustManager(trustStoreStream));</span>
-<span class="source-line-no">043</span><span id="line-43">            trustManagers.add(getDefaultTrustManager());</span>
-<span class="source-line-no">044</span><span id="line-44">        } catch (Exception e) {</span>
-<span class="source-line-no">045</span><span id="line-45">            log.error("Exception: ", e);</span>
-<span class="source-line-no">046</span><span id="line-46">            throw new RuntimeException(e);</span>
-<span class="source-line-no">047</span><span id="line-47">        } finally {</span>
-<span class="source-line-no">048</span><span id="line-48">            try {</span>
-<span class="source-line-no">049</span><span id="line-49">                trustStoreStream.close();</span>
-<span class="source-line-no">050</span><span id="line-50">            } catch (IOException e) {</span>
-<span class="source-line-no">051</span><span id="line-51">                log.error("Exception: ", e);</span>
-<span class="source-line-no">052</span><span id="line-52">            }</span>
-<span class="source-line-no">053</span><span id="line-53">        }</span>
-<span class="source-line-no">054</span><span id="line-54">        trustManagerList = trustManagers;</span>
-<span class="source-line-no">055</span><span id="line-55">    }</span>
-<span class="source-line-no">056</span><span id="line-56"></span>
-<span class="source-line-no">057</span><span id="line-57">    /**</span>
-<span class="source-line-no">058</span><span id="line-58">     * @param trustStorePath Path to a Java keystore with additional certificates</span>
-<span class="source-line-no">059</span><span id="line-59">     * @throws FileNotFoundException If the file doesn't exist</span>
-<span class="source-line-no">060</span><span id="line-60">     */</span>
-<span class="source-line-no">061</span><span id="line-61">    public CompositeTrustManager(Path trustStorePath) throws FileNotFoundException {</span>
-<span class="source-line-no">062</span><span id="line-62">        this(new FileInputStream(trustStorePath.toFile()));</span>
-<span class="source-line-no">063</span><span id="line-63">    }</span>
-<span class="source-line-no">064</span><span id="line-64"></span>
-<span class="source-line-no">065</span><span id="line-65">    @Deprecated</span>
-<span class="source-line-no">066</span><span id="line-66">    public static SSLSocketFactory getCompositeSSLSocketFactory(Path trustStorePath) throws NoSuchAlgorithmException, KeyManagementException, FileNotFoundException {</span>
-<span class="source-line-no">067</span><span id="line-67">        TrustManager tm = new CompositeTrustManager(trustStorePath);</span>
-<span class="source-line-no">068</span><span id="line-68">        return getSocketFactory(tm);</span>
-<span class="source-line-no">069</span><span id="line-69">    }</span>
-<span class="source-line-no">070</span><span id="line-70"></span>
-<span class="source-line-no">071</span><span id="line-71"></span>
-<span class="source-line-no">072</span><span id="line-72">    @Deprecated</span>
-<span class="source-line-no">073</span><span id="line-73">    public static SSLSocketFactory getCompositeSSLSocketFactory(InputStream trustStoreStream) throws NoSuchAlgorithmException, KeyManagementException {</span>
-<span class="source-line-no">074</span><span id="line-74">        TrustManager tm = new CompositeTrustManager(trustStoreStream);</span>
-<span class="source-line-no">075</span><span id="line-75">        return getSocketFactory(tm);</span>
-<span class="source-line-no">076</span><span id="line-76">    }</span>
-<span class="source-line-no">077</span><span id="line-77"></span>
-<span class="source-line-no">078</span><span id="line-78">    @Deprecated</span>
-<span class="source-line-no">079</span><span id="line-79">    public static SSLSocketFactory getAlternateSSLSocketFactory(Path trustStorePath) throws KeyStoreException, IOException, NoSuchAlgorithmException, KeyManagementException, CertificateException {</span>
-<span class="source-line-no">080</span><span id="line-80">        return getAlternateSSLSocketFactory(new FileInputStream(trustStorePath.toFile()));</span>
+<span class="source-line-no">007</span><span id="line-7">import javax.net.ssl.TrustManager;</span>
+<span class="source-line-no">008</span><span id="line-8">import javax.net.ssl.TrustManagerFactory;</span>
+<span class="source-line-no">009</span><span id="line-9">import javax.net.ssl.X509TrustManager;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.io.FileInputStream;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.io.FileNotFoundException;</span>
+<span class="source-line-no">012</span><span id="line-12">import java.io.IOException;</span>
+<span class="source-line-no">013</span><span id="line-13">import java.io.InputStream;</span>
+<span class="source-line-no">014</span><span id="line-14">import java.nio.file.Path;</span>
+<span class="source-line-no">015</span><span id="line-15">import java.security.KeyManagementException;</span>
+<span class="source-line-no">016</span><span id="line-16">import java.security.KeyStore;</span>
+<span class="source-line-no">017</span><span id="line-17">import java.security.KeyStoreException;</span>
+<span class="source-line-no">018</span><span id="line-18">import java.security.NoSuchAlgorithmException;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.security.cert.CertificateException;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.security.cert.X509Certificate;</span>
+<span class="source-line-no">021</span><span id="line-21">import java.util.ArrayList;</span>
+<span class="source-line-no">022</span><span id="line-22">import java.util.Arrays;</span>
+<span class="source-line-no">023</span><span id="line-23">import java.util.List;</span>
+<span class="source-line-no">024</span><span id="line-24"></span>
+<span class="source-line-no">025</span><span id="line-25">/**</span>
+<span class="source-line-no">026</span><span id="line-26"> * A Trust Manager that adds a second trust store (key store) to the default trust store.</span>
+<span class="source-line-no">027</span><span id="line-27"> * See: https://stackoverflow.com/questions/48790981/load-java-trust-store-at-runtime-after-jvm-have-been-launched/58695061#58695061</span>
+<span class="source-line-no">028</span><span id="line-28"> */</span>
+<span class="source-line-no">029</span><span id="line-29">public class CompositeTrustManager implements X509TrustManager {</span>
+<span class="source-line-no">030</span><span id="line-30">    private static final Logger log = LoggerFactory.getLogger(CompositeTrustManager.class);</span>
+<span class="source-line-no">031</span><span id="line-31">    private static final char[] password = new char[]{'c','h','a','n','g','e','i','t'};</span>
+<span class="source-line-no">032</span><span id="line-32"></span>
+<span class="source-line-no">033</span><span id="line-33">    private final List&lt;X509TrustManager&gt; trustManagerList;</span>
+<span class="source-line-no">034</span><span id="line-34"></span>
+<span class="source-line-no">035</span><span id="line-35">    /**</span>
+<span class="source-line-no">036</span><span id="line-36">     * @param trustStoreStream Input stream for Java keystore with additional certificates</span>
+<span class="source-line-no">037</span><span id="line-37">     */</span>
+<span class="source-line-no">038</span><span id="line-38">    public CompositeTrustManager(InputStream trustStoreStream) {</span>
+<span class="source-line-no">039</span><span id="line-39">        List&lt;X509TrustManager&gt; trustManagers = new ArrayList&lt;&gt;();</span>
+<span class="source-line-no">040</span><span id="line-40">        try {</span>
+<span class="source-line-no">041</span><span id="line-41">            trustManagers.add(getCustomTrustManager(trustStoreStream));</span>
+<span class="source-line-no">042</span><span id="line-42">            trustManagers.add(getDefaultTrustManager());</span>
+<span class="source-line-no">043</span><span id="line-43">        } catch (Exception e) {</span>
+<span class="source-line-no">044</span><span id="line-44">            log.error("Exception: ", e);</span>
+<span class="source-line-no">045</span><span id="line-45">            throw new RuntimeException(e);</span>
+<span class="source-line-no">046</span><span id="line-46">        } finally {</span>
+<span class="source-line-no">047</span><span id="line-47">            try {</span>
+<span class="source-line-no">048</span><span id="line-48">                trustStoreStream.close();</span>
+<span class="source-line-no">049</span><span id="line-49">            } catch (IOException e) {</span>
+<span class="source-line-no">050</span><span id="line-50">                log.error("Exception: ", e);</span>
+<span class="source-line-no">051</span><span id="line-51">            }</span>
+<span class="source-line-no">052</span><span id="line-52">        }</span>
+<span class="source-line-no">053</span><span id="line-53">        trustManagerList = trustManagers;</span>
+<span class="source-line-no">054</span><span id="line-54">    }</span>
+<span class="source-line-no">055</span><span id="line-55"></span>
+<span class="source-line-no">056</span><span id="line-56">    /**</span>
+<span class="source-line-no">057</span><span id="line-57">     * @param trustStorePath Path to a Java keystore with additional certificates</span>
+<span class="source-line-no">058</span><span id="line-58">     * @throws FileNotFoundException If the file doesn't exist</span>
+<span class="source-line-no">059</span><span id="line-59">     */</span>
+<span class="source-line-no">060</span><span id="line-60">    public CompositeTrustManager(Path trustStorePath) throws FileNotFoundException {</span>
+<span class="source-line-no">061</span><span id="line-61">        this(new FileInputStream(trustStorePath.toFile()));</span>
+<span class="source-line-no">062</span><span id="line-62">    }</span>
+<span class="source-line-no">063</span><span id="line-63"></span>
+<span class="source-line-no">064</span><span id="line-64">    /**</span>
+<span class="source-line-no">065</span><span id="line-65">     * Used to create an SSLContext using {@link CompositeTrustManager}</span>
+<span class="source-line-no">066</span><span id="line-66">     * See: https://stackoverflow.com/questions/859111/how-can-i-use-different-certificates-on-specific-connections</span>
+<span class="source-line-no">067</span><span id="line-67">     */</span>
+<span class="source-line-no">068</span><span id="line-68">    public static SSLContext getCompositeSSLContext(Path trustStorePath) throws NoSuchAlgorithmException, KeyManagementException, FileNotFoundException {</span>
+<span class="source-line-no">069</span><span id="line-69">        TrustManager tm = new CompositeTrustManager(trustStorePath);</span>
+<span class="source-line-no">070</span><span id="line-70">        return getSSLContext(tm);</span>
+<span class="source-line-no">071</span><span id="line-71">    }</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73"></span>
+<span class="source-line-no">074</span><span id="line-74">    /**</span>
+<span class="source-line-no">075</span><span id="line-75">     * Used to create an SSLContext using {@link CompositeTrustManager}</span>
+<span class="source-line-no">076</span><span id="line-76">     * See: https://stackoverflow.com/questions/859111/how-can-i-use-different-certificates-on-specific-connections</span>
+<span class="source-line-no">077</span><span id="line-77">     */</span>
+<span class="source-line-no">078</span><span id="line-78">    public static SSLContext getCompositeSSLContext(InputStream trustStoreStream) throws NoSuchAlgorithmException, KeyManagementException {</span>
+<span class="source-line-no">079</span><span id="line-79">        TrustManager tm = new CompositeTrustManager(trustStoreStream);</span>
+<span class="source-line-no">080</span><span id="line-80">        return getSSLContext(tm);</span>
 <span class="source-line-no">081</span><span id="line-81">    }</span>
 <span class="source-line-no">082</span><span id="line-82"></span>
-<span class="source-line-no">083</span><span id="line-83">    @Deprecated</span>
-<span class="source-line-no">084</span><span id="line-84">    public static SSLSocketFactory getAlternateSSLSocketFactory(InputStream trustStoreStream) throws KeyStoreException, IOException, NoSuchAlgorithmException, KeyManagementException, CertificateException {</span>
-<span class="source-line-no">085</span><span id="line-85">        X509TrustManager trustManager = getCustomTrustManager(trustStoreStream);</span>
-<span class="source-line-no">086</span><span id="line-86">        return getSocketFactory( trustManager );</span>
-<span class="source-line-no">087</span><span id="line-87">    }</span>
-<span class="source-line-no">088</span><span id="line-88"></span>
-<span class="source-line-no">089</span><span id="line-89">    /**</span>
-<span class="source-line-no">090</span><span id="line-90">     * Used to create an SSLContext using {@link CompositeTrustManager}</span>
-<span class="source-line-no">091</span><span id="line-91">     * See: https://stackoverflow.com/questions/859111/how-can-i-use-different-certificates-on-specific-connections</span>
-<span class="source-line-no">092</span><span id="line-92">     */</span>
-<span class="source-line-no">093</span><span id="line-93">    public static SSLContext getCompositeSSLContext(Path trustStorePath) throws NoSuchAlgorithmException, KeyManagementException, FileNotFoundException {</span>
-<span class="source-line-no">094</span><span id="line-94">        TrustManager tm = new CompositeTrustManager(trustStorePath);</span>
-<span class="source-line-no">095</span><span id="line-95">        return getSSLContext(tm);</span>
-<span class="source-line-no">096</span><span id="line-96">    }</span>
-<span class="source-line-no">097</span><span id="line-97"></span>
+<span class="source-line-no">083</span><span id="line-83">    /**</span>
+<span class="source-line-no">084</span><span id="line-84">     * Create an SSLContext using an alternative Trust Store</span>
+<span class="source-line-no">085</span><span id="line-85">     */</span>
+<span class="source-line-no">086</span><span id="line-86">    public static SSLContext getAlternateSSLContext(Path trustStorePath) throws KeyStoreException, IOException, NoSuchAlgorithmException, KeyManagementException, CertificateException {</span>
+<span class="source-line-no">087</span><span id="line-87">        return getAlternateSSLContext(new FileInputStream(trustStorePath.toFile()));</span>
+<span class="source-line-no">088</span><span id="line-88">    }</span>
+<span class="source-line-no">089</span><span id="line-89"></span>
+<span class="source-line-no">090</span><span id="line-90">    /**</span>
+<span class="source-line-no">091</span><span id="line-91">     * Create an SSLContext using an alternative Trust Store</span>
+<span class="source-line-no">092</span><span id="line-92">     * @param trustStoreStream inputStream with Trust Store (password must be 'changeit')</span>
+<span class="source-line-no">093</span><span id="line-93">     */</span>
+<span class="source-line-no">094</span><span id="line-94">    public static SSLContext getAlternateSSLContext(InputStream trustStoreStream) throws KeyStoreException, IOException, NoSuchAlgorithmException, KeyManagementException, CertificateException {</span>
+<span class="source-line-no">095</span><span id="line-95">        X509TrustManager trustManager = getCustomTrustManager(trustStoreStream);</span>
+<span class="source-line-no">096</span><span id="line-96">        return getSSLContext( trustManager );</span>
+<span class="source-line-no">097</span><span id="line-97">    }</span>
 <span class="source-line-no">098</span><span id="line-98"></span>
-<span class="source-line-no">099</span><span id="line-99">    /**</span>
-<span class="source-line-no">100</span><span id="line-100">     * Used to create an SSLContext using {@link CompositeTrustManager}</span>
-<span class="source-line-no">101</span><span id="line-101">     * See: https://stackoverflow.com/questions/859111/how-can-i-use-different-certificates-on-specific-connections</span>
-<span class="source-line-no">102</span><span id="line-102">     */</span>
-<span class="source-line-no">103</span><span id="line-103">    public static SSLContext getCompositeSSLContext(InputStream trustStoreStream) throws NoSuchAlgorithmException, KeyManagementException {</span>
-<span class="source-line-no">104</span><span id="line-104">        TrustManager tm = new CompositeTrustManager(trustStoreStream);</span>
-<span class="source-line-no">105</span><span id="line-105">        return getSSLContext(tm);</span>
-<span class="source-line-no">106</span><span id="line-106">    }</span>
-<span class="source-line-no">107</span><span id="line-107"></span>
-<span class="source-line-no">108</span><span id="line-108">    /**</span>
-<span class="source-line-no">109</span><span id="line-109">     * Create an SSLContext using an alternative Trust Store</span>
-<span class="source-line-no">110</span><span id="line-110">     */</span>
-<span class="source-line-no">111</span><span id="line-111">    public static SSLContext getAlternateSSLContext(Path trustStorePath) throws KeyStoreException, IOException, NoSuchAlgorithmException, KeyManagementException, CertificateException {</span>
-<span class="source-line-no">112</span><span id="line-112">        return getAlternateSSLContext(new FileInputStream(trustStorePath.toFile()));</span>
-<span class="source-line-no">113</span><span id="line-113">    }</span>
-<span class="source-line-no">114</span><span id="line-114"></span>
-<span class="source-line-no">115</span><span id="line-115">    /**</span>
-<span class="source-line-no">116</span><span id="line-116">     * Create an SSLContext using an alternative Trust Store</span>
-<span class="source-line-no">117</span><span id="line-117">     * @param trustStoreStream inputStream with Trust Store (password must be 'changeit')</span>
-<span class="source-line-no">118</span><span id="line-118">     */</span>
-<span class="source-line-no">119</span><span id="line-119">    public static SSLContext getAlternateSSLContext(InputStream trustStoreStream) throws KeyStoreException, IOException, NoSuchAlgorithmException, KeyManagementException, CertificateException {</span>
-<span class="source-line-no">120</span><span id="line-120">        X509TrustManager trustManager = getCustomTrustManager(trustStoreStream);</span>
-<span class="source-line-no">121</span><span id="line-121">        return getSSLContext( trustManager );</span>
-<span class="source-line-no">122</span><span id="line-122">    }</span>
-<span class="source-line-no">123</span><span id="line-123"></span>
-<span class="source-line-no">124</span><span id="line-124">    @Deprecated</span>
-<span class="source-line-no">125</span><span id="line-125">    private static SSLSocketFactory getSocketFactory(TrustManager trustManager) throws NoSuchAlgorithmException, KeyManagementException {</span>
-<span class="source-line-no">126</span><span id="line-126">        return getSSLContext(trustManager).getSocketFactory();</span>
-<span class="source-line-no">127</span><span id="line-127">    }</span>
-<span class="source-line-no">128</span><span id="line-128"></span>
-<span class="source-line-no">129</span><span id="line-129">    private static SSLContext getSSLContext(TrustManager trustManager) throws NoSuchAlgorithmException, KeyManagementException {</span>
-<span class="source-line-no">130</span><span id="line-130">        SSLContext ctx = SSLContext.getInstance("TLS");</span>
-<span class="source-line-no">131</span><span id="line-131">        ctx.init(null, new TrustManager[] {trustManager}, null);</span>
-<span class="source-line-no">132</span><span id="line-132">        return ctx;</span>
-<span class="source-line-no">133</span><span id="line-133">    }</span>
-<span class="source-line-no">134</span><span id="line-134"></span>
-<span class="source-line-no">135</span><span id="line-135">    @Override</span>
-<span class="source-line-no">136</span><span id="line-136">    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {</span>
-<span class="source-line-no">137</span><span id="line-137">        for (X509TrustManager trustManager : trustManagerList) {</span>
-<span class="source-line-no">138</span><span id="line-138">            try {</span>
-<span class="source-line-no">139</span><span id="line-139">                trustManager.checkClientTrusted(chain, authType);</span>
-<span class="source-line-no">140</span><span id="line-140">                return;</span>
-<span class="source-line-no">141</span><span id="line-141">            } catch (CertificateException e) {</span>
-<span class="source-line-no">142</span><span id="line-142">                // maybe the next trust manager will trust it, don't break the loop</span>
-<span class="source-line-no">143</span><span id="line-143">            }</span>
-<span class="source-line-no">144</span><span id="line-144">        }</span>
-<span class="source-line-no">145</span><span id="line-145">        throw new CertificateException("None of the TrustManagers trust this certificate chain");</span>
+<span class="source-line-no">099</span><span id="line-99">    private static SSLContext getSSLContext(TrustManager trustManager) throws NoSuchAlgorithmException, KeyManagementException {</span>
+<span class="source-line-no">100</span><span id="line-100">        SSLContext ctx = SSLContext.getInstance("TLS");</span>
+<span class="source-line-no">101</span><span id="line-101">        ctx.init(null, new TrustManager[] {trustManager}, null);</span>
+<span class="source-line-no">102</span><span id="line-102">        return ctx;</span>
+<span class="source-line-no">103</span><span id="line-103">    }</span>
+<span class="source-line-no">104</span><span id="line-104"></span>
+<span class="source-line-no">105</span><span id="line-105">    @Override</span>
+<span class="source-line-no">106</span><span id="line-106">    public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {</span>
+<span class="source-line-no">107</span><span id="line-107">        for (X509TrustManager trustManager : trustManagerList) {</span>
+<span class="source-line-no">108</span><span id="line-108">            try {</span>
+<span class="source-line-no">109</span><span id="line-109">                trustManager.checkClientTrusted(chain, authType);</span>
+<span class="source-line-no">110</span><span id="line-110">                return;</span>
+<span class="source-line-no">111</span><span id="line-111">            } catch (CertificateException e) {</span>
+<span class="source-line-no">112</span><span id="line-112">                // maybe the next trust manager will trust it, don't break the loop</span>
+<span class="source-line-no">113</span><span id="line-113">            }</span>
+<span class="source-line-no">114</span><span id="line-114">        }</span>
+<span class="source-line-no">115</span><span id="line-115">        throw new CertificateException("None of the TrustManagers trust this certificate chain");</span>
+<span class="source-line-no">116</span><span id="line-116">    }</span>
+<span class="source-line-no">117</span><span id="line-117"></span>
+<span class="source-line-no">118</span><span id="line-118">    @Override</span>
+<span class="source-line-no">119</span><span id="line-119">    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {</span>
+<span class="source-line-no">120</span><span id="line-120">        for (X509TrustManager trustManager : trustManagerList) {</span>
+<span class="source-line-no">121</span><span id="line-121">            try {</span>
+<span class="source-line-no">122</span><span id="line-122">                trustManager.checkServerTrusted(chain, authType);</span>
+<span class="source-line-no">123</span><span id="line-123">                return;</span>
+<span class="source-line-no">124</span><span id="line-124">            } catch (CertificateException e) {</span>
+<span class="source-line-no">125</span><span id="line-125">                // maybe the next trust manager will trust it, don't break the loop</span>
+<span class="source-line-no">126</span><span id="line-126">            }</span>
+<span class="source-line-no">127</span><span id="line-127">        }</span>
+<span class="source-line-no">128</span><span id="line-128">        throw new CertificateException("None of the TrustManagers trust this certificate chain");</span>
+<span class="source-line-no">129</span><span id="line-129">    }</span>
+<span class="source-line-no">130</span><span id="line-130"></span>
+<span class="source-line-no">131</span><span id="line-131">    @Override</span>
+<span class="source-line-no">132</span><span id="line-132">    public X509Certificate[] getAcceptedIssuers() {</span>
+<span class="source-line-no">133</span><span id="line-133">        List&lt;X509Certificate&gt; certs = new ArrayList&lt;&gt;();</span>
+<span class="source-line-no">134</span><span id="line-134">        for (X509TrustManager trustManager : trustManagerList) {</span>
+<span class="source-line-no">135</span><span id="line-135">            certs.addAll(Arrays.asList(trustManager.getAcceptedIssuers()));</span>
+<span class="source-line-no">136</span><span id="line-136">        }</span>
+<span class="source-line-no">137</span><span id="line-137">        return certs.toArray(new X509Certificate[0]);</span>
+<span class="source-line-no">138</span><span id="line-138">    }</span>
+<span class="source-line-no">139</span><span id="line-139"></span>
+<span class="source-line-no">140</span><span id="line-140">    private static X509TrustManager getCustomTrustManager(InputStream trustStream) throws CertificateException, KeyStoreException, NoSuchAlgorithmException, IOException {</span>
+<span class="source-line-no">141</span><span id="line-141">        return createTrustManager(trustStream);</span>
+<span class="source-line-no">142</span><span id="line-142">    }</span>
+<span class="source-line-no">143</span><span id="line-143"></span>
+<span class="source-line-no">144</span><span id="line-144">    private static X509TrustManager getDefaultTrustManager() throws CertificateException, KeyStoreException, NoSuchAlgorithmException, IOException {</span>
+<span class="source-line-no">145</span><span id="line-145">        return createTrustManager(null);</span>
 <span class="source-line-no">146</span><span id="line-146">    }</span>
 <span class="source-line-no">147</span><span id="line-147"></span>
-<span class="source-line-no">148</span><span id="line-148">    @Override</span>
-<span class="source-line-no">149</span><span id="line-149">    public void checkServerTrusted(X509Certificate[] chain, String authType) throws CertificateException {</span>
-<span class="source-line-no">150</span><span id="line-150">        for (X509TrustManager trustManager : trustManagerList) {</span>
-<span class="source-line-no">151</span><span id="line-151">            try {</span>
-<span class="source-line-no">152</span><span id="line-152">                trustManager.checkServerTrusted(chain, authType);</span>
-<span class="source-line-no">153</span><span id="line-153">                return;</span>
-<span class="source-line-no">154</span><span id="line-154">            } catch (CertificateException e) {</span>
-<span class="source-line-no">155</span><span id="line-155">                // maybe the next trust manager will trust it, don't break the loop</span>
-<span class="source-line-no">156</span><span id="line-156">            }</span>
-<span class="source-line-no">157</span><span id="line-157">        }</span>
-<span class="source-line-no">158</span><span id="line-158">        throw new CertificateException("None of the TrustManagers trust this certificate chain");</span>
-<span class="source-line-no">159</span><span id="line-159">    }</span>
-<span class="source-line-no">160</span><span id="line-160"></span>
-<span class="source-line-no">161</span><span id="line-161">    @Override</span>
-<span class="source-line-no">162</span><span id="line-162">    public X509Certificate[] getAcceptedIssuers() {</span>
-<span class="source-line-no">163</span><span id="line-163">        List&lt;X509Certificate&gt; certs = new ArrayList&lt;&gt;();</span>
-<span class="source-line-no">164</span><span id="line-164">        for (X509TrustManager trustManager : trustManagerList) {</span>
-<span class="source-line-no">165</span><span id="line-165">            certs.addAll(Arrays.asList(trustManager.getAcceptedIssuers()));</span>
-<span class="source-line-no">166</span><span id="line-166">        }</span>
-<span class="source-line-no">167</span><span id="line-167">        return certs.toArray(new X509Certificate[0]);</span>
-<span class="source-line-no">168</span><span id="line-168">    }</span>
-<span class="source-line-no">169</span><span id="line-169"></span>
-<span class="source-line-no">170</span><span id="line-170">    private static X509TrustManager getCustomTrustManager(InputStream trustStream) throws CertificateException, KeyStoreException, NoSuchAlgorithmException, IOException {</span>
-<span class="source-line-no">171</span><span id="line-171">        return createTrustManager(trustStream);</span>
-<span class="source-line-no">172</span><span id="line-172">    }</span>
-<span class="source-line-no">173</span><span id="line-173"></span>
-<span class="source-line-no">174</span><span id="line-174">    private static X509TrustManager getDefaultTrustManager() throws CertificateException, KeyStoreException, NoSuchAlgorithmException, IOException {</span>
-<span class="source-line-no">175</span><span id="line-175">        return createTrustManager(null);</span>
-<span class="source-line-no">176</span><span id="line-176">    }</span>
-<span class="source-line-no">177</span><span id="line-177"></span>
-<span class="source-line-no">178</span><span id="line-178">    private static X509TrustManager createTrustManager(InputStream trustStream) throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {</span>
-<span class="source-line-no">179</span><span id="line-179">        // Now get trustStore</span>
-<span class="source-line-no">180</span><span id="line-180">        KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());</span>
-<span class="source-line-no">181</span><span id="line-181"></span>
-<span class="source-line-no">182</span><span id="line-182">        // load the stream to your store</span>
-<span class="source-line-no">183</span><span id="line-183">        trustStore.load(trustStream, password);</span>
-<span class="source-line-no">184</span><span id="line-184"></span>
-<span class="source-line-no">185</span><span id="line-185">        // initialize a trust manager factory with the trusted store</span>
-<span class="source-line-no">186</span><span id="line-186">        TrustManagerFactory trustFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());</span>
-<span class="source-line-no">187</span><span id="line-187">        trustFactory.init(trustStore);</span>
-<span class="source-line-no">188</span><span id="line-188"></span>
-<span class="source-line-no">189</span><span id="line-189">        // get the trust managers from the factory</span>
-<span class="source-line-no">190</span><span id="line-190">        TrustManager[] trustManagers = trustFactory.getTrustManagers();</span>
-<span class="source-line-no">191</span><span id="line-191">        for (TrustManager trustManager : trustManagers) {</span>
-<span class="source-line-no">192</span><span id="line-192">            if (trustManager instanceof X509TrustManager) {</span>
-<span class="source-line-no">193</span><span id="line-193">                return (X509TrustManager) trustManager;</span>
-<span class="source-line-no">194</span><span id="line-194">            }</span>
-<span class="source-line-no">195</span><span id="line-195">        }</span>
-<span class="source-line-no">196</span><span id="line-196">        throw new CertificateException("No X509TrustManager available");</span>
-<span class="source-line-no">197</span><span id="line-197">    }</span>
-<span class="source-line-no">198</span><span id="line-198">}</span>
+<span class="source-line-no">148</span><span id="line-148">    private static X509TrustManager createTrustManager(InputStream trustStream) throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {</span>
+<span class="source-line-no">149</span><span id="line-149">        // Now get trustStore</span>
+<span class="source-line-no">150</span><span id="line-150">        KeyStore trustStore = KeyStore.getInstance(KeyStore.getDefaultType());</span>
+<span class="source-line-no">151</span><span id="line-151"></span>
+<span class="source-line-no">152</span><span id="line-152">        // load the stream to your store</span>
+<span class="source-line-no">153</span><span id="line-153">        trustStore.load(trustStream, password);</span>
+<span class="source-line-no">154</span><span id="line-154"></span>
+<span class="source-line-no">155</span><span id="line-155">        // initialize a trust manager factory with the trusted store</span>
+<span class="source-line-no">156</span><span id="line-156">        TrustManagerFactory trustFactory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());</span>
+<span class="source-line-no">157</span><span id="line-157">        trustFactory.init(trustStore);</span>
+<span class="source-line-no">158</span><span id="line-158"></span>
+<span class="source-line-no">159</span><span id="line-159">        // get the trust managers from the factory</span>
+<span class="source-line-no">160</span><span id="line-160">        TrustManager[] trustManagers = trustFactory.getTrustManagers();</span>
+<span class="source-line-no">161</span><span id="line-161">        for (TrustManager trustManager : trustManagers) {</span>
+<span class="source-line-no">162</span><span id="line-162">            if (trustManager instanceof X509TrustManager) {</span>
+<span class="source-line-no">163</span><span id="line-163">                return (X509TrustManager) trustManager;</span>
+<span class="source-line-no">164</span><span id="line-164">            }</span>
+<span class="source-line-no">165</span><span id="line-165">        }</span>
+<span class="source-line-no">166</span><span id="line-166">        throw new CertificateException("No X509TrustManager available");</span>
+<span class="source-line-no">167</span><span id="line-167">    }</span>
+<span class="source-line-no">168</span><span id="line-168">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html b/apidoc/src-html/org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html
new file mode 100644
index 000000000..7977bb5fb
--- /dev/null
+++ b/apidoc/src-html/org/consensusj/jsonrpc/DefaultRpcClient.TransientErrorMapper.html
@@ -0,0 +1,373 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Source code</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="source: package: org.consensusj.jsonrpc, class: DefaultRpcClient, interface: TransientErrorMapper">
+<meta name="generator" content="javadoc/SourceToHTMLConverter">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+</head>
+<body class="source-page">
+<main role="main">
+<div class="source-container">
+<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
+<span class="source-line-no">002</span><span id="line-2"></span>
+<span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.databind.DeserializationFeature;</span>
+<span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JavaType;</span>
+<span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.databind.JsonNode;</span>
+<span class="source-line-no">006</span><span id="line-6">import com.fasterxml.jackson.databind.ObjectMapper;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.slf4j.Logger;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">009</span><span id="line-9"></span>
+<span class="source-line-no">010</span><span id="line-10">import javax.net.ssl.SSLContext;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.lang.reflect.Type;</span>
+<span class="source-line-no">012</span><span id="line-12">import java.time.Duration;</span>
+<span class="source-line-no">013</span><span id="line-13">import java.net.URI;</span>
+<span class="source-line-no">014</span><span id="line-14">import java.util.Collection;</span>
+<span class="source-line-no">015</span><span id="line-15">import java.util.List;</span>
+<span class="source-line-no">016</span><span id="line-16">import java.util.Objects;</span>
+<span class="source-line-no">017</span><span id="line-17">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">018</span><span id="line-18">import java.util.concurrent.ExecutionException;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.util.concurrent.TimeoutException;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.util.function.Function;</span>
+<span class="source-line-no">021</span><span id="line-21">import java.util.function.Supplier;</span>
+<span class="source-line-no">022</span><span id="line-22"></span>
+<span class="source-line-no">023</span><span id="line-23">// We're overusing inheritance in this hierarchy. We are breaking Effective Java, Item 18: Favor composition over inheritance.</span>
+<span class="source-line-no">024</span><span id="line-24">// We're using inheritance to configure:</span>
+<span class="source-line-no">025</span><span id="line-25">// A. The set of JSON-RPC methods that are supported, e.g. `getblockcount()` (which creates potential conflicts with `send()` etc)</span>
+<span class="source-line-no">026</span><span id="line-26">// B. The JSON mapping implementation. Which for now and the foreseeable future is Jackson only.</span>
+<span class="source-line-no">027</span><span id="line-27">//</span>
+<span class="source-line-no">028</span><span id="line-28">// TODO: Maybe look at extracting a class with some common "mapper" functions between the two transport implementations</span>
+<span class="source-line-no">029</span><span id="line-29">//</span>
+<span class="source-line-no">030</span><span id="line-30">// The proper separation for (A) is probably a complete separation. There should be no required inheritance to implement</span>
+<span class="source-line-no">031</span><span id="line-31">// a client with a set of methods. Internally the client would have a transport and a mapper and those could optionally be made available</span>
+<span class="source-line-no">032</span><span id="line-32">// via some accessor methods if the client application deems necessary.</span>
+<span class="source-line-no">033</span><span id="line-33">// At the heart of (B) (at least as currently implemented) is the mapping from a Java (or Groovy) method name to (i) a JSON-RPC method</span>
+<span class="source-line-no">034</span><span id="line-34">// name, (ii) optional parameter type-conversion for JSON serialization in the request, and (iii) type mapping for the deserialization</span>
+<span class="source-line-no">035</span><span id="line-35">// of the `result` field in the JsonRpcResponse&lt;RSLT&gt;. It might be helpful to think of this as two functional mappings:</span>
+<span class="source-line-no">036</span><span id="line-36">// (1) Map Java method name and parameters to a JSON-RPC request (either map to set of Java Objects _or_ all the way to JSON)</span>
+<span class="source-line-no">037</span><span id="line-37">// (2) Map from received JSON-RPC response to JsonRpcResponse&lt;RSLT&gt; -- this response mapper function is configured as part of making the request.</span>
+<span class="source-line-no">038</span><span id="line-38">//</span>
+<span class="source-line-no">039</span><span id="line-39">// To abstract the specifics of Jackson from the (two) transport implementations. Basically methods/functions to</span>
+<span class="source-line-no">040</span><span id="line-40">// map from request to string/stream and to map from string/stream to response.  The java.net.http implementation has already defined</span>
+<span class="source-line-no">041</span><span id="line-41">// some functional interfaces for this, so coming up with an interface that both the java.net.http implementation and the HttpUrlConnection</span>
+<span class="source-line-no">042</span><span id="line-42">// implementation can use will lead to this "SECOND STEP"</span>
+<span class="source-line-no">043</span><span id="line-43">//</span>
+<span class="source-line-no">044</span><span id="line-44">// Now that JsonRpcClient is a generic with &lt;T extends Type&gt;, we have loosened the Jackson coupling somewhat.</span>
+<span class="source-line-no">045</span><span id="line-45">//</span>
+<span class="source-line-no">046</span><span id="line-46">/**</span>
+<span class="source-line-no">047</span><span id="line-47"> * A strongly-typed, Jackson-based JSON-RPC client. {@link JsonRpcClient} provides many convenience send `default` methods in a</span>
+<span class="source-line-no">048</span><span id="line-48"> * JSON-library-independent way. DefaultRpcClient provides the needed implementation support for Jackson. This class implements</span>
+<span class="source-line-no">049</span><span id="line-49"> * the constructors, static fields, and getters, but delegates the core</span>
+<span class="source-line-no">050</span><span id="line-50"> * {@link JsonRpcTransport#sendRequestForResponseAsync(JsonRpcRequest, Type)} method to a {@link JsonRpcTransport} implementation component.</span>
+<span class="source-line-no">051</span><span id="line-51"> */</span>
+<span class="source-line-no">052</span><span id="line-52">public class DefaultRpcClient implements JsonRpcClient&lt;JavaType&gt; {</span>
+<span class="source-line-no">053</span><span id="line-53">    private static final Logger log = LoggerFactory.getLogger(DefaultRpcClient.class);</span>
+<span class="source-line-no">054</span><span id="line-54">    private static final JsonRpcMessage.Version DEFAULT_JSON_RPC_VERSION = JsonRpcMessage.Version.V2;</span>
+<span class="source-line-no">055</span><span id="line-55"></span>
+<span class="source-line-no">056</span><span id="line-56">    /**</span>
+<span class="source-line-no">057</span><span id="line-57">     * Functional interface for creating JsonRpcTransport instances. This is used to prevent a circular</span>
+<span class="source-line-no">058</span><span id="line-58">     * dependency on {@link ObjectMapper}.</span>
+<span class="source-line-no">059</span><span id="line-59">     */</span>
+<span class="source-line-no">060</span><span id="line-60">    @FunctionalInterface</span>
+<span class="source-line-no">061</span><span id="line-61">    public interface TransportFactory {</span>
+<span class="source-line-no">062</span><span id="line-62">        /**</span>
+<span class="source-line-no">063</span><span id="line-63">         * @param mapper mapper that is shared between {@code DefaultRpcClient} and the {@link JsonRpcTransport}.</span>
+<span class="source-line-no">064</span><span id="line-64">         * @return a transport instance</span>
+<span class="source-line-no">065</span><span id="line-65">         */</span>
+<span class="source-line-no">066</span><span id="line-66">        JsonRpcTransport&lt;JavaType&gt; create(ObjectMapper mapper);</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68">    protected final JsonRpcMessage.Version jsonRpcVersion;</span>
+<span class="source-line-no">069</span><span id="line-69">    protected final ObjectMapper mapper;</span>
+<span class="source-line-no">070</span><span id="line-70">    private final JavaType defaultType;</span>
+<span class="source-line-no">071</span><span id="line-71">    private final JsonRpcTransport&lt;JavaType&gt; transport;</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73">    public DefaultRpcClient(URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">074</span><span id="line-74">        this(JsonRpcTransport.getDefaultSSLContext(), DEFAULT_JSON_RPC_VERSION, server, rpcUser, rpcPassword);</span>
+<span class="source-line-no">075</span><span id="line-75">    }</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">    public DefaultRpcClient(JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">078</span><span id="line-78">        this(JsonRpcTransport.getDefaultSSLContext(), jsonRpcVersion, server, rpcUser, rpcPassword);</span>
+<span class="source-line-no">079</span><span id="line-79">    }</span>
+<span class="source-line-no">080</span><span id="line-80">    public DefaultRpcClient(SSLContext sslContext, JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">081</span><span id="line-81">        this((m) -&gt; new JsonRpcClientJavaNet(m, sslContext, server, rpcUser, rpcPassword), jsonRpcVersion);</span>
+<span class="source-line-no">082</span><span id="line-82">    }</span>
+<span class="source-line-no">083</span><span id="line-83"></span>
+<span class="source-line-no">084</span><span id="line-84">    public DefaultRpcClient(TransportFactory transportFactory, JsonRpcMessage.Version jsonRpcVersion) {</span>
+<span class="source-line-no">085</span><span id="line-85">        this.jsonRpcVersion = jsonRpcVersion;</span>
+<span class="source-line-no">086</span><span id="line-86">        mapper = new ObjectMapper();</span>
+<span class="source-line-no">087</span><span id="line-87">        // TODO: Provide external API to configure FAIL_ON_UNKNOWN_PROPERTIES</span>
+<span class="source-line-no">088</span><span id="line-88">        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);</span>
+<span class="source-line-no">089</span><span id="line-89">        defaultType = mapper.getTypeFactory().constructType(Object.class);</span>
+<span class="source-line-no">090</span><span id="line-90">        transport = transportFactory.create(mapper);</span>
+<span class="source-line-no">091</span><span id="line-91">    }</span>
+<span class="source-line-no">092</span><span id="line-92"></span>
+<span class="source-line-no">093</span><span id="line-93">    @Override</span>
+<span class="source-line-no">094</span><span id="line-94">    public JsonRpcMessage.Version getJsonRpcVersion() {</span>
+<span class="source-line-no">095</span><span id="line-95">        return jsonRpcVersion;</span>
+<span class="source-line-no">096</span><span id="line-96">    }</span>
+<span class="source-line-no">097</span><span id="line-97"></span>
+<span class="source-line-no">098</span><span id="line-98">    @Override</span>
+<span class="source-line-no">099</span><span id="line-99">    public URI getServerURI() {</span>
+<span class="source-line-no">100</span><span id="line-100">        return transport.getServerURI();</span>
+<span class="source-line-no">101</span><span id="line-101">    }</span>
+<span class="source-line-no">102</span><span id="line-102"></span>
+<span class="source-line-no">103</span><span id="line-103">    @Override</span>
+<span class="source-line-no">104</span><span id="line-104">    public &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, JavaType responseType) {</span>
+<span class="source-line-no">105</span><span id="line-105">        return transport.sendRequestForResponseAsync(request, responseType);</span>
+<span class="source-line-no">106</span><span id="line-106">    }</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108">    /**</span>
+<span class="source-line-no">109</span><span id="line-109">     * Convenience method for requesting an asynchronous response with a {@link JsonNode} for the result.</span>
+<span class="source-line-no">110</span><span id="line-110">     * @param request The request to send</span>
+<span class="source-line-no">111</span><span id="line-111">     * @return A future JSON RPC Response with `result` of type {@code JsonNode}</span>
+<span class="source-line-no">112</span><span id="line-112">     */</span>
+<span class="source-line-no">113</span><span id="line-113">    public CompletableFuture&lt;JsonRpcResponse&lt;JsonNode&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request) {</span>
+<span class="source-line-no">114</span><span id="line-114">        return sendRequestForResponseAsync(request, responseTypeFor(JsonNode.class));</span>
+<span class="source-line-no">115</span><span id="line-115">    }</span>
+<span class="source-line-no">116</span><span id="line-116"></span>
+<span class="source-line-no">117</span><span id="line-117">    public ObjectMapper getMapper() {</span>
+<span class="source-line-no">118</span><span id="line-118">        return mapper;</span>
+<span class="source-line-no">119</span><span id="line-119">    }</span>
+<span class="source-line-no">120</span><span id="line-120"></span>
+<span class="source-line-no">121</span><span id="line-121">    @Override</span>
+<span class="source-line-no">122</span><span id="line-122">    public JavaType defaultType() {</span>
+<span class="source-line-no">123</span><span id="line-123">        return defaultType;</span>
+<span class="source-line-no">124</span><span id="line-124">    }</span>
+<span class="source-line-no">125</span><span id="line-125"></span>
+<span class="source-line-no">126</span><span id="line-126">    @Override</span>
+<span class="source-line-no">127</span><span id="line-127">    public JavaType responseTypeFor(JavaType resultType) {</span>
+<span class="source-line-no">128</span><span id="line-128">        return getMapper().getTypeFactory().</span>
+<span class="source-line-no">129</span><span id="line-129">                constructParametricType(JsonRpcResponse.class, resultType);</span>
+<span class="source-line-no">130</span><span id="line-130">    }</span>
+<span class="source-line-no">131</span><span id="line-131"></span>
+<span class="source-line-no">132</span><span id="line-132">    @Override</span>
+<span class="source-line-no">133</span><span id="line-133">    public JavaType responseTypeFor(Class&lt;?&gt; resultType) {</span>
+<span class="source-line-no">134</span><span id="line-134">        return getMapper().getTypeFactory().</span>
+<span class="source-line-no">135</span><span id="line-135">                constructParametricType(JsonRpcResponse.class, resultType);</span>
+<span class="source-line-no">136</span><span id="line-136">    }</span>
+<span class="source-line-no">137</span><span id="line-137"></span>
+<span class="source-line-no">138</span><span id="line-138">    @Override</span>
+<span class="source-line-no">139</span><span id="line-139">    public JavaType typeForClass(Class&lt;?&gt; clazz) {</span>
+<span class="source-line-no">140</span><span id="line-140">        return getMapper().constructType(clazz);</span>
+<span class="source-line-no">141</span><span id="line-141">    }</span>
+<span class="source-line-no">142</span><span id="line-142"></span>
+<span class="source-line-no">143</span><span id="line-143">    @Override</span>
+<span class="source-line-no">144</span><span id="line-144">    public JavaType collectionTypeForClasses(Class&lt;? extends Collection&gt; collection, Class&lt;?&gt; clazz) {</span>
+<span class="source-line-no">145</span><span id="line-145">        return getMapper().getTypeFactory()</span>
+<span class="source-line-no">146</span><span id="line-146">                .constructCollectionType(collection, clazz);</span>
+<span class="source-line-no">147</span><span id="line-147">    }</span>
+<span class="source-line-no">148</span><span id="line-148"></span>
+<span class="source-line-no">149</span><span id="line-149">    @Override</span>
+<span class="source-line-no">150</span><span id="line-150">    public JavaType collectionTypeForClasses(Class&lt;? extends Collection&gt; collection, JavaType type) {</span>
+<span class="source-line-no">151</span><span id="line-151">        return getMapper().getTypeFactory()</span>
+<span class="source-line-no">152</span><span id="line-152">                .constructCollectionType(collection, type);</span>
+<span class="source-line-no">153</span><span id="line-153">    }</span>
+<span class="source-line-no">154</span><span id="line-154"></span>
+<span class="source-line-no">155</span><span id="line-155">    public &lt;T&gt; CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; pollOnce(JsonRpcRequest request, JavaType resultType, TransientErrorMapper&lt;T&gt; errorMapper) {</span>
+<span class="source-line-no">156</span><span id="line-156">        CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; f = sendRequestForResponseAsync(request, responseTypeFor(resultType));</span>
+<span class="source-line-no">157</span><span id="line-157">        // In Java 12+ this can be replaced with exceptionallyCompose()</span>
+<span class="source-line-no">158</span><span id="line-158">        return f.handle((r, t) -&gt; errorMapper.map(request, r, t))</span>
+<span class="source-line-no">159</span><span id="line-159">                .thenCompose(Function.identity());</span>
+<span class="source-line-no">160</span><span id="line-160">    }</span>
+<span class="source-line-no">161</span><span id="line-161"></span>
+<span class="source-line-no">162</span><span id="line-162">    /**</span>
+<span class="source-line-no">163</span><span id="line-163">     * A wait-for-server routine that is agnostic about which RPC methods the server supports. In addition to two {@link Duration}</span>
+<span class="source-line-no">164</span><span id="line-164">     * parameters, there are 2 lambda parameters to enable this method to work with any JSON-RPC server. This version will tell</span>
+<span class="source-line-no">165</span><span id="line-165">     * the JSON-RPC Mapper to return an {@link JsonRpcResponse} with a result of type {@link Object}. If you need more precise</span>
+<span class="source-line-no">166</span><span id="line-166">     * control over the type, use {@link #waitForServer(Duration, Duration, Supplier, JavaType, TransientErrorMapper)}.</span>
+<span class="source-line-no">167</span><span id="line-167">     * @param timeout how long to wait</span>
+<span class="source-line-no">168</span><span id="line-168">     * @param retry delay between retries</span>
+<span class="source-line-no">169</span><span id="line-169">     * @param requestSupplier supplier of requests (needs to increment request ID at the very least)</span>
+<span class="source-line-no">170</span><span id="line-170">     * @param errorMapper function that maps non-fatal errors (i.e. cases to keep polling)</span>
+<span class="source-line-no">171</span><span id="line-171">     * @return A future that returns a successful</span>
+<span class="source-line-no">172</span><span id="line-172">     * @param &lt;T&gt; The desired result type to be returned when the server is running</span>
+<span class="source-line-no">173</span><span id="line-173">     */</span>
+<span class="source-line-no">174</span><span id="line-174">    public &lt;T&gt; CompletableFuture&lt;T&gt; waitForServer(Duration timeout, Duration retry, Supplier&lt;JsonRpcRequest&gt; requestSupplier, TransientErrorMapper&lt;T&gt; errorMapper) {</span>
+<span class="source-line-no">175</span><span id="line-175">        return waitForServer(timeout,retry, requestSupplier, typeForClass(Object.class), errorMapper);</span>
+<span class="source-line-no">176</span><span id="line-176">    }</span>
+<span class="source-line-no">177</span><span id="line-177"></span>
+<span class="source-line-no">178</span><span id="line-178">    // TODO: What happens if you cancel this future?</span>
+<span class="source-line-no">179</span><span id="line-179">    /**</span>
+<span class="source-line-no">180</span><span id="line-180">    * A wait-for-server routine that is agnostic about which RPC methods the server supports. In addition to two {@link Duration}</span>
+<span class="source-line-no">181</span><span id="line-181">    * parameters, there are 3 parameters (2 functions and a generic type specifier) to enable this method to work with any JSON-RPC server.</span>
+<span class="source-line-no">182</span><span id="line-182">    * @param timeout how long to wait</span>
+<span class="source-line-no">183</span><span id="line-183">    * @param retry delay between retries</span>
+<span class="source-line-no">184</span><span id="line-184">    * @param requestSupplier supplier of requests (needs to increment request ID at the very least)</span>
+<span class="source-line-no">185</span><span id="line-185">    * @param resultType the result type for the response</span>
+<span class="source-line-no">186</span><span id="line-186">    * @param errorMapper function that maps non-fatal errors (i.e. cases to keep polling)</span>
+<span class="source-line-no">187</span><span id="line-187">    * @return A future that returns a successful</span>
+<span class="source-line-no">188</span><span id="line-188">    * @param &lt;T&gt; The desired result type to be returned when the server is running</span>
+<span class="source-line-no">189</span><span id="line-189">    */</span>
+<span class="source-line-no">190</span><span id="line-190">    public &lt;T&gt; CompletableFuture&lt;T&gt; waitForServer(Duration timeout, Duration retry, Supplier&lt;JsonRpcRequest&gt; requestSupplier, JavaType resultType, TransientErrorMapper&lt;T&gt; errorMapper) {</span>
+<span class="source-line-no">191</span><span id="line-191">        CompletableFuture&lt;T&gt; future = new CompletableFuture&lt;&gt;();</span>
+<span class="source-line-no">192</span><span id="line-192">        getDefaultAsyncExecutor().execute(() -&gt; {</span>
+<span class="source-line-no">193</span><span id="line-193">            log.debug("Waiting for server RPC ready...");</span>
+<span class="source-line-no">194</span><span id="line-194">            String status;          // Status message for logging</span>
+<span class="source-line-no">195</span><span id="line-195">            String statusLast = null;</span>
+<span class="source-line-no">196</span><span id="line-196">            long seconds = 0;</span>
+<span class="source-line-no">197</span><span id="line-197">            while (seconds &lt; timeout.toSeconds()) {</span>
+<span class="source-line-no">198</span><span id="line-198">                JsonRpcResponse&lt;T&gt; r;</span>
+<span class="source-line-no">199</span><span id="line-199">                try {</span>
+<span class="source-line-no">200</span><span id="line-200">                    // All non-fatal exceptions will be mapped to a JsonRpcError with code -20000</span>
+<span class="source-line-no">201</span><span id="line-201">                    r = this.pollOnce(requestSupplier.get(), resultType, errorMapper).get();</span>
+<span class="source-line-no">202</span><span id="line-202">                } catch (InterruptedException | ExecutionException e) {</span>
+<span class="source-line-no">203</span><span id="line-203">                    // If a fatal error occurred, fail our future and abort this thread</span>
+<span class="source-line-no">204</span><span id="line-204">                    log.error("Fatal exception: ", e);</span>
+<span class="source-line-no">205</span><span id="line-205">                    future.completeExceptionally(e);</span>
+<span class="source-line-no">206</span><span id="line-206">                    return;</span>
+<span class="source-line-no">207</span><span id="line-207">                }</span>
+<span class="source-line-no">208</span><span id="line-208">                if (r.getResult() != null) {</span>
+<span class="source-line-no">209</span><span id="line-209">                    // We received a response with a result, server is ready and has returned a usable result</span>
+<span class="source-line-no">210</span><span id="line-210">                    log.debug("RPC Ready.");</span>
+<span class="source-line-no">211</span><span id="line-211">                    future.complete(r.getResult());</span>
+<span class="source-line-no">212</span><span id="line-212">                    return;</span>
+<span class="source-line-no">213</span><span id="line-213">                }</span>
+<span class="source-line-no">214</span><span id="line-214">                // We received a response with a non-fatal error, log it and wait to retry.</span>
+<span class="source-line-no">215</span><span id="line-215">                status = statusFromErrorResponse(r);</span>
+<span class="source-line-no">216</span><span id="line-216">                // Log status messages only once, if new or updated</span>
+<span class="source-line-no">217</span><span id="line-217">                if (!status.equals(statusLast)) {</span>
+<span class="source-line-no">218</span><span id="line-218">                    log.info("Waiting for server: RPC Status: " + status);</span>
+<span class="source-line-no">219</span><span id="line-219">                    statusLast = status;</span>
+<span class="source-line-no">220</span><span id="line-220">                }</span>
+<span class="source-line-no">221</span><span id="line-221">                try {</span>
+<span class="source-line-no">222</span><span id="line-222">                    // Damnit, IntelliJ we're not busy-waiting we're polling!</span>
+<span class="source-line-no">223</span><span id="line-223">                    Thread.sleep(retry.toMillis());</span>
+<span class="source-line-no">224</span><span id="line-224">                    seconds += retry.toSeconds();</span>
+<span class="source-line-no">225</span><span id="line-225">                } catch (InterruptedException e) {</span>
+<span class="source-line-no">226</span><span id="line-226">                    log.error(e.toString());</span>
+<span class="source-line-no">227</span><span id="line-227">                    Thread.currentThread().interrupt();</span>
+<span class="source-line-no">228</span><span id="line-228">                    future.completeExceptionally(e);</span>
+<span class="source-line-no">229</span><span id="line-229">                    return;</span>
+<span class="source-line-no">230</span><span id="line-230">                }</span>
+<span class="source-line-no">231</span><span id="line-231">            }</span>
+<span class="source-line-no">232</span><span id="line-232">            String timeoutMessage = String.format("waitForServer() timed out after %d seconds", timeout.toSeconds());</span>
+<span class="source-line-no">233</span><span id="line-233">            log.error(timeoutMessage);</span>
+<span class="source-line-no">234</span><span id="line-234">            future.completeExceptionally(new TimeoutException(timeoutMessage));</span>
+<span class="source-line-no">235</span><span id="line-235">        });</span>
+<span class="source-line-no">236</span><span id="line-236">        return future;</span>
+<span class="source-line-no">237</span><span id="line-237">    }</span>
+<span class="source-line-no">238</span><span id="line-238"></span>
+<span class="source-line-no">239</span><span id="line-239">    /**</span>
+<span class="source-line-no">240</span><span id="line-240">     * Functional interface for ignoring what are considered "transient" errors. The definition of what is transient</span>
+<span class="source-line-no">241</span><span id="line-241">     * may vary depending upon the application. Different implementations of this function can be created for</span>
+<span class="source-line-no">242</span><span id="line-242">     * different applications.</span>
+<span class="source-line-no">243</span><span id="line-243">     * &lt;p&gt;</span>
+<span class="source-line-no">244</span><span id="line-244">     * The {@code JsonRpcResponse} returned may be a "synthetic" response, that is generated by the client,</span>
+<span class="source-line-no">245</span><span id="line-245">     * not by the server. The synthetic response will look like this:</span>
+<span class="source-line-no">246</span><span id="line-246">     *     &lt;ul&gt;</span>
+<span class="source-line-no">247</span><span id="line-247">     *         &lt;li&gt;error.code: -20000&lt;/li&gt;</span>
+<span class="source-line-no">248</span><span id="line-248">     *         &lt;li&gt;error.message: "Server temporarily unavailable"&lt;/li&gt;</span>
+<span class="source-line-no">249</span><span id="line-249">     *         &lt;li&gt;error.data: Detailed string message, e.g. "Connection refused"&lt;/li&gt;</span>
+<span class="source-line-no">250</span><span id="line-250">     *     &lt;/ul&gt;</span>
+<span class="source-line-no">251</span><span id="line-251">     * @param &lt;T&gt; The expected result type</span>
+<span class="source-line-no">252</span><span id="line-252">     */</span>
+<span class="source-line-no">253</span><span id="line-253">    @FunctionalInterface</span>
+<span class="source-line-no">254</span><span id="line-254">    public interface TransientErrorMapper&lt;T&gt; {</span>
+<span class="source-line-no">255</span><span id="line-255">        /**</span>
+<span class="source-line-no">256</span><span id="line-256">         * @param request The request we're handling completions for</span>
+<span class="source-line-no">257</span><span id="line-257">         * @param response response if one was successfully returned (or null)</span>
+<span class="source-line-no">258</span><span id="line-258">         * @param throwable exception if the call failed (or null)</span>
+<span class="source-line-no">259</span><span id="line-259">         * @return A completed or failed future than can replace the input (response, throwable) pair</span>
+<span class="source-line-no">260</span><span id="line-260">         */</span>
+<span class="source-line-no">261</span><span id="line-261">        CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; map(JsonRpcRequest request, JsonRpcResponse&lt;T&gt; response, Throwable throwable);</span>
+<span class="source-line-no">262</span><span id="line-262">    }</span>
+<span class="source-line-no">263</span><span id="line-263"></span>
+<span class="source-line-no">264</span><span id="line-264">    /**</span>
+<span class="source-line-no">265</span><span id="line-265">     * Transient error mapper that is a no-op, i.e. it passes all errors through unchanged.</span>
+<span class="source-line-no">266</span><span id="line-266">     */</span>
+<span class="source-line-no">267</span><span id="line-267">    protected  &lt;T&gt; CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; identityTransientErrorMapper(JsonRpcRequest request, JsonRpcResponse&lt;T&gt; response, Throwable t) {</span>
+<span class="source-line-no">268</span><span id="line-268">        return response != null</span>
+<span class="source-line-no">269</span><span id="line-269">                ? CompletableFuture.completedFuture(response)</span>
+<span class="source-line-no">270</span><span id="line-270">                : CompletableFuture.failedFuture(t);</span>
+<span class="source-line-no">271</span><span id="line-271">    }</span>
+<span class="source-line-no">272</span><span id="line-272"></span>
+<span class="source-line-no">273</span><span id="line-273">    protected &lt;T&gt; JsonRpcResponse&lt;T&gt; temporarilyUnavailableResponse(JsonRpcRequest request,  Throwable t) {</span>
+<span class="source-line-no">274</span><span id="line-274">        return new JsonRpcResponse&lt;T&gt;(request, new JsonRpcError(-2000, "Server temporarily unavailable", t.getMessage()));</span>
+<span class="source-line-no">275</span><span id="line-275">    }</span>
+<span class="source-line-no">276</span><span id="line-276"></span>
+<span class="source-line-no">277</span><span id="line-277">    /**</span>
+<span class="source-line-no">278</span><span id="line-278">     * @param response A response where {@code getResult() == null}</span>
+<span class="source-line-no">279</span><span id="line-279">     * @return An error status string suitable for log messages</span>
+<span class="source-line-no">280</span><span id="line-280">     */</span>
+<span class="source-line-no">281</span><span id="line-281">    protected String statusFromErrorResponse(JsonRpcResponse&lt;?&gt; response) {</span>
+<span class="source-line-no">282</span><span id="line-282">        Objects.requireNonNull(response);</span>
+<span class="source-line-no">283</span><span id="line-283">        if (response.getResult() != null) {</span>
+<span class="source-line-no">284</span><span id="line-284">            throw new IllegalStateException("This should only be called for responses with null result");</span>
+<span class="source-line-no">285</span><span id="line-285">        }</span>
+<span class="source-line-no">286</span><span id="line-286">        if (response.getError() == null) {</span>
+<span class="source-line-no">287</span><span id="line-287">            return "Invalid response both result and error were null";</span>
+<span class="source-line-no">288</span><span id="line-288">        } else if (response.getError().getData() != null) {</span>
+<span class="source-line-no">289</span><span id="line-289">            // Has option data, possibly the -2000 special case</span>
+<span class="source-line-no">290</span><span id="line-290">            return response.getError().getData().toString();</span>
+<span class="source-line-no">291</span><span id="line-291">        } else {</span>
+<span class="source-line-no">292</span><span id="line-292">            return response.getError().getMessage();</span>
+<span class="source-line-no">293</span><span id="line-293">        }</span>
+<span class="source-line-no">294</span><span id="line-294">    }</span>
+<span class="source-line-no">295</span><span id="line-295">}</span>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</main>
+</body>
+</html>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html b/apidoc/src-html/org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html
new file mode 100644
index 000000000..a28b047ba
--- /dev/null
+++ b/apidoc/src-html/org/consensusj/jsonrpc/DefaultRpcClient.TransportFactory.html
@@ -0,0 +1,373 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Source code</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="source: package: org.consensusj.jsonrpc, class: DefaultRpcClient, interface: TransportFactory">
+<meta name="generator" content="javadoc/SourceToHTMLConverter">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+</head>
+<body class="source-page">
+<main role="main">
+<div class="source-container">
+<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
+<span class="source-line-no">002</span><span id="line-2"></span>
+<span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.databind.DeserializationFeature;</span>
+<span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JavaType;</span>
+<span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.databind.JsonNode;</span>
+<span class="source-line-no">006</span><span id="line-6">import com.fasterxml.jackson.databind.ObjectMapper;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.slf4j.Logger;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">009</span><span id="line-9"></span>
+<span class="source-line-no">010</span><span id="line-10">import javax.net.ssl.SSLContext;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.lang.reflect.Type;</span>
+<span class="source-line-no">012</span><span id="line-12">import java.time.Duration;</span>
+<span class="source-line-no">013</span><span id="line-13">import java.net.URI;</span>
+<span class="source-line-no">014</span><span id="line-14">import java.util.Collection;</span>
+<span class="source-line-no">015</span><span id="line-15">import java.util.List;</span>
+<span class="source-line-no">016</span><span id="line-16">import java.util.Objects;</span>
+<span class="source-line-no">017</span><span id="line-17">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">018</span><span id="line-18">import java.util.concurrent.ExecutionException;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.util.concurrent.TimeoutException;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.util.function.Function;</span>
+<span class="source-line-no">021</span><span id="line-21">import java.util.function.Supplier;</span>
+<span class="source-line-no">022</span><span id="line-22"></span>
+<span class="source-line-no">023</span><span id="line-23">// We're overusing inheritance in this hierarchy. We are breaking Effective Java, Item 18: Favor composition over inheritance.</span>
+<span class="source-line-no">024</span><span id="line-24">// We're using inheritance to configure:</span>
+<span class="source-line-no">025</span><span id="line-25">// A. The set of JSON-RPC methods that are supported, e.g. `getblockcount()` (which creates potential conflicts with `send()` etc)</span>
+<span class="source-line-no">026</span><span id="line-26">// B. The JSON mapping implementation. Which for now and the foreseeable future is Jackson only.</span>
+<span class="source-line-no">027</span><span id="line-27">//</span>
+<span class="source-line-no">028</span><span id="line-28">// TODO: Maybe look at extracting a class with some common "mapper" functions between the two transport implementations</span>
+<span class="source-line-no">029</span><span id="line-29">//</span>
+<span class="source-line-no">030</span><span id="line-30">// The proper separation for (A) is probably a complete separation. There should be no required inheritance to implement</span>
+<span class="source-line-no">031</span><span id="line-31">// a client with a set of methods. Internally the client would have a transport and a mapper and those could optionally be made available</span>
+<span class="source-line-no">032</span><span id="line-32">// via some accessor methods if the client application deems necessary.</span>
+<span class="source-line-no">033</span><span id="line-33">// At the heart of (B) (at least as currently implemented) is the mapping from a Java (or Groovy) method name to (i) a JSON-RPC method</span>
+<span class="source-line-no">034</span><span id="line-34">// name, (ii) optional parameter type-conversion for JSON serialization in the request, and (iii) type mapping for the deserialization</span>
+<span class="source-line-no">035</span><span id="line-35">// of the `result` field in the JsonRpcResponse&lt;RSLT&gt;. It might be helpful to think of this as two functional mappings:</span>
+<span class="source-line-no">036</span><span id="line-36">// (1) Map Java method name and parameters to a JSON-RPC request (either map to set of Java Objects _or_ all the way to JSON)</span>
+<span class="source-line-no">037</span><span id="line-37">// (2) Map from received JSON-RPC response to JsonRpcResponse&lt;RSLT&gt; -- this response mapper function is configured as part of making the request.</span>
+<span class="source-line-no">038</span><span id="line-38">//</span>
+<span class="source-line-no">039</span><span id="line-39">// To abstract the specifics of Jackson from the (two) transport implementations. Basically methods/functions to</span>
+<span class="source-line-no">040</span><span id="line-40">// map from request to string/stream and to map from string/stream to response.  The java.net.http implementation has already defined</span>
+<span class="source-line-no">041</span><span id="line-41">// some functional interfaces for this, so coming up with an interface that both the java.net.http implementation and the HttpUrlConnection</span>
+<span class="source-line-no">042</span><span id="line-42">// implementation can use will lead to this "SECOND STEP"</span>
+<span class="source-line-no">043</span><span id="line-43">//</span>
+<span class="source-line-no">044</span><span id="line-44">// Now that JsonRpcClient is a generic with &lt;T extends Type&gt;, we have loosened the Jackson coupling somewhat.</span>
+<span class="source-line-no">045</span><span id="line-45">//</span>
+<span class="source-line-no">046</span><span id="line-46">/**</span>
+<span class="source-line-no">047</span><span id="line-47"> * A strongly-typed, Jackson-based JSON-RPC client. {@link JsonRpcClient} provides many convenience send `default` methods in a</span>
+<span class="source-line-no">048</span><span id="line-48"> * JSON-library-independent way. DefaultRpcClient provides the needed implementation support for Jackson. This class implements</span>
+<span class="source-line-no">049</span><span id="line-49"> * the constructors, static fields, and getters, but delegates the core</span>
+<span class="source-line-no">050</span><span id="line-50"> * {@link JsonRpcTransport#sendRequestForResponseAsync(JsonRpcRequest, Type)} method to a {@link JsonRpcTransport} implementation component.</span>
+<span class="source-line-no">051</span><span id="line-51"> */</span>
+<span class="source-line-no">052</span><span id="line-52">public class DefaultRpcClient implements JsonRpcClient&lt;JavaType&gt; {</span>
+<span class="source-line-no">053</span><span id="line-53">    private static final Logger log = LoggerFactory.getLogger(DefaultRpcClient.class);</span>
+<span class="source-line-no">054</span><span id="line-54">    private static final JsonRpcMessage.Version DEFAULT_JSON_RPC_VERSION = JsonRpcMessage.Version.V2;</span>
+<span class="source-line-no">055</span><span id="line-55"></span>
+<span class="source-line-no">056</span><span id="line-56">    /**</span>
+<span class="source-line-no">057</span><span id="line-57">     * Functional interface for creating JsonRpcTransport instances. This is used to prevent a circular</span>
+<span class="source-line-no">058</span><span id="line-58">     * dependency on {@link ObjectMapper}.</span>
+<span class="source-line-no">059</span><span id="line-59">     */</span>
+<span class="source-line-no">060</span><span id="line-60">    @FunctionalInterface</span>
+<span class="source-line-no">061</span><span id="line-61">    public interface TransportFactory {</span>
+<span class="source-line-no">062</span><span id="line-62">        /**</span>
+<span class="source-line-no">063</span><span id="line-63">         * @param mapper mapper that is shared between {@code DefaultRpcClient} and the {@link JsonRpcTransport}.</span>
+<span class="source-line-no">064</span><span id="line-64">         * @return a transport instance</span>
+<span class="source-line-no">065</span><span id="line-65">         */</span>
+<span class="source-line-no">066</span><span id="line-66">        JsonRpcTransport&lt;JavaType&gt; create(ObjectMapper mapper);</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68">    protected final JsonRpcMessage.Version jsonRpcVersion;</span>
+<span class="source-line-no">069</span><span id="line-69">    protected final ObjectMapper mapper;</span>
+<span class="source-line-no">070</span><span id="line-70">    private final JavaType defaultType;</span>
+<span class="source-line-no">071</span><span id="line-71">    private final JsonRpcTransport&lt;JavaType&gt; transport;</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73">    public DefaultRpcClient(URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">074</span><span id="line-74">        this(JsonRpcTransport.getDefaultSSLContext(), DEFAULT_JSON_RPC_VERSION, server, rpcUser, rpcPassword);</span>
+<span class="source-line-no">075</span><span id="line-75">    }</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">    public DefaultRpcClient(JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">078</span><span id="line-78">        this(JsonRpcTransport.getDefaultSSLContext(), jsonRpcVersion, server, rpcUser, rpcPassword);</span>
+<span class="source-line-no">079</span><span id="line-79">    }</span>
+<span class="source-line-no">080</span><span id="line-80">    public DefaultRpcClient(SSLContext sslContext, JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">081</span><span id="line-81">        this((m) -&gt; new JsonRpcClientJavaNet(m, sslContext, server, rpcUser, rpcPassword), jsonRpcVersion);</span>
+<span class="source-line-no">082</span><span id="line-82">    }</span>
+<span class="source-line-no">083</span><span id="line-83"></span>
+<span class="source-line-no">084</span><span id="line-84">    public DefaultRpcClient(TransportFactory transportFactory, JsonRpcMessage.Version jsonRpcVersion) {</span>
+<span class="source-line-no">085</span><span id="line-85">        this.jsonRpcVersion = jsonRpcVersion;</span>
+<span class="source-line-no">086</span><span id="line-86">        mapper = new ObjectMapper();</span>
+<span class="source-line-no">087</span><span id="line-87">        // TODO: Provide external API to configure FAIL_ON_UNKNOWN_PROPERTIES</span>
+<span class="source-line-no">088</span><span id="line-88">        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);</span>
+<span class="source-line-no">089</span><span id="line-89">        defaultType = mapper.getTypeFactory().constructType(Object.class);</span>
+<span class="source-line-no">090</span><span id="line-90">        transport = transportFactory.create(mapper);</span>
+<span class="source-line-no">091</span><span id="line-91">    }</span>
+<span class="source-line-no">092</span><span id="line-92"></span>
+<span class="source-line-no">093</span><span id="line-93">    @Override</span>
+<span class="source-line-no">094</span><span id="line-94">    public JsonRpcMessage.Version getJsonRpcVersion() {</span>
+<span class="source-line-no">095</span><span id="line-95">        return jsonRpcVersion;</span>
+<span class="source-line-no">096</span><span id="line-96">    }</span>
+<span class="source-line-no">097</span><span id="line-97"></span>
+<span class="source-line-no">098</span><span id="line-98">    @Override</span>
+<span class="source-line-no">099</span><span id="line-99">    public URI getServerURI() {</span>
+<span class="source-line-no">100</span><span id="line-100">        return transport.getServerURI();</span>
+<span class="source-line-no">101</span><span id="line-101">    }</span>
+<span class="source-line-no">102</span><span id="line-102"></span>
+<span class="source-line-no">103</span><span id="line-103">    @Override</span>
+<span class="source-line-no">104</span><span id="line-104">    public &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, JavaType responseType) {</span>
+<span class="source-line-no">105</span><span id="line-105">        return transport.sendRequestForResponseAsync(request, responseType);</span>
+<span class="source-line-no">106</span><span id="line-106">    }</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108">    /**</span>
+<span class="source-line-no">109</span><span id="line-109">     * Convenience method for requesting an asynchronous response with a {@link JsonNode} for the result.</span>
+<span class="source-line-no">110</span><span id="line-110">     * @param request The request to send</span>
+<span class="source-line-no">111</span><span id="line-111">     * @return A future JSON RPC Response with `result` of type {@code JsonNode}</span>
+<span class="source-line-no">112</span><span id="line-112">     */</span>
+<span class="source-line-no">113</span><span id="line-113">    public CompletableFuture&lt;JsonRpcResponse&lt;JsonNode&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request) {</span>
+<span class="source-line-no">114</span><span id="line-114">        return sendRequestForResponseAsync(request, responseTypeFor(JsonNode.class));</span>
+<span class="source-line-no">115</span><span id="line-115">    }</span>
+<span class="source-line-no">116</span><span id="line-116"></span>
+<span class="source-line-no">117</span><span id="line-117">    public ObjectMapper getMapper() {</span>
+<span class="source-line-no">118</span><span id="line-118">        return mapper;</span>
+<span class="source-line-no">119</span><span id="line-119">    }</span>
+<span class="source-line-no">120</span><span id="line-120"></span>
+<span class="source-line-no">121</span><span id="line-121">    @Override</span>
+<span class="source-line-no">122</span><span id="line-122">    public JavaType defaultType() {</span>
+<span class="source-line-no">123</span><span id="line-123">        return defaultType;</span>
+<span class="source-line-no">124</span><span id="line-124">    }</span>
+<span class="source-line-no">125</span><span id="line-125"></span>
+<span class="source-line-no">126</span><span id="line-126">    @Override</span>
+<span class="source-line-no">127</span><span id="line-127">    public JavaType responseTypeFor(JavaType resultType) {</span>
+<span class="source-line-no">128</span><span id="line-128">        return getMapper().getTypeFactory().</span>
+<span class="source-line-no">129</span><span id="line-129">                constructParametricType(JsonRpcResponse.class, resultType);</span>
+<span class="source-line-no">130</span><span id="line-130">    }</span>
+<span class="source-line-no">131</span><span id="line-131"></span>
+<span class="source-line-no">132</span><span id="line-132">    @Override</span>
+<span class="source-line-no">133</span><span id="line-133">    public JavaType responseTypeFor(Class&lt;?&gt; resultType) {</span>
+<span class="source-line-no">134</span><span id="line-134">        return getMapper().getTypeFactory().</span>
+<span class="source-line-no">135</span><span id="line-135">                constructParametricType(JsonRpcResponse.class, resultType);</span>
+<span class="source-line-no">136</span><span id="line-136">    }</span>
+<span class="source-line-no">137</span><span id="line-137"></span>
+<span class="source-line-no">138</span><span id="line-138">    @Override</span>
+<span class="source-line-no">139</span><span id="line-139">    public JavaType typeForClass(Class&lt;?&gt; clazz) {</span>
+<span class="source-line-no">140</span><span id="line-140">        return getMapper().constructType(clazz);</span>
+<span class="source-line-no">141</span><span id="line-141">    }</span>
+<span class="source-line-no">142</span><span id="line-142"></span>
+<span class="source-line-no">143</span><span id="line-143">    @Override</span>
+<span class="source-line-no">144</span><span id="line-144">    public JavaType collectionTypeForClasses(Class&lt;? extends Collection&gt; collection, Class&lt;?&gt; clazz) {</span>
+<span class="source-line-no">145</span><span id="line-145">        return getMapper().getTypeFactory()</span>
+<span class="source-line-no">146</span><span id="line-146">                .constructCollectionType(collection, clazz);</span>
+<span class="source-line-no">147</span><span id="line-147">    }</span>
+<span class="source-line-no">148</span><span id="line-148"></span>
+<span class="source-line-no">149</span><span id="line-149">    @Override</span>
+<span class="source-line-no">150</span><span id="line-150">    public JavaType collectionTypeForClasses(Class&lt;? extends Collection&gt; collection, JavaType type) {</span>
+<span class="source-line-no">151</span><span id="line-151">        return getMapper().getTypeFactory()</span>
+<span class="source-line-no">152</span><span id="line-152">                .constructCollectionType(collection, type);</span>
+<span class="source-line-no">153</span><span id="line-153">    }</span>
+<span class="source-line-no">154</span><span id="line-154"></span>
+<span class="source-line-no">155</span><span id="line-155">    public &lt;T&gt; CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; pollOnce(JsonRpcRequest request, JavaType resultType, TransientErrorMapper&lt;T&gt; errorMapper) {</span>
+<span class="source-line-no">156</span><span id="line-156">        CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; f = sendRequestForResponseAsync(request, responseTypeFor(resultType));</span>
+<span class="source-line-no">157</span><span id="line-157">        // In Java 12+ this can be replaced with exceptionallyCompose()</span>
+<span class="source-line-no">158</span><span id="line-158">        return f.handle((r, t) -&gt; errorMapper.map(request, r, t))</span>
+<span class="source-line-no">159</span><span id="line-159">                .thenCompose(Function.identity());</span>
+<span class="source-line-no">160</span><span id="line-160">    }</span>
+<span class="source-line-no">161</span><span id="line-161"></span>
+<span class="source-line-no">162</span><span id="line-162">    /**</span>
+<span class="source-line-no">163</span><span id="line-163">     * A wait-for-server routine that is agnostic about which RPC methods the server supports. In addition to two {@link Duration}</span>
+<span class="source-line-no">164</span><span id="line-164">     * parameters, there are 2 lambda parameters to enable this method to work with any JSON-RPC server. This version will tell</span>
+<span class="source-line-no">165</span><span id="line-165">     * the JSON-RPC Mapper to return an {@link JsonRpcResponse} with a result of type {@link Object}. If you need more precise</span>
+<span class="source-line-no">166</span><span id="line-166">     * control over the type, use {@link #waitForServer(Duration, Duration, Supplier, JavaType, TransientErrorMapper)}.</span>
+<span class="source-line-no">167</span><span id="line-167">     * @param timeout how long to wait</span>
+<span class="source-line-no">168</span><span id="line-168">     * @param retry delay between retries</span>
+<span class="source-line-no">169</span><span id="line-169">     * @param requestSupplier supplier of requests (needs to increment request ID at the very least)</span>
+<span class="source-line-no">170</span><span id="line-170">     * @param errorMapper function that maps non-fatal errors (i.e. cases to keep polling)</span>
+<span class="source-line-no">171</span><span id="line-171">     * @return A future that returns a successful</span>
+<span class="source-line-no">172</span><span id="line-172">     * @param &lt;T&gt; The desired result type to be returned when the server is running</span>
+<span class="source-line-no">173</span><span id="line-173">     */</span>
+<span class="source-line-no">174</span><span id="line-174">    public &lt;T&gt; CompletableFuture&lt;T&gt; waitForServer(Duration timeout, Duration retry, Supplier&lt;JsonRpcRequest&gt; requestSupplier, TransientErrorMapper&lt;T&gt; errorMapper) {</span>
+<span class="source-line-no">175</span><span id="line-175">        return waitForServer(timeout,retry, requestSupplier, typeForClass(Object.class), errorMapper);</span>
+<span class="source-line-no">176</span><span id="line-176">    }</span>
+<span class="source-line-no">177</span><span id="line-177"></span>
+<span class="source-line-no">178</span><span id="line-178">    // TODO: What happens if you cancel this future?</span>
+<span class="source-line-no">179</span><span id="line-179">    /**</span>
+<span class="source-line-no">180</span><span id="line-180">    * A wait-for-server routine that is agnostic about which RPC methods the server supports. In addition to two {@link Duration}</span>
+<span class="source-line-no">181</span><span id="line-181">    * parameters, there are 3 parameters (2 functions and a generic type specifier) to enable this method to work with any JSON-RPC server.</span>
+<span class="source-line-no">182</span><span id="line-182">    * @param timeout how long to wait</span>
+<span class="source-line-no">183</span><span id="line-183">    * @param retry delay between retries</span>
+<span class="source-line-no">184</span><span id="line-184">    * @param requestSupplier supplier of requests (needs to increment request ID at the very least)</span>
+<span class="source-line-no">185</span><span id="line-185">    * @param resultType the result type for the response</span>
+<span class="source-line-no">186</span><span id="line-186">    * @param errorMapper function that maps non-fatal errors (i.e. cases to keep polling)</span>
+<span class="source-line-no">187</span><span id="line-187">    * @return A future that returns a successful</span>
+<span class="source-line-no">188</span><span id="line-188">    * @param &lt;T&gt; The desired result type to be returned when the server is running</span>
+<span class="source-line-no">189</span><span id="line-189">    */</span>
+<span class="source-line-no">190</span><span id="line-190">    public &lt;T&gt; CompletableFuture&lt;T&gt; waitForServer(Duration timeout, Duration retry, Supplier&lt;JsonRpcRequest&gt; requestSupplier, JavaType resultType, TransientErrorMapper&lt;T&gt; errorMapper) {</span>
+<span class="source-line-no">191</span><span id="line-191">        CompletableFuture&lt;T&gt; future = new CompletableFuture&lt;&gt;();</span>
+<span class="source-line-no">192</span><span id="line-192">        getDefaultAsyncExecutor().execute(() -&gt; {</span>
+<span class="source-line-no">193</span><span id="line-193">            log.debug("Waiting for server RPC ready...");</span>
+<span class="source-line-no">194</span><span id="line-194">            String status;          // Status message for logging</span>
+<span class="source-line-no">195</span><span id="line-195">            String statusLast = null;</span>
+<span class="source-line-no">196</span><span id="line-196">            long seconds = 0;</span>
+<span class="source-line-no">197</span><span id="line-197">            while (seconds &lt; timeout.toSeconds()) {</span>
+<span class="source-line-no">198</span><span id="line-198">                JsonRpcResponse&lt;T&gt; r;</span>
+<span class="source-line-no">199</span><span id="line-199">                try {</span>
+<span class="source-line-no">200</span><span id="line-200">                    // All non-fatal exceptions will be mapped to a JsonRpcError with code -20000</span>
+<span class="source-line-no">201</span><span id="line-201">                    r = this.pollOnce(requestSupplier.get(), resultType, errorMapper).get();</span>
+<span class="source-line-no">202</span><span id="line-202">                } catch (InterruptedException | ExecutionException e) {</span>
+<span class="source-line-no">203</span><span id="line-203">                    // If a fatal error occurred, fail our future and abort this thread</span>
+<span class="source-line-no">204</span><span id="line-204">                    log.error("Fatal exception: ", e);</span>
+<span class="source-line-no">205</span><span id="line-205">                    future.completeExceptionally(e);</span>
+<span class="source-line-no">206</span><span id="line-206">                    return;</span>
+<span class="source-line-no">207</span><span id="line-207">                }</span>
+<span class="source-line-no">208</span><span id="line-208">                if (r.getResult() != null) {</span>
+<span class="source-line-no">209</span><span id="line-209">                    // We received a response with a result, server is ready and has returned a usable result</span>
+<span class="source-line-no">210</span><span id="line-210">                    log.debug("RPC Ready.");</span>
+<span class="source-line-no">211</span><span id="line-211">                    future.complete(r.getResult());</span>
+<span class="source-line-no">212</span><span id="line-212">                    return;</span>
+<span class="source-line-no">213</span><span id="line-213">                }</span>
+<span class="source-line-no">214</span><span id="line-214">                // We received a response with a non-fatal error, log it and wait to retry.</span>
+<span class="source-line-no">215</span><span id="line-215">                status = statusFromErrorResponse(r);</span>
+<span class="source-line-no">216</span><span id="line-216">                // Log status messages only once, if new or updated</span>
+<span class="source-line-no">217</span><span id="line-217">                if (!status.equals(statusLast)) {</span>
+<span class="source-line-no">218</span><span id="line-218">                    log.info("Waiting for server: RPC Status: " + status);</span>
+<span class="source-line-no">219</span><span id="line-219">                    statusLast = status;</span>
+<span class="source-line-no">220</span><span id="line-220">                }</span>
+<span class="source-line-no">221</span><span id="line-221">                try {</span>
+<span class="source-line-no">222</span><span id="line-222">                    // Damnit, IntelliJ we're not busy-waiting we're polling!</span>
+<span class="source-line-no">223</span><span id="line-223">                    Thread.sleep(retry.toMillis());</span>
+<span class="source-line-no">224</span><span id="line-224">                    seconds += retry.toSeconds();</span>
+<span class="source-line-no">225</span><span id="line-225">                } catch (InterruptedException e) {</span>
+<span class="source-line-no">226</span><span id="line-226">                    log.error(e.toString());</span>
+<span class="source-line-no">227</span><span id="line-227">                    Thread.currentThread().interrupt();</span>
+<span class="source-line-no">228</span><span id="line-228">                    future.completeExceptionally(e);</span>
+<span class="source-line-no">229</span><span id="line-229">                    return;</span>
+<span class="source-line-no">230</span><span id="line-230">                }</span>
+<span class="source-line-no">231</span><span id="line-231">            }</span>
+<span class="source-line-no">232</span><span id="line-232">            String timeoutMessage = String.format("waitForServer() timed out after %d seconds", timeout.toSeconds());</span>
+<span class="source-line-no">233</span><span id="line-233">            log.error(timeoutMessage);</span>
+<span class="source-line-no">234</span><span id="line-234">            future.completeExceptionally(new TimeoutException(timeoutMessage));</span>
+<span class="source-line-no">235</span><span id="line-235">        });</span>
+<span class="source-line-no">236</span><span id="line-236">        return future;</span>
+<span class="source-line-no">237</span><span id="line-237">    }</span>
+<span class="source-line-no">238</span><span id="line-238"></span>
+<span class="source-line-no">239</span><span id="line-239">    /**</span>
+<span class="source-line-no">240</span><span id="line-240">     * Functional interface for ignoring what are considered "transient" errors. The definition of what is transient</span>
+<span class="source-line-no">241</span><span id="line-241">     * may vary depending upon the application. Different implementations of this function can be created for</span>
+<span class="source-line-no">242</span><span id="line-242">     * different applications.</span>
+<span class="source-line-no">243</span><span id="line-243">     * &lt;p&gt;</span>
+<span class="source-line-no">244</span><span id="line-244">     * The {@code JsonRpcResponse} returned may be a "synthetic" response, that is generated by the client,</span>
+<span class="source-line-no">245</span><span id="line-245">     * not by the server. The synthetic response will look like this:</span>
+<span class="source-line-no">246</span><span id="line-246">     *     &lt;ul&gt;</span>
+<span class="source-line-no">247</span><span id="line-247">     *         &lt;li&gt;error.code: -20000&lt;/li&gt;</span>
+<span class="source-line-no">248</span><span id="line-248">     *         &lt;li&gt;error.message: "Server temporarily unavailable"&lt;/li&gt;</span>
+<span class="source-line-no">249</span><span id="line-249">     *         &lt;li&gt;error.data: Detailed string message, e.g. "Connection refused"&lt;/li&gt;</span>
+<span class="source-line-no">250</span><span id="line-250">     *     &lt;/ul&gt;</span>
+<span class="source-line-no">251</span><span id="line-251">     * @param &lt;T&gt; The expected result type</span>
+<span class="source-line-no">252</span><span id="line-252">     */</span>
+<span class="source-line-no">253</span><span id="line-253">    @FunctionalInterface</span>
+<span class="source-line-no">254</span><span id="line-254">    public interface TransientErrorMapper&lt;T&gt; {</span>
+<span class="source-line-no">255</span><span id="line-255">        /**</span>
+<span class="source-line-no">256</span><span id="line-256">         * @param request The request we're handling completions for</span>
+<span class="source-line-no">257</span><span id="line-257">         * @param response response if one was successfully returned (or null)</span>
+<span class="source-line-no">258</span><span id="line-258">         * @param throwable exception if the call failed (or null)</span>
+<span class="source-line-no">259</span><span id="line-259">         * @return A completed or failed future than can replace the input (response, throwable) pair</span>
+<span class="source-line-no">260</span><span id="line-260">         */</span>
+<span class="source-line-no">261</span><span id="line-261">        CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; map(JsonRpcRequest request, JsonRpcResponse&lt;T&gt; response, Throwable throwable);</span>
+<span class="source-line-no">262</span><span id="line-262">    }</span>
+<span class="source-line-no">263</span><span id="line-263"></span>
+<span class="source-line-no">264</span><span id="line-264">    /**</span>
+<span class="source-line-no">265</span><span id="line-265">     * Transient error mapper that is a no-op, i.e. it passes all errors through unchanged.</span>
+<span class="source-line-no">266</span><span id="line-266">     */</span>
+<span class="source-line-no">267</span><span id="line-267">    protected  &lt;T&gt; CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; identityTransientErrorMapper(JsonRpcRequest request, JsonRpcResponse&lt;T&gt; response, Throwable t) {</span>
+<span class="source-line-no">268</span><span id="line-268">        return response != null</span>
+<span class="source-line-no">269</span><span id="line-269">                ? CompletableFuture.completedFuture(response)</span>
+<span class="source-line-no">270</span><span id="line-270">                : CompletableFuture.failedFuture(t);</span>
+<span class="source-line-no">271</span><span id="line-271">    }</span>
+<span class="source-line-no">272</span><span id="line-272"></span>
+<span class="source-line-no">273</span><span id="line-273">    protected &lt;T&gt; JsonRpcResponse&lt;T&gt; temporarilyUnavailableResponse(JsonRpcRequest request,  Throwable t) {</span>
+<span class="source-line-no">274</span><span id="line-274">        return new JsonRpcResponse&lt;T&gt;(request, new JsonRpcError(-2000, "Server temporarily unavailable", t.getMessage()));</span>
+<span class="source-line-no">275</span><span id="line-275">    }</span>
+<span class="source-line-no">276</span><span id="line-276"></span>
+<span class="source-line-no">277</span><span id="line-277">    /**</span>
+<span class="source-line-no">278</span><span id="line-278">     * @param response A response where {@code getResult() == null}</span>
+<span class="source-line-no">279</span><span id="line-279">     * @return An error status string suitable for log messages</span>
+<span class="source-line-no">280</span><span id="line-280">     */</span>
+<span class="source-line-no">281</span><span id="line-281">    protected String statusFromErrorResponse(JsonRpcResponse&lt;?&gt; response) {</span>
+<span class="source-line-no">282</span><span id="line-282">        Objects.requireNonNull(response);</span>
+<span class="source-line-no">283</span><span id="line-283">        if (response.getResult() != null) {</span>
+<span class="source-line-no">284</span><span id="line-284">            throw new IllegalStateException("This should only be called for responses with null result");</span>
+<span class="source-line-no">285</span><span id="line-285">        }</span>
+<span class="source-line-no">286</span><span id="line-286">        if (response.getError() == null) {</span>
+<span class="source-line-no">287</span><span id="line-287">            return "Invalid response both result and error were null";</span>
+<span class="source-line-no">288</span><span id="line-288">        } else if (response.getError().getData() != null) {</span>
+<span class="source-line-no">289</span><span id="line-289">            // Has option data, possibly the -2000 special case</span>
+<span class="source-line-no">290</span><span id="line-290">            return response.getError().getData().toString();</span>
+<span class="source-line-no">291</span><span id="line-291">        } else {</span>
+<span class="source-line-no">292</span><span id="line-292">            return response.getError().getMessage();</span>
+<span class="source-line-no">293</span><span id="line-293">        }</span>
+<span class="source-line-no">294</span><span id="line-294">    }</span>
+<span class="source-line-no">295</span><span id="line-295">}</span>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</main>
+</body>
+</html>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/DefaultRpcClient.html b/apidoc/src-html/org/consensusj/jsonrpc/DefaultRpcClient.html
new file mode 100644
index 000000000..fc75fa022
--- /dev/null
+++ b/apidoc/src-html/org/consensusj/jsonrpc/DefaultRpcClient.html
@@ -0,0 +1,373 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Source code</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="source: package: org.consensusj.jsonrpc, class: DefaultRpcClient">
+<meta name="generator" content="javadoc/SourceToHTMLConverter">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+</head>
+<body class="source-page">
+<main role="main">
+<div class="source-container">
+<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
+<span class="source-line-no">002</span><span id="line-2"></span>
+<span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.databind.DeserializationFeature;</span>
+<span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JavaType;</span>
+<span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.databind.JsonNode;</span>
+<span class="source-line-no">006</span><span id="line-6">import com.fasterxml.jackson.databind.ObjectMapper;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.slf4j.Logger;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">009</span><span id="line-9"></span>
+<span class="source-line-no">010</span><span id="line-10">import javax.net.ssl.SSLContext;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.lang.reflect.Type;</span>
+<span class="source-line-no">012</span><span id="line-12">import java.time.Duration;</span>
+<span class="source-line-no">013</span><span id="line-13">import java.net.URI;</span>
+<span class="source-line-no">014</span><span id="line-14">import java.util.Collection;</span>
+<span class="source-line-no">015</span><span id="line-15">import java.util.List;</span>
+<span class="source-line-no">016</span><span id="line-16">import java.util.Objects;</span>
+<span class="source-line-no">017</span><span id="line-17">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">018</span><span id="line-18">import java.util.concurrent.ExecutionException;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.util.concurrent.TimeoutException;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.util.function.Function;</span>
+<span class="source-line-no">021</span><span id="line-21">import java.util.function.Supplier;</span>
+<span class="source-line-no">022</span><span id="line-22"></span>
+<span class="source-line-no">023</span><span id="line-23">// We're overusing inheritance in this hierarchy. We are breaking Effective Java, Item 18: Favor composition over inheritance.</span>
+<span class="source-line-no">024</span><span id="line-24">// We're using inheritance to configure:</span>
+<span class="source-line-no">025</span><span id="line-25">// A. The set of JSON-RPC methods that are supported, e.g. `getblockcount()` (which creates potential conflicts with `send()` etc)</span>
+<span class="source-line-no">026</span><span id="line-26">// B. The JSON mapping implementation. Which for now and the foreseeable future is Jackson only.</span>
+<span class="source-line-no">027</span><span id="line-27">//</span>
+<span class="source-line-no">028</span><span id="line-28">// TODO: Maybe look at extracting a class with some common "mapper" functions between the two transport implementations</span>
+<span class="source-line-no">029</span><span id="line-29">//</span>
+<span class="source-line-no">030</span><span id="line-30">// The proper separation for (A) is probably a complete separation. There should be no required inheritance to implement</span>
+<span class="source-line-no">031</span><span id="line-31">// a client with a set of methods. Internally the client would have a transport and a mapper and those could optionally be made available</span>
+<span class="source-line-no">032</span><span id="line-32">// via some accessor methods if the client application deems necessary.</span>
+<span class="source-line-no">033</span><span id="line-33">// At the heart of (B) (at least as currently implemented) is the mapping from a Java (or Groovy) method name to (i) a JSON-RPC method</span>
+<span class="source-line-no">034</span><span id="line-34">// name, (ii) optional parameter type-conversion for JSON serialization in the request, and (iii) type mapping for the deserialization</span>
+<span class="source-line-no">035</span><span id="line-35">// of the `result` field in the JsonRpcResponse&lt;RSLT&gt;. It might be helpful to think of this as two functional mappings:</span>
+<span class="source-line-no">036</span><span id="line-36">// (1) Map Java method name and parameters to a JSON-RPC request (either map to set of Java Objects _or_ all the way to JSON)</span>
+<span class="source-line-no">037</span><span id="line-37">// (2) Map from received JSON-RPC response to JsonRpcResponse&lt;RSLT&gt; -- this response mapper function is configured as part of making the request.</span>
+<span class="source-line-no">038</span><span id="line-38">//</span>
+<span class="source-line-no">039</span><span id="line-39">// To abstract the specifics of Jackson from the (two) transport implementations. Basically methods/functions to</span>
+<span class="source-line-no">040</span><span id="line-40">// map from request to string/stream and to map from string/stream to response.  The java.net.http implementation has already defined</span>
+<span class="source-line-no">041</span><span id="line-41">// some functional interfaces for this, so coming up with an interface that both the java.net.http implementation and the HttpUrlConnection</span>
+<span class="source-line-no">042</span><span id="line-42">// implementation can use will lead to this "SECOND STEP"</span>
+<span class="source-line-no">043</span><span id="line-43">//</span>
+<span class="source-line-no">044</span><span id="line-44">// Now that JsonRpcClient is a generic with &lt;T extends Type&gt;, we have loosened the Jackson coupling somewhat.</span>
+<span class="source-line-no">045</span><span id="line-45">//</span>
+<span class="source-line-no">046</span><span id="line-46">/**</span>
+<span class="source-line-no">047</span><span id="line-47"> * A strongly-typed, Jackson-based JSON-RPC client. {@link JsonRpcClient} provides many convenience send `default` methods in a</span>
+<span class="source-line-no">048</span><span id="line-48"> * JSON-library-independent way. DefaultRpcClient provides the needed implementation support for Jackson. This class implements</span>
+<span class="source-line-no">049</span><span id="line-49"> * the constructors, static fields, and getters, but delegates the core</span>
+<span class="source-line-no">050</span><span id="line-50"> * {@link JsonRpcTransport#sendRequestForResponseAsync(JsonRpcRequest, Type)} method to a {@link JsonRpcTransport} implementation component.</span>
+<span class="source-line-no">051</span><span id="line-51"> */</span>
+<span class="source-line-no">052</span><span id="line-52">public class DefaultRpcClient implements JsonRpcClient&lt;JavaType&gt; {</span>
+<span class="source-line-no">053</span><span id="line-53">    private static final Logger log = LoggerFactory.getLogger(DefaultRpcClient.class);</span>
+<span class="source-line-no">054</span><span id="line-54">    private static final JsonRpcMessage.Version DEFAULT_JSON_RPC_VERSION = JsonRpcMessage.Version.V2;</span>
+<span class="source-line-no">055</span><span id="line-55"></span>
+<span class="source-line-no">056</span><span id="line-56">    /**</span>
+<span class="source-line-no">057</span><span id="line-57">     * Functional interface for creating JsonRpcTransport instances. This is used to prevent a circular</span>
+<span class="source-line-no">058</span><span id="line-58">     * dependency on {@link ObjectMapper}.</span>
+<span class="source-line-no">059</span><span id="line-59">     */</span>
+<span class="source-line-no">060</span><span id="line-60">    @FunctionalInterface</span>
+<span class="source-line-no">061</span><span id="line-61">    public interface TransportFactory {</span>
+<span class="source-line-no">062</span><span id="line-62">        /**</span>
+<span class="source-line-no">063</span><span id="line-63">         * @param mapper mapper that is shared between {@code DefaultRpcClient} and the {@link JsonRpcTransport}.</span>
+<span class="source-line-no">064</span><span id="line-64">         * @return a transport instance</span>
+<span class="source-line-no">065</span><span id="line-65">         */</span>
+<span class="source-line-no">066</span><span id="line-66">        JsonRpcTransport&lt;JavaType&gt; create(ObjectMapper mapper);</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68">    protected final JsonRpcMessage.Version jsonRpcVersion;</span>
+<span class="source-line-no">069</span><span id="line-69">    protected final ObjectMapper mapper;</span>
+<span class="source-line-no">070</span><span id="line-70">    private final JavaType defaultType;</span>
+<span class="source-line-no">071</span><span id="line-71">    private final JsonRpcTransport&lt;JavaType&gt; transport;</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73">    public DefaultRpcClient(URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">074</span><span id="line-74">        this(JsonRpcTransport.getDefaultSSLContext(), DEFAULT_JSON_RPC_VERSION, server, rpcUser, rpcPassword);</span>
+<span class="source-line-no">075</span><span id="line-75">    }</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">    public DefaultRpcClient(JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">078</span><span id="line-78">        this(JsonRpcTransport.getDefaultSSLContext(), jsonRpcVersion, server, rpcUser, rpcPassword);</span>
+<span class="source-line-no">079</span><span id="line-79">    }</span>
+<span class="source-line-no">080</span><span id="line-80">    public DefaultRpcClient(SSLContext sslContext, JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">081</span><span id="line-81">        this((m) -&gt; new JsonRpcClientJavaNet(m, sslContext, server, rpcUser, rpcPassword), jsonRpcVersion);</span>
+<span class="source-line-no">082</span><span id="line-82">    }</span>
+<span class="source-line-no">083</span><span id="line-83"></span>
+<span class="source-line-no">084</span><span id="line-84">    public DefaultRpcClient(TransportFactory transportFactory, JsonRpcMessage.Version jsonRpcVersion) {</span>
+<span class="source-line-no">085</span><span id="line-85">        this.jsonRpcVersion = jsonRpcVersion;</span>
+<span class="source-line-no">086</span><span id="line-86">        mapper = new ObjectMapper();</span>
+<span class="source-line-no">087</span><span id="line-87">        // TODO: Provide external API to configure FAIL_ON_UNKNOWN_PROPERTIES</span>
+<span class="source-line-no">088</span><span id="line-88">        mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);</span>
+<span class="source-line-no">089</span><span id="line-89">        defaultType = mapper.getTypeFactory().constructType(Object.class);</span>
+<span class="source-line-no">090</span><span id="line-90">        transport = transportFactory.create(mapper);</span>
+<span class="source-line-no">091</span><span id="line-91">    }</span>
+<span class="source-line-no">092</span><span id="line-92"></span>
+<span class="source-line-no">093</span><span id="line-93">    @Override</span>
+<span class="source-line-no">094</span><span id="line-94">    public JsonRpcMessage.Version getJsonRpcVersion() {</span>
+<span class="source-line-no">095</span><span id="line-95">        return jsonRpcVersion;</span>
+<span class="source-line-no">096</span><span id="line-96">    }</span>
+<span class="source-line-no">097</span><span id="line-97"></span>
+<span class="source-line-no">098</span><span id="line-98">    @Override</span>
+<span class="source-line-no">099</span><span id="line-99">    public URI getServerURI() {</span>
+<span class="source-line-no">100</span><span id="line-100">        return transport.getServerURI();</span>
+<span class="source-line-no">101</span><span id="line-101">    }</span>
+<span class="source-line-no">102</span><span id="line-102"></span>
+<span class="source-line-no">103</span><span id="line-103">    @Override</span>
+<span class="source-line-no">104</span><span id="line-104">    public &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, JavaType responseType) {</span>
+<span class="source-line-no">105</span><span id="line-105">        return transport.sendRequestForResponseAsync(request, responseType);</span>
+<span class="source-line-no">106</span><span id="line-106">    }</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108">    /**</span>
+<span class="source-line-no">109</span><span id="line-109">     * Convenience method for requesting an asynchronous response with a {@link JsonNode} for the result.</span>
+<span class="source-line-no">110</span><span id="line-110">     * @param request The request to send</span>
+<span class="source-line-no">111</span><span id="line-111">     * @return A future JSON RPC Response with `result` of type {@code JsonNode}</span>
+<span class="source-line-no">112</span><span id="line-112">     */</span>
+<span class="source-line-no">113</span><span id="line-113">    public CompletableFuture&lt;JsonRpcResponse&lt;JsonNode&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request) {</span>
+<span class="source-line-no">114</span><span id="line-114">        return sendRequestForResponseAsync(request, responseTypeFor(JsonNode.class));</span>
+<span class="source-line-no">115</span><span id="line-115">    }</span>
+<span class="source-line-no">116</span><span id="line-116"></span>
+<span class="source-line-no">117</span><span id="line-117">    public ObjectMapper getMapper() {</span>
+<span class="source-line-no">118</span><span id="line-118">        return mapper;</span>
+<span class="source-line-no">119</span><span id="line-119">    }</span>
+<span class="source-line-no">120</span><span id="line-120"></span>
+<span class="source-line-no">121</span><span id="line-121">    @Override</span>
+<span class="source-line-no">122</span><span id="line-122">    public JavaType defaultType() {</span>
+<span class="source-line-no">123</span><span id="line-123">        return defaultType;</span>
+<span class="source-line-no">124</span><span id="line-124">    }</span>
+<span class="source-line-no">125</span><span id="line-125"></span>
+<span class="source-line-no">126</span><span id="line-126">    @Override</span>
+<span class="source-line-no">127</span><span id="line-127">    public JavaType responseTypeFor(JavaType resultType) {</span>
+<span class="source-line-no">128</span><span id="line-128">        return getMapper().getTypeFactory().</span>
+<span class="source-line-no">129</span><span id="line-129">                constructParametricType(JsonRpcResponse.class, resultType);</span>
+<span class="source-line-no">130</span><span id="line-130">    }</span>
+<span class="source-line-no">131</span><span id="line-131"></span>
+<span class="source-line-no">132</span><span id="line-132">    @Override</span>
+<span class="source-line-no">133</span><span id="line-133">    public JavaType responseTypeFor(Class&lt;?&gt; resultType) {</span>
+<span class="source-line-no">134</span><span id="line-134">        return getMapper().getTypeFactory().</span>
+<span class="source-line-no">135</span><span id="line-135">                constructParametricType(JsonRpcResponse.class, resultType);</span>
+<span class="source-line-no">136</span><span id="line-136">    }</span>
+<span class="source-line-no">137</span><span id="line-137"></span>
+<span class="source-line-no">138</span><span id="line-138">    @Override</span>
+<span class="source-line-no">139</span><span id="line-139">    public JavaType typeForClass(Class&lt;?&gt; clazz) {</span>
+<span class="source-line-no">140</span><span id="line-140">        return getMapper().constructType(clazz);</span>
+<span class="source-line-no">141</span><span id="line-141">    }</span>
+<span class="source-line-no">142</span><span id="line-142"></span>
+<span class="source-line-no">143</span><span id="line-143">    @Override</span>
+<span class="source-line-no">144</span><span id="line-144">    public JavaType collectionTypeForClasses(Class&lt;? extends Collection&gt; collection, Class&lt;?&gt; clazz) {</span>
+<span class="source-line-no">145</span><span id="line-145">        return getMapper().getTypeFactory()</span>
+<span class="source-line-no">146</span><span id="line-146">                .constructCollectionType(collection, clazz);</span>
+<span class="source-line-no">147</span><span id="line-147">    }</span>
+<span class="source-line-no">148</span><span id="line-148"></span>
+<span class="source-line-no">149</span><span id="line-149">    @Override</span>
+<span class="source-line-no">150</span><span id="line-150">    public JavaType collectionTypeForClasses(Class&lt;? extends Collection&gt; collection, JavaType type) {</span>
+<span class="source-line-no">151</span><span id="line-151">        return getMapper().getTypeFactory()</span>
+<span class="source-line-no">152</span><span id="line-152">                .constructCollectionType(collection, type);</span>
+<span class="source-line-no">153</span><span id="line-153">    }</span>
+<span class="source-line-no">154</span><span id="line-154"></span>
+<span class="source-line-no">155</span><span id="line-155">    public &lt;T&gt; CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; pollOnce(JsonRpcRequest request, JavaType resultType, TransientErrorMapper&lt;T&gt; errorMapper) {</span>
+<span class="source-line-no">156</span><span id="line-156">        CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; f = sendRequestForResponseAsync(request, responseTypeFor(resultType));</span>
+<span class="source-line-no">157</span><span id="line-157">        // In Java 12+ this can be replaced with exceptionallyCompose()</span>
+<span class="source-line-no">158</span><span id="line-158">        return f.handle((r, t) -&gt; errorMapper.map(request, r, t))</span>
+<span class="source-line-no">159</span><span id="line-159">                .thenCompose(Function.identity());</span>
+<span class="source-line-no">160</span><span id="line-160">    }</span>
+<span class="source-line-no">161</span><span id="line-161"></span>
+<span class="source-line-no">162</span><span id="line-162">    /**</span>
+<span class="source-line-no">163</span><span id="line-163">     * A wait-for-server routine that is agnostic about which RPC methods the server supports. In addition to two {@link Duration}</span>
+<span class="source-line-no">164</span><span id="line-164">     * parameters, there are 2 lambda parameters to enable this method to work with any JSON-RPC server. This version will tell</span>
+<span class="source-line-no">165</span><span id="line-165">     * the JSON-RPC Mapper to return an {@link JsonRpcResponse} with a result of type {@link Object}. If you need more precise</span>
+<span class="source-line-no">166</span><span id="line-166">     * control over the type, use {@link #waitForServer(Duration, Duration, Supplier, JavaType, TransientErrorMapper)}.</span>
+<span class="source-line-no">167</span><span id="line-167">     * @param timeout how long to wait</span>
+<span class="source-line-no">168</span><span id="line-168">     * @param retry delay between retries</span>
+<span class="source-line-no">169</span><span id="line-169">     * @param requestSupplier supplier of requests (needs to increment request ID at the very least)</span>
+<span class="source-line-no">170</span><span id="line-170">     * @param errorMapper function that maps non-fatal errors (i.e. cases to keep polling)</span>
+<span class="source-line-no">171</span><span id="line-171">     * @return A future that returns a successful</span>
+<span class="source-line-no">172</span><span id="line-172">     * @param &lt;T&gt; The desired result type to be returned when the server is running</span>
+<span class="source-line-no">173</span><span id="line-173">     */</span>
+<span class="source-line-no">174</span><span id="line-174">    public &lt;T&gt; CompletableFuture&lt;T&gt; waitForServer(Duration timeout, Duration retry, Supplier&lt;JsonRpcRequest&gt; requestSupplier, TransientErrorMapper&lt;T&gt; errorMapper) {</span>
+<span class="source-line-no">175</span><span id="line-175">        return waitForServer(timeout,retry, requestSupplier, typeForClass(Object.class), errorMapper);</span>
+<span class="source-line-no">176</span><span id="line-176">    }</span>
+<span class="source-line-no">177</span><span id="line-177"></span>
+<span class="source-line-no">178</span><span id="line-178">    // TODO: What happens if you cancel this future?</span>
+<span class="source-line-no">179</span><span id="line-179">    /**</span>
+<span class="source-line-no">180</span><span id="line-180">    * A wait-for-server routine that is agnostic about which RPC methods the server supports. In addition to two {@link Duration}</span>
+<span class="source-line-no">181</span><span id="line-181">    * parameters, there are 3 parameters (2 functions and a generic type specifier) to enable this method to work with any JSON-RPC server.</span>
+<span class="source-line-no">182</span><span id="line-182">    * @param timeout how long to wait</span>
+<span class="source-line-no">183</span><span id="line-183">    * @param retry delay between retries</span>
+<span class="source-line-no">184</span><span id="line-184">    * @param requestSupplier supplier of requests (needs to increment request ID at the very least)</span>
+<span class="source-line-no">185</span><span id="line-185">    * @param resultType the result type for the response</span>
+<span class="source-line-no">186</span><span id="line-186">    * @param errorMapper function that maps non-fatal errors (i.e. cases to keep polling)</span>
+<span class="source-line-no">187</span><span id="line-187">    * @return A future that returns a successful</span>
+<span class="source-line-no">188</span><span id="line-188">    * @param &lt;T&gt; The desired result type to be returned when the server is running</span>
+<span class="source-line-no">189</span><span id="line-189">    */</span>
+<span class="source-line-no">190</span><span id="line-190">    public &lt;T&gt; CompletableFuture&lt;T&gt; waitForServer(Duration timeout, Duration retry, Supplier&lt;JsonRpcRequest&gt; requestSupplier, JavaType resultType, TransientErrorMapper&lt;T&gt; errorMapper) {</span>
+<span class="source-line-no">191</span><span id="line-191">        CompletableFuture&lt;T&gt; future = new CompletableFuture&lt;&gt;();</span>
+<span class="source-line-no">192</span><span id="line-192">        getDefaultAsyncExecutor().execute(() -&gt; {</span>
+<span class="source-line-no">193</span><span id="line-193">            log.debug("Waiting for server RPC ready...");</span>
+<span class="source-line-no">194</span><span id="line-194">            String status;          // Status message for logging</span>
+<span class="source-line-no">195</span><span id="line-195">            String statusLast = null;</span>
+<span class="source-line-no">196</span><span id="line-196">            long seconds = 0;</span>
+<span class="source-line-no">197</span><span id="line-197">            while (seconds &lt; timeout.toSeconds()) {</span>
+<span class="source-line-no">198</span><span id="line-198">                JsonRpcResponse&lt;T&gt; r;</span>
+<span class="source-line-no">199</span><span id="line-199">                try {</span>
+<span class="source-line-no">200</span><span id="line-200">                    // All non-fatal exceptions will be mapped to a JsonRpcError with code -20000</span>
+<span class="source-line-no">201</span><span id="line-201">                    r = this.pollOnce(requestSupplier.get(), resultType, errorMapper).get();</span>
+<span class="source-line-no">202</span><span id="line-202">                } catch (InterruptedException | ExecutionException e) {</span>
+<span class="source-line-no">203</span><span id="line-203">                    // If a fatal error occurred, fail our future and abort this thread</span>
+<span class="source-line-no">204</span><span id="line-204">                    log.error("Fatal exception: ", e);</span>
+<span class="source-line-no">205</span><span id="line-205">                    future.completeExceptionally(e);</span>
+<span class="source-line-no">206</span><span id="line-206">                    return;</span>
+<span class="source-line-no">207</span><span id="line-207">                }</span>
+<span class="source-line-no">208</span><span id="line-208">                if (r.getResult() != null) {</span>
+<span class="source-line-no">209</span><span id="line-209">                    // We received a response with a result, server is ready and has returned a usable result</span>
+<span class="source-line-no">210</span><span id="line-210">                    log.debug("RPC Ready.");</span>
+<span class="source-line-no">211</span><span id="line-211">                    future.complete(r.getResult());</span>
+<span class="source-line-no">212</span><span id="line-212">                    return;</span>
+<span class="source-line-no">213</span><span id="line-213">                }</span>
+<span class="source-line-no">214</span><span id="line-214">                // We received a response with a non-fatal error, log it and wait to retry.</span>
+<span class="source-line-no">215</span><span id="line-215">                status = statusFromErrorResponse(r);</span>
+<span class="source-line-no">216</span><span id="line-216">                // Log status messages only once, if new or updated</span>
+<span class="source-line-no">217</span><span id="line-217">                if (!status.equals(statusLast)) {</span>
+<span class="source-line-no">218</span><span id="line-218">                    log.info("Waiting for server: RPC Status: " + status);</span>
+<span class="source-line-no">219</span><span id="line-219">                    statusLast = status;</span>
+<span class="source-line-no">220</span><span id="line-220">                }</span>
+<span class="source-line-no">221</span><span id="line-221">                try {</span>
+<span class="source-line-no">222</span><span id="line-222">                    // Damnit, IntelliJ we're not busy-waiting we're polling!</span>
+<span class="source-line-no">223</span><span id="line-223">                    Thread.sleep(retry.toMillis());</span>
+<span class="source-line-no">224</span><span id="line-224">                    seconds += retry.toSeconds();</span>
+<span class="source-line-no">225</span><span id="line-225">                } catch (InterruptedException e) {</span>
+<span class="source-line-no">226</span><span id="line-226">                    log.error(e.toString());</span>
+<span class="source-line-no">227</span><span id="line-227">                    Thread.currentThread().interrupt();</span>
+<span class="source-line-no">228</span><span id="line-228">                    future.completeExceptionally(e);</span>
+<span class="source-line-no">229</span><span id="line-229">                    return;</span>
+<span class="source-line-no">230</span><span id="line-230">                }</span>
+<span class="source-line-no">231</span><span id="line-231">            }</span>
+<span class="source-line-no">232</span><span id="line-232">            String timeoutMessage = String.format("waitForServer() timed out after %d seconds", timeout.toSeconds());</span>
+<span class="source-line-no">233</span><span id="line-233">            log.error(timeoutMessage);</span>
+<span class="source-line-no">234</span><span id="line-234">            future.completeExceptionally(new TimeoutException(timeoutMessage));</span>
+<span class="source-line-no">235</span><span id="line-235">        });</span>
+<span class="source-line-no">236</span><span id="line-236">        return future;</span>
+<span class="source-line-no">237</span><span id="line-237">    }</span>
+<span class="source-line-no">238</span><span id="line-238"></span>
+<span class="source-line-no">239</span><span id="line-239">    /**</span>
+<span class="source-line-no">240</span><span id="line-240">     * Functional interface for ignoring what are considered "transient" errors. The definition of what is transient</span>
+<span class="source-line-no">241</span><span id="line-241">     * may vary depending upon the application. Different implementations of this function can be created for</span>
+<span class="source-line-no">242</span><span id="line-242">     * different applications.</span>
+<span class="source-line-no">243</span><span id="line-243">     * &lt;p&gt;</span>
+<span class="source-line-no">244</span><span id="line-244">     * The {@code JsonRpcResponse} returned may be a "synthetic" response, that is generated by the client,</span>
+<span class="source-line-no">245</span><span id="line-245">     * not by the server. The synthetic response will look like this:</span>
+<span class="source-line-no">246</span><span id="line-246">     *     &lt;ul&gt;</span>
+<span class="source-line-no">247</span><span id="line-247">     *         &lt;li&gt;error.code: -20000&lt;/li&gt;</span>
+<span class="source-line-no">248</span><span id="line-248">     *         &lt;li&gt;error.message: "Server temporarily unavailable"&lt;/li&gt;</span>
+<span class="source-line-no">249</span><span id="line-249">     *         &lt;li&gt;error.data: Detailed string message, e.g. "Connection refused"&lt;/li&gt;</span>
+<span class="source-line-no">250</span><span id="line-250">     *     &lt;/ul&gt;</span>
+<span class="source-line-no">251</span><span id="line-251">     * @param &lt;T&gt; The expected result type</span>
+<span class="source-line-no">252</span><span id="line-252">     */</span>
+<span class="source-line-no">253</span><span id="line-253">    @FunctionalInterface</span>
+<span class="source-line-no">254</span><span id="line-254">    public interface TransientErrorMapper&lt;T&gt; {</span>
+<span class="source-line-no">255</span><span id="line-255">        /**</span>
+<span class="source-line-no">256</span><span id="line-256">         * @param request The request we're handling completions for</span>
+<span class="source-line-no">257</span><span id="line-257">         * @param response response if one was successfully returned (or null)</span>
+<span class="source-line-no">258</span><span id="line-258">         * @param throwable exception if the call failed (or null)</span>
+<span class="source-line-no">259</span><span id="line-259">         * @return A completed or failed future than can replace the input (response, throwable) pair</span>
+<span class="source-line-no">260</span><span id="line-260">         */</span>
+<span class="source-line-no">261</span><span id="line-261">        CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; map(JsonRpcRequest request, JsonRpcResponse&lt;T&gt; response, Throwable throwable);</span>
+<span class="source-line-no">262</span><span id="line-262">    }</span>
+<span class="source-line-no">263</span><span id="line-263"></span>
+<span class="source-line-no">264</span><span id="line-264">    /**</span>
+<span class="source-line-no">265</span><span id="line-265">     * Transient error mapper that is a no-op, i.e. it passes all errors through unchanged.</span>
+<span class="source-line-no">266</span><span id="line-266">     */</span>
+<span class="source-line-no">267</span><span id="line-267">    protected  &lt;T&gt; CompletableFuture&lt;JsonRpcResponse&lt;T&gt;&gt; identityTransientErrorMapper(JsonRpcRequest request, JsonRpcResponse&lt;T&gt; response, Throwable t) {</span>
+<span class="source-line-no">268</span><span id="line-268">        return response != null</span>
+<span class="source-line-no">269</span><span id="line-269">                ? CompletableFuture.completedFuture(response)</span>
+<span class="source-line-no">270</span><span id="line-270">                : CompletableFuture.failedFuture(t);</span>
+<span class="source-line-no">271</span><span id="line-271">    }</span>
+<span class="source-line-no">272</span><span id="line-272"></span>
+<span class="source-line-no">273</span><span id="line-273">    protected &lt;T&gt; JsonRpcResponse&lt;T&gt; temporarilyUnavailableResponse(JsonRpcRequest request,  Throwable t) {</span>
+<span class="source-line-no">274</span><span id="line-274">        return new JsonRpcResponse&lt;T&gt;(request, new JsonRpcError(-2000, "Server temporarily unavailable", t.getMessage()));</span>
+<span class="source-line-no">275</span><span id="line-275">    }</span>
+<span class="source-line-no">276</span><span id="line-276"></span>
+<span class="source-line-no">277</span><span id="line-277">    /**</span>
+<span class="source-line-no">278</span><span id="line-278">     * @param response A response where {@code getResult() == null}</span>
+<span class="source-line-no">279</span><span id="line-279">     * @return An error status string suitable for log messages</span>
+<span class="source-line-no">280</span><span id="line-280">     */</span>
+<span class="source-line-no">281</span><span id="line-281">    protected String statusFromErrorResponse(JsonRpcResponse&lt;?&gt; response) {</span>
+<span class="source-line-no">282</span><span id="line-282">        Objects.requireNonNull(response);</span>
+<span class="source-line-no">283</span><span id="line-283">        if (response.getResult() != null) {</span>
+<span class="source-line-no">284</span><span id="line-284">            throw new IllegalStateException("This should only be called for responses with null result");</span>
+<span class="source-line-no">285</span><span id="line-285">        }</span>
+<span class="source-line-no">286</span><span id="line-286">        if (response.getError() == null) {</span>
+<span class="source-line-no">287</span><span id="line-287">            return "Invalid response both result and error were null";</span>
+<span class="source-line-no">288</span><span id="line-288">        } else if (response.getError().getData() != null) {</span>
+<span class="source-line-no">289</span><span id="line-289">            // Has option data, possibly the -2000 special case</span>
+<span class="source-line-no">290</span><span id="line-290">            return response.getError().getData().toString();</span>
+<span class="source-line-no">291</span><span id="line-291">        } else {</span>
+<span class="source-line-no">292</span><span id="line-292">            return response.getError().getMessage();</span>
+<span class="source-line-no">293</span><span id="line-293">        }</span>
+<span class="source-line-no">294</span><span id="line-294">    }</span>
+<span class="source-line-no">295</span><span id="line-295">}</span>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</main>
+</body>
+</html>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JacksonRpcClient.html b/apidoc/src-html/org/consensusj/jsonrpc/JacksonRpcClient.html
deleted file mode 100644
index dd01d37a2..000000000
--- a/apidoc/src-html/org/consensusj/jsonrpc/JacksonRpcClient.html
+++ /dev/null
@@ -1,247 +0,0 @@
-<!DOCTYPE HTML>
-<html lang="en">
-<head>
-<!-- Generated by javadoc (17) -->
-<title>Source code</title>
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="description" content="source: package: org.consensusj.jsonrpc, interface: JacksonRpcClient">
-<meta name="generator" content="javadoc/SourceToHTMLConverter">
-<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
-</head>
-<body class="source-page">
-<main role="main">
-<div class="source-container">
-<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
-<span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.databind.JavaType;</span>
-<span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JsonNode;</span>
-<span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.databind.ObjectMapper;</span>
-<span class="source-line-no">006</span><span id="line-6"></span>
-<span class="source-line-no">007</span><span id="line-7">import java.io.IOException;</span>
-<span class="source-line-no">008</span><span id="line-8">import java.util.List;</span>
-<span class="source-line-no">009</span><span id="line-9">import java.util.concurrent.CompletableFuture;</span>
-<span class="source-line-no">010</span><span id="line-10">import java.util.concurrent.ExecutionException;</span>
-<span class="source-line-no">011</span><span id="line-11">import java.util.function.Supplier;</span>
-<span class="source-line-no">012</span><span id="line-12"></span>
-<span class="source-line-no">013</span><span id="line-13">/**</span>
-<span class="source-line-no">014</span><span id="line-14"> * Interface with default methods for a strongly-typed JSON-RPC client that uses Jackson to map from JSON to Java Objects.</span>
-<span class="source-line-no">015</span><span id="line-15"> */</span>
-<span class="source-line-no">016</span><span id="line-16">public interface JacksonRpcClient extends JsonRpcClient {</span>
-<span class="source-line-no">017</span><span id="line-17"></span>
-<span class="source-line-no">018</span><span id="line-18">    ObjectMapper getMapper();</span>
-<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">    JavaType getDefaultType();</span>
-<span class="source-line-no">021</span><span id="line-21"></span>
-<span class="source-line-no">022</span><span id="line-22">    default JavaType responseTypeFor(JavaType resultType) {</span>
-<span class="source-line-no">023</span><span id="line-23">        return getMapper().getTypeFactory().</span>
-<span class="source-line-no">024</span><span id="line-24">                constructParametricType(JsonRpcResponse.class, resultType);</span>
-<span class="source-line-no">025</span><span id="line-25">    }</span>
-<span class="source-line-no">026</span><span id="line-26"></span>
-<span class="source-line-no">027</span><span id="line-27">    default JavaType responseTypeFor(Class&lt;?&gt; resultType) {</span>
-<span class="source-line-no">028</span><span id="line-28">        return getMapper().getTypeFactory().</span>
-<span class="source-line-no">029</span><span id="line-29">                constructParametricType(JsonRpcResponse.class, resultType);</span>
-<span class="source-line-no">030</span><span id="line-30">    }</span>
-<span class="source-line-no">031</span><span id="line-31"></span>
-<span class="source-line-no">032</span><span id="line-32">    default JavaType typeForClass(Class&lt;?&gt; clazz) {</span>
-<span class="source-line-no">033</span><span id="line-33">        return getMapper().constructType(clazz);</span>
-<span class="source-line-no">034</span><span id="line-34">    }</span>
-<span class="source-line-no">035</span><span id="line-35"></span>
-<span class="source-line-no">036</span><span id="line-36">    /**</span>
-<span class="source-line-no">037</span><span id="line-37">     * Send a {@link JsonRpcRequest} for a {@link JsonRpcResponse}</span>
-<span class="source-line-no">038</span><span id="line-38">     * &lt;p&gt;Synchronous subclasses should override this method to prevent {@link CompletableFuture#supplyAsync(Supplier)} from</span>
-<span class="source-line-no">039</span><span id="line-39">     * being called twice when {@link AsyncSupport} is being used. Eventually we'll migrate more of the codebase to native</span>
-<span class="source-line-no">040</span><span id="line-40">     * async, and then we won't have to worry about calling {@code supplyAsync} twice.</span>
-<span class="source-line-no">041</span><span id="line-41">     * @param &lt;R&gt; Type of result object</span>
-<span class="source-line-no">042</span><span id="line-42">     * @param request The request to send</span>
-<span class="source-line-no">043</span><span id="line-43">     * @param responseType The response type expected (used by Jackson for conversion)</span>
-<span class="source-line-no">044</span><span id="line-44">     * @return A JSON RPC Response with `result` of type `R`</span>
-<span class="source-line-no">045</span><span id="line-45">     * @throws IOException network error</span>
-<span class="source-line-no">046</span><span id="line-46">     * @throws JsonRpcStatusException JSON RPC status error</span>
-<span class="source-line-no">047</span><span id="line-47">     */</span>
-<span class="source-line-no">048</span><span id="line-48">    default &lt;R&gt; JsonRpcResponse&lt;R&gt; sendRequestForResponse(JsonRpcRequest request, JavaType responseType) throws IOException, JsonRpcStatusException {</span>
-<span class="source-line-no">049</span><span id="line-49">        try {</span>
-<span class="source-line-no">050</span><span id="line-50">            return (JsonRpcResponse&lt;R&gt;) sendRequestForResponseAsync(request, responseType).get();</span>
-<span class="source-line-no">051</span><span id="line-51">        } catch (InterruptedException ie) {</span>
-<span class="source-line-no">052</span><span id="line-52">            throw new RuntimeException(ie);</span>
-<span class="source-line-no">053</span><span id="line-53">        } catch (ExecutionException ee) {</span>
-<span class="source-line-no">054</span><span id="line-54">            Throwable cause = ee.getCause();</span>
-<span class="source-line-no">055</span><span id="line-55">            if (cause instanceof JsonRpcStatusException) {</span>
-<span class="source-line-no">056</span><span id="line-56">                throw (JsonRpcStatusException) cause;</span>
-<span class="source-line-no">057</span><span id="line-57">            } else if (cause instanceof IOException) {</span>
-<span class="source-line-no">058</span><span id="line-58">                throw (IOException) cause;</span>
-<span class="source-line-no">059</span><span id="line-59">            } else {</span>
-<span class="source-line-no">060</span><span id="line-60">                throw new RuntimeException(ee);</span>
-<span class="source-line-no">061</span><span id="line-61">            }</span>
-<span class="source-line-no">062</span><span id="line-62">        }</span>
-<span class="source-line-no">063</span><span id="line-63">    }</span>
-<span class="source-line-no">064</span><span id="line-64"></span>
-<span class="source-line-no">065</span><span id="line-65">    /**</span>
-<span class="source-line-no">066</span><span id="line-66">     * Send a {@link JsonRpcRequest} for a {@link JsonRpcResponse} asynchronously.</span>
-<span class="source-line-no">067</span><span id="line-67">     * @param &lt;R&gt; Type of result object</span>
-<span class="source-line-no">068</span><span id="line-68">     * @param request The request to send</span>
-<span class="source-line-no">069</span><span id="line-69">     * @param responseType The response type expected (used by Jackson for conversion)</span>
-<span class="source-line-no">070</span><span id="line-70">     * @return A future JSON RPC Response with `result` of type `R`</span>
-<span class="source-line-no">071</span><span id="line-71">     */</span>
-<span class="source-line-no">072</span><span id="line-72">    &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, JavaType responseType);</span>
-<span class="source-line-no">073</span><span id="line-73"></span>
-<span class="source-line-no">074</span><span id="line-74">    /**</span>
-<span class="source-line-no">075</span><span id="line-75">     * Convenience method for requesting a response with a {@link JsonNode} for the result.</span>
-<span class="source-line-no">076</span><span id="line-76">     * @param request The request to send</span>
-<span class="source-line-no">077</span><span id="line-77">     * @return A JSON RPC Response with `result` of type {@code JsonNode}</span>
-<span class="source-line-no">078</span><span id="line-78">     * @throws IOException network error</span>
-<span class="source-line-no">079</span><span id="line-79">     * @throws JsonRpcStatusException JSON RPC status error</span>
-<span class="source-line-no">080</span><span id="line-80">     */</span>
-<span class="source-line-no">081</span><span id="line-81">    default JsonRpcResponse&lt;JsonNode&gt; sendRequestForResponse(JsonRpcRequest request) throws IOException, JsonRpcStatusException {</span>
-<span class="source-line-no">082</span><span id="line-82">        return sendRequestForResponse(request, responseTypeFor(JsonNode.class));</span>
-<span class="source-line-no">083</span><span id="line-83">    }</span>
-<span class="source-line-no">084</span><span id="line-84"></span>
-<span class="source-line-no">085</span><span id="line-85">    private &lt;R&gt; R sendRequestForResult(JsonRpcRequest request, JavaType resultType) throws IOException, JsonRpcStatusException {</span>
-<span class="source-line-no">086</span><span id="line-86">        JsonRpcResponse&lt;R&gt; response = sendRequestForResponse(request, responseTypeFor(resultType));</span>
-<span class="source-line-no">087</span><span id="line-87"></span>
-<span class="source-line-no">088</span><span id="line-88">//        assert response != null;</span>
-<span class="source-line-no">089</span><span id="line-89">//        assert response.getJsonrpc() != null;</span>
-<span class="source-line-no">090</span><span id="line-90">//        assert response.getJsonrpc().equals("2.0");</span>
-<span class="source-line-no">091</span><span id="line-91">//        assert response.getId() != null;</span>
-<span class="source-line-no">092</span><span id="line-92">//        assert response.getId().equals(request.getId());</span>
-<span class="source-line-no">093</span><span id="line-93"></span>
-<span class="source-line-no">094</span><span id="line-94">        if (response.getError() != null &amp;&amp; response.getError().getCode() != 0) {</span>
-<span class="source-line-no">095</span><span id="line-95">            throw new JsonRpcStatusException(</span>
-<span class="source-line-no">096</span><span id="line-96">                    response.getError().getMessage(),</span>
-<span class="source-line-no">097</span><span id="line-97">                    200,    // If response code wasn't 200 we couldn't be here</span>
-<span class="source-line-no">098</span><span id="line-98">                    null,</span>
-<span class="source-line-no">099</span><span id="line-99">                    response.getError().getCode(),</span>
-<span class="source-line-no">100</span><span id="line-100">                    null,</span>
-<span class="source-line-no">101</span><span id="line-101">                    response);</span>
-<span class="source-line-no">102</span><span id="line-102">        }</span>
-<span class="source-line-no">103</span><span id="line-103">        return response.getResult();</span>
-<span class="source-line-no">104</span><span id="line-104">    }</span>
-<span class="source-line-no">105</span><span id="line-105">    </span>
-<span class="source-line-no">106</span><span id="line-106">    /**</span>
-<span class="source-line-no">107</span><span id="line-107">     * JSON-RPC remote method call that returns 'response.result`</span>
-<span class="source-line-no">108</span><span id="line-108">     *</span>
-<span class="source-line-no">109</span><span id="line-109">     * @param &lt;R&gt; Type of result object</span>
-<span class="source-line-no">110</span><span id="line-110">     * @param method JSON RPC method call to send</span>
-<span class="source-line-no">111</span><span id="line-111">     * @param resultType desired result type as a Java class object</span>
-<span class="source-line-no">112</span><span id="line-112">     * @param params JSON RPC params</span>
-<span class="source-line-no">113</span><span id="line-113">     * @return the 'response.result' field of the JSON RPC response converted to type R</span>
-<span class="source-line-no">114</span><span id="line-114">     */</span>
-<span class="source-line-no">115</span><span id="line-115">    @Override</span>
-<span class="source-line-no">116</span><span id="line-116">    default &lt;R&gt; R send(String method, Class&lt;R&gt; resultType, List&lt;Object&gt; params) throws IOException, JsonRpcStatusException {</span>
-<span class="source-line-no">117</span><span id="line-117">        // Construct a JavaType object so we can tell Jackson what type of result we are expecting.</span>
-<span class="source-line-no">118</span><span id="line-118">        // (We can't use R because of type erasure)</span>
-<span class="source-line-no">119</span><span id="line-119">//        JavaType responseType = mapper.getTypeFactory().</span>
-<span class="source-line-no">120</span><span id="line-120">//                constructParametricType(JsonRpcResponse.class, resultType);</span>
-<span class="source-line-no">121</span><span id="line-121">        return sendRequestForResult(buildJsonRequest(method, params), typeForClass(resultType));</span>
-<span class="source-line-no">122</span><span id="line-122">    }</span>
-<span class="source-line-no">123</span><span id="line-123"></span>
-<span class="source-line-no">124</span><span id="line-124">    /**</span>
-<span class="source-line-no">125</span><span id="line-125">     * JSON-RPC remote method call that returns 'response.result`</span>
-<span class="source-line-no">126</span><span id="line-126">     *</span>
-<span class="source-line-no">127</span><span id="line-127">     * @param &lt;R&gt; Type of result object</span>
-<span class="source-line-no">128</span><span id="line-128">     * @param method JSON RPC method call to send</span>
-<span class="source-line-no">129</span><span id="line-129">     * @param resultType desired result type as a Jackson JavaType object</span>
-<span class="source-line-no">130</span><span id="line-130">     * @param params JSON RPC params</span>
-<span class="source-line-no">131</span><span id="line-131">     * @return the 'response.result' field of the JSON RPC response converted to type R</span>
-<span class="source-line-no">132</span><span id="line-132">     */</span>
-<span class="source-line-no">133</span><span id="line-133">    default &lt;R&gt; R send(String method, JavaType resultType, List&lt;Object&gt; params) throws IOException, JsonRpcStatusException {</span>
-<span class="source-line-no">134</span><span id="line-134">        // Construct a JavaType object so we can tell Jackson what type of result we are expecting.</span>
-<span class="source-line-no">135</span><span id="line-135">        // (We can't use R because of type erasure)</span>
-<span class="source-line-no">136</span><span id="line-136">        //JavaType responseType = mapper.getTypeFactory().</span>
-<span class="source-line-no">137</span><span id="line-137">        //        constructParametricType(JsonRpcResponse.class, resultType);</span>
-<span class="source-line-no">138</span><span id="line-138">        return sendRequestForResult(buildJsonRequest(method, params), resultType);</span>
-<span class="source-line-no">139</span><span id="line-139">    }</span>
-<span class="source-line-no">140</span><span id="line-140"></span>
-<span class="source-line-no">141</span><span id="line-141">    /**</span>
-<span class="source-line-no">142</span><span id="line-142">     * Varargs version</span>
-<span class="source-line-no">143</span><span id="line-143">     */</span>
-<span class="source-line-no">144</span><span id="line-144">    default &lt;R&gt; R send(String method, JavaType resultType, Object... params) throws IOException, JsonRpcStatusException {</span>
-<span class="source-line-no">145</span><span id="line-145">        return sendRequestForResult(buildJsonRequest(method, params), resultType);</span>
-<span class="source-line-no">146</span><span id="line-146">    }</span>
-<span class="source-line-no">147</span><span id="line-147"></span>
-<span class="source-line-no">148</span><span id="line-148">    /**</span>
-<span class="source-line-no">149</span><span id="line-149">     * Call an RPC method and return default object type.</span>
-<span class="source-line-no">150</span><span id="line-150">     *</span>
-<span class="source-line-no">151</span><span id="line-151">     * Caller should cast returned object to the correct type.</span>
-<span class="source-line-no">152</span><span id="line-152">     *</span>
-<span class="source-line-no">153</span><span id="line-153">     * Useful for:</span>
-<span class="source-line-no">154</span><span id="line-154">     * * Dynamically-dispatched JSON-RPC methods calls via Groovy subclasses</span>
-<span class="source-line-no">155</span><span id="line-155">     * * Simple (not client-side validated) command line utilities</span>
-<span class="source-line-no">156</span><span id="line-156">     * * Functional tests that need to send incorrect types to the server to test error handling</span>
-<span class="source-line-no">157</span><span id="line-157">     *</span>
-<span class="source-line-no">158</span><span id="line-158">     * @param &lt;R&gt; Type of result object</span>
-<span class="source-line-no">159</span><span id="line-159">     * @param method JSON RPC method call to send</span>
-<span class="source-line-no">160</span><span id="line-160">     * @param params JSON RPC parameters as a `List`</span>
-<span class="source-line-no">161</span><span id="line-161">     * @return the 'response.result' field of the JSON RPC response cast to type R</span>
-<span class="source-line-no">162</span><span id="line-162">     * @throws IOException network error</span>
-<span class="source-line-no">163</span><span id="line-163">     * @throws JsonRpcStatusException JSON RPC status error</span>
-<span class="source-line-no">164</span><span id="line-164">     */</span>
-<span class="source-line-no">165</span><span id="line-165">    @Override</span>
-<span class="source-line-no">166</span><span id="line-166">    default &lt;R&gt; R send(String method, List&lt;Object&gt; params) throws IOException, JsonRpcStatusException {</span>
-<span class="source-line-no">167</span><span id="line-167">        return send(method, getDefaultType(), params);</span>
-<span class="source-line-no">168</span><span id="line-168">    }</span>
-<span class="source-line-no">169</span><span id="line-169">}</span>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-</pre>
-</div>
-</main>
-</body>
-</html>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClient.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClient.html
index 9023bc664..c4bc24f2e 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClient.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClient.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, interface: JsonRpcClient">
@@ -14,104 +14,182 @@
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import java.io.IOException;</span>
-<span class="source-line-no">004</span><span id="line-4">import java.net.HttpURLConnection;</span>
-<span class="source-line-no">005</span><span id="line-5">import java.net.URI;</span>
+<span class="source-line-no">004</span><span id="line-4">import java.lang.reflect.Type;</span>
+<span class="source-line-no">005</span><span id="line-5">import java.net.HttpURLConnection;</span>
 <span class="source-line-no">006</span><span id="line-6">import java.util.Arrays;</span>
-<span class="source-line-no">007</span><span id="line-7">import java.util.List;</span>
-<span class="source-line-no">008</span><span id="line-8"></span>
-<span class="source-line-no">009</span><span id="line-9">/**</span>
-<span class="source-line-no">010</span><span id="line-10"> *  JSON-RPC client interface. This interface is independent of the JSON conversion library</span>
-<span class="source-line-no">011</span><span id="line-11"> *  (the default implementation uses Jackson) and HTTP client library (currently {@link HttpURLConnection}).</span>
-<span class="source-line-no">012</span><span id="line-12"> *  For historical reasons the interface is synchronous, but {@link AsyncSupport} makes it easier</span>
-<span class="source-line-no">013</span><span id="line-13"> *  to add use of {@link java.util.concurrent.CompletableFuture} for special cases. In the future</span>
-<span class="source-line-no">014</span><span id="line-14"> *  this interface may change to natively asynchronous.</span>
-<span class="source-line-no">015</span><span id="line-15"> *  &lt;p&gt;</span>
-<span class="source-line-no">016</span><span id="line-16"> *  Both JSON-RPC 1.0 and JSON-RPC 2.0 are supported. Implementations should also be (via configuration, perhaps)</span>
-<span class="source-line-no">017</span><span id="line-17"> *  lenient enough to support Bitcoin Core and similar servers that don't follow the JSON-RPC specifications exactly.</span>
-<span class="source-line-no">018</span><span id="line-18"> * @see &lt;a href="https://www.jsonrpc.org/specification_v1"&gt;JSON-RPC 1.0 Specification (2005)&lt;/a&gt;</span>
-<span class="source-line-no">019</span><span id="line-19"> * @see &lt;a href="https://www.jsonrpc.org/specification"&gt;JSON-RPC 2.0 Specification&lt;/a&gt;</span>
-<span class="source-line-no">020</span><span id="line-20"> */</span>
-<span class="source-line-no">021</span><span id="line-21">public interface JsonRpcClient extends AutoCloseable, AsyncSupport {</span>
-<span class="source-line-no">022</span><span id="line-22"></span>
-<span class="source-line-no">023</span><span id="line-23">    /**</span>
-<span class="source-line-no">024</span><span id="line-24">     * Return the JSON-RPC version used by the implementation</span>
-<span class="source-line-no">025</span><span id="line-25">     *</span>
-<span class="source-line-no">026</span><span id="line-26">     * @return JSON-RPC version</span>
-<span class="source-line-no">027</span><span id="line-27">     */</span>
-<span class="source-line-no">028</span><span id="line-28">    JsonRpcMessage.Version getJsonRpcVersion();</span>
-<span class="source-line-no">029</span><span id="line-29"></span>
-<span class="source-line-no">030</span><span id="line-30">    /**</span>
-<span class="source-line-no">031</span><span id="line-31">     * Get the URI of the remote server</span>
-<span class="source-line-no">032</span><span id="line-32">     * @return URI of remote server</span>
-<span class="source-line-no">033</span><span id="line-33">     */</span>
-<span class="source-line-no">034</span><span id="line-34">    URI getServerURI();</span>
-<span class="source-line-no">035</span><span id="line-35">    </span>
-<span class="source-line-no">036</span><span id="line-36">    /**</span>
-<span class="source-line-no">037</span><span id="line-37">     * Call an RPC method and return "default" object type. Caller should cast returned object to the correct type.</span>
-<span class="source-line-no">038</span><span id="line-38">     * &lt;p&gt;</span>
-<span class="source-line-no">039</span><span id="line-39">     * The parameter list is "untyped" (declared as {@code List&lt;Object&gt;}) and implementations are responsible</span>
-<span class="source-line-no">040</span><span id="line-40">     * for converting each Java object parameter to a valid and correctly-typed (for {@code method}) JSON object.</span>
-<span class="source-line-no">041</span><span id="line-41">     * &lt;p&gt;</span>
-<span class="source-line-no">042</span><span id="line-42">     * This is used to implement the {@code DynamicRpcMethodFallback} trait in Groovy which is applied</span>
-<span class="source-line-no">043</span><span id="line-43">     * to various Groovy RPC client implementations that typically inherit statically-dispatched</span>
-<span class="source-line-no">044</span><span id="line-44">     * methods from Java classes, but use {@code methodMissing()} to add JSON-RPC methods dynamically.</span>
-<span class="source-line-no">045</span><span id="line-45">     * This may be useful in other Dynamic JVM languages, as well.</span>
-<span class="source-line-no">046</span><span id="line-46">     *</span>
-<span class="source-line-no">047</span><span id="line-47">     * @param method JSON RPC method call to send</span>
-<span class="source-line-no">048</span><span id="line-48">     * @param params JSON RPC parameters using types that are convertible to JSON</span>
-<span class="source-line-no">049</span><span id="line-49">     * @param &lt;R&gt; Type of result object</span>
-<span class="source-line-no">050</span><span id="line-50">     * @return the `response.result` field of the JSON-RPC response cast to type R</span>
-<span class="source-line-no">051</span><span id="line-51">     * @throws IOException network error</span>
-<span class="source-line-no">052</span><span id="line-52">     * @throws JsonRpcStatusException JSON RPC status error</span>
-<span class="source-line-no">053</span><span id="line-53">     */</span>
-<span class="source-line-no">054</span><span id="line-54">    &lt;R&gt; R send(String method, List&lt;Object&gt; params) throws IOException, JsonRpcStatusException;</span>
-<span class="source-line-no">055</span><span id="line-55"></span>
-<span class="source-line-no">056</span><span id="line-56">    /**</span>
-<span class="source-line-no">057</span><span id="line-57">     * Call an RPC method and return default object type.</span>
-<span class="source-line-no">058</span><span id="line-58">     *</span>
-<span class="source-line-no">059</span><span id="line-59">     * Convenience version that takes `params` as array/varargs.</span>
-<span class="source-line-no">060</span><span id="line-60">     *</span>
-<span class="source-line-no">061</span><span id="line-61">     * @param &lt;R&gt; Type of result object</span>
-<span class="source-line-no">062</span><span id="line-62">     * @param method JSON RPC method call to send</span>
-<span class="source-line-no">063</span><span id="line-63">     * @param params JSON RPC parameters as array or varargs</span>
-<span class="source-line-no">064</span><span id="line-64">     * @return the 'response.result' field of the JSON RPC response cast to type R</span>
-<span class="source-line-no">065</span><span id="line-65">     * @throws IOException network error</span>
-<span class="source-line-no">066</span><span id="line-66">     * @throws JsonRpcStatusException JSON RPC status error</span>
-<span class="source-line-no">067</span><span id="line-67">     */</span>
-<span class="source-line-no">068</span><span id="line-68">    default &lt;R&gt; R send(String method, Object... params) throws IOException, JsonRpcStatusException {</span>
-<span class="source-line-no">069</span><span id="line-69">        return send(method, Arrays.asList(params));</span>
-<span class="source-line-no">070</span><span id="line-70">    }</span>
-<span class="source-line-no">071</span><span id="line-71"></span>
-<span class="source-line-no">072</span><span id="line-72">    &lt;R&gt; R send(String method, Class&lt;R&gt; resultType, List&lt;Object&gt; params) throws IOException, JsonRpcStatusException;</span>
-<span class="source-line-no">073</span><span id="line-73"></span>
-<span class="source-line-no">074</span><span id="line-74">    default &lt;R&gt; R send(String method, Class&lt;R&gt; resultType, Object... params) throws IOException, JsonRpcStatusException {</span>
-<span class="source-line-no">075</span><span id="line-75">        return send(method, resultType, Arrays.asList(params));</span>
-<span class="source-line-no">076</span><span id="line-76">    }</span>
-<span class="source-line-no">077</span><span id="line-77"></span>
-<span class="source-line-no">078</span><span id="line-78">    /**</span>
-<span class="source-line-no">079</span><span id="line-79">     * Create a JsonRpcRequest from method and parameters</span>
-<span class="source-line-no">080</span><span id="line-80">     *</span>
-<span class="source-line-no">081</span><span id="line-81">     * @param method name of method to call</span>
-<span class="source-line-no">082</span><span id="line-82">     * @param params parameter Java objects</span>
-<span class="source-line-no">083</span><span id="line-83">     * @return A ready-to-send JsonRpcRequest</span>
-<span class="source-line-no">084</span><span id="line-84">     */</span>
-<span class="source-line-no">085</span><span id="line-85">    default JsonRpcRequest buildJsonRequest(String method, List&lt;Object&gt; params) {</span>
-<span class="source-line-no">086</span><span id="line-86">        return new JsonRpcRequest(getJsonRpcVersion(), method, params);</span>
-<span class="source-line-no">087</span><span id="line-87">    }</span>
-<span class="source-line-no">088</span><span id="line-88"></span>
-<span class="source-line-no">089</span><span id="line-89">    default JsonRpcRequest buildJsonRequest(String method, Object... params) {</span>
-<span class="source-line-no">090</span><span id="line-90">        return new JsonRpcRequest(getJsonRpcVersion(), method, Arrays.asList(params));</span>
-<span class="source-line-no">091</span><span id="line-91">    }</span>
-<span class="source-line-no">092</span><span id="line-92"></span>
-<span class="source-line-no">093</span><span id="line-93">    /**</span>
-<span class="source-line-no">094</span><span id="line-94">     * Default no-op implementation of close. Classes should override when</span>
-<span class="source-line-no">095</span><span id="line-95">     * they have something they need to close properly.</span>
-<span class="source-line-no">096</span><span id="line-96">     *</span>
-<span class="source-line-no">097</span><span id="line-97">     * @throws IOException if something happens during close</span>
-<span class="source-line-no">098</span><span id="line-98">     */</span>
-<span class="source-line-no">099</span><span id="line-99">    default void close() throws Exception {</span>
-<span class="source-line-no">100</span><span id="line-100">    }</span>
-<span class="source-line-no">101</span><span id="line-101">}</span>
+<span class="source-line-no">007</span><span id="line-7">import java.util.Collection;</span>
+<span class="source-line-no">008</span><span id="line-8">import java.util.List;</span>
+<span class="source-line-no">009</span><span id="line-9">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">010</span><span id="line-10"></span>
+<span class="source-line-no">011</span><span id="line-11">/**</span>
+<span class="source-line-no">012</span><span id="line-12"> *  JSON-RPC client interface. This interface is independent of the JSON conversion library</span>
+<span class="source-line-no">013</span><span id="line-13"> *  (the default implementation uses Jackson) and HTTP client library (currently {@link HttpURLConnection}).</span>
+<span class="source-line-no">014</span><span id="line-14"> *  For historical reasons the interface is mostly synchronous, but {@link AsyncSupport} makes it easier</span>
+<span class="source-line-no">015</span><span id="line-15"> *  to add use of {@link java.util.concurrent.CompletableFuture} for special cases. In the future</span>
+<span class="source-line-no">016</span><span id="line-16"> *  this interface may change to natively asynchronous.</span>
+<span class="source-line-no">017</span><span id="line-17"> *  &lt;p&gt;</span>
+<span class="source-line-no">018</span><span id="line-18"> *  Both JSON-RPC 1.0 and JSON-RPC 2.0 are supported. Implementations should also be (via configuration, perhaps)</span>
+<span class="source-line-no">019</span><span id="line-19"> *  lenient enough to support Bitcoin Core and similar servers that don't follow the JSON-RPC specifications exactly.</span>
+<span class="source-line-no">020</span><span id="line-20"> * @see &lt;a href="https://www.jsonrpc.org/specification_v1"&gt;JSON-RPC 1.0 Specification (2005)&lt;/a&gt;</span>
+<span class="source-line-no">021</span><span id="line-21"> * @see &lt;a href="https://www.jsonrpc.org/specification"&gt;JSON-RPC 2.0 Specification&lt;/a&gt;</span>
+<span class="source-line-no">022</span><span id="line-22"> */</span>
+<span class="source-line-no">023</span><span id="line-23">public interface JsonRpcClient&lt;T extends Type&gt; extends JsonRpcTransport&lt;T&gt;, AutoCloseable {</span>
+<span class="source-line-no">024</span><span id="line-24"></span>
+<span class="source-line-no">025</span><span id="line-25">    /**</span>
+<span class="source-line-no">026</span><span id="line-26">     * Return the JSON-RPC version used by the implementation</span>
+<span class="source-line-no">027</span><span id="line-27">     *</span>
+<span class="source-line-no">028</span><span id="line-28">     * @return JSON-RPC version</span>
+<span class="source-line-no">029</span><span id="line-29">     */</span>
+<span class="source-line-no">030</span><span id="line-30">    JsonRpcMessage.Version getJsonRpcVersion();</span>
+<span class="source-line-no">031</span><span id="line-31"></span>
+<span class="source-line-no">032</span><span id="line-32">    /**</span>
+<span class="source-line-no">033</span><span id="line-33">     * Call an RPC method and return default object type.</span>
+<span class="source-line-no">034</span><span id="line-34">     * &lt;p&gt;</span>
+<span class="source-line-no">035</span><span id="line-35">     * Caller should cast returned object to the correct type.</span>
+<span class="source-line-no">036</span><span id="line-36">     * &lt;p&gt;</span>
+<span class="source-line-no">037</span><span id="line-37">     * Useful for:</span>
+<span class="source-line-no">038</span><span id="line-38">     * &lt;ul&gt;</span>
+<span class="source-line-no">039</span><span id="line-39">     * &lt;li&gt;Dynamically-dispatched JSON-RPC methods calls via Groovy subclasses&lt;/li&gt;</span>
+<span class="source-line-no">040</span><span id="line-40">     * &lt;li&gt;Simple (not client-side validated) command line utilities&lt;/li&gt;</span>
+<span class="source-line-no">041</span><span id="line-41">     * &lt;li&gt;Functional tests that need to send incorrect types to the server to test error handling&lt;/li&gt;</span>
+<span class="source-line-no">042</span><span id="line-42">     * &lt;/ul&gt;</span>
+<span class="source-line-no">043</span><span id="line-43">     *</span>
+<span class="source-line-no">044</span><span id="line-44">     * @param &lt;R&gt; Type of result object</span>
+<span class="source-line-no">045</span><span id="line-45">     * @param method JSON RPC method call to send</span>
+<span class="source-line-no">046</span><span id="line-46">     * @param params JSON RPC parameters as a `List`</span>
+<span class="source-line-no">047</span><span id="line-47">     * @return the 'response.result' field of the JSON RPC response cast to type R</span>
+<span class="source-line-no">048</span><span id="line-48">     * @throws IOException network error</span>
+<span class="source-line-no">049</span><span id="line-49">     * @throws JsonRpcStatusException JSON RPC status error</span>
+<span class="source-line-no">050</span><span id="line-50">     */</span>
+<span class="source-line-no">051</span><span id="line-51">    default &lt;R&gt; R send(String method, List&lt;Object&gt; params) throws IOException, JsonRpcStatusException {</span>
+<span class="source-line-no">052</span><span id="line-52">        return send(method, defaultType(), params);</span>
+<span class="source-line-no">053</span><span id="line-53">    }</span>
+<span class="source-line-no">054</span><span id="line-54"></span>
+<span class="source-line-no">055</span><span id="line-55">    default &lt;R&gt; CompletableFuture&lt;R&gt;  sendAsync(String method, List&lt;Object&gt; params) {</span>
+<span class="source-line-no">056</span><span id="line-56">        return sendAsync(method, defaultType(), params);</span>
+<span class="source-line-no">057</span><span id="line-57">    }</span>
+<span class="source-line-no">058</span><span id="line-58"></span>
+<span class="source-line-no">059</span><span id="line-59">    /**</span>
+<span class="source-line-no">060</span><span id="line-60">     * Call an RPC method and return default object type.</span>
+<span class="source-line-no">061</span><span id="line-61">     * &lt;p&gt;</span>
+<span class="source-line-no">062</span><span id="line-62">     * Convenience version that takes {@code params} as array/varargs.</span>
+<span class="source-line-no">063</span><span id="line-63">     *</span>
+<span class="source-line-no">064</span><span id="line-64">     * @param &lt;R&gt; Type of result object</span>
+<span class="source-line-no">065</span><span id="line-65">     * @param method JSON RPC method call to send</span>
+<span class="source-line-no">066</span><span id="line-66">     * @param params JSON RPC parameters as array or varargs</span>
+<span class="source-line-no">067</span><span id="line-67">     * @return the 'response.result' field of the JSON RPC response cast to type R</span>
+<span class="source-line-no">068</span><span id="line-68">     * @throws IOException network error</span>
+<span class="source-line-no">069</span><span id="line-69">     * @throws JsonRpcStatusException JSON RPC status error</span>
+<span class="source-line-no">070</span><span id="line-70">     */</span>
+<span class="source-line-no">071</span><span id="line-71">    default &lt;R&gt; R send(String method, Object... params) throws IOException, JsonRpcStatusException {</span>
+<span class="source-line-no">072</span><span id="line-72">        return send(method, Arrays.asList(params));</span>
+<span class="source-line-no">073</span><span id="line-73">    }</span>
+<span class="source-line-no">074</span><span id="line-74"></span>
+<span class="source-line-no">075</span><span id="line-75">    default &lt;R&gt; R send(String method, Class&lt;R&gt; resultType, Object... params) throws IOException, JsonRpcStatusException {</span>
+<span class="source-line-no">076</span><span id="line-76">        return send(method, resultType, Arrays.asList(params));</span>
+<span class="source-line-no">077</span><span id="line-77">    }</span>
+<span class="source-line-no">078</span><span id="line-78"></span>
+<span class="source-line-no">079</span><span id="line-79">    default &lt;R&gt; CompletableFuture&lt;R&gt; sendAsync(String method, Class&lt;R&gt; resultType, Object... params) {</span>
+<span class="source-line-no">080</span><span id="line-80">        return sendAsync(method, resultType, Arrays.asList(params));</span>
+<span class="source-line-no">081</span><span id="line-81">    }</span>
+<span class="source-line-no">082</span><span id="line-82"></span>
+<span class="source-line-no">083</span><span id="line-83">    /**</span>
+<span class="source-line-no">084</span><span id="line-84">     * JSON-RPC remote method call that returns 'response.result`</span>
+<span class="source-line-no">085</span><span id="line-85">     *</span>
+<span class="source-line-no">086</span><span id="line-86">     * @param &lt;R&gt; Type of result object</span>
+<span class="source-line-no">087</span><span id="line-87">     * @param method JSON RPC method call to send</span>
+<span class="source-line-no">088</span><span id="line-88">     * @param resultType desired result type as a Java class object</span>
+<span class="source-line-no">089</span><span id="line-89">     * @param params JSON RPC params</span>
+<span class="source-line-no">090</span><span id="line-90">     * @return the 'response.result' field of the JSON RPC response converted to type R</span>
+<span class="source-line-no">091</span><span id="line-91">     */</span>
+<span class="source-line-no">092</span><span id="line-92">    default &lt;R&gt; R send(String method, Class&lt;R&gt; resultType, List&lt;Object&gt; params) throws IOException, JsonRpcStatusException {</span>
+<span class="source-line-no">093</span><span id="line-93">        return syncGet(sendRequestForResultAsync(buildJsonRequest(method, params), typeForClass(resultType)));</span>
+<span class="source-line-no">094</span><span id="line-94">    }</span>
+<span class="source-line-no">095</span><span id="line-95"></span>
+<span class="source-line-no">096</span><span id="line-96">    default &lt;R&gt; CompletableFuture&lt;R&gt; sendAsync(String method, Class&lt;R&gt; resultType, List&lt;Object&gt; params) {</span>
+<span class="source-line-no">097</span><span id="line-97">        return sendRequestForResultAsync(buildJsonRequest(method, params), typeForClass(resultType));</span>
+<span class="source-line-no">098</span><span id="line-98">    }</span>
+<span class="source-line-no">099</span><span id="line-99"></span>
+<span class="source-line-no">100</span><span id="line-100">    default &lt;R&gt; CompletableFuture&lt;R&gt; sendAsync(String method, T resultType, List&lt;Object&gt; params) {</span>
+<span class="source-line-no">101</span><span id="line-101">        return sendRequestForResultAsync(buildJsonRequest(method, params), resultType);</span>
+<span class="source-line-no">102</span><span id="line-102">    }</span>
+<span class="source-line-no">103</span><span id="line-103"></span>
+<span class="source-line-no">104</span><span id="line-104">    /**</span>
+<span class="source-line-no">105</span><span id="line-105">     * JSON-RPC remote method call that returns {@code response.result}</span>
+<span class="source-line-no">106</span><span id="line-106">     *</span>
+<span class="source-line-no">107</span><span id="line-107">     * @param &lt;R&gt; Type of result object</span>
+<span class="source-line-no">108</span><span id="line-108">     * @param method JSON RPC method call to send</span>
+<span class="source-line-no">109</span><span id="line-109">     * @param resultType desired result type as a Jackson JavaType object</span>
+<span class="source-line-no">110</span><span id="line-110">     * @param params JSON RPC params</span>
+<span class="source-line-no">111</span><span id="line-111">     * @return the 'response.result' field of the JSON RPC response converted to type R</span>
+<span class="source-line-no">112</span><span id="line-112">     */</span>
+<span class="source-line-no">113</span><span id="line-113">    default &lt;R&gt; R send(String method, T resultType, List&lt;Object&gt; params) throws IOException, JsonRpcStatusException {</span>
+<span class="source-line-no">114</span><span id="line-114">        return syncGet(sendRequestForResultAsync(buildJsonRequest(method, params), resultType));</span>
+<span class="source-line-no">115</span><span id="line-115">    }</span>
+<span class="source-line-no">116</span><span id="line-116"></span>
+<span class="source-line-no">117</span><span id="line-117">    /**</span>
+<span class="source-line-no">118</span><span id="line-118">     * Varargs version</span>
+<span class="source-line-no">119</span><span id="line-119">     */</span>
+<span class="source-line-no">120</span><span id="line-120">    default &lt;R&gt; R send(String method, T resultType, Object... params) throws IOException, JsonRpcStatusException {</span>
+<span class="source-line-no">121</span><span id="line-121">        return syncGet(sendRequestForResultAsync(buildJsonRequest(method, params), resultType));</span>
+<span class="source-line-no">122</span><span id="line-122">    }</span>
+<span class="source-line-no">123</span><span id="line-123"></span>
+<span class="source-line-no">124</span><span id="line-124">    default &lt;R&gt; CompletableFuture&lt;R&gt; sendAsync(String method, T resultType, Object... params) {</span>
+<span class="source-line-no">125</span><span id="line-125">        return sendRequestForResultAsync(buildJsonRequest(method, params), resultType);</span>
+<span class="source-line-no">126</span><span id="line-126">    }</span>
+<span class="source-line-no">127</span><span id="line-127"></span>
+<span class="source-line-no">128</span><span id="line-128">    private &lt;R&gt; CompletableFuture&lt;R&gt; sendRequestForResultAsync(JsonRpcRequest request, T resultType) {</span>
+<span class="source-line-no">129</span><span id="line-129">        CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; responseFuture = sendRequestForResponseAsync(request, responseTypeFor(resultType));</span>
+<span class="source-line-no">130</span><span id="line-130"></span>
+<span class="source-line-no">131</span><span id="line-131">//        assert response != null;</span>
+<span class="source-line-no">132</span><span id="line-132">//        assert response.getJsonrpc() != null;</span>
+<span class="source-line-no">133</span><span id="line-133">//        assert response.getJsonrpc().equals("2.0");</span>
+<span class="source-line-no">134</span><span id="line-134">//        assert response.getId() != null;</span>
+<span class="source-line-no">135</span><span id="line-135">//        assert response.getId().equals(request.getId());</span>
+<span class="source-line-no">136</span><span id="line-136"></span>
+<span class="source-line-no">137</span><span id="line-137">        // TODO: Error case should probably complete with JsonRpcErrorException (not status exception with code 200)</span>
+<span class="source-line-no">138</span><span id="line-138">        return responseFuture.thenCompose(resp -&gt; (resp.getError() == null || resp.getError().getCode() == 0)</span>
+<span class="source-line-no">139</span><span id="line-139">                ? CompletableFuture.completedFuture(resp.getResult())</span>
+<span class="source-line-no">140</span><span id="line-140">                : CompletableFuture.failedFuture(new JsonRpcStatusException(200, resp)) // If response code wasn't 200 we couldn't be here</span>
+<span class="source-line-no">141</span><span id="line-141">        );</span>
+<span class="source-line-no">142</span><span id="line-142">    }</span>
+<span class="source-line-no">143</span><span id="line-143"></span>
+<span class="source-line-no">144</span><span id="line-144">    /**</span>
+<span class="source-line-no">145</span><span id="line-145">     * Create a JsonRpcRequest from method and parameters</span>
+<span class="source-line-no">146</span><span id="line-146">     *</span>
+<span class="source-line-no">147</span><span id="line-147">     * @param method name of method to call</span>
+<span class="source-line-no">148</span><span id="line-148">     * @param params parameter Java objects</span>
+<span class="source-line-no">149</span><span id="line-149">     * @return A ready-to-send JsonRpcRequest</span>
+<span class="source-line-no">150</span><span id="line-150">     */</span>
+<span class="source-line-no">151</span><span id="line-151">    default JsonRpcRequest buildJsonRequest(String method, List&lt;Object&gt; params) {</span>
+<span class="source-line-no">152</span><span id="line-152">        return new JsonRpcRequest(getJsonRpcVersion(), method, params);</span>
+<span class="source-line-no">153</span><span id="line-153">    }</span>
+<span class="source-line-no">154</span><span id="line-154"></span>
+<span class="source-line-no">155</span><span id="line-155">    default JsonRpcRequest buildJsonRequest(String method, Object... params) {</span>
+<span class="source-line-no">156</span><span id="line-156">        return new JsonRpcRequest(getJsonRpcVersion(), method, Arrays.asList(params));</span>
+<span class="source-line-no">157</span><span id="line-157">    }</span>
+<span class="source-line-no">158</span><span id="line-158"></span>
+<span class="source-line-no">159</span><span id="line-159">    /**</span>
+<span class="source-line-no">160</span><span id="line-160">     * Default no-op implementation of {@link AutoCloseable#close()}. Classes should override when</span>
+<span class="source-line-no">161</span><span id="line-161">     * they have something they need to close properly.</span>
+<span class="source-line-no">162</span><span id="line-162">     *</span>
+<span class="source-line-no">163</span><span id="line-163">     * @throws IOException if something happens during close</span>
+<span class="source-line-no">164</span><span id="line-164">     */</span>
+<span class="source-line-no">165</span><span id="line-165">    @Override</span>
+<span class="source-line-no">166</span><span id="line-166">    default void close() throws Exception {</span>
+<span class="source-line-no">167</span><span id="line-167">    }</span>
+<span class="source-line-no">168</span><span id="line-168"></span>
+<span class="source-line-no">169</span><span id="line-169">    T defaultType();</span>
+<span class="source-line-no">170</span><span id="line-170"></span>
+<span class="source-line-no">171</span><span id="line-171">    T responseTypeFor(T resultType);</span>
+<span class="source-line-no">172</span><span id="line-172">    T responseTypeFor(Class&lt;?&gt; resultType);</span>
+<span class="source-line-no">173</span><span id="line-173"></span>
+<span class="source-line-no">174</span><span id="line-174">    T typeForClass(Class&lt;?&gt; clazz);</span>
+<span class="source-line-no">175</span><span id="line-175"></span>
+<span class="source-line-no">176</span><span id="line-176">    T collectionTypeForClasses(Class&lt;? extends Collection&gt; collectionClazz, Class&lt;?&gt; clazz);</span>
+<span class="source-line-no">177</span><span id="line-177"></span>
+<span class="source-line-no">178</span><span id="line-178">    T collectionTypeForClasses(Class&lt;? extends Collection&gt; collectionClazz, T itemType);</span>
+<span class="source-line-no">179</span><span id="line-179">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html
index 3ee495d16..b2fb83513 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientHttpUrlConnection.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcClientHttpUrlConnection">
@@ -15,7 +15,7 @@
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.core.JsonProcessingException;</span>
 <span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JavaType;</span>
-<span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.databind.JsonNode;</span>
+<span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.databind.ObjectMapper;</span>
 <span class="source-line-no">006</span><span id="line-6">import org.slf4j.Logger;</span>
 <span class="source-line-no">007</span><span id="line-7">import org.slf4j.LoggerFactory;</span>
 <span class="source-line-no">008</span><span id="line-8"></span>
@@ -25,204 +25,172 @@
 <span class="source-line-no">012</span><span id="line-12">import java.io.IOException;</span>
 <span class="source-line-no">013</span><span id="line-13">import java.io.InputStream;</span>
 <span class="source-line-no">014</span><span id="line-14">import java.io.OutputStream;</span>
-<span class="source-line-no">015</span><span id="line-15">import java.net.HttpURLConnection;</span>
-<span class="source-line-no">016</span><span id="line-16">import java.net.URI;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.nio.charset.StandardCharsets;</span>
-<span class="source-line-no">018</span><span id="line-18">import java.util.concurrent.CompletableFuture;</span>
-<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">/**</span>
-<span class="source-line-no">021</span><span id="line-21"> * JSON-RPC Client using {@link HttpURLConnection} formerly named{@code RpcClient}.</span>
-<span class="source-line-no">022</span><span id="line-22"> * &lt;p&gt;</span>
-<span class="source-line-no">023</span><span id="line-23"> * This is a concrete class with generic JSON-RPC functionality, it implements the abstract</span>
-<span class="source-line-no">024</span><span id="line-24"> * method {@link AbstractRpcClient#sendRequestForResponseAsync(JsonRpcRequest, JavaType)} using {@link HttpURLConnection}.</span>
-<span class="source-line-no">025</span><span id="line-25"> * &lt;p&gt;</span>
-<span class="source-line-no">026</span><span id="line-26"> * Uses strongly-typed POJOs representing {@link JsonRpcRequest} and {@link JsonRpcResponse}. The</span>
-<span class="source-line-no">027</span><span id="line-27"> * response object uses a parameterized type for the object that is the actual JSON-RPC `result`.</span>
-<span class="source-line-no">028</span><span id="line-28"> * Using strong types and Jackson to serialize/deserialize to/from strongly-typed POJO's without</span>
-<span class="source-line-no">029</span><span id="line-29"> * using intermediate `Map` or `JsonNode` types.</span>
-<span class="source-line-no">030</span><span id="line-30"> *</span>
-<span class="source-line-no">031</span><span id="line-31"> */</span>
-<span class="source-line-no">032</span><span id="line-32">public class JsonRpcClientHttpUrlConnection extends AbstractRpcClient {</span>
-<span class="source-line-no">033</span><span id="line-33">    private static final Logger log = LoggerFactory.getLogger(JsonRpcClientHttpUrlConnection.class);</span>
-<span class="source-line-no">034</span><span id="line-34">    private final URI serverURI;</span>
-<span class="source-line-no">035</span><span id="line-35">    private final String username;</span>
-<span class="source-line-no">036</span><span id="line-36">    private final String password;</span>
-<span class="source-line-no">037</span><span id="line-37">    private static final String UTF8 = StandardCharsets.UTF_8.name();</span>
-<span class="source-line-no">038</span><span id="line-38">    private final SSLSocketFactory sslSocketFactory;</span>
-<span class="source-line-no">039</span><span id="line-39"></span>
-<span class="source-line-no">040</span><span id="line-40">    /**</span>
-<span class="source-line-no">041</span><span id="line-41">     * @deprecated Use {@link JsonRpcClientHttpUrlConnection#JsonRpcClientHttpUrlConnection(SSLContext, JsonRpcMessage.Version, URI, String, String)}</span>
-<span class="source-line-no">042</span><span id="line-42">     */</span>
-<span class="source-line-no">043</span><span id="line-43">    @Deprecated</span>
-<span class="source-line-no">044</span><span id="line-44">    public JsonRpcClientHttpUrlConnection(SSLSocketFactory socketFactory, JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
-<span class="source-line-no">045</span><span id="line-45">        super(jsonRpcVersion);</span>
-<span class="source-line-no">046</span><span id="line-46">        this.sslSocketFactory = socketFactory;</span>
-<span class="source-line-no">047</span><span id="line-47">        log.debug("Constructing JSON-RPC client for: {}", server);</span>
-<span class="source-line-no">048</span><span id="line-48">        this.serverURI = server;</span>
-<span class="source-line-no">049</span><span id="line-49">        this.username = rpcUser;</span>
-<span class="source-line-no">050</span><span id="line-50">        this.password = rpcPassword;</span>
-<span class="source-line-no">051</span><span id="line-51">    }</span>
-<span class="source-line-no">052</span><span id="line-52"></span>
-<span class="source-line-no">053</span><span id="line-53">    public JsonRpcClientHttpUrlConnection(SSLContext sslContext, JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
-<span class="source-line-no">054</span><span id="line-54">        super(jsonRpcVersion);</span>
-<span class="source-line-no">055</span><span id="line-55">        this.sslSocketFactory = sslContext.getSocketFactory();</span>
-<span class="source-line-no">056</span><span id="line-56">        log.debug("Constructing JSON-RPC client for: {}", server);</span>
-<span class="source-line-no">057</span><span id="line-57">        this.serverURI = server;</span>
-<span class="source-line-no">058</span><span id="line-58">        this.username = rpcUser;</span>
-<span class="source-line-no">059</span><span id="line-59">        this.password = rpcPassword;</span>
-<span class="source-line-no">060</span><span id="line-60">    }</span>
-<span class="source-line-no">061</span><span id="line-61"></span>
-<span class="source-line-no">062</span><span id="line-62">    /**</span>
-<span class="source-line-no">063</span><span id="line-63">     * Construct a JSON-RPC client from URI, username, and password</span>
-<span class="source-line-no">064</span><span id="line-64">     *</span>
-<span class="source-line-no">065</span><span id="line-65">     * @param jsonRpcVersion version for {@code jsonrpc} field in messages</span>
-<span class="source-line-no">066</span><span id="line-66">     * @param server server URI should not contain username/password</span>
-<span class="source-line-no">067</span><span id="line-67">     * @param rpcUser username for the RPC HTTP connection</span>
-<span class="source-line-no">068</span><span id="line-68">     * @param rpcPassword password for the RPC HTTP connection</span>
-<span class="source-line-no">069</span><span id="line-69">     */</span>
-<span class="source-line-no">070</span><span id="line-70">    public JsonRpcClientHttpUrlConnection(JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
-<span class="source-line-no">071</span><span id="line-71">        this(getDefaultSSLContext(), jsonRpcVersion, server, rpcUser, rpcPassword);</span>
-<span class="source-line-no">072</span><span id="line-72">    }</span>
-<span class="source-line-no">073</span><span id="line-73"></span>
-<span class="source-line-no">074</span><span id="line-74">    /**</span>
-<span class="source-line-no">075</span><span id="line-75">     * Get the URI of the server this client connects to</span>
-<span class="source-line-no">076</span><span id="line-76">     * @return Server URI</span>
-<span class="source-line-no">077</span><span id="line-77">     */</span>
-<span class="source-line-no">078</span><span id="line-78">    @Override</span>
-<span class="source-line-no">079</span><span id="line-79">    public URI getServerURI() {</span>
-<span class="source-line-no">080</span><span id="line-80">        return serverURI;</span>
-<span class="source-line-no">081</span><span id="line-81">    }</span>
-<span class="source-line-no">082</span><span id="line-82"></span>
-<span class="source-line-no">083</span><span id="line-83">    /**</span>
-<span class="source-line-no">084</span><span id="line-84">     * Send a JSON-RPC request to the server and return a JSON-RPC response.</span>
-<span class="source-line-no">085</span><span id="line-85">     *</span>
-<span class="source-line-no">086</span><span id="line-86">     * @param request JSON-RPC request</span>
-<span class="source-line-no">087</span><span id="line-87">     * @param responseType Response type to deserialize to</span>
-<span class="source-line-no">088</span><span id="line-88">     * @return JSON-RPC response</span>
-<span class="source-line-no">089</span><span id="line-89">     * @throws IOException when thrown by the underlying HttpURLConnection</span>
-<span class="source-line-no">090</span><span id="line-90">     * @throws JsonRpcStatusException when the HTTP response code is other than 200</span>
-<span class="source-line-no">091</span><span id="line-91">     */</span>
-<span class="source-line-no">092</span><span id="line-92">    @Override</span>
-<span class="source-line-no">093</span><span id="line-93">    public &lt;R&gt; JsonRpcResponse&lt;R&gt; sendRequestForResponse(JsonRpcRequest request, JavaType responseType) throws IOException, JsonRpcStatusException {</span>
-<span class="source-line-no">094</span><span id="line-94">        HttpURLConnection connection = openConnection();</span>
-<span class="source-line-no">095</span><span id="line-95"></span>
-<span class="source-line-no">096</span><span id="line-96">        // TODO: Make sure HTTP keep-alive will work</span>
-<span class="source-line-no">097</span><span id="line-97">        // See: http://docs.oracle.com/javase/7/docs/technotes/guides/net/http-keepalive.html</span>
-<span class="source-line-no">098</span><span id="line-98">        // http://developer.android.com/reference/java/net/HttpURLConnection.html</span>
-<span class="source-line-no">099</span><span id="line-99">        // http://android-developers.blogspot.com/2011/09/androids-http-clients.html</span>
-<span class="source-line-no">100</span><span id="line-100"></span>
-<span class="source-line-no">101</span><span id="line-101">        if (log.isDebugEnabled()) {</span>
-<span class="source-line-no">102</span><span id="line-102">            log.debug("JsonRpcRequest: {}", mapper.writeValueAsString(request));</span>
-<span class="source-line-no">103</span><span id="line-103">        }</span>
-<span class="source-line-no">104</span><span id="line-104">        </span>
-<span class="source-line-no">105</span><span id="line-105">        try (OutputStream requestStream = connection.getOutputStream()) {</span>
-<span class="source-line-no">106</span><span id="line-106">            mapper.writeValue(requestStream, request);</span>
-<span class="source-line-no">107</span><span id="line-107">        }</span>
-<span class="source-line-no">108</span><span id="line-108"></span>
-<span class="source-line-no">109</span><span id="line-109">        int responseCode = connection.getResponseCode();</span>
-<span class="source-line-no">110</span><span id="line-110">        log.debug("HTTP Response code: {}", responseCode);</span>
-<span class="source-line-no">111</span><span id="line-111"></span>
-<span class="source-line-no">112</span><span id="line-112">        if (responseCode != 200) {</span>
-<span class="source-line-no">113</span><span id="line-113">            handleBadResponseCode(responseCode, connection);</span>
-<span class="source-line-no">114</span><span id="line-114">        }</span>
-<span class="source-line-no">115</span><span id="line-115"></span>
-<span class="source-line-no">116</span><span id="line-116">        JsonRpcResponse&lt;R&gt; responseJson = responseFromStream(connection.getInputStream(), responseType);</span>
-<span class="source-line-no">117</span><span id="line-117">        connection.disconnect();</span>
-<span class="source-line-no">118</span><span id="line-118">        return responseJson;</span>
-<span class="source-line-no">119</span><span id="line-119">    }</span>
-<span class="source-line-no">120</span><span id="line-120"></span>
-<span class="source-line-no">121</span><span id="line-121">    @Override</span>
-<span class="source-line-no">122</span><span id="line-122">    public &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, JavaType responseType) {</span>
-<span class="source-line-no">123</span><span id="line-123">        return supplyAsync(() -&gt; this.sendRequestForResponse(request, responseType));</span>
-<span class="source-line-no">124</span><span id="line-124">    }</span>
-<span class="source-line-no">125</span><span id="line-125"></span>
-<span class="source-line-no">126</span><span id="line-126">    private &lt;R&gt; JsonRpcResponse&lt;R&gt; responseFromStream(InputStream inputStream, JavaType responseType) throws IOException {</span>
-<span class="source-line-no">127</span><span id="line-127">        JsonRpcResponse&lt;R&gt; responseJson;</span>
-<span class="source-line-no">128</span><span id="line-128">        try {</span>
-<span class="source-line-no">129</span><span id="line-129">            if (log.isDebugEnabled()) {</span>
-<span class="source-line-no">130</span><span id="line-130">                // If logging enabled, copy InputStream to string and log</span>
-<span class="source-line-no">131</span><span id="line-131">                String responseBody = convertStreamToString(inputStream);</span>
-<span class="source-line-no">132</span><span id="line-132">                log.debug("Response Body: {}", responseBody);</span>
-<span class="source-line-no">133</span><span id="line-133">                responseJson = mapper.readValue(responseBody, responseType);</span>
-<span class="source-line-no">134</span><span id="line-134">            } else {</span>
-<span class="source-line-no">135</span><span id="line-135">                // Otherwise convert directly to responseType</span>
-<span class="source-line-no">136</span><span id="line-136">                responseJson = mapper.readValue(inputStream, responseType);</span>
-<span class="source-line-no">137</span><span id="line-137">            }</span>
-<span class="source-line-no">138</span><span id="line-138">        } catch (JsonProcessingException e) {</span>
-<span class="source-line-no">139</span><span id="line-139">            log.error("JsonProcessingException: ", e);</span>
-<span class="source-line-no">140</span><span id="line-140">            // TODO: Map to some kind of JsonRPC exception similar to JsonRPCStatusException</span>
-<span class="source-line-no">141</span><span id="line-141">            throw e;</span>
-<span class="source-line-no">142</span><span id="line-142">        }</span>
-<span class="source-line-no">143</span><span id="line-143">        return responseJson;</span>
-<span class="source-line-no">144</span><span id="line-144">    }</span>
-<span class="source-line-no">145</span><span id="line-145"></span>
-<span class="source-line-no">146</span><span id="line-146">    /**</span>
-<span class="source-line-no">147</span><span id="line-147">     * Prepare and throw JsonRPCStatusException with all relevant info</span>
-<span class="source-line-no">148</span><span id="line-148">     * @param responseCode Non-success response code</span>
-<span class="source-line-no">149</span><span id="line-149">     * @param connection the current connection</span>
-<span class="source-line-no">150</span><span id="line-150">     * @throws IOException IO Error</span>
-<span class="source-line-no">151</span><span id="line-151">     * @throws JsonRpcStatusException An exception containing the HTTP status code and a message</span>
-<span class="source-line-no">152</span><span id="line-152">     */</span>
-<span class="source-line-no">153</span><span id="line-153">    private void handleBadResponseCode(int responseCode, HttpURLConnection connection) throws IOException, JsonRpcStatusException</span>
-<span class="source-line-no">154</span><span id="line-154">    {</span>
-<span class="source-line-no">155</span><span id="line-155">        String responseMessage = connection.getResponseMessage();</span>
-<span class="source-line-no">156</span><span id="line-156">        String exceptionMessage = responseMessage;</span>
-<span class="source-line-no">157</span><span id="line-157">        int jsonRpcCode = 0;</span>
-<span class="source-line-no">158</span><span id="line-158">        JsonRpcResponse bodyJson = null;    // Body as JSON if available</span>
-<span class="source-line-no">159</span><span id="line-159">        String bodyString = null;           // Body as String if not JSON</span>
-<span class="source-line-no">160</span><span id="line-160">        InputStream errorStream = connection.getErrorStream();</span>
-<span class="source-line-no">161</span><span id="line-161">        if (errorStream != null) {</span>
-<span class="source-line-no">162</span><span id="line-162">            if (connection.getContentType().equals("application/json")) {</span>
-<span class="source-line-no">163</span><span id="line-163">                JavaType genericResponseType = mapper.getTypeFactory().</span>
-<span class="source-line-no">164</span><span id="line-164">                        constructParametricType(JsonRpcResponse.class, JsonNode.class);</span>
-<span class="source-line-no">165</span><span id="line-165">                // We got a JSON error response -- try to parse it as a JsonRpcResponse</span>
-<span class="source-line-no">166</span><span id="line-166">                bodyJson = responseFromStream(errorStream, genericResponseType);</span>
-<span class="source-line-no">167</span><span id="line-167">                JsonRpcError error = bodyJson.getError();</span>
-<span class="source-line-no">168</span><span id="line-168">                if (error != null) {</span>
-<span class="source-line-no">169</span><span id="line-169">                    // If there's a more specific message in the JSON use it instead.</span>
-<span class="source-line-no">170</span><span id="line-170">                    exceptionMessage = error.getMessage();</span>
-<span class="source-line-no">171</span><span id="line-171">                    jsonRpcCode = error.getCode();</span>
-<span class="source-line-no">172</span><span id="line-172">                    // Since this is an error at the JSON level, let's log it with `debug` level and</span>
-<span class="source-line-no">173</span><span id="line-173">                    // let the higher-level software decide whether to log it as `error` or not.</span>
-<span class="source-line-no">174</span><span id="line-174">                    // i.e. The higher-level software can set error level on this module to `warn` and then</span>
-<span class="source-line-no">175</span><span id="line-175">                    // decide whether to log this "error" not based upon the JsonRpcStatusException thrown.</span>
-<span class="source-line-no">176</span><span id="line-176">                    // An example occurs in Bitcoin when a client is waiting for a server to initialize</span>
-<span class="source-line-no">177</span><span id="line-177">                    // and returns 'Still scanning.. at block 530006 of 548850'</span>
-<span class="source-line-no">178</span><span id="line-178">                    log.debug("json error code: {}, message: {}", jsonRpcCode, exceptionMessage);</span>
-<span class="source-line-no">179</span><span id="line-179">                }</span>
-<span class="source-line-no">180</span><span id="line-180">            } else {</span>
-<span class="source-line-no">181</span><span id="line-181">                // No JSON, read response body as string</span>
-<span class="source-line-no">182</span><span id="line-182">                bodyString = convertStreamToString(errorStream);</span>
-<span class="source-line-no">183</span><span id="line-183">                log.error("error string: {}", bodyString);</span>
-<span class="source-line-no">184</span><span id="line-184">                errorStream.close();</span>
-<span class="source-line-no">185</span><span id="line-185">            }</span>
-<span class="source-line-no">186</span><span id="line-186">        }</span>
-<span class="source-line-no">187</span><span id="line-187">        throw new JsonRpcStatusException(exceptionMessage, responseCode, responseMessage, jsonRpcCode, bodyString, bodyJson);</span>
-<span class="source-line-no">188</span><span id="line-188">    }</span>
-<span class="source-line-no">189</span><span id="line-189"></span>
-<span class="source-line-no">190</span><span id="line-190">    private static String convertStreamToString(java.io.InputStream is) {</span>
-<span class="source-line-no">191</span><span id="line-191">        java.util.Scanner s = new java.util.Scanner(is, UTF8).useDelimiter("\\A");</span>
-<span class="source-line-no">192</span><span id="line-192">        return s.hasNext() ? s.next() : "";</span>
-<span class="source-line-no">193</span><span id="line-193">    }</span>
-<span class="source-line-no">194</span><span id="line-194"></span>
-<span class="source-line-no">195</span><span id="line-195">    private HttpURLConnection openConnection() throws IOException {</span>
-<span class="source-line-no">196</span><span id="line-196">        HttpURLConnection connection =  (HttpURLConnection) serverURI.toURL().openConnection();</span>
-<span class="source-line-no">197</span><span id="line-197">        if (connection instanceof HttpsURLConnection) {</span>
-<span class="source-line-no">198</span><span id="line-198">            ((HttpsURLConnection) connection).setSSLSocketFactory(this.sslSocketFactory);</span>
-<span class="source-line-no">199</span><span id="line-199">        }</span>
-<span class="source-line-no">200</span><span id="line-200">        connection.setDoOutput(true); // For writes</span>
-<span class="source-line-no">201</span><span id="line-201">        connection.setRequestMethod("POST");</span>
-<span class="source-line-no">202</span><span id="line-202">        connection.setRequestProperty("Accept-Charset", UTF8);</span>
-<span class="source-line-no">203</span><span id="line-203">        connection.setRequestProperty("Content-Type", "application/json;charset=" +  UTF8);</span>
-<span class="source-line-no">204</span><span id="line-204">        connection.setRequestProperty("Connection", "close");   // Avoid EOFException: http://stackoverflow.com/questions/19641374/android-eofexception-when-using-httpurlconnection-headers</span>
-<span class="source-line-no">205</span><span id="line-205"></span>
-<span class="source-line-no">206</span><span id="line-206">        String auth = username + ":" + password;</span>
-<span class="source-line-no">207</span><span id="line-207">        String basicAuth = "Basic " + base64Encode(auth);</span>
-<span class="source-line-no">208</span><span id="line-208">        connection.setRequestProperty ("Authorization", basicAuth);</span>
-<span class="source-line-no">209</span><span id="line-209"></span>
-<span class="source-line-no">210</span><span id="line-210">        return connection;</span>
-<span class="source-line-no">211</span><span id="line-211">    }</span>
-<span class="source-line-no">212</span><span id="line-212">}</span>
+<span class="source-line-no">015</span><span id="line-15">import java.lang.reflect.Type;</span>
+<span class="source-line-no">016</span><span id="line-16">import java.net.HttpURLConnection;</span>
+<span class="source-line-no">017</span><span id="line-17">import java.net.URI;</span>
+<span class="source-line-no">018</span><span id="line-18">import java.nio.charset.StandardCharsets;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">020</span><span id="line-20"></span>
+<span class="source-line-no">021</span><span id="line-21">/**</span>
+<span class="source-line-no">022</span><span id="line-22"> * JSON-RPC Client using {@link HttpURLConnection} formerly named{@code RpcClient}.</span>
+<span class="source-line-no">023</span><span id="line-23"> * &lt;p&gt;</span>
+<span class="source-line-no">024</span><span id="line-24"> * This is a concrete class with generic JSON-RPC functionality, it implements the abstract</span>
+<span class="source-line-no">025</span><span id="line-25"> * method {@link JsonRpcClient#sendRequestForResponseAsync(JsonRpcRequest, Type)} using {@link HttpURLConnection}.</span>
+<span class="source-line-no">026</span><span id="line-26"> * &lt;p&gt;</span>
+<span class="source-line-no">027</span><span id="line-27"> * Uses strongly-typed POJOs representing {@link JsonRpcRequest} and {@link JsonRpcResponse}. The</span>
+<span class="source-line-no">028</span><span id="line-28"> * response object uses a parameterized type for the object that is the actual JSON-RPC `result`.</span>
+<span class="source-line-no">029</span><span id="line-29"> * Using strong types and Jackson to serialize/deserialize to/from strongly-typed POJO's without</span>
+<span class="source-line-no">030</span><span id="line-30"> * using intermediate `Map` or `JsonNode` types.</span>
+<span class="source-line-no">031</span><span id="line-31"> *</span>
+<span class="source-line-no">032</span><span id="line-32"> */</span>
+<span class="source-line-no">033</span><span id="line-33">public class JsonRpcClientHttpUrlConnection implements JsonRpcTransport&lt;JavaType&gt; {</span>
+<span class="source-line-no">034</span><span id="line-34">    private static final Logger log = LoggerFactory.getLogger(JsonRpcClientHttpUrlConnection.class);</span>
+<span class="source-line-no">035</span><span id="line-35">    private final ObjectMapper mapper;</span>
+<span class="source-line-no">036</span><span id="line-36">    private final URI serverURI;</span>
+<span class="source-line-no">037</span><span id="line-37">    private final String username;</span>
+<span class="source-line-no">038</span><span id="line-38">    private final String password;</span>
+<span class="source-line-no">039</span><span id="line-39">    private static final String UTF8 = StandardCharsets.UTF_8.name();</span>
+<span class="source-line-no">040</span><span id="line-40">    private final SSLSocketFactory sslSocketFactory;</span>
+<span class="source-line-no">041</span><span id="line-41"></span>
+<span class="source-line-no">042</span><span id="line-42">    public JsonRpcClientHttpUrlConnection(ObjectMapper mapper, SSLContext sslContext, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">043</span><span id="line-43">        this.mapper = mapper;</span>
+<span class="source-line-no">044</span><span id="line-44">        this.sslSocketFactory = sslContext.getSocketFactory();</span>
+<span class="source-line-no">045</span><span id="line-45">        log.debug("Constructing JSON-RPC client for: {}", server);</span>
+<span class="source-line-no">046</span><span id="line-46">        this.serverURI = server;</span>
+<span class="source-line-no">047</span><span id="line-47">        this.username = rpcUser;</span>
+<span class="source-line-no">048</span><span id="line-48">        this.password = rpcPassword;</span>
+<span class="source-line-no">049</span><span id="line-49">    }</span>
+<span class="source-line-no">050</span><span id="line-50"></span>
+<span class="source-line-no">051</span><span id="line-51">    /**</span>
+<span class="source-line-no">052</span><span id="line-52">     * Get the URI of the server this client connects to</span>
+<span class="source-line-no">053</span><span id="line-53">     * @return Server URI</span>
+<span class="source-line-no">054</span><span id="line-54">     */</span>
+<span class="source-line-no">055</span><span id="line-55">    @Override</span>
+<span class="source-line-no">056</span><span id="line-56">    public URI getServerURI() {</span>
+<span class="source-line-no">057</span><span id="line-57">        return serverURI;</span>
+<span class="source-line-no">058</span><span id="line-58">    }</span>
+<span class="source-line-no">059</span><span id="line-59"></span>
+<span class="source-line-no">060</span><span id="line-60">    /**</span>
+<span class="source-line-no">061</span><span id="line-61">     * Send a JSON-RPC request to the server and return a JSON-RPC response.</span>
+<span class="source-line-no">062</span><span id="line-62">     *</span>
+<span class="source-line-no">063</span><span id="line-63">     * @param request JSON-RPC request</span>
+<span class="source-line-no">064</span><span id="line-64">     * @param responseType Response type to deserialize to</span>
+<span class="source-line-no">065</span><span id="line-65">     * @return JSON-RPC response</span>
+<span class="source-line-no">066</span><span id="line-66">     * @throws IOException when thrown by the underlying HttpURLConnection</span>
+<span class="source-line-no">067</span><span id="line-67">     * @throws JsonRpcStatusException when the HTTP response code is other than 200</span>
+<span class="source-line-no">068</span><span id="line-68">     */</span>
+<span class="source-line-no">069</span><span id="line-69">    @Override</span>
+<span class="source-line-no">070</span><span id="line-70">    public &lt;R&gt; JsonRpcResponse&lt;R&gt; sendRequestForResponse(JsonRpcRequest request, JavaType responseType) throws IOException, JsonRpcStatusException {</span>
+<span class="source-line-no">071</span><span id="line-71">        HttpURLConnection connection = openConnection();</span>
+<span class="source-line-no">072</span><span id="line-72"></span>
+<span class="source-line-no">073</span><span id="line-73">        // TODO: Make sure HTTP keep-alive will work</span>
+<span class="source-line-no">074</span><span id="line-74">        // See: http://docs.oracle.com/javase/7/docs/technotes/guides/net/http-keepalive.html</span>
+<span class="source-line-no">075</span><span id="line-75">        // http://developer.android.com/reference/java/net/HttpURLConnection.html</span>
+<span class="source-line-no">076</span><span id="line-76">        // http://android-developers.blogspot.com/2011/09/androids-http-clients.html</span>
+<span class="source-line-no">077</span><span id="line-77"></span>
+<span class="source-line-no">078</span><span id="line-78">        if (log.isDebugEnabled()) {</span>
+<span class="source-line-no">079</span><span id="line-79">            log.debug("JsonRpcRequest: {}", mapper.writeValueAsString(request));</span>
+<span class="source-line-no">080</span><span id="line-80">        }</span>
+<span class="source-line-no">081</span><span id="line-81">        </span>
+<span class="source-line-no">082</span><span id="line-82">        try (OutputStream requestStream = connection.getOutputStream()) {</span>
+<span class="source-line-no">083</span><span id="line-83">            mapper.writeValue(requestStream, request);</span>
+<span class="source-line-no">084</span><span id="line-84">        }</span>
+<span class="source-line-no">085</span><span id="line-85"></span>
+<span class="source-line-no">086</span><span id="line-86">        int responseCode = connection.getResponseCode();</span>
+<span class="source-line-no">087</span><span id="line-87">        log.debug("HTTP Response code: {}", responseCode);</span>
+<span class="source-line-no">088</span><span id="line-88"></span>
+<span class="source-line-no">089</span><span id="line-89">        if (responseCode != 200) {</span>
+<span class="source-line-no">090</span><span id="line-90">            handleBadResponseCode(responseCode, connection);</span>
+<span class="source-line-no">091</span><span id="line-91">        }</span>
+<span class="source-line-no">092</span><span id="line-92"></span>
+<span class="source-line-no">093</span><span id="line-93">        JsonRpcResponse&lt;R&gt; responseJson = responseFromStream(connection.getInputStream(), responseType);</span>
+<span class="source-line-no">094</span><span id="line-94">        connection.disconnect();</span>
+<span class="source-line-no">095</span><span id="line-95">        return responseJson;</span>
+<span class="source-line-no">096</span><span id="line-96">    }</span>
+<span class="source-line-no">097</span><span id="line-97"></span>
+<span class="source-line-no">098</span><span id="line-98">    @Override</span>
+<span class="source-line-no">099</span><span id="line-99">    public &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, JavaType responseType) {</span>
+<span class="source-line-no">100</span><span id="line-100">        return supplyAsync(() -&gt; this.sendRequestForResponse(request, responseType));</span>
+<span class="source-line-no">101</span><span id="line-101">    }</span>
+<span class="source-line-no">102</span><span id="line-102"></span>
+<span class="source-line-no">103</span><span id="line-103">    private &lt;R&gt; JsonRpcResponse&lt;R&gt; responseFromStream(InputStream inputStream, JavaType responseType) throws IOException {</span>
+<span class="source-line-no">104</span><span id="line-104">        JsonRpcResponse&lt;R&gt; responseJson;</span>
+<span class="source-line-no">105</span><span id="line-105">        try {</span>
+<span class="source-line-no">106</span><span id="line-106">            if (log.isDebugEnabled()) {</span>
+<span class="source-line-no">107</span><span id="line-107">                // If logging enabled, copy InputStream to string and log</span>
+<span class="source-line-no">108</span><span id="line-108">                String responseBody = convertStreamToString(inputStream);</span>
+<span class="source-line-no">109</span><span id="line-109">                log.debug("Response Body: {}", responseBody);</span>
+<span class="source-line-no">110</span><span id="line-110">                responseJson = mapper.readValue(responseBody, responseType);</span>
+<span class="source-line-no">111</span><span id="line-111">            } else {</span>
+<span class="source-line-no">112</span><span id="line-112">                // Otherwise convert directly to responseType</span>
+<span class="source-line-no">113</span><span id="line-113">                responseJson = mapper.readValue(inputStream, responseType);</span>
+<span class="source-line-no">114</span><span id="line-114">            }</span>
+<span class="source-line-no">115</span><span id="line-115">        } catch (JsonProcessingException e) {</span>
+<span class="source-line-no">116</span><span id="line-116">            log.error("JsonProcessingException: ", e);</span>
+<span class="source-line-no">117</span><span id="line-117">            // TODO: Map to some kind of JsonRPC exception similar to JsonRPCStatusException</span>
+<span class="source-line-no">118</span><span id="line-118">            throw e;</span>
+<span class="source-line-no">119</span><span id="line-119">        }</span>
+<span class="source-line-no">120</span><span id="line-120">        return responseJson;</span>
+<span class="source-line-no">121</span><span id="line-121">    }</span>
+<span class="source-line-no">122</span><span id="line-122"></span>
+<span class="source-line-no">123</span><span id="line-123">    /**</span>
+<span class="source-line-no">124</span><span id="line-124">     * Prepare and throw JsonRPCStatusException with all relevant info</span>
+<span class="source-line-no">125</span><span id="line-125">     * @param responseCode Non-success response code</span>
+<span class="source-line-no">126</span><span id="line-126">     * @param connection the current connection</span>
+<span class="source-line-no">127</span><span id="line-127">     * @throws IOException IO Error</span>
+<span class="source-line-no">128</span><span id="line-128">     * @throws JsonRpcStatusException An exception containing the HTTP status code and a message</span>
+<span class="source-line-no">129</span><span id="line-129">     */</span>
+<span class="source-line-no">130</span><span id="line-130">    private void handleBadResponseCode(int responseCode, HttpURLConnection connection) throws IOException, JsonRpcStatusException</span>
+<span class="source-line-no">131</span><span id="line-131">    {</span>
+<span class="source-line-no">132</span><span id="line-132">        String responseMessage = connection.getResponseMessage();   // HTTP/1 message like "OK" or "Not found"</span>
+<span class="source-line-no">133</span><span id="line-133">        InputStream errorStream = connection.getErrorStream();</span>
+<span class="source-line-no">134</span><span id="line-134">        if (errorStream != null) {</span>
+<span class="source-line-no">135</span><span id="line-135">            if (connection.getContentType().equals("application/json")) {</span>
+<span class="source-line-no">136</span><span id="line-136">                // We got a JSON error response -- try to parse it as a JsonRpcResponse</span>
+<span class="source-line-no">137</span><span id="line-137">                JsonRpcResponse&lt;Object&gt; bodyJson = responseFromStream(errorStream, responseTypeFor(Object.class));</span>
+<span class="source-line-no">138</span><span id="line-138">                // Since this is an error at the JSON level, let's log it with `debug` level and</span>
+<span class="source-line-no">139</span><span id="line-139">                // let the higher-level software decide whether to log it as `error` or not.</span>
+<span class="source-line-no">140</span><span id="line-140">                log.debug("json error code: {}, message: {}", bodyJson.getError().getCode(), responseMessage);</span>
+<span class="source-line-no">141</span><span id="line-141">                throw new JsonRpcStatusException(responseCode, bodyJson);</span>
+<span class="source-line-no">142</span><span id="line-142">            } else {</span>
+<span class="source-line-no">143</span><span id="line-143">                // No JSON, read response body as string</span>
+<span class="source-line-no">144</span><span id="line-144">                String bodyString = convertStreamToString(errorStream);</span>
+<span class="source-line-no">145</span><span id="line-145">                log.error("error string: {}", bodyString);</span>
+<span class="source-line-no">146</span><span id="line-146">                errorStream.close();</span>
+<span class="source-line-no">147</span><span id="line-147">                throw new JsonRpcStatusException(responseCode, bodyString);</span>
+<span class="source-line-no">148</span><span id="line-148">            }</span>
+<span class="source-line-no">149</span><span id="line-149">        }</span>
+<span class="source-line-no">150</span><span id="line-150">        throw new JsonRpcStatusException(responseMessage, responseCode, responseMessage, 0, null, null);</span>
+<span class="source-line-no">151</span><span id="line-151">    }</span>
+<span class="source-line-no">152</span><span id="line-152"></span>
+<span class="source-line-no">153</span><span id="line-153">    private static String convertStreamToString(java.io.InputStream is) {</span>
+<span class="source-line-no">154</span><span id="line-154">        java.util.Scanner s = new java.util.Scanner(is, UTF8).useDelimiter("\\A");</span>
+<span class="source-line-no">155</span><span id="line-155">        return s.hasNext() ? s.next() : "";</span>
+<span class="source-line-no">156</span><span id="line-156">    }</span>
+<span class="source-line-no">157</span><span id="line-157"></span>
+<span class="source-line-no">158</span><span id="line-158">    private HttpURLConnection openConnection() throws IOException {</span>
+<span class="source-line-no">159</span><span id="line-159">        HttpURLConnection connection =  (HttpURLConnection) serverURI.toURL().openConnection();</span>
+<span class="source-line-no">160</span><span id="line-160">        if (connection instanceof HttpsURLConnection) {</span>
+<span class="source-line-no">161</span><span id="line-161">            ((HttpsURLConnection) connection).setSSLSocketFactory(this.sslSocketFactory);</span>
+<span class="source-line-no">162</span><span id="line-162">        }</span>
+<span class="source-line-no">163</span><span id="line-163">        connection.setDoOutput(true); // For writes</span>
+<span class="source-line-no">164</span><span id="line-164">        connection.setRequestMethod("POST");</span>
+<span class="source-line-no">165</span><span id="line-165">        connection.setRequestProperty("Accept-Charset", UTF8);</span>
+<span class="source-line-no">166</span><span id="line-166">        connection.setRequestProperty("Content-Type", "application/json;charset=" +  UTF8);</span>
+<span class="source-line-no">167</span><span id="line-167">        connection.setRequestProperty("Connection", "close");   // Avoid EOFException: http://stackoverflow.com/questions/19641374/android-eofexception-when-using-httpurlconnection-headers</span>
+<span class="source-line-no">168</span><span id="line-168"></span>
+<span class="source-line-no">169</span><span id="line-169">        String auth = username + ":" + password;</span>
+<span class="source-line-no">170</span><span id="line-170">        String basicAuth = "Basic " + JsonRpcTransport.base64Encode(auth);</span>
+<span class="source-line-no">171</span><span id="line-171">        connection.setRequestProperty ("Authorization", basicAuth);</span>
+<span class="source-line-no">172</span><span id="line-172"></span>
+<span class="source-line-no">173</span><span id="line-173">        return connection;</span>
+<span class="source-line-no">174</span><span id="line-174">    }</span>
+<span class="source-line-no">175</span><span id="line-175"></span>
+<span class="source-line-no">176</span><span id="line-176">    private JavaType responseTypeFor(Class&lt;?&gt; resultType) {</span>
+<span class="source-line-no">177</span><span id="line-177">        return mapper.getTypeFactory().</span>
+<span class="source-line-no">178</span><span id="line-178">                constructParametricType(JsonRpcResponse.class, resultType);</span>
+<span class="source-line-no">179</span><span id="line-179">    }</span>
+<span class="source-line-no">180</span><span id="line-180">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html
index 961e5960c..a70a13d86 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.MappingFunction.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcClientJavaNet, interface: MappingFunction">
@@ -15,180 +15,228 @@
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.core.JsonProcessingException;</span>
 <span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JavaType;</span>
-<span class="source-line-no">005</span><span id="line-5">import org.slf4j.Logger;</span>
-<span class="source-line-no">006</span><span id="line-6">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">007</span><span id="line-7"></span>
-<span class="source-line-no">008</span><span id="line-8">import javax.net.ssl.SSLContext;</span>
-<span class="source-line-no">009</span><span id="line-9">import java.net.URI;</span>
-<span class="source-line-no">010</span><span id="line-10">import java.net.http.HttpClient;</span>
-<span class="source-line-no">011</span><span id="line-11">import java.net.http.HttpRequest;</span>
-<span class="source-line-no">012</span><span id="line-12">import java.net.http.HttpResponse;</span>
-<span class="source-line-no">013</span><span id="line-13">import java.nio.charset.StandardCharsets;</span>
-<span class="source-line-no">014</span><span id="line-14">import java.time.Duration;</span>
-<span class="source-line-no">015</span><span id="line-15">import java.util.concurrent.CompletableFuture;</span>
-<span class="source-line-no">016</span><span id="line-16">import java.util.concurrent.CompletionException;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.util.function.Function;</span>
-<span class="source-line-no">018</span><span id="line-18"></span>
-<span class="source-line-no">019</span><span id="line-19">/**</span>
-<span class="source-line-no">020</span><span id="line-20"> * Incubating JSON-RPC client using {@link java.net.http.HttpClient}</span>
-<span class="source-line-no">021</span><span id="line-21"> */</span>
-<span class="source-line-no">022</span><span id="line-22">public class JsonRpcClientJavaNet extends AbstractRpcClient {</span>
-<span class="source-line-no">023</span><span id="line-23">    private static final Logger log = LoggerFactory.getLogger(JsonRpcClientJavaNet.class);</span>
-<span class="source-line-no">024</span><span id="line-24">    private final URI serverURI;</span>
-<span class="source-line-no">025</span><span id="line-25">    private final String username;</span>
-<span class="source-line-no">026</span><span id="line-26">    private final String password;</span>
-<span class="source-line-no">027</span><span id="line-27">    private final HttpClient client;</span>
-<span class="source-line-no">028</span><span id="line-28">    private static final String UTF8 = StandardCharsets.UTF_8.name();</span>
-<span class="source-line-no">029</span><span id="line-29"></span>
-<span class="source-line-no">030</span><span id="line-30"></span>
-<span class="source-line-no">031</span><span id="line-31">    public JsonRpcClientJavaNet(JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
-<span class="source-line-no">032</span><span id="line-32">        this(getDefaultSSLContext(), jsonRpcVersion, server, rpcUser, rpcPassword);</span>
-<span class="source-line-no">033</span><span id="line-33">    }</span>
+<span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.databind.ObjectMapper;</span>
+<span class="source-line-no">006</span><span id="line-6">import org.slf4j.Logger;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">008</span><span id="line-8"></span>
+<span class="source-line-no">009</span><span id="line-9">import javax.net.ssl.SSLContext;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.lang.reflect.Type;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.net.URI;</span>
+<span class="source-line-no">012</span><span id="line-12">import java.net.http.HttpClient;</span>
+<span class="source-line-no">013</span><span id="line-13">import java.net.http.HttpRequest;</span>
+<span class="source-line-no">014</span><span id="line-14">import java.net.http.HttpResponse;</span>
+<span class="source-line-no">015</span><span id="line-15">import java.nio.charset.StandardCharsets;</span>
+<span class="source-line-no">016</span><span id="line-16">import java.time.Duration;</span>
+<span class="source-line-no">017</span><span id="line-17">import java.util.Optional;</span>
+<span class="source-line-no">018</span><span id="line-18">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.util.concurrent.CompletionException;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.util.function.Function;</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">/**</span>
+<span class="source-line-no">023</span><span id="line-23"> * Incubating JSON-RPC client using {@link java.net.http.HttpClient}</span>
+<span class="source-line-no">024</span><span id="line-24"> */</span>
+<span class="source-line-no">025</span><span id="line-25">public class JsonRpcClientJavaNet implements JsonRpcTransport&lt;JavaType&gt; {</span>
+<span class="source-line-no">026</span><span id="line-26">    private static final Logger log = LoggerFactory.getLogger(JsonRpcClientJavaNet.class);</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    private final ObjectMapper mapper;</span>
+<span class="source-line-no">029</span><span id="line-29">    private final URI serverURI;</span>
+<span class="source-line-no">030</span><span id="line-30">    private final String username;</span>
+<span class="source-line-no">031</span><span id="line-31">    private final String password;</span>
+<span class="source-line-no">032</span><span id="line-32">    private final HttpClient client;</span>
+<span class="source-line-no">033</span><span id="line-33">    private static final String UTF8 = StandardCharsets.UTF_8.name();</span>
 <span class="source-line-no">034</span><span id="line-34"></span>
-<span class="source-line-no">035</span><span id="line-35">    public JsonRpcClientJavaNet(SSLContext sslContext, JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
-<span class="source-line-no">036</span><span id="line-36">        super(jsonRpcVersion);</span>
-<span class="source-line-no">037</span><span id="line-37">        log.debug("Constructing JSON-RPC client for: {}", server);</span>
-<span class="source-line-no">038</span><span id="line-38">        this.serverURI = server;</span>
-<span class="source-line-no">039</span><span id="line-39">        this.username = rpcUser;</span>
-<span class="source-line-no">040</span><span id="line-40">        this.password = rpcPassword;</span>
-<span class="source-line-no">041</span><span id="line-41">        this.client = HttpClient.newBuilder()</span>
-<span class="source-line-no">042</span><span id="line-42">                .connectTimeout(Duration.ofMinutes(2))</span>
-<span class="source-line-no">043</span><span id="line-43">                .sslContext(sslContext)</span>
-<span class="source-line-no">044</span><span id="line-44">                .build();</span>
-<span class="source-line-no">045</span><span id="line-45">    }</span>
-<span class="source-line-no">046</span><span id="line-46"></span>
-<span class="source-line-no">047</span><span id="line-47">    public JsonRpcClientJavaNet(URI server, final String rpcUser, final String rpcPassword) {</span>
-<span class="source-line-no">048</span><span id="line-48">        this(JsonRpcMessage.Version.V2, server, rpcUser, rpcPassword);</span>
-<span class="source-line-no">049</span><span id="line-49">    }</span>
-<span class="source-line-no">050</span><span id="line-50"></span>
-<span class="source-line-no">051</span><span id="line-51">    /**</span>
-<span class="source-line-no">052</span><span id="line-52">     * {@inheritDoc}</span>
-<span class="source-line-no">053</span><span id="line-53">     */</span>
-<span class="source-line-no">054</span><span id="line-54">    @Override</span>
-<span class="source-line-no">055</span><span id="line-55">    public &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, JavaType responseType) {</span>
-<span class="source-line-no">056</span><span id="line-56">        return sendCommon(request)</span>
-<span class="source-line-no">057</span><span id="line-57">                .thenApply(mappingFunc(responseType));</span>
-<span class="source-line-no">058</span><span id="line-58">    }</span>
-<span class="source-line-no">059</span><span id="line-59"></span>
-<span class="source-line-no">060</span><span id="line-60">    // For testing only</span>
-<span class="source-line-no">061</span><span id="line-61">    CompletableFuture&lt;String&gt; sendRequestForResponseString(JsonRpcRequest request) {</span>
-<span class="source-line-no">062</span><span id="line-62">        return sendCommon(request);</span>
-<span class="source-line-no">063</span><span id="line-63">    }</span>
-<span class="source-line-no">064</span><span id="line-64"></span>
-<span class="source-line-no">065</span><span id="line-65">    /**</span>
-<span class="source-line-no">066</span><span id="line-66">     * {@inheritDoc}</span>
-<span class="source-line-no">067</span><span id="line-67">     */</span>
-<span class="source-line-no">068</span><span id="line-68">    @Override</span>
-<span class="source-line-no">069</span><span id="line-69">    public URI getServerURI() {</span>
-<span class="source-line-no">070</span><span id="line-70">        return serverURI;</span>
-<span class="source-line-no">071</span><span id="line-71">    }</span>
-<span class="source-line-no">072</span><span id="line-72"></span>
-<span class="source-line-no">073</span><span id="line-73">    private String encodeJsonRpcRequest(JsonRpcRequest request) throws JsonProcessingException {</span>
-<span class="source-line-no">074</span><span id="line-74">        return mapper.writeValueAsString(request);</span>
-<span class="source-line-no">075</span><span id="line-75">    }</span>
-<span class="source-line-no">076</span><span id="line-76"></span>
-<span class="source-line-no">077</span><span id="line-77">    /**</span>
-<span class="source-line-no">078</span><span id="line-78">     * @param request A JSON-RPC request</span>
-<span class="source-line-no">079</span><span id="line-79">     * @return A future for a JSON-RPC response in String format</span>
-<span class="source-line-no">080</span><span id="line-80">     */</span>
-<span class="source-line-no">081</span><span id="line-81">    private CompletableFuture&lt;String&gt; sendCommon(JsonRpcRequest request) {</span>
-<span class="source-line-no">082</span><span id="line-82">        log.debug("Send: {}", request);</span>
-<span class="source-line-no">083</span><span id="line-83">        try {</span>
-<span class="source-line-no">084</span><span id="line-84">            HttpRequest httpRequest = buildJsonRpcPostRequest(request);</span>
-<span class="source-line-no">085</span><span id="line-85">            return client.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString())</span>
-<span class="source-line-no">086</span><span id="line-86">                    .whenComplete(this::log)</span>
-<span class="source-line-no">087</span><span id="line-87">                    .thenComposeAsync(this::handleStatusError)</span>
-<span class="source-line-no">088</span><span id="line-88">                    .thenApply(HttpResponse::body)</span>
-<span class="source-line-no">089</span><span id="line-89">                    .whenComplete(this::log);</span>
-<span class="source-line-no">090</span><span id="line-90">        } catch (JsonProcessingException e) {</span>
-<span class="source-line-no">091</span><span id="line-91">            return CompletableFuture.failedFuture(e);</span>
-<span class="source-line-no">092</span><span id="line-92">        }</span>
-<span class="source-line-no">093</span><span id="line-93">    }</span>
-<span class="source-line-no">094</span><span id="line-94"></span>
-<span class="source-line-no">095</span><span id="line-95">    private CompletableFuture&lt;HttpResponse&lt;String&gt;&gt; handleStatusError(HttpResponse&lt;String&gt; response) {</span>
-<span class="source-line-no">096</span><span id="line-96">        if (response.statusCode() != 200) {</span>
-<span class="source-line-no">097</span><span id="line-97">            String errorResponse = response.body();</span>
-<span class="source-line-no">098</span><span id="line-98">            log.error("Bad status code: {}: {}", response.statusCode(), errorResponse);</span>
-<span class="source-line-no">099</span><span id="line-99">            return CompletableFuture.failedFuture(new JsonRpcStatusException(errorResponse, response.statusCode(), errorResponse, -1, errorResponse, null));</span>
-<span class="source-line-no">100</span><span id="line-100"></span>
-<span class="source-line-no">101</span><span id="line-101">        } else {</span>
-<span class="source-line-no">102</span><span id="line-102">            return CompletableFuture.completedFuture(response);</span>
-<span class="source-line-no">103</span><span id="line-103">        }</span>
-<span class="source-line-no">104</span><span id="line-104">    }</span>
-<span class="source-line-no">105</span><span id="line-105"></span>
-<span class="source-line-no">106</span><span id="line-106">    private HttpRequest buildJsonRpcPostRequest(JsonRpcRequest request) throws JsonProcessingException {</span>
-<span class="source-line-no">107</span><span id="line-107">        String requestString = encodeJsonRpcRequest(request);</span>
-<span class="source-line-no">108</span><span id="line-108">        return buildJsonRpcPostRequest(requestString);</span>
-<span class="source-line-no">109</span><span id="line-109">    }</span>
-<span class="source-line-no">110</span><span id="line-110"></span>
-<span class="source-line-no">111</span><span id="line-111">    private HttpRequest buildJsonRpcPostRequest(String requestString) {</span>
-<span class="source-line-no">112</span><span id="line-112">        log.info("request is: {}", requestString);</span>
-<span class="source-line-no">113</span><span id="line-113"></span>
-<span class="source-line-no">114</span><span id="line-114">        String auth = username + ":" + password;</span>
-<span class="source-line-no">115</span><span id="line-115">        String basicAuth = "Basic " + base64Encode(auth);</span>
-<span class="source-line-no">116</span><span id="line-116"></span>
-<span class="source-line-no">117</span><span id="line-117">        return HttpRequest</span>
-<span class="source-line-no">118</span><span id="line-118">                .newBuilder(serverURI)</span>
-<span class="source-line-no">119</span><span id="line-119">                .header("Content-Type", "application/json;charset=" +  UTF8)</span>
-<span class="source-line-no">120</span><span id="line-120">                .header("Accept-Charset", UTF8)</span>
-<span class="source-line-no">121</span><span id="line-121">                .header("Accept", "application/json")</span>
-<span class="source-line-no">122</span><span id="line-122">                .header("Authorization", basicAuth)</span>
-<span class="source-line-no">123</span><span id="line-123">                .POST(HttpRequest.BodyPublishers.ofString(requestString))</span>
-<span class="source-line-no">124</span><span id="line-124">                .build();</span>
-<span class="source-line-no">125</span><span id="line-125">    }</span>
-<span class="source-line-no">126</span><span id="line-126"></span>
-<span class="source-line-no">127</span><span id="line-127">    private &lt;R&gt; MappingFunction&lt;R&gt; mappingFunc(JavaType responseType) {</span>
-<span class="source-line-no">128</span><span id="line-128">        return s -&gt; mapper.readValue(s, responseType);</span>
+<span class="source-line-no">035</span><span id="line-35"></span>
+<span class="source-line-no">036</span><span id="line-36">    public JsonRpcClientJavaNet(ObjectMapper mapper, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">037</span><span id="line-37">        this(mapper, JsonRpcTransport.getDefaultSSLContext(), server, rpcUser, rpcPassword);</span>
+<span class="source-line-no">038</span><span id="line-38">    }</span>
+<span class="source-line-no">039</span><span id="line-39"></span>
+<span class="source-line-no">040</span><span id="line-40">    public JsonRpcClientJavaNet(ObjectMapper mapper, SSLContext sslContext, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">041</span><span id="line-41">        log.debug("Constructing JSON-RPC client for: {}", server);</span>
+<span class="source-line-no">042</span><span id="line-42">        this.mapper = mapper;</span>
+<span class="source-line-no">043</span><span id="line-43">        this.serverURI = server;</span>
+<span class="source-line-no">044</span><span id="line-44">        this.username = rpcUser;</span>
+<span class="source-line-no">045</span><span id="line-45">        this.password = rpcPassword;</span>
+<span class="source-line-no">046</span><span id="line-46">        this.client = HttpClient.newBuilder()</span>
+<span class="source-line-no">047</span><span id="line-47">                .connectTimeout(Duration.ofMinutes(2))</span>
+<span class="source-line-no">048</span><span id="line-48">                .sslContext(sslContext)</span>
+<span class="source-line-no">049</span><span id="line-49">                .build();</span>
+<span class="source-line-no">050</span><span id="line-50">    }</span>
+<span class="source-line-no">051</span><span id="line-51"></span>
+<span class="source-line-no">052</span><span id="line-52">    /**</span>
+<span class="source-line-no">053</span><span id="line-53">     * {@inheritDoc}</span>
+<span class="source-line-no">054</span><span id="line-54">     */</span>
+<span class="source-line-no">055</span><span id="line-55">    @Override</span>
+<span class="source-line-no">056</span><span id="line-56">    public &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, JavaType responseType) {</span>
+<span class="source-line-no">057</span><span id="line-57">        return sendCommon(request)</span>
+<span class="source-line-no">058</span><span id="line-58">                .thenApply(mappingFuncFor(responseType));</span>
+<span class="source-line-no">059</span><span id="line-59">    }</span>
+<span class="source-line-no">060</span><span id="line-60"></span>
+<span class="source-line-no">061</span><span id="line-61">    // For testing only</span>
+<span class="source-line-no">062</span><span id="line-62">    CompletableFuture&lt;String&gt; sendRequestForResponseString(JsonRpcRequest request) {</span>
+<span class="source-line-no">063</span><span id="line-63">        return sendCommon(request);</span>
+<span class="source-line-no">064</span><span id="line-64">    }</span>
+<span class="source-line-no">065</span><span id="line-65"></span>
+<span class="source-line-no">066</span><span id="line-66">    /**</span>
+<span class="source-line-no">067</span><span id="line-67">     * {@inheritDoc}</span>
+<span class="source-line-no">068</span><span id="line-68">     */</span>
+<span class="source-line-no">069</span><span id="line-69">    @Override</span>
+<span class="source-line-no">070</span><span id="line-70">    public URI getServerURI() {</span>
+<span class="source-line-no">071</span><span id="line-71">        return serverURI;</span>
+<span class="source-line-no">072</span><span id="line-72">    }</span>
+<span class="source-line-no">073</span><span id="line-73"></span>
+<span class="source-line-no">074</span><span id="line-74">    private String encodeJsonRpcRequest(JsonRpcRequest request) throws JsonProcessingException {</span>
+<span class="source-line-no">075</span><span id="line-75">        return mapper.writeValueAsString(request);</span>
+<span class="source-line-no">076</span><span id="line-76">    }</span>
+<span class="source-line-no">077</span><span id="line-77"></span>
+<span class="source-line-no">078</span><span id="line-78">    /**</span>
+<span class="source-line-no">079</span><span id="line-79">     * @param request A JSON-RPC request</span>
+<span class="source-line-no">080</span><span id="line-80">     * @return A future for a JSON-RPC response in String format</span>
+<span class="source-line-no">081</span><span id="line-81">     */</span>
+<span class="source-line-no">082</span><span id="line-82">    private CompletableFuture&lt;String&gt; sendCommon(JsonRpcRequest request) {</span>
+<span class="source-line-no">083</span><span id="line-83">        log.debug("Send: {}", request);</span>
+<span class="source-line-no">084</span><span id="line-84">        try {</span>
+<span class="source-line-no">085</span><span id="line-85">            HttpRequest httpRequest = buildJsonRpcPostRequest(request);</span>
+<span class="source-line-no">086</span><span id="line-86">            return client.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString())</span>
+<span class="source-line-no">087</span><span id="line-87">                    .whenComplete(this::log)</span>
+<span class="source-line-no">088</span><span id="line-88">                    .thenCompose(this::handleStatusError)</span>
+<span class="source-line-no">089</span><span id="line-89">                    .thenApply(HttpResponse::body)</span>
+<span class="source-line-no">090</span><span id="line-90">                    .whenComplete(this::log);</span>
+<span class="source-line-no">091</span><span id="line-91">        } catch (JsonProcessingException e) {</span>
+<span class="source-line-no">092</span><span id="line-92">            return CompletableFuture.failedFuture(e);</span>
+<span class="source-line-no">093</span><span id="line-93">        }</span>
+<span class="source-line-no">094</span><span id="line-94">    }</span>
+<span class="source-line-no">095</span><span id="line-95"></span>
+<span class="source-line-no">096</span><span id="line-96">    /**</span>
+<span class="source-line-no">097</span><span id="line-97">     * Process the HTTP status code. Treats values other than 200 as an error.</span>
+<span class="source-line-no">098</span><span id="line-98">     * @param response A received HTTP response.</span>
+<span class="source-line-no">099</span><span id="line-99">     * @return Completed or failed future as appropriate.</span>
+<span class="source-line-no">100</span><span id="line-100">     */</span>
+<span class="source-line-no">101</span><span id="line-101">    private CompletableFuture&lt;HttpResponse&lt;String&gt;&gt; handleStatusError(HttpResponse&lt;String&gt; response) {</span>
+<span class="source-line-no">102</span><span id="line-102">        if (response.statusCode() != 200) {</span>
+<span class="source-line-no">103</span><span id="line-103">            String body = response.body();</span>
+<span class="source-line-no">104</span><span id="line-104">            log.warn("Bad status code: {}: {}", response.statusCode(), body);</span>
+<span class="source-line-no">105</span><span id="line-105">            log.debug("Headers: {}", response.headers());</span>
+<span class="source-line-no">106</span><span id="line-106">            // Return a failed future containing a JsonRpcStatusException. Create the exception</span>
+<span class="source-line-no">107</span><span id="line-107">            // from a JsonRpcResponse if one can be built, otherwise just use the body string.</span>
+<span class="source-line-no">108</span><span id="line-108">            return CompletableFuture.failedFuture(response.headers()</span>
+<span class="source-line-no">109</span><span id="line-109">                    .firstValue("Content-Type")</span>
+<span class="source-line-no">110</span><span id="line-110">                    .map(s -&gt; s.contains("application/json"))</span>
+<span class="source-line-no">111</span><span id="line-111">                    .flatMap(b -&gt; readErrorResponse(body))</span>
+<span class="source-line-no">112</span><span id="line-112">                    .map(r -&gt; new JsonRpcStatusException(response.statusCode(), r))</span>
+<span class="source-line-no">113</span><span id="line-113">                    .orElse(new JsonRpcStatusException(response.statusCode(), body))</span>
+<span class="source-line-no">114</span><span id="line-114">            );</span>
+<span class="source-line-no">115</span><span id="line-115">        } else {</span>
+<span class="source-line-no">116</span><span id="line-116">            return CompletableFuture.completedFuture(response);</span>
+<span class="source-line-no">117</span><span id="line-117">        }</span>
+<span class="source-line-no">118</span><span id="line-118">    }</span>
+<span class="source-line-no">119</span><span id="line-119"></span>
+<span class="source-line-no">120</span><span id="line-120">    // Try to read a JsonRpcResponse from a string (error case)</span>
+<span class="source-line-no">121</span><span id="line-121">    private Optional&lt;JsonRpcResponse&lt;Object&gt;&gt; readErrorResponse(String body) {</span>
+<span class="source-line-no">122</span><span id="line-122">        JsonRpcResponse&lt;Object&gt; response;</span>
+<span class="source-line-no">123</span><span id="line-123">        try {</span>
+<span class="source-line-no">124</span><span id="line-124">            response = mapper.readValue(body, responseTypeFor(Object.class));</span>
+<span class="source-line-no">125</span><span id="line-125">        } catch (JsonProcessingException e) {</span>
+<span class="source-line-no">126</span><span id="line-126">            response = null;</span>
+<span class="source-line-no">127</span><span id="line-127">        }</span>
+<span class="source-line-no">128</span><span id="line-128">        return Optional.ofNullable(response);</span>
 <span class="source-line-no">129</span><span id="line-129">    }</span>
 <span class="source-line-no">130</span><span id="line-130"></span>
-<span class="source-line-no">131</span><span id="line-131">    /**</span>
-<span class="source-line-no">132</span><span id="line-132">     * Map a response string to a Java object. Wraps checked {@link JsonProcessingException}</span>
-<span class="source-line-no">133</span><span id="line-133">     * in unchecked {@link CompletionException}.</span>
-<span class="source-line-no">134</span><span id="line-134">     * @param &lt;R&gt; result type</span>
-<span class="source-line-no">135</span><span id="line-135">     */</span>
-<span class="source-line-no">136</span><span id="line-136">    @FunctionalInterface</span>
-<span class="source-line-no">137</span><span id="line-137">    protected interface MappingFunction&lt;R&gt; extends Function&lt;String, R&gt; {</span>
+<span class="source-line-no">131</span><span id="line-131">    private HttpRequest buildJsonRpcPostRequest(JsonRpcRequest request) throws JsonProcessingException {</span>
+<span class="source-line-no">132</span><span id="line-132">        String requestString = encodeJsonRpcRequest(request);</span>
+<span class="source-line-no">133</span><span id="line-133">        return buildJsonRpcPostRequest(requestString);</span>
+<span class="source-line-no">134</span><span id="line-134">    }</span>
+<span class="source-line-no">135</span><span id="line-135"></span>
+<span class="source-line-no">136</span><span id="line-136">    private HttpRequest buildJsonRpcPostRequest(String requestString) {</span>
+<span class="source-line-no">137</span><span id="line-137">        log.info("request is: {}", requestString);</span>
 <span class="source-line-no">138</span><span id="line-138"></span>
-<span class="source-line-no">139</span><span id="line-139">        /**</span>
-<span class="source-line-no">140</span><span id="line-140">         * Gets a result. Wraps checked {@link JsonProcessingException} in {@link CompletionException}</span>
-<span class="source-line-no">141</span><span id="line-141">         * @param s input</span>
-<span class="source-line-no">142</span><span id="line-142">         * @return a result</span>
-<span class="source-line-no">143</span><span id="line-143">         */</span>
-<span class="source-line-no">144</span><span id="line-144">        @Override</span>
-<span class="source-line-no">145</span><span id="line-145">        default R apply(String s) {</span>
-<span class="source-line-no">146</span><span id="line-146">            try {</span>
-<span class="source-line-no">147</span><span id="line-147">                return applyThrows(s);</span>
-<span class="source-line-no">148</span><span id="line-148">            } catch (JsonProcessingException e) {</span>
-<span class="source-line-no">149</span><span id="line-149">                throw new CompletionException(e);</span>
-<span class="source-line-no">150</span><span id="line-150">            }</span>
-<span class="source-line-no">151</span><span id="line-151">        }</span>
-<span class="source-line-no">152</span><span id="line-152"></span>
-<span class="source-line-no">153</span><span id="line-153">        /**</span>
-<span class="source-line-no">154</span><span id="line-154">         * Gets a result and may throw a checked exception.</span>
-<span class="source-line-no">155</span><span id="line-155">         *</span>
-<span class="source-line-no">156</span><span id="line-156">         * @param s input</span>
-<span class="source-line-no">157</span><span id="line-157">         * @return a result</span>
-<span class="source-line-no">158</span><span id="line-158">         * @throws JsonProcessingException Checked Exception</span>
-<span class="source-line-no">159</span><span id="line-159">         */</span>
-<span class="source-line-no">160</span><span id="line-160">        R applyThrows(String s) throws JsonProcessingException;</span>
-<span class="source-line-no">161</span><span id="line-161">    }</span>
-<span class="source-line-no">162</span><span id="line-162">    </span>
-<span class="source-line-no">163</span><span id="line-163">    private void log(HttpResponse&lt;String&gt; httpResponse, Throwable t) {</span>
-<span class="source-line-no">164</span><span id="line-164">        if ((httpResponse != null)) {</span>
-<span class="source-line-no">165</span><span id="line-165">            log.info("log data string: {}", httpResponse);</span>
-<span class="source-line-no">166</span><span id="line-166">        } else {</span>
-<span class="source-line-no">167</span><span id="line-167">            log.error("exception: ", t);</span>
-<span class="source-line-no">168</span><span id="line-168">        }</span>
-<span class="source-line-no">169</span><span id="line-169">    }</span>
-<span class="source-line-no">170</span><span id="line-170"></span>
-<span class="source-line-no">171</span><span id="line-171">    private void log(String s, Throwable t) {</span>
-<span class="source-line-no">172</span><span id="line-172">        if ((s != null)) {</span>
-<span class="source-line-no">173</span><span id="line-173">            log.info("log data string: {}", s.substring(0 ,Math.min(100, s.length())));</span>
-<span class="source-line-no">174</span><span id="line-174">        } else {</span>
-<span class="source-line-no">175</span><span id="line-175">            log.error("exception: ", t);</span>
-<span class="source-line-no">176</span><span id="line-176">        }</span>
-<span class="source-line-no">177</span><span id="line-177">    }</span>
-<span class="source-line-no">178</span><span id="line-178">}</span>
+<span class="source-line-no">139</span><span id="line-139">        String auth = username + ":" + password;</span>
+<span class="source-line-no">140</span><span id="line-140">        String basicAuth = "Basic " + JsonRpcTransport.base64Encode(auth);</span>
+<span class="source-line-no">141</span><span id="line-141"></span>
+<span class="source-line-no">142</span><span id="line-142">        return HttpRequest</span>
+<span class="source-line-no">143</span><span id="line-143">                .newBuilder(serverURI)</span>
+<span class="source-line-no">144</span><span id="line-144">                .header("Content-Type", "application/json;charset=" +  UTF8)</span>
+<span class="source-line-no">145</span><span id="line-145">                .header("Accept-Charset", UTF8)</span>
+<span class="source-line-no">146</span><span id="line-146">                .header("Accept", "application/json")</span>
+<span class="source-line-no">147</span><span id="line-147">                .header("Authorization", basicAuth)</span>
+<span class="source-line-no">148</span><span id="line-148">                .POST(HttpRequest.BodyPublishers.ofString(requestString))</span>
+<span class="source-line-no">149</span><span id="line-149">                .build();</span>
+<span class="source-line-no">150</span><span id="line-150">    }</span>
+<span class="source-line-no">151</span><span id="line-151"></span>
+<span class="source-line-no">152</span><span id="line-152">    // return a MappingFunction for a given type</span>
+<span class="source-line-no">153</span><span id="line-153">    private &lt;R, T extends Type&gt; MappingFunction&lt;R&gt; mappingFuncFor(T responseType) {</span>
+<span class="source-line-no">154</span><span id="line-154">        return s -&gt; mapper.readValue(s, (JavaType) responseType);</span>
+<span class="source-line-no">155</span><span id="line-155">    }</span>
+<span class="source-line-no">156</span><span id="line-156"></span>
+<span class="source-line-no">157</span><span id="line-157">    /**</span>
+<span class="source-line-no">158</span><span id="line-158">     * Map a response string to a Java object. Wraps checked {@link JsonProcessingException}</span>
+<span class="source-line-no">159</span><span id="line-159">     * in unchecked {@link CompletionException}.</span>
+<span class="source-line-no">160</span><span id="line-160">     * @param &lt;R&gt; result type</span>
+<span class="source-line-no">161</span><span id="line-161">     */</span>
+<span class="source-line-no">162</span><span id="line-162">    @FunctionalInterface</span>
+<span class="source-line-no">163</span><span id="line-163">    protected interface MappingFunction&lt;R&gt; extends Function&lt;String, R&gt; {</span>
+<span class="source-line-no">164</span><span id="line-164"></span>
+<span class="source-line-no">165</span><span id="line-165">        /**</span>
+<span class="source-line-no">166</span><span id="line-166">         * Gets a result. Wraps checked {@link JsonProcessingException} in {@link CompletionException}</span>
+<span class="source-line-no">167</span><span id="line-167">         * @param s input</span>
+<span class="source-line-no">168</span><span id="line-168">         * @return a result</span>
+<span class="source-line-no">169</span><span id="line-169">         * @throws CompletionException (unchecked) if a JsonProcessingException exception occurs</span>
+<span class="source-line-no">170</span><span id="line-170">         */</span>
+<span class="source-line-no">171</span><span id="line-171">        @Override</span>
+<span class="source-line-no">172</span><span id="line-172">        default R apply(String s) throws CompletionException {</span>
+<span class="source-line-no">173</span><span id="line-173">            try {</span>
+<span class="source-line-no">174</span><span id="line-174">                return applyThrows(s);</span>
+<span class="source-line-no">175</span><span id="line-175">            } catch (Exception e) {</span>
+<span class="source-line-no">176</span><span id="line-176">                throw new CompletionException(e);</span>
+<span class="source-line-no">177</span><span id="line-177">            }</span>
+<span class="source-line-no">178</span><span id="line-178">        }</span>
+<span class="source-line-no">179</span><span id="line-179"></span>
+<span class="source-line-no">180</span><span id="line-180">        /**</span>
+<span class="source-line-no">181</span><span id="line-181">         * Gets a result and may throw a checked exception.</span>
+<span class="source-line-no">182</span><span id="line-182">         * @param s input</span>
+<span class="source-line-no">183</span><span id="line-183">         * @return a result</span>
+<span class="source-line-no">184</span><span id="line-184">         * @throws JsonProcessingException Checked Exception</span>
+<span class="source-line-no">185</span><span id="line-185">         */</span>
+<span class="source-line-no">186</span><span id="line-186">        R applyThrows(String s) throws Exception;</span>
+<span class="source-line-no">187</span><span id="line-187">    }</span>
+<span class="source-line-no">188</span><span id="line-188"></span>
+<span class="source-line-no">189</span><span id="line-189">    /**</span>
+<span class="source-line-no">190</span><span id="line-190">     * Logging action for a {@code CompletionStage} that returns {@link HttpResponse}</span>
+<span class="source-line-no">191</span><span id="line-191">     * &lt;p&gt;</span>
+<span class="source-line-no">192</span><span id="line-192">     * Note that an error at this layer should be treated as a warning for logging purposes, because network</span>
+<span class="source-line-no">193</span><span id="line-193">     * errors are relatively common and should be handled and/or logged at higher layers of the stack.</span>
+<span class="source-line-no">194</span><span id="line-194">     * @param httpResponse non-null on success</span>
+<span class="source-line-no">195</span><span id="line-195">     * @param t non-null on error</span>
+<span class="source-line-no">196</span><span id="line-196">     */</span>
+<span class="source-line-no">197</span><span id="line-197">    private void log(HttpResponse&lt;String&gt; httpResponse, Throwable t) {</span>
+<span class="source-line-no">198</span><span id="line-198">        if ((httpResponse != null)) {</span>
+<span class="source-line-no">199</span><span id="line-199">            log.info("log data string: {}", httpResponse);</span>
+<span class="source-line-no">200</span><span id="line-200">        } else {</span>
+<span class="source-line-no">201</span><span id="line-201">            log.warn("exception: ", t);</span>
+<span class="source-line-no">202</span><span id="line-202">        }</span>
+<span class="source-line-no">203</span><span id="line-203">    }</span>
+<span class="source-line-no">204</span><span id="line-204"></span>
+<span class="source-line-no">205</span><span id="line-205">    /**</span>
+<span class="source-line-no">206</span><span id="line-206">     * Logging action for a {@code CompletionStage} that returns {@link String}. In the current</span>
+<span class="source-line-no">207</span><span id="line-207">     * implementation of this client, that should be a JSON-formatted string.</span>
+<span class="source-line-no">208</span><span id="line-208">     * &lt;p&gt;</span>
+<span class="source-line-no">209</span><span id="line-209">     * Note that an error at this layer should be treated as a warning for logging purposes, because network</span>
+<span class="source-line-no">210</span><span id="line-210">     * errors are relatively common and should be handled and/or logged at higher layers of the stack.</span>
+<span class="source-line-no">211</span><span id="line-211">     * @param s non-null on success</span>
+<span class="source-line-no">212</span><span id="line-212">     * @param t non-null on error</span>
+<span class="source-line-no">213</span><span id="line-213">     */</span>
+<span class="source-line-no">214</span><span id="line-214">    private void log(String s, Throwable t) {</span>
+<span class="source-line-no">215</span><span id="line-215">        if ((s != null)) {</span>
+<span class="source-line-no">216</span><span id="line-216">            log.info("log data string: {}", s.substring(0 ,Math.min(100, s.length())));</span>
+<span class="source-line-no">217</span><span id="line-217">        } else {</span>
+<span class="source-line-no">218</span><span id="line-218">            log.warn("exception: ", t);</span>
+<span class="source-line-no">219</span><span id="line-219">        }</span>
+<span class="source-line-no">220</span><span id="line-220">    }</span>
+<span class="source-line-no">221</span><span id="line-221"></span>
+<span class="source-line-no">222</span><span id="line-222">    private JavaType responseTypeFor(Class&lt;?&gt; resultType) {</span>
+<span class="source-line-no">223</span><span id="line-223">        return mapper.getTypeFactory().</span>
+<span class="source-line-no">224</span><span id="line-224">                constructParametricType(JsonRpcResponse.class, resultType);</span>
+<span class="source-line-no">225</span><span id="line-225">    }</span>
+<span class="source-line-no">226</span><span id="line-226">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html
index ea69ad524..40615b365 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcClientJavaNet.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcClientJavaNet">
@@ -15,180 +15,228 @@
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.core.JsonProcessingException;</span>
 <span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JavaType;</span>
-<span class="source-line-no">005</span><span id="line-5">import org.slf4j.Logger;</span>
-<span class="source-line-no">006</span><span id="line-6">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">007</span><span id="line-7"></span>
-<span class="source-line-no">008</span><span id="line-8">import javax.net.ssl.SSLContext;</span>
-<span class="source-line-no">009</span><span id="line-9">import java.net.URI;</span>
-<span class="source-line-no">010</span><span id="line-10">import java.net.http.HttpClient;</span>
-<span class="source-line-no">011</span><span id="line-11">import java.net.http.HttpRequest;</span>
-<span class="source-line-no">012</span><span id="line-12">import java.net.http.HttpResponse;</span>
-<span class="source-line-no">013</span><span id="line-13">import java.nio.charset.StandardCharsets;</span>
-<span class="source-line-no">014</span><span id="line-14">import java.time.Duration;</span>
-<span class="source-line-no">015</span><span id="line-15">import java.util.concurrent.CompletableFuture;</span>
-<span class="source-line-no">016</span><span id="line-16">import java.util.concurrent.CompletionException;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.util.function.Function;</span>
-<span class="source-line-no">018</span><span id="line-18"></span>
-<span class="source-line-no">019</span><span id="line-19">/**</span>
-<span class="source-line-no">020</span><span id="line-20"> * Incubating JSON-RPC client using {@link java.net.http.HttpClient}</span>
-<span class="source-line-no">021</span><span id="line-21"> */</span>
-<span class="source-line-no">022</span><span id="line-22">public class JsonRpcClientJavaNet extends AbstractRpcClient {</span>
-<span class="source-line-no">023</span><span id="line-23">    private static final Logger log = LoggerFactory.getLogger(JsonRpcClientJavaNet.class);</span>
-<span class="source-line-no">024</span><span id="line-24">    private final URI serverURI;</span>
-<span class="source-line-no">025</span><span id="line-25">    private final String username;</span>
-<span class="source-line-no">026</span><span id="line-26">    private final String password;</span>
-<span class="source-line-no">027</span><span id="line-27">    private final HttpClient client;</span>
-<span class="source-line-no">028</span><span id="line-28">    private static final String UTF8 = StandardCharsets.UTF_8.name();</span>
-<span class="source-line-no">029</span><span id="line-29"></span>
-<span class="source-line-no">030</span><span id="line-30"></span>
-<span class="source-line-no">031</span><span id="line-31">    public JsonRpcClientJavaNet(JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
-<span class="source-line-no">032</span><span id="line-32">        this(getDefaultSSLContext(), jsonRpcVersion, server, rpcUser, rpcPassword);</span>
-<span class="source-line-no">033</span><span id="line-33">    }</span>
+<span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.databind.ObjectMapper;</span>
+<span class="source-line-no">006</span><span id="line-6">import org.slf4j.Logger;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">008</span><span id="line-8"></span>
+<span class="source-line-no">009</span><span id="line-9">import javax.net.ssl.SSLContext;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.lang.reflect.Type;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.net.URI;</span>
+<span class="source-line-no">012</span><span id="line-12">import java.net.http.HttpClient;</span>
+<span class="source-line-no">013</span><span id="line-13">import java.net.http.HttpRequest;</span>
+<span class="source-line-no">014</span><span id="line-14">import java.net.http.HttpResponse;</span>
+<span class="source-line-no">015</span><span id="line-15">import java.nio.charset.StandardCharsets;</span>
+<span class="source-line-no">016</span><span id="line-16">import java.time.Duration;</span>
+<span class="source-line-no">017</span><span id="line-17">import java.util.Optional;</span>
+<span class="source-line-no">018</span><span id="line-18">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.util.concurrent.CompletionException;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.util.function.Function;</span>
+<span class="source-line-no">021</span><span id="line-21"></span>
+<span class="source-line-no">022</span><span id="line-22">/**</span>
+<span class="source-line-no">023</span><span id="line-23"> * Incubating JSON-RPC client using {@link java.net.http.HttpClient}</span>
+<span class="source-line-no">024</span><span id="line-24"> */</span>
+<span class="source-line-no">025</span><span id="line-25">public class JsonRpcClientJavaNet implements JsonRpcTransport&lt;JavaType&gt; {</span>
+<span class="source-line-no">026</span><span id="line-26">    private static final Logger log = LoggerFactory.getLogger(JsonRpcClientJavaNet.class);</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    private final ObjectMapper mapper;</span>
+<span class="source-line-no">029</span><span id="line-29">    private final URI serverURI;</span>
+<span class="source-line-no">030</span><span id="line-30">    private final String username;</span>
+<span class="source-line-no">031</span><span id="line-31">    private final String password;</span>
+<span class="source-line-no">032</span><span id="line-32">    private final HttpClient client;</span>
+<span class="source-line-no">033</span><span id="line-33">    private static final String UTF8 = StandardCharsets.UTF_8.name();</span>
 <span class="source-line-no">034</span><span id="line-34"></span>
-<span class="source-line-no">035</span><span id="line-35">    public JsonRpcClientJavaNet(SSLContext sslContext, JsonRpcMessage.Version jsonRpcVersion, URI server, final String rpcUser, final String rpcPassword) {</span>
-<span class="source-line-no">036</span><span id="line-36">        super(jsonRpcVersion);</span>
-<span class="source-line-no">037</span><span id="line-37">        log.debug("Constructing JSON-RPC client for: {}", server);</span>
-<span class="source-line-no">038</span><span id="line-38">        this.serverURI = server;</span>
-<span class="source-line-no">039</span><span id="line-39">        this.username = rpcUser;</span>
-<span class="source-line-no">040</span><span id="line-40">        this.password = rpcPassword;</span>
-<span class="source-line-no">041</span><span id="line-41">        this.client = HttpClient.newBuilder()</span>
-<span class="source-line-no">042</span><span id="line-42">                .connectTimeout(Duration.ofMinutes(2))</span>
-<span class="source-line-no">043</span><span id="line-43">                .sslContext(sslContext)</span>
-<span class="source-line-no">044</span><span id="line-44">                .build();</span>
-<span class="source-line-no">045</span><span id="line-45">    }</span>
-<span class="source-line-no">046</span><span id="line-46"></span>
-<span class="source-line-no">047</span><span id="line-47">    public JsonRpcClientJavaNet(URI server, final String rpcUser, final String rpcPassword) {</span>
-<span class="source-line-no">048</span><span id="line-48">        this(JsonRpcMessage.Version.V2, server, rpcUser, rpcPassword);</span>
-<span class="source-line-no">049</span><span id="line-49">    }</span>
-<span class="source-line-no">050</span><span id="line-50"></span>
-<span class="source-line-no">051</span><span id="line-51">    /**</span>
-<span class="source-line-no">052</span><span id="line-52">     * {@inheritDoc}</span>
-<span class="source-line-no">053</span><span id="line-53">     */</span>
-<span class="source-line-no">054</span><span id="line-54">    @Override</span>
-<span class="source-line-no">055</span><span id="line-55">    public &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, JavaType responseType) {</span>
-<span class="source-line-no">056</span><span id="line-56">        return sendCommon(request)</span>
-<span class="source-line-no">057</span><span id="line-57">                .thenApply(mappingFunc(responseType));</span>
-<span class="source-line-no">058</span><span id="line-58">    }</span>
-<span class="source-line-no">059</span><span id="line-59"></span>
-<span class="source-line-no">060</span><span id="line-60">    // For testing only</span>
-<span class="source-line-no">061</span><span id="line-61">    CompletableFuture&lt;String&gt; sendRequestForResponseString(JsonRpcRequest request) {</span>
-<span class="source-line-no">062</span><span id="line-62">        return sendCommon(request);</span>
-<span class="source-line-no">063</span><span id="line-63">    }</span>
-<span class="source-line-no">064</span><span id="line-64"></span>
-<span class="source-line-no">065</span><span id="line-65">    /**</span>
-<span class="source-line-no">066</span><span id="line-66">     * {@inheritDoc}</span>
-<span class="source-line-no">067</span><span id="line-67">     */</span>
-<span class="source-line-no">068</span><span id="line-68">    @Override</span>
-<span class="source-line-no">069</span><span id="line-69">    public URI getServerURI() {</span>
-<span class="source-line-no">070</span><span id="line-70">        return serverURI;</span>
-<span class="source-line-no">071</span><span id="line-71">    }</span>
-<span class="source-line-no">072</span><span id="line-72"></span>
-<span class="source-line-no">073</span><span id="line-73">    private String encodeJsonRpcRequest(JsonRpcRequest request) throws JsonProcessingException {</span>
-<span class="source-line-no">074</span><span id="line-74">        return mapper.writeValueAsString(request);</span>
-<span class="source-line-no">075</span><span id="line-75">    }</span>
-<span class="source-line-no">076</span><span id="line-76"></span>
-<span class="source-line-no">077</span><span id="line-77">    /**</span>
-<span class="source-line-no">078</span><span id="line-78">     * @param request A JSON-RPC request</span>
-<span class="source-line-no">079</span><span id="line-79">     * @return A future for a JSON-RPC response in String format</span>
-<span class="source-line-no">080</span><span id="line-80">     */</span>
-<span class="source-line-no">081</span><span id="line-81">    private CompletableFuture&lt;String&gt; sendCommon(JsonRpcRequest request) {</span>
-<span class="source-line-no">082</span><span id="line-82">        log.debug("Send: {}", request);</span>
-<span class="source-line-no">083</span><span id="line-83">        try {</span>
-<span class="source-line-no">084</span><span id="line-84">            HttpRequest httpRequest = buildJsonRpcPostRequest(request);</span>
-<span class="source-line-no">085</span><span id="line-85">            return client.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString())</span>
-<span class="source-line-no">086</span><span id="line-86">                    .whenComplete(this::log)</span>
-<span class="source-line-no">087</span><span id="line-87">                    .thenComposeAsync(this::handleStatusError)</span>
-<span class="source-line-no">088</span><span id="line-88">                    .thenApply(HttpResponse::body)</span>
-<span class="source-line-no">089</span><span id="line-89">                    .whenComplete(this::log);</span>
-<span class="source-line-no">090</span><span id="line-90">        } catch (JsonProcessingException e) {</span>
-<span class="source-line-no">091</span><span id="line-91">            return CompletableFuture.failedFuture(e);</span>
-<span class="source-line-no">092</span><span id="line-92">        }</span>
-<span class="source-line-no">093</span><span id="line-93">    }</span>
-<span class="source-line-no">094</span><span id="line-94"></span>
-<span class="source-line-no">095</span><span id="line-95">    private CompletableFuture&lt;HttpResponse&lt;String&gt;&gt; handleStatusError(HttpResponse&lt;String&gt; response) {</span>
-<span class="source-line-no">096</span><span id="line-96">        if (response.statusCode() != 200) {</span>
-<span class="source-line-no">097</span><span id="line-97">            String errorResponse = response.body();</span>
-<span class="source-line-no">098</span><span id="line-98">            log.error("Bad status code: {}: {}", response.statusCode(), errorResponse);</span>
-<span class="source-line-no">099</span><span id="line-99">            return CompletableFuture.failedFuture(new JsonRpcStatusException(errorResponse, response.statusCode(), errorResponse, -1, errorResponse, null));</span>
-<span class="source-line-no">100</span><span id="line-100"></span>
-<span class="source-line-no">101</span><span id="line-101">        } else {</span>
-<span class="source-line-no">102</span><span id="line-102">            return CompletableFuture.completedFuture(response);</span>
-<span class="source-line-no">103</span><span id="line-103">        }</span>
-<span class="source-line-no">104</span><span id="line-104">    }</span>
-<span class="source-line-no">105</span><span id="line-105"></span>
-<span class="source-line-no">106</span><span id="line-106">    private HttpRequest buildJsonRpcPostRequest(JsonRpcRequest request) throws JsonProcessingException {</span>
-<span class="source-line-no">107</span><span id="line-107">        String requestString = encodeJsonRpcRequest(request);</span>
-<span class="source-line-no">108</span><span id="line-108">        return buildJsonRpcPostRequest(requestString);</span>
-<span class="source-line-no">109</span><span id="line-109">    }</span>
-<span class="source-line-no">110</span><span id="line-110"></span>
-<span class="source-line-no">111</span><span id="line-111">    private HttpRequest buildJsonRpcPostRequest(String requestString) {</span>
-<span class="source-line-no">112</span><span id="line-112">        log.info("request is: {}", requestString);</span>
-<span class="source-line-no">113</span><span id="line-113"></span>
-<span class="source-line-no">114</span><span id="line-114">        String auth = username + ":" + password;</span>
-<span class="source-line-no">115</span><span id="line-115">        String basicAuth = "Basic " + base64Encode(auth);</span>
-<span class="source-line-no">116</span><span id="line-116"></span>
-<span class="source-line-no">117</span><span id="line-117">        return HttpRequest</span>
-<span class="source-line-no">118</span><span id="line-118">                .newBuilder(serverURI)</span>
-<span class="source-line-no">119</span><span id="line-119">                .header("Content-Type", "application/json;charset=" +  UTF8)</span>
-<span class="source-line-no">120</span><span id="line-120">                .header("Accept-Charset", UTF8)</span>
-<span class="source-line-no">121</span><span id="line-121">                .header("Accept", "application/json")</span>
-<span class="source-line-no">122</span><span id="line-122">                .header("Authorization", basicAuth)</span>
-<span class="source-line-no">123</span><span id="line-123">                .POST(HttpRequest.BodyPublishers.ofString(requestString))</span>
-<span class="source-line-no">124</span><span id="line-124">                .build();</span>
-<span class="source-line-no">125</span><span id="line-125">    }</span>
-<span class="source-line-no">126</span><span id="line-126"></span>
-<span class="source-line-no">127</span><span id="line-127">    private &lt;R&gt; MappingFunction&lt;R&gt; mappingFunc(JavaType responseType) {</span>
-<span class="source-line-no">128</span><span id="line-128">        return s -&gt; mapper.readValue(s, responseType);</span>
+<span class="source-line-no">035</span><span id="line-35"></span>
+<span class="source-line-no">036</span><span id="line-36">    public JsonRpcClientJavaNet(ObjectMapper mapper, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">037</span><span id="line-37">        this(mapper, JsonRpcTransport.getDefaultSSLContext(), server, rpcUser, rpcPassword);</span>
+<span class="source-line-no">038</span><span id="line-38">    }</span>
+<span class="source-line-no">039</span><span id="line-39"></span>
+<span class="source-line-no">040</span><span id="line-40">    public JsonRpcClientJavaNet(ObjectMapper mapper, SSLContext sslContext, URI server, final String rpcUser, final String rpcPassword) {</span>
+<span class="source-line-no">041</span><span id="line-41">        log.debug("Constructing JSON-RPC client for: {}", server);</span>
+<span class="source-line-no">042</span><span id="line-42">        this.mapper = mapper;</span>
+<span class="source-line-no">043</span><span id="line-43">        this.serverURI = server;</span>
+<span class="source-line-no">044</span><span id="line-44">        this.username = rpcUser;</span>
+<span class="source-line-no">045</span><span id="line-45">        this.password = rpcPassword;</span>
+<span class="source-line-no">046</span><span id="line-46">        this.client = HttpClient.newBuilder()</span>
+<span class="source-line-no">047</span><span id="line-47">                .connectTimeout(Duration.ofMinutes(2))</span>
+<span class="source-line-no">048</span><span id="line-48">                .sslContext(sslContext)</span>
+<span class="source-line-no">049</span><span id="line-49">                .build();</span>
+<span class="source-line-no">050</span><span id="line-50">    }</span>
+<span class="source-line-no">051</span><span id="line-51"></span>
+<span class="source-line-no">052</span><span id="line-52">    /**</span>
+<span class="source-line-no">053</span><span id="line-53">     * {@inheritDoc}</span>
+<span class="source-line-no">054</span><span id="line-54">     */</span>
+<span class="source-line-no">055</span><span id="line-55">    @Override</span>
+<span class="source-line-no">056</span><span id="line-56">    public &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, JavaType responseType) {</span>
+<span class="source-line-no">057</span><span id="line-57">        return sendCommon(request)</span>
+<span class="source-line-no">058</span><span id="line-58">                .thenApply(mappingFuncFor(responseType));</span>
+<span class="source-line-no">059</span><span id="line-59">    }</span>
+<span class="source-line-no">060</span><span id="line-60"></span>
+<span class="source-line-no">061</span><span id="line-61">    // For testing only</span>
+<span class="source-line-no">062</span><span id="line-62">    CompletableFuture&lt;String&gt; sendRequestForResponseString(JsonRpcRequest request) {</span>
+<span class="source-line-no">063</span><span id="line-63">        return sendCommon(request);</span>
+<span class="source-line-no">064</span><span id="line-64">    }</span>
+<span class="source-line-no">065</span><span id="line-65"></span>
+<span class="source-line-no">066</span><span id="line-66">    /**</span>
+<span class="source-line-no">067</span><span id="line-67">     * {@inheritDoc}</span>
+<span class="source-line-no">068</span><span id="line-68">     */</span>
+<span class="source-line-no">069</span><span id="line-69">    @Override</span>
+<span class="source-line-no">070</span><span id="line-70">    public URI getServerURI() {</span>
+<span class="source-line-no">071</span><span id="line-71">        return serverURI;</span>
+<span class="source-line-no">072</span><span id="line-72">    }</span>
+<span class="source-line-no">073</span><span id="line-73"></span>
+<span class="source-line-no">074</span><span id="line-74">    private String encodeJsonRpcRequest(JsonRpcRequest request) throws JsonProcessingException {</span>
+<span class="source-line-no">075</span><span id="line-75">        return mapper.writeValueAsString(request);</span>
+<span class="source-line-no">076</span><span id="line-76">    }</span>
+<span class="source-line-no">077</span><span id="line-77"></span>
+<span class="source-line-no">078</span><span id="line-78">    /**</span>
+<span class="source-line-no">079</span><span id="line-79">     * @param request A JSON-RPC request</span>
+<span class="source-line-no">080</span><span id="line-80">     * @return A future for a JSON-RPC response in String format</span>
+<span class="source-line-no">081</span><span id="line-81">     */</span>
+<span class="source-line-no">082</span><span id="line-82">    private CompletableFuture&lt;String&gt; sendCommon(JsonRpcRequest request) {</span>
+<span class="source-line-no">083</span><span id="line-83">        log.debug("Send: {}", request);</span>
+<span class="source-line-no">084</span><span id="line-84">        try {</span>
+<span class="source-line-no">085</span><span id="line-85">            HttpRequest httpRequest = buildJsonRpcPostRequest(request);</span>
+<span class="source-line-no">086</span><span id="line-86">            return client.sendAsync(httpRequest, HttpResponse.BodyHandlers.ofString())</span>
+<span class="source-line-no">087</span><span id="line-87">                    .whenComplete(this::log)</span>
+<span class="source-line-no">088</span><span id="line-88">                    .thenCompose(this::handleStatusError)</span>
+<span class="source-line-no">089</span><span id="line-89">                    .thenApply(HttpResponse::body)</span>
+<span class="source-line-no">090</span><span id="line-90">                    .whenComplete(this::log);</span>
+<span class="source-line-no">091</span><span id="line-91">        } catch (JsonProcessingException e) {</span>
+<span class="source-line-no">092</span><span id="line-92">            return CompletableFuture.failedFuture(e);</span>
+<span class="source-line-no">093</span><span id="line-93">        }</span>
+<span class="source-line-no">094</span><span id="line-94">    }</span>
+<span class="source-line-no">095</span><span id="line-95"></span>
+<span class="source-line-no">096</span><span id="line-96">    /**</span>
+<span class="source-line-no">097</span><span id="line-97">     * Process the HTTP status code. Treats values other than 200 as an error.</span>
+<span class="source-line-no">098</span><span id="line-98">     * @param response A received HTTP response.</span>
+<span class="source-line-no">099</span><span id="line-99">     * @return Completed or failed future as appropriate.</span>
+<span class="source-line-no">100</span><span id="line-100">     */</span>
+<span class="source-line-no">101</span><span id="line-101">    private CompletableFuture&lt;HttpResponse&lt;String&gt;&gt; handleStatusError(HttpResponse&lt;String&gt; response) {</span>
+<span class="source-line-no">102</span><span id="line-102">        if (response.statusCode() != 200) {</span>
+<span class="source-line-no">103</span><span id="line-103">            String body = response.body();</span>
+<span class="source-line-no">104</span><span id="line-104">            log.warn("Bad status code: {}: {}", response.statusCode(), body);</span>
+<span class="source-line-no">105</span><span id="line-105">            log.debug("Headers: {}", response.headers());</span>
+<span class="source-line-no">106</span><span id="line-106">            // Return a failed future containing a JsonRpcStatusException. Create the exception</span>
+<span class="source-line-no">107</span><span id="line-107">            // from a JsonRpcResponse if one can be built, otherwise just use the body string.</span>
+<span class="source-line-no">108</span><span id="line-108">            return CompletableFuture.failedFuture(response.headers()</span>
+<span class="source-line-no">109</span><span id="line-109">                    .firstValue("Content-Type")</span>
+<span class="source-line-no">110</span><span id="line-110">                    .map(s -&gt; s.contains("application/json"))</span>
+<span class="source-line-no">111</span><span id="line-111">                    .flatMap(b -&gt; readErrorResponse(body))</span>
+<span class="source-line-no">112</span><span id="line-112">                    .map(r -&gt; new JsonRpcStatusException(response.statusCode(), r))</span>
+<span class="source-line-no">113</span><span id="line-113">                    .orElse(new JsonRpcStatusException(response.statusCode(), body))</span>
+<span class="source-line-no">114</span><span id="line-114">            );</span>
+<span class="source-line-no">115</span><span id="line-115">        } else {</span>
+<span class="source-line-no">116</span><span id="line-116">            return CompletableFuture.completedFuture(response);</span>
+<span class="source-line-no">117</span><span id="line-117">        }</span>
+<span class="source-line-no">118</span><span id="line-118">    }</span>
+<span class="source-line-no">119</span><span id="line-119"></span>
+<span class="source-line-no">120</span><span id="line-120">    // Try to read a JsonRpcResponse from a string (error case)</span>
+<span class="source-line-no">121</span><span id="line-121">    private Optional&lt;JsonRpcResponse&lt;Object&gt;&gt; readErrorResponse(String body) {</span>
+<span class="source-line-no">122</span><span id="line-122">        JsonRpcResponse&lt;Object&gt; response;</span>
+<span class="source-line-no">123</span><span id="line-123">        try {</span>
+<span class="source-line-no">124</span><span id="line-124">            response = mapper.readValue(body, responseTypeFor(Object.class));</span>
+<span class="source-line-no">125</span><span id="line-125">        } catch (JsonProcessingException e) {</span>
+<span class="source-line-no">126</span><span id="line-126">            response = null;</span>
+<span class="source-line-no">127</span><span id="line-127">        }</span>
+<span class="source-line-no">128</span><span id="line-128">        return Optional.ofNullable(response);</span>
 <span class="source-line-no">129</span><span id="line-129">    }</span>
 <span class="source-line-no">130</span><span id="line-130"></span>
-<span class="source-line-no">131</span><span id="line-131">    /**</span>
-<span class="source-line-no">132</span><span id="line-132">     * Map a response string to a Java object. Wraps checked {@link JsonProcessingException}</span>
-<span class="source-line-no">133</span><span id="line-133">     * in unchecked {@link CompletionException}.</span>
-<span class="source-line-no">134</span><span id="line-134">     * @param &lt;R&gt; result type</span>
-<span class="source-line-no">135</span><span id="line-135">     */</span>
-<span class="source-line-no">136</span><span id="line-136">    @FunctionalInterface</span>
-<span class="source-line-no">137</span><span id="line-137">    protected interface MappingFunction&lt;R&gt; extends Function&lt;String, R&gt; {</span>
+<span class="source-line-no">131</span><span id="line-131">    private HttpRequest buildJsonRpcPostRequest(JsonRpcRequest request) throws JsonProcessingException {</span>
+<span class="source-line-no">132</span><span id="line-132">        String requestString = encodeJsonRpcRequest(request);</span>
+<span class="source-line-no">133</span><span id="line-133">        return buildJsonRpcPostRequest(requestString);</span>
+<span class="source-line-no">134</span><span id="line-134">    }</span>
+<span class="source-line-no">135</span><span id="line-135"></span>
+<span class="source-line-no">136</span><span id="line-136">    private HttpRequest buildJsonRpcPostRequest(String requestString) {</span>
+<span class="source-line-no">137</span><span id="line-137">        log.info("request is: {}", requestString);</span>
 <span class="source-line-no">138</span><span id="line-138"></span>
-<span class="source-line-no">139</span><span id="line-139">        /**</span>
-<span class="source-line-no">140</span><span id="line-140">         * Gets a result. Wraps checked {@link JsonProcessingException} in {@link CompletionException}</span>
-<span class="source-line-no">141</span><span id="line-141">         * @param s input</span>
-<span class="source-line-no">142</span><span id="line-142">         * @return a result</span>
-<span class="source-line-no">143</span><span id="line-143">         */</span>
-<span class="source-line-no">144</span><span id="line-144">        @Override</span>
-<span class="source-line-no">145</span><span id="line-145">        default R apply(String s) {</span>
-<span class="source-line-no">146</span><span id="line-146">            try {</span>
-<span class="source-line-no">147</span><span id="line-147">                return applyThrows(s);</span>
-<span class="source-line-no">148</span><span id="line-148">            } catch (JsonProcessingException e) {</span>
-<span class="source-line-no">149</span><span id="line-149">                throw new CompletionException(e);</span>
-<span class="source-line-no">150</span><span id="line-150">            }</span>
-<span class="source-line-no">151</span><span id="line-151">        }</span>
-<span class="source-line-no">152</span><span id="line-152"></span>
-<span class="source-line-no">153</span><span id="line-153">        /**</span>
-<span class="source-line-no">154</span><span id="line-154">         * Gets a result and may throw a checked exception.</span>
-<span class="source-line-no">155</span><span id="line-155">         *</span>
-<span class="source-line-no">156</span><span id="line-156">         * @param s input</span>
-<span class="source-line-no">157</span><span id="line-157">         * @return a result</span>
-<span class="source-line-no">158</span><span id="line-158">         * @throws JsonProcessingException Checked Exception</span>
-<span class="source-line-no">159</span><span id="line-159">         */</span>
-<span class="source-line-no">160</span><span id="line-160">        R applyThrows(String s) throws JsonProcessingException;</span>
-<span class="source-line-no">161</span><span id="line-161">    }</span>
-<span class="source-line-no">162</span><span id="line-162">    </span>
-<span class="source-line-no">163</span><span id="line-163">    private void log(HttpResponse&lt;String&gt; httpResponse, Throwable t) {</span>
-<span class="source-line-no">164</span><span id="line-164">        if ((httpResponse != null)) {</span>
-<span class="source-line-no">165</span><span id="line-165">            log.info("log data string: {}", httpResponse);</span>
-<span class="source-line-no">166</span><span id="line-166">        } else {</span>
-<span class="source-line-no">167</span><span id="line-167">            log.error("exception: ", t);</span>
-<span class="source-line-no">168</span><span id="line-168">        }</span>
-<span class="source-line-no">169</span><span id="line-169">    }</span>
-<span class="source-line-no">170</span><span id="line-170"></span>
-<span class="source-line-no">171</span><span id="line-171">    private void log(String s, Throwable t) {</span>
-<span class="source-line-no">172</span><span id="line-172">        if ((s != null)) {</span>
-<span class="source-line-no">173</span><span id="line-173">            log.info("log data string: {}", s.substring(0 ,Math.min(100, s.length())));</span>
-<span class="source-line-no">174</span><span id="line-174">        } else {</span>
-<span class="source-line-no">175</span><span id="line-175">            log.error("exception: ", t);</span>
-<span class="source-line-no">176</span><span id="line-176">        }</span>
-<span class="source-line-no">177</span><span id="line-177">    }</span>
-<span class="source-line-no">178</span><span id="line-178">}</span>
+<span class="source-line-no">139</span><span id="line-139">        String auth = username + ":" + password;</span>
+<span class="source-line-no">140</span><span id="line-140">        String basicAuth = "Basic " + JsonRpcTransport.base64Encode(auth);</span>
+<span class="source-line-no">141</span><span id="line-141"></span>
+<span class="source-line-no">142</span><span id="line-142">        return HttpRequest</span>
+<span class="source-line-no">143</span><span id="line-143">                .newBuilder(serverURI)</span>
+<span class="source-line-no">144</span><span id="line-144">                .header("Content-Type", "application/json;charset=" +  UTF8)</span>
+<span class="source-line-no">145</span><span id="line-145">                .header("Accept-Charset", UTF8)</span>
+<span class="source-line-no">146</span><span id="line-146">                .header("Accept", "application/json")</span>
+<span class="source-line-no">147</span><span id="line-147">                .header("Authorization", basicAuth)</span>
+<span class="source-line-no">148</span><span id="line-148">                .POST(HttpRequest.BodyPublishers.ofString(requestString))</span>
+<span class="source-line-no">149</span><span id="line-149">                .build();</span>
+<span class="source-line-no">150</span><span id="line-150">    }</span>
+<span class="source-line-no">151</span><span id="line-151"></span>
+<span class="source-line-no">152</span><span id="line-152">    // return a MappingFunction for a given type</span>
+<span class="source-line-no">153</span><span id="line-153">    private &lt;R, T extends Type&gt; MappingFunction&lt;R&gt; mappingFuncFor(T responseType) {</span>
+<span class="source-line-no">154</span><span id="line-154">        return s -&gt; mapper.readValue(s, (JavaType) responseType);</span>
+<span class="source-line-no">155</span><span id="line-155">    }</span>
+<span class="source-line-no">156</span><span id="line-156"></span>
+<span class="source-line-no">157</span><span id="line-157">    /**</span>
+<span class="source-line-no">158</span><span id="line-158">     * Map a response string to a Java object. Wraps checked {@link JsonProcessingException}</span>
+<span class="source-line-no">159</span><span id="line-159">     * in unchecked {@link CompletionException}.</span>
+<span class="source-line-no">160</span><span id="line-160">     * @param &lt;R&gt; result type</span>
+<span class="source-line-no">161</span><span id="line-161">     */</span>
+<span class="source-line-no">162</span><span id="line-162">    @FunctionalInterface</span>
+<span class="source-line-no">163</span><span id="line-163">    protected interface MappingFunction&lt;R&gt; extends Function&lt;String, R&gt; {</span>
+<span class="source-line-no">164</span><span id="line-164"></span>
+<span class="source-line-no">165</span><span id="line-165">        /**</span>
+<span class="source-line-no">166</span><span id="line-166">         * Gets a result. Wraps checked {@link JsonProcessingException} in {@link CompletionException}</span>
+<span class="source-line-no">167</span><span id="line-167">         * @param s input</span>
+<span class="source-line-no">168</span><span id="line-168">         * @return a result</span>
+<span class="source-line-no">169</span><span id="line-169">         * @throws CompletionException (unchecked) if a JsonProcessingException exception occurs</span>
+<span class="source-line-no">170</span><span id="line-170">         */</span>
+<span class="source-line-no">171</span><span id="line-171">        @Override</span>
+<span class="source-line-no">172</span><span id="line-172">        default R apply(String s) throws CompletionException {</span>
+<span class="source-line-no">173</span><span id="line-173">            try {</span>
+<span class="source-line-no">174</span><span id="line-174">                return applyThrows(s);</span>
+<span class="source-line-no">175</span><span id="line-175">            } catch (Exception e) {</span>
+<span class="source-line-no">176</span><span id="line-176">                throw new CompletionException(e);</span>
+<span class="source-line-no">177</span><span id="line-177">            }</span>
+<span class="source-line-no">178</span><span id="line-178">        }</span>
+<span class="source-line-no">179</span><span id="line-179"></span>
+<span class="source-line-no">180</span><span id="line-180">        /**</span>
+<span class="source-line-no">181</span><span id="line-181">         * Gets a result and may throw a checked exception.</span>
+<span class="source-line-no">182</span><span id="line-182">         * @param s input</span>
+<span class="source-line-no">183</span><span id="line-183">         * @return a result</span>
+<span class="source-line-no">184</span><span id="line-184">         * @throws JsonProcessingException Checked Exception</span>
+<span class="source-line-no">185</span><span id="line-185">         */</span>
+<span class="source-line-no">186</span><span id="line-186">        R applyThrows(String s) throws Exception;</span>
+<span class="source-line-no">187</span><span id="line-187">    }</span>
+<span class="source-line-no">188</span><span id="line-188"></span>
+<span class="source-line-no">189</span><span id="line-189">    /**</span>
+<span class="source-line-no">190</span><span id="line-190">     * Logging action for a {@code CompletionStage} that returns {@link HttpResponse}</span>
+<span class="source-line-no">191</span><span id="line-191">     * &lt;p&gt;</span>
+<span class="source-line-no">192</span><span id="line-192">     * Note that an error at this layer should be treated as a warning for logging purposes, because network</span>
+<span class="source-line-no">193</span><span id="line-193">     * errors are relatively common and should be handled and/or logged at higher layers of the stack.</span>
+<span class="source-line-no">194</span><span id="line-194">     * @param httpResponse non-null on success</span>
+<span class="source-line-no">195</span><span id="line-195">     * @param t non-null on error</span>
+<span class="source-line-no">196</span><span id="line-196">     */</span>
+<span class="source-line-no">197</span><span id="line-197">    private void log(HttpResponse&lt;String&gt; httpResponse, Throwable t) {</span>
+<span class="source-line-no">198</span><span id="line-198">        if ((httpResponse != null)) {</span>
+<span class="source-line-no">199</span><span id="line-199">            log.info("log data string: {}", httpResponse);</span>
+<span class="source-line-no">200</span><span id="line-200">        } else {</span>
+<span class="source-line-no">201</span><span id="line-201">            log.warn("exception: ", t);</span>
+<span class="source-line-no">202</span><span id="line-202">        }</span>
+<span class="source-line-no">203</span><span id="line-203">    }</span>
+<span class="source-line-no">204</span><span id="line-204"></span>
+<span class="source-line-no">205</span><span id="line-205">    /**</span>
+<span class="source-line-no">206</span><span id="line-206">     * Logging action for a {@code CompletionStage} that returns {@link String}. In the current</span>
+<span class="source-line-no">207</span><span id="line-207">     * implementation of this client, that should be a JSON-formatted string.</span>
+<span class="source-line-no">208</span><span id="line-208">     * &lt;p&gt;</span>
+<span class="source-line-no">209</span><span id="line-209">     * Note that an error at this layer should be treated as a warning for logging purposes, because network</span>
+<span class="source-line-no">210</span><span id="line-210">     * errors are relatively common and should be handled and/or logged at higher layers of the stack.</span>
+<span class="source-line-no">211</span><span id="line-211">     * @param s non-null on success</span>
+<span class="source-line-no">212</span><span id="line-212">     * @param t non-null on error</span>
+<span class="source-line-no">213</span><span id="line-213">     */</span>
+<span class="source-line-no">214</span><span id="line-214">    private void log(String s, Throwable t) {</span>
+<span class="source-line-no">215</span><span id="line-215">        if ((s != null)) {</span>
+<span class="source-line-no">216</span><span id="line-216">            log.info("log data string: {}", s.substring(0 ,Math.min(100, s.length())));</span>
+<span class="source-line-no">217</span><span id="line-217">        } else {</span>
+<span class="source-line-no">218</span><span id="line-218">            log.warn("exception: ", t);</span>
+<span class="source-line-no">219</span><span id="line-219">        }</span>
+<span class="source-line-no">220</span><span id="line-220">    }</span>
+<span class="source-line-no">221</span><span id="line-221"></span>
+<span class="source-line-no">222</span><span id="line-222">    private JavaType responseTypeFor(Class&lt;?&gt; resultType) {</span>
+<span class="source-line-no">223</span><span id="line-223">        return mapper.getTypeFactory().</span>
+<span class="source-line-no">224</span><span id="line-224">                constructParametricType(JsonRpcResponse.class, resultType);</span>
+<span class="source-line-no">225</span><span id="line-225">    }</span>
+<span class="source-line-no">226</span><span id="line-226">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcError.Error.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcError.Error.html
index a9c794488..339ed4c4d 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcError.Error.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcError.Error.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcError, enum: Error">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcError.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcError.html
index f670e1cea..89d508bea 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcError.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcError.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcError">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcErrorException.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcErrorException.html
index 35e0379b1..07fa37b63 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcErrorException.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcErrorException.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcErrorException">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcException.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcException.html
index e2b991cb3..31e24c5b4 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcException.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcException.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcException">
@@ -27,7 +27,7 @@
 <span class="source-line-no">014</span><span id="line-14"> * &lt;p&gt;</span>
 <span class="source-line-no">015</span><span id="line-15"> * TODO: Rethink the differences between the two subclasses in light of Bitcoin (and possibly other)</span>
 <span class="source-line-no">016</span><span id="line-16"> * implementations returning HTTP status codes along with JsonRpcError responses. Bitcoin even incorrectly</span>
-<span class="source-line-no">017</span><span id="line-17"> * returns a 500 for invalid parameters. I think I originally assume that their would be either an</span>
+<span class="source-line-no">017</span><span id="line-17"> * returns a 500 for invalid parameters. I think I originally assumed that there would be either an</span>
 <span class="source-line-no">018</span><span id="line-18"> * HTTP status error or a JSON-RPC error, but in reality responses can probably have neither, either, or both.</span>
 <span class="source-line-no">019</span><span id="line-19"> * @see &lt;a href="https://github.com/bitcoin/bitcoin/issues/2960"&gt;Bitcoin Core Issue #2960&lt;/a&gt;</span>
 <span class="source-line-no">020</span><span id="line-20"> */</span>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcMessage.Version.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcMessage.Version.html
index a791c4f57..dec859638 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcMessage.Version.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcMessage.Version.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcMessage, enum: Version">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcMessage.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcMessage.html
index d9474a226..59cc2ee2f 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcMessage.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcMessage.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcMessage">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcRequest.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcRequest.html
index 6c3562831..740dd25e4 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcRequest.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcRequest.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcRequest">
@@ -18,134 +18,133 @@
 <span class="source-line-no">005</span><span id="line-5">import com.fasterxml.jackson.databind.annotation.JsonSerialize;</span>
 <span class="source-line-no">006</span><span id="line-6">import org.consensusj.jsonrpc.internal.NumberStringSerializer;</span>
 <span class="source-line-no">007</span><span id="line-7"></span>
-<span class="source-line-no">008</span><span id="line-8">import java.util.LinkedList;</span>
-<span class="source-line-no">009</span><span id="line-9">import java.util.List;</span>
-<span class="source-line-no">010</span><span id="line-10">import java.util.concurrent.atomic.AtomicLong;</span>
-<span class="source-line-no">011</span><span id="line-11"></span>
-<span class="source-line-no">012</span><span id="line-12">import static org.consensusj.jsonrpc.JsonRpcMessage.Version.*;</span>
+<span class="source-line-no">008</span><span id="line-8">import java.util.ArrayList;</span>
+<span class="source-line-no">009</span><span id="line-9">import java.util.Collections;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.util.LinkedList;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.util.List;</span>
+<span class="source-line-no">012</span><span id="line-12">import java.util.concurrent.atomic.AtomicLong;</span>
 <span class="source-line-no">013</span><span id="line-13"></span>
-<span class="source-line-no">014</span><span id="line-14">/**</span>
-<span class="source-line-no">015</span><span id="line-15"> * JSON-RPC Request POJO</span>
-<span class="source-line-no">016</span><span id="line-16"> */</span>
-<span class="source-line-no">017</span><span id="line-17">public class JsonRpcRequest {</span>
-<span class="source-line-no">018</span><span id="line-18">    private static final JsonRpcMessage.Version DEFAULT_JSON_RPC_VERSION = V2;</span>
-<span class="source-line-no">019</span><span id="line-19">    private static final AtomicLong nextRequestId =  new AtomicLong(0);</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">    private final String  method;</span>
-<span class="source-line-no">022</span><span id="line-22">    private final List&lt;Object&gt; params;</span>
-<span class="source-line-no">023</span><span id="line-23">    private final String  jsonrpc;   // version</span>
-<span class="source-line-no">024</span><span id="line-24">    private final String  id;</span>
-<span class="source-line-no">025</span><span id="line-25"></span>
-<span class="source-line-no">026</span><span id="line-26">    /**</span>
-<span class="source-line-no">027</span><span id="line-27">     * Constructor for use by Jackson deserialization. Deserialization will typically</span>
-<span class="source-line-no">028</span><span id="line-28">     * be used on the server-side. To create a request on the client side, it</span>
-<span class="source-line-no">029</span><span id="line-29">     * is generally recommended to use the methods in {@link JsonRpcClient}.</span>
-<span class="source-line-no">030</span><span id="line-30">     *</span>
-<span class="source-line-no">031</span><span id="line-31">     * @param jsonrpc filled from the JSON object</span>
-<span class="source-line-no">032</span><span id="line-32">     * @param id filled from the JSON object</span>
-<span class="source-line-no">033</span><span id="line-33">     * @param method filled from the JSON object</span>
-<span class="source-line-no">034</span><span id="line-34">     * @param params filled from the JSON object</span>
-<span class="source-line-no">035</span><span id="line-35">     * @see JsonRpcClient#buildJsonRequest(String, List)</span>
-<span class="source-line-no">036</span><span id="line-36">     * @see JsonRpcClient#buildJsonRequest(String, Object...)</span>
-<span class="source-line-no">037</span><span id="line-37">     */</span>
-<span class="source-line-no">038</span><span id="line-38">    @JsonCreator</span>
-<span class="source-line-no">039</span><span id="line-39">    public JsonRpcRequest(@JsonProperty("jsonrpc")  String jsonrpc,</span>
-<span class="source-line-no">040</span><span id="line-40">                          @JsonProperty("id")       String id,</span>
-<span class="source-line-no">041</span><span id="line-41">                          @JsonProperty("method")   String method,</span>
-<span class="source-line-no">042</span><span id="line-42">                          @JsonProperty("params")   List&lt;Object&gt; params) {</span>
-<span class="source-line-no">043</span><span id="line-43">        this.jsonrpc = jsonrpc;</span>
-<span class="source-line-no">044</span><span id="line-44">        this.method = method;</span>
-<span class="source-line-no">045</span><span id="line-45">        this.id = id;</span>
-<span class="source-line-no">046</span><span id="line-46">        this.params = params;</span>
-<span class="source-line-no">047</span><span id="line-47">    }</span>
-<span class="source-line-no">048</span><span id="line-48"></span>
-<span class="source-line-no">049</span><span id="line-49">    /**</span>
-<span class="source-line-no">050</span><span id="line-50">     * This constructor is slightly more strict than the deserialization constructor and should be used</span>
-<span class="source-line-no">051</span><span id="line-51">     * where possible. It uses the {@link JsonRpcMessage.Version} {@code enum} and requires that</span>
-<span class="source-line-no">052</span><span id="line-52">     * the {@code id} be a {@code long}.</span>
-<span class="source-line-no">053</span><span id="line-53">     *</span>
-<span class="source-line-no">054</span><span id="line-54">     * @param jsonRpcVersion JSON-RPC version (enum)</span>
-<span class="source-line-no">055</span><span id="line-55">     * @param id message id</span>
-<span class="source-line-no">056</span><span id="line-56">     * @param method RPC {@code method}</span>
-<span class="source-line-no">057</span><span id="line-57">     * @param params RPC method positional parameters</span>
-<span class="source-line-no">058</span><span id="line-58">     */</span>
-<span class="source-line-no">059</span><span id="line-59">    public JsonRpcRequest(JsonRpcMessage.Version jsonRpcVersion,</span>
-<span class="source-line-no">060</span><span id="line-60">                          long id,</span>
-<span class="source-line-no">061</span><span id="line-61">                          String method,</span>
-<span class="source-line-no">062</span><span id="line-62">                          List&lt;Object&gt; params) {</span>
-<span class="source-line-no">063</span><span id="line-63">        this.jsonrpc    = jsonRpcVersion.jsonrpc();</span>
-<span class="source-line-no">064</span><span id="line-64">        this.method     = method;</span>
-<span class="source-line-no">065</span><span id="line-65">        this.id         = Long.toString(id);</span>
-<span class="source-line-no">066</span><span id="line-66">        this.params     = params;</span>
-<span class="source-line-no">067</span><span id="line-67">    }</span>
-<span class="source-line-no">068</span><span id="line-68"></span>
-<span class="source-line-no">069</span><span id="line-69">    /**</span>
-<span class="source-line-no">070</span><span id="line-70">     * Create a JSON RPC request (for serialization.)</span>
-<span class="source-line-no">071</span><span id="line-71">     * Can be used to override default JSON RPC version. To create a request on the client side, it</span>
-<span class="source-line-no">072</span><span id="line-72">     * is generally recommended to use the methods in the {@link JsonRpcClient} you are using.</span>
-<span class="source-line-no">073</span><span id="line-73">     *</span>
-<span class="source-line-no">074</span><span id="line-74">     * @param jsonRpcVersion JSON-RPC version (enum)</span>
-<span class="source-line-no">075</span><span id="line-75">     * @param method Method of remote procedure to call</span>
-<span class="source-line-no">076</span><span id="line-76">     * @param params Parameters to serialize</span>
-<span class="source-line-no">077</span><span id="line-77">     */</span>
-<span class="source-line-no">078</span><span id="line-78">    public JsonRpcRequest(JsonRpcMessage.Version jsonRpcVersion, String method, List&lt;Object&gt; params) {</span>
-<span class="source-line-no">079</span><span id="line-79">        this(jsonRpcVersion, JsonRpcRequest.nextRequestId.incrementAndGet(), method, removeTrailingNulls(params));</span>
-<span class="source-line-no">080</span><span id="line-80">    }</span>
-<span class="source-line-no">081</span><span id="line-81"></span>
-<span class="source-line-no">082</span><span id="line-82">    /**</span>
-<span class="source-line-no">083</span><span id="line-83">     * Create a JSON RPC request (for serialization.) To create a request on the client side, it</span>
-<span class="source-line-no">084</span><span id="line-84">     * is generally recommended to use the methods in {@link JsonRpcClient}.</span>
-<span class="source-line-no">085</span><span id="line-85">     *</span>
-<span class="source-line-no">086</span><span id="line-86">     * @param method Method of remote procedure to call</span>
-<span class="source-line-no">087</span><span id="line-87">     * @param params Parameters to serialize</span>
-<span class="source-line-no">088</span><span id="line-88">     * @see JsonRpcClient#buildJsonRequest(String, List)</span>
-<span class="source-line-no">089</span><span id="line-89">     * @see JsonRpcClient#buildJsonRequest(String, Object...)</span>
-<span class="source-line-no">090</span><span id="line-90">     */</span>
-<span class="source-line-no">091</span><span id="line-91">    public JsonRpcRequest(String method, List&lt;Object&gt; params) {</span>
-<span class="source-line-no">092</span><span id="line-92">        this(DEFAULT_JSON_RPC_VERSION, method, params);</span>
-<span class="source-line-no">093</span><span id="line-93">    }</span>
-<span class="source-line-no">094</span><span id="line-94"></span>
-<span class="source-line-no">095</span><span id="line-95">    /**</span>
-<span class="source-line-no">096</span><span id="line-96">     * Convenience constructor for requests with empty parameter list</span>
-<span class="source-line-no">097</span><span id="line-97">     * @param method method name string</span>
-<span class="source-line-no">098</span><span id="line-98">     */</span>
-<span class="source-line-no">099</span><span id="line-99">    public JsonRpcRequest(String method) {</span>
-<span class="source-line-no">100</span><span id="line-100">        this(method, List.of());</span>
-<span class="source-line-no">101</span><span id="line-101">    }</span>
-<span class="source-line-no">102</span><span id="line-102"></span>
-<span class="source-line-no">103</span><span id="line-103">    public String getJsonrpc() {</span>
-<span class="source-line-no">104</span><span id="line-104">        return jsonrpc;</span>
-<span class="source-line-no">105</span><span id="line-105">    }</span>
-<span class="source-line-no">106</span><span id="line-106"></span>
-<span class="source-line-no">107</span><span id="line-107">    public String getMethod() {</span>
-<span class="source-line-no">108</span><span id="line-108">        return method;</span>
-<span class="source-line-no">109</span><span id="line-109">    }</span>
-<span class="source-line-no">110</span><span id="line-110"></span>
-<span class="source-line-no">111</span><span id="line-111">    @JsonSerialize(using=NumberStringSerializer.class)</span>
-<span class="source-line-no">112</span><span id="line-112">    public String getId() {</span>
-<span class="source-line-no">113</span><span id="line-113">        return id;</span>
-<span class="source-line-no">114</span><span id="line-114">    }</span>
-<span class="source-line-no">115</span><span id="line-115"></span>
-<span class="source-line-no">116</span><span id="line-116">    public List&lt;Object&gt; getParams() {</span>
-<span class="source-line-no">117</span><span id="line-117">        return params;</span>
-<span class="source-line-no">118</span><span id="line-118">    }</span>
-<span class="source-line-no">119</span><span id="line-119"></span>
-<span class="source-line-no">120</span><span id="line-120">    /**</span>
-<span class="source-line-no">121</span><span id="line-121">     * Remove trailing nulls (all nulls *following* the last non-null object)</span>
-<span class="source-line-no">122</span><span id="line-122">     *</span>
-<span class="source-line-no">123</span><span id="line-123">     * This allows convenience methods to use `null` parameters to indicate the</span>
-<span class="source-line-no">124</span><span id="line-124">     * server-determined default should be used. If `null` were actually passed as</span>
-<span class="source-line-no">125</span><span id="line-125">     * JSON, then the server default would be overridden.  `null` can be used before</span>
-<span class="source-line-no">126</span><span id="line-126">     * the last non-null element, but those `null`s will be sent to the server.</span>
-<span class="source-line-no">127</span><span id="line-127">     */</span>
-<span class="source-line-no">128</span><span id="line-128">    private static List&lt;Object&gt; removeTrailingNulls(List&lt;Object&gt; params) {</span>
-<span class="source-line-no">129</span><span id="line-129">        LinkedList&lt;Object&gt; cleaned = new LinkedList&lt;&gt;(params);</span>
-<span class="source-line-no">130</span><span id="line-130">        while ((cleaned.size() &gt; 0) &amp;&amp; (cleaned.getLast() == null)) {</span>
-<span class="source-line-no">131</span><span id="line-131">            cleaned.removeLast();</span>
-<span class="source-line-no">132</span><span id="line-132">        }</span>
-<span class="source-line-no">133</span><span id="line-133">        return cleaned;</span>
-<span class="source-line-no">134</span><span id="line-134">    }</span>
-<span class="source-line-no">135</span><span id="line-135">}</span>
+<span class="source-line-no">014</span><span id="line-14">import static org.consensusj.jsonrpc.JsonRpcMessage.Version.*;</span>
+<span class="source-line-no">015</span><span id="line-15"></span>
+<span class="source-line-no">016</span><span id="line-16">/**</span>
+<span class="source-line-no">017</span><span id="line-17"> * JSON-RPC Request POJO</span>
+<span class="source-line-no">018</span><span id="line-18"> */</span>
+<span class="source-line-no">019</span><span id="line-19">public class JsonRpcRequest {</span>
+<span class="source-line-no">020</span><span id="line-20">    private static final JsonRpcMessage.Version DEFAULT_JSON_RPC_VERSION = V2;</span>
+<span class="source-line-no">021</span><span id="line-21">    private static final AtomicLong nextRequestId =  new AtomicLong(0);</span>
+<span class="source-line-no">022</span><span id="line-22"></span>
+<span class="source-line-no">023</span><span id="line-23">    private final String  method;</span>
+<span class="source-line-no">024</span><span id="line-24">    private final List&lt;Object&gt; params;</span>
+<span class="source-line-no">025</span><span id="line-25">    private final String  jsonrpc;   // version</span>
+<span class="source-line-no">026</span><span id="line-26">    private final String  id;</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    /**</span>
+<span class="source-line-no">029</span><span id="line-29">     * Constructor for use by Jackson deserialization. Deserialization will typically</span>
+<span class="source-line-no">030</span><span id="line-30">     * be used on the server-side. To create a request on the client side, it</span>
+<span class="source-line-no">031</span><span id="line-31">     * is generally recommended to use the methods in {@link JsonRpcClient}.</span>
+<span class="source-line-no">032</span><span id="line-32">     *</span>
+<span class="source-line-no">033</span><span id="line-33">     * @param jsonrpc filled from the JSON object</span>
+<span class="source-line-no">034</span><span id="line-34">     * @param id filled from the JSON object</span>
+<span class="source-line-no">035</span><span id="line-35">     * @param method filled from the JSON object</span>
+<span class="source-line-no">036</span><span id="line-36">     * @param params filled from the JSON object</span>
+<span class="source-line-no">037</span><span id="line-37">     * @see JsonRpcClient#buildJsonRequest(String, List)</span>
+<span class="source-line-no">038</span><span id="line-38">     * @see JsonRpcClient#buildJsonRequest(String, Object...)</span>
+<span class="source-line-no">039</span><span id="line-39">     */</span>
+<span class="source-line-no">040</span><span id="line-40">    @JsonCreator</span>
+<span class="source-line-no">041</span><span id="line-41">    public JsonRpcRequest(@JsonProperty("jsonrpc")  String jsonrpc,</span>
+<span class="source-line-no">042</span><span id="line-42">                          @JsonProperty("id")       String id,</span>
+<span class="source-line-no">043</span><span id="line-43">                          @JsonProperty("method")   String method,</span>
+<span class="source-line-no">044</span><span id="line-44">                          @JsonProperty("params")   List&lt;Object&gt; params) {</span>
+<span class="source-line-no">045</span><span id="line-45">        this.jsonrpc = jsonrpc;</span>
+<span class="source-line-no">046</span><span id="line-46">        this.method = method;</span>
+<span class="source-line-no">047</span><span id="line-47">        this.id = id;</span>
+<span class="source-line-no">048</span><span id="line-48">        this.params = Collections.unmodifiableList(new ArrayList&lt;&gt;(params));</span>
+<span class="source-line-no">049</span><span id="line-49">    }</span>
+<span class="source-line-no">050</span><span id="line-50"></span>
+<span class="source-line-no">051</span><span id="line-51">    /**</span>
+<span class="source-line-no">052</span><span id="line-52">     * This constructor is slightly more strict than the deserialization constructor and should be used</span>
+<span class="source-line-no">053</span><span id="line-53">     * where possible. It uses the {@link JsonRpcMessage.Version} {@code enum} and requires that</span>
+<span class="source-line-no">054</span><span id="line-54">     * the {@code id} be a {@code long}.</span>
+<span class="source-line-no">055</span><span id="line-55">     *</span>
+<span class="source-line-no">056</span><span id="line-56">     * @param jsonRpcVersion JSON-RPC version (enum)</span>
+<span class="source-line-no">057</span><span id="line-57">     * @param id message id</span>
+<span class="source-line-no">058</span><span id="line-58">     * @param method RPC {@code method}</span>
+<span class="source-line-no">059</span><span id="line-59">     * @param params RPC method positional parameters</span>
+<span class="source-line-no">060</span><span id="line-60">     */</span>
+<span class="source-line-no">061</span><span id="line-61">    public JsonRpcRequest(JsonRpcMessage.Version jsonRpcVersion,</span>
+<span class="source-line-no">062</span><span id="line-62">                          long id,</span>
+<span class="source-line-no">063</span><span id="line-63">                          String method,</span>
+<span class="source-line-no">064</span><span id="line-64">                          List&lt;Object&gt; params) {</span>
+<span class="source-line-no">065</span><span id="line-65">        this(jsonRpcVersion.jsonrpc(), Long.toString(id), method, params);</span>
+<span class="source-line-no">066</span><span id="line-66">    }</span>
+<span class="source-line-no">067</span><span id="line-67"></span>
+<span class="source-line-no">068</span><span id="line-68">    /**</span>
+<span class="source-line-no">069</span><span id="line-69">     * Create a JSON RPC request (for serialization.)</span>
+<span class="source-line-no">070</span><span id="line-70">     * Can be used to override default JSON RPC version. To create a request on the client side, it</span>
+<span class="source-line-no">071</span><span id="line-71">     * is generally recommended to use the methods in the {@link JsonRpcClient} you are using.</span>
+<span class="source-line-no">072</span><span id="line-72">     *</span>
+<span class="source-line-no">073</span><span id="line-73">     * @param jsonRpcVersion JSON-RPC version (enum)</span>
+<span class="source-line-no">074</span><span id="line-74">     * @param method Method of remote procedure to call</span>
+<span class="source-line-no">075</span><span id="line-75">     * @param params Parameters to serialize</span>
+<span class="source-line-no">076</span><span id="line-76">     */</span>
+<span class="source-line-no">077</span><span id="line-77">    public JsonRpcRequest(JsonRpcMessage.Version jsonRpcVersion, String method, List&lt;?&gt; params) {</span>
+<span class="source-line-no">078</span><span id="line-78">        this(jsonRpcVersion, JsonRpcRequest.nextRequestId.incrementAndGet(), method, removeTrailingNulls(params));</span>
+<span class="source-line-no">079</span><span id="line-79">    }</span>
+<span class="source-line-no">080</span><span id="line-80"></span>
+<span class="source-line-no">081</span><span id="line-81">    /**</span>
+<span class="source-line-no">082</span><span id="line-82">     * Create a JSON RPC request (for serialization.) To create a request on the client side, it</span>
+<span class="source-line-no">083</span><span id="line-83">     * is generally recommended to use the methods in {@link JsonRpcClient}.</span>
+<span class="source-line-no">084</span><span id="line-84">     *</span>
+<span class="source-line-no">085</span><span id="line-85">     * @param method Method of remote procedure to call</span>
+<span class="source-line-no">086</span><span id="line-86">     * @param params Parameters to serialize</span>
+<span class="source-line-no">087</span><span id="line-87">     * @see JsonRpcClient#buildJsonRequest(String, List)</span>
+<span class="source-line-no">088</span><span id="line-88">     * @see JsonRpcClient#buildJsonRequest(String, Object...)</span>
+<span class="source-line-no">089</span><span id="line-89">     */</span>
+<span class="source-line-no">090</span><span id="line-90">    public JsonRpcRequest(String method, List&lt;?&gt; params) {</span>
+<span class="source-line-no">091</span><span id="line-91">        this(DEFAULT_JSON_RPC_VERSION, method, params);</span>
+<span class="source-line-no">092</span><span id="line-92">    }</span>
+<span class="source-line-no">093</span><span id="line-93"></span>
+<span class="source-line-no">094</span><span id="line-94">    /**</span>
+<span class="source-line-no">095</span><span id="line-95">     * Convenience constructor for requests with empty parameter list</span>
+<span class="source-line-no">096</span><span id="line-96">     * @param method method name string</span>
+<span class="source-line-no">097</span><span id="line-97">     */</span>
+<span class="source-line-no">098</span><span id="line-98">    public JsonRpcRequest(String method) {</span>
+<span class="source-line-no">099</span><span id="line-99">        this(method, List.of());</span>
+<span class="source-line-no">100</span><span id="line-100">    }</span>
+<span class="source-line-no">101</span><span id="line-101"></span>
+<span class="source-line-no">102</span><span id="line-102">    public String getJsonrpc() {</span>
+<span class="source-line-no">103</span><span id="line-103">        return jsonrpc;</span>
+<span class="source-line-no">104</span><span id="line-104">    }</span>
+<span class="source-line-no">105</span><span id="line-105"></span>
+<span class="source-line-no">106</span><span id="line-106">    public String getMethod() {</span>
+<span class="source-line-no">107</span><span id="line-107">        return method;</span>
+<span class="source-line-no">108</span><span id="line-108">    }</span>
+<span class="source-line-no">109</span><span id="line-109"></span>
+<span class="source-line-no">110</span><span id="line-110">    @JsonSerialize(using=NumberStringSerializer.class)</span>
+<span class="source-line-no">111</span><span id="line-111">    public String getId() {</span>
+<span class="source-line-no">112</span><span id="line-112">        return id;</span>
+<span class="source-line-no">113</span><span id="line-113">    }</span>
+<span class="source-line-no">114</span><span id="line-114"></span>
+<span class="source-line-no">115</span><span id="line-115">    public List&lt;Object&gt; getParams() {</span>
+<span class="source-line-no">116</span><span id="line-116">        return params;</span>
+<span class="source-line-no">117</span><span id="line-117">    }</span>
+<span class="source-line-no">118</span><span id="line-118"></span>
+<span class="source-line-no">119</span><span id="line-119">    /**</span>
+<span class="source-line-no">120</span><span id="line-120">     * Remove trailing {@code null}s (all {@code null}s &lt;/i&gt;following&lt;/i&gt; the last non-{@code null}  object)</span>
+<span class="source-line-no">121</span><span id="line-121">     * &lt;p&gt;</span>
+<span class="source-line-no">122</span><span id="line-122">     * This allows convenience methods to use {@code null} parameters to indicate the</span>
+<span class="source-line-no">123</span><span id="line-123">     * server-determined default should be used. If {@code null} were actually sent as</span>
+<span class="source-line-no">124</span><span id="line-124">     * JSON, then the server default would be overridden.  {@code null}  can be used before</span>
+<span class="source-line-no">125</span><span id="line-125">     * the last non-null element, but those {@code null} s will be sent to the server.</span>
+<span class="source-line-no">126</span><span id="line-126">     */</span>
+<span class="source-line-no">127</span><span id="line-127">    private static List&lt;Object&gt; removeTrailingNulls(List&lt;?&gt; params) {</span>
+<span class="source-line-no">128</span><span id="line-128">        LinkedList&lt;Object&gt; cleaned = new LinkedList&lt;&gt;(params);</span>
+<span class="source-line-no">129</span><span id="line-129">        while (!cleaned.isEmpty() &amp;&amp; cleaned.getLast() == null) {</span>
+<span class="source-line-no">130</span><span id="line-130">            cleaned.removeLast();</span>
+<span class="source-line-no">131</span><span id="line-131">        }</span>
+<span class="source-line-no">132</span><span id="line-132">        return cleaned;</span>
+<span class="source-line-no">133</span><span id="line-133">    }</span>
+<span class="source-line-no">134</span><span id="line-134">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcResponse.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcResponse.html
index c7b4b4543..1f3610528 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcResponse.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcResponse.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcResponse">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcService.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcService.html
index be33c509d..56d96fbc8 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcService.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, interface: JsonRpcService">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html
index ff64fb6ef..7e5a810e9 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcStatusException.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc, class: JsonRpcStatusException">
@@ -14,7 +14,7 @@
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
 <span class="source-line-no">003</span><span id="line-3">/**</span>
-<span class="source-line-no">004</span><span id="line-4"> * JSON-RPC returned HTTP status other than 200</span>
+<span class="source-line-no">004</span><span id="line-4"> * JSON-RPC returned HTTP status other than 200 (and unfortunately also sometimes when their is response.error)</span>
 <span class="source-line-no">005</span><span id="line-5"> * Additional information is usually in JSON-RPC response</span>
 <span class="source-line-no">006</span><span id="line-6"> * TODO: See TODO in parent class {@link JsonRpcException}</span>
 <span class="source-line-no">007</span><span id="line-7"> * @see org.consensusj.jsonrpc.JsonRpcException</span>
@@ -23,28 +23,69 @@
 <span class="source-line-no">010</span><span id="line-10">    public final String httpMessage;</span>
 <span class="source-line-no">011</span><span id="line-11">    public final int httpCode;</span>
 <span class="source-line-no">012</span><span id="line-12">    public final int jsonRpcCode;</span>
-<span class="source-line-no">013</span><span id="line-13">    public final String response;</span>
-<span class="source-line-no">014</span><span id="line-14">    public final JsonRpcResponse&lt;?&gt; responseJson;</span>
-<span class="source-line-no">015</span><span id="line-15"></span>
-<span class="source-line-no">016</span><span id="line-16">    /**</span>
-<span class="source-line-no">017</span><span id="line-17">     * Default Constructor</span>
-<span class="source-line-no">018</span><span id="line-18">     *</span>
-<span class="source-line-no">019</span><span id="line-19">     * @param message Error message from Json if available, else http status message</span>
-<span class="source-line-no">020</span><span id="line-20">     * @param httpCode HTTP status code, e.g. 404</span>
-<span class="source-line-no">021</span><span id="line-21">     * @param httpMessage HTTP status message, e.g. "Not found"</span>
-<span class="source-line-no">022</span><span id="line-22">     * @param jsonRPCCode Integer error code in JSON response, if any</span>
-<span class="source-line-no">023</span><span id="line-23">     * @param responseBody responseBody body as string</span>
-<span class="source-line-no">024</span><span id="line-24">     * @param responseBodyJson responseBody body as Json Map</span>
+<span class="source-line-no">013</span><span id="line-13"></span>
+<span class="source-line-no">014</span><span id="line-14">    /**</span>
+<span class="source-line-no">015</span><span id="line-15">     * Http response body as a string. Null if not-available (check deserialized JSON in this case)</span>
+<span class="source-line-no">016</span><span id="line-16">     */</span>
+<span class="source-line-no">017</span><span id="line-17">    public final String response;</span>
+<span class="source-line-no">018</span><span id="line-18"></span>
+<span class="source-line-no">019</span><span id="line-19">    /**</span>
+<span class="source-line-no">020</span><span id="line-20">     * Deserialized response message, if available. Null if not-available.</span>
+<span class="source-line-no">021</span><span id="line-21">     * Result is usually null when an error occurs, but the type of the result is</span>
+<span class="source-line-no">022</span><span id="line-22">     * unspecified and could be either {@link java.util.Map}, {@link com.fasterxml.jackson.databind.JsonNode},</span>
+<span class="source-line-no">023</span><span id="line-23">     * or the result type of the failed request depending upon where and how the exception was</span>
+<span class="source-line-no">024</span><span id="line-24">     * created.</span>
 <span class="source-line-no">025</span><span id="line-25">     */</span>
-<span class="source-line-no">026</span><span id="line-26">    public JsonRpcStatusException(String message, int httpCode, String httpMessage, int jsonRPCCode, String responseBody, JsonRpcResponse&lt;?&gt; responseBodyJson ) {</span>
-<span class="source-line-no">027</span><span id="line-27">        super(message);</span>
-<span class="source-line-no">028</span><span id="line-28">        this.httpCode = httpCode;</span>
-<span class="source-line-no">029</span><span id="line-29">        this.httpMessage = httpMessage;</span>
-<span class="source-line-no">030</span><span id="line-30">        this.jsonRpcCode = jsonRPCCode;</span>
-<span class="source-line-no">031</span><span id="line-31">        this.response = responseBody;</span>
-<span class="source-line-no">032</span><span id="line-32">        this.responseJson = responseBodyJson;</span>
-<span class="source-line-no">033</span><span id="line-33">    }</span>
-<span class="source-line-no">034</span><span id="line-34">}</span>
+<span class="source-line-no">026</span><span id="line-26">    public final JsonRpcResponse&lt;?&gt; responseJson;</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    /**</span>
+<span class="source-line-no">029</span><span id="line-29">     * Canonical Constructor</span>
+<span class="source-line-no">030</span><span id="line-30">     *</span>
+<span class="source-line-no">031</span><span id="line-31">     * @param message Error message from Json if available, else http status message</span>
+<span class="source-line-no">032</span><span id="line-32">     * @param httpCode HTTP status code, e.g. 404</span>
+<span class="source-line-no">033</span><span id="line-33">     * @param httpMessage HTTP status message, e.g. "Not found" (removed from HTTP/2 and HTTP/3)</span>
+<span class="source-line-no">034</span><span id="line-34">     * @param jsonRPCCode Integer error code in JSON response, if any</span>
+<span class="source-line-no">035</span><span id="line-35">     * @param responseBody responseBody body as string (null if JSON available)</span>
+<span class="source-line-no">036</span><span id="line-36">     * @param responseBodyJson responseBody body as Json Map (null if JSON not-available)</span>
+<span class="source-line-no">037</span><span id="line-37">     */</span>
+<span class="source-line-no">038</span><span id="line-38">    public JsonRpcStatusException(String message, int httpCode, String httpMessage, int jsonRPCCode, String responseBody, JsonRpcResponse&lt;?&gt; responseBodyJson ) {</span>
+<span class="source-line-no">039</span><span id="line-39">        super(message);</span>
+<span class="source-line-no">040</span><span id="line-40">        this.httpCode = httpCode;</span>
+<span class="source-line-no">041</span><span id="line-41">        this.httpMessage = httpMessage;</span>
+<span class="source-line-no">042</span><span id="line-42">        this.jsonRpcCode = jsonRPCCode;</span>
+<span class="source-line-no">043</span><span id="line-43">        this.response = responseBody;</span>
+<span class="source-line-no">044</span><span id="line-44">        this.responseJson = responseBodyJson;</span>
+<span class="source-line-no">045</span><span id="line-45">    }</span>
+<span class="source-line-no">046</span><span id="line-46"></span>
+<span class="source-line-no">047</span><span id="line-47">    /**</span>
+<span class="source-line-no">048</span><span id="line-48">     * Same as canonical, but without the {@code httpCode} parameter. (which is not present in java.net.http, HTTP/2, etc.)</span>
+<span class="source-line-no">049</span><span id="line-49">     */</span>
+<span class="source-line-no">050</span><span id="line-50">    public JsonRpcStatusException(String message, int httpCode, int jsonRPCCode, String responseBody, JsonRpcResponse&lt;?&gt; responseBodyJson ) {</span>
+<span class="source-line-no">051</span><span id="line-51">        this(message, httpCode, "", jsonRPCCode, responseBody, responseBodyJson);</span>
+<span class="source-line-no">052</span><span id="line-52">    }</span>
+<span class="source-line-no">053</span><span id="line-53"></span>
+<span class="source-line-no">054</span><span id="line-54">    /**</span>
+<span class="source-line-no">055</span><span id="line-55">     * Constructor for when we were able to deserialize a JSON response</span>
+<span class="source-line-no">056</span><span id="line-56">     * @param httpCode http status code</span>
+<span class="source-line-no">057</span><span id="line-57">     * @param responseBodyJson deserialized JSON</span>
+<span class="source-line-no">058</span><span id="line-58">     */</span>
+<span class="source-line-no">059</span><span id="line-59">    public JsonRpcStatusException(int httpCode, JsonRpcResponse&lt;?&gt; responseBodyJson) {</span>
+<span class="source-line-no">060</span><span id="line-60">        this(responseBodyJson.getError().getMessage(),</span>
+<span class="source-line-no">061</span><span id="line-61">                httpCode,</span>
+<span class="source-line-no">062</span><span id="line-62">                responseBodyJson.getError() != null ? responseBodyJson.getError().getCode() : 0,</span>
+<span class="source-line-no">063</span><span id="line-63">                null,</span>
+<span class="source-line-no">064</span><span id="line-64">                responseBodyJson);</span>
+<span class="source-line-no">065</span><span id="line-65">    }</span>
+<span class="source-line-no">066</span><span id="line-66"></span>
+<span class="source-line-no">067</span><span id="line-67">    /**</span>
+<span class="source-line-no">068</span><span id="line-68">     * Constructor for when we were unable to deserialize a JSON response</span>
+<span class="source-line-no">069</span><span id="line-69">     * @param httpCode http status code</span>
+<span class="source-line-no">070</span><span id="line-70">     * @param responseBody response body as a string</span>
+<span class="source-line-no">071</span><span id="line-71">     */</span>
+<span class="source-line-no">072</span><span id="line-72">    public JsonRpcStatusException(int httpCode, String responseBody) {</span>
+<span class="source-line-no">073</span><span id="line-73">        this(responseBody, httpCode, 0, responseBody, null);</span>
+<span class="source-line-no">074</span><span id="line-74">    }</span>
+<span class="source-line-no">075</span><span id="line-75">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcTransport.html b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcTransport.html
new file mode 100644
index 000000000..7f836a0ac
--- /dev/null
+++ b/apidoc/src-html/org/consensusj/jsonrpc/JsonRpcTransport.html
@@ -0,0 +1,177 @@
+<!DOCTYPE HTML>
+<html lang="en">
+<head>
+<!-- Generated by javadoc (21) -->
+<title>Source code</title>
+<meta name="viewport" content="width=device-width, initial-scale=1">
+<meta name="description" content="source: package: org.consensusj.jsonrpc, interface: JsonRpcTransport">
+<meta name="generator" content="javadoc/SourceToHTMLConverter">
+<link rel="stylesheet" type="text/css" href="../../../../stylesheet.css" title="Style">
+</head>
+<body class="source-page">
+<main role="main">
+<div class="source-container">
+<pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc;</span>
+<span class="source-line-no">002</span><span id="line-2"></span>
+<span class="source-line-no">003</span><span id="line-3">import javax.net.ssl.SSLContext;</span>
+<span class="source-line-no">004</span><span id="line-4">import java.io.IOException;</span>
+<span class="source-line-no">005</span><span id="line-5">import java.lang.reflect.Type;</span>
+<span class="source-line-no">006</span><span id="line-6">import java.net.URI;</span>
+<span class="source-line-no">007</span><span id="line-7">import java.security.NoSuchAlgorithmException;</span>
+<span class="source-line-no">008</span><span id="line-8">import java.util.Base64;</span>
+<span class="source-line-no">009</span><span id="line-9">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.util.concurrent.ExecutionException;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.util.function.Supplier;</span>
+<span class="source-line-no">012</span><span id="line-12"></span>
+<span class="source-line-no">013</span><span id="line-13">/**</span>
+<span class="source-line-no">014</span><span id="line-14"> * Defines the interface for a network-layer implementation of a JSON-RPC client.</span>
+<span class="source-line-no">015</span><span id="line-15"> */</span>
+<span class="source-line-no">016</span><span id="line-16">public interface JsonRpcTransport&lt;T extends Type&gt; extends AsyncSupport {</span>
+<span class="source-line-no">017</span><span id="line-17">    /**</span>
+<span class="source-line-no">018</span><span id="line-18">     * Get the URI of the remote server</span>
+<span class="source-line-no">019</span><span id="line-19">     * @return URI of remote server</span>
+<span class="source-line-no">020</span><span id="line-20">     */</span>
+<span class="source-line-no">021</span><span id="line-21">    URI getServerURI();</span>
+<span class="source-line-no">022</span><span id="line-22"></span>
+<span class="source-line-no">023</span><span id="line-23">    /**</span>
+<span class="source-line-no">024</span><span id="line-24">     * Send a {@link JsonRpcRequest} for a {@link JsonRpcResponse}</span>
+<span class="source-line-no">025</span><span id="line-25">     * &lt;p&gt;Synchronous subclasses should override this method to prevent {@link CompletableFuture#supplyAsync(Supplier)} from</span>
+<span class="source-line-no">026</span><span id="line-26">     * being called twice when {@link AsyncSupport} is being used. Eventually we'll migrate more of the codebase to native</span>
+<span class="source-line-no">027</span><span id="line-27">     * async, and then we won't have to worry about calling {@code supplyAsync} twice.</span>
+<span class="source-line-no">028</span><span id="line-28">     * @param &lt;R&gt; Type of result object</span>
+<span class="source-line-no">029</span><span id="line-29">     * @param request The request to send</span>
+<span class="source-line-no">030</span><span id="line-30">     * @param responseType The response type expected (used by Jackson for conversion)</span>
+<span class="source-line-no">031</span><span id="line-31">     * @return A JSON RPC Response with `result` of type `R`</span>
+<span class="source-line-no">032</span><span id="line-32">     * @throws IOException network error</span>
+<span class="source-line-no">033</span><span id="line-33">     * @throws JsonRpcStatusException JSON RPC status error</span>
+<span class="source-line-no">034</span><span id="line-34">     */</span>
+<span class="source-line-no">035</span><span id="line-35">    default &lt;R&gt; JsonRpcResponse&lt;R&gt; sendRequestForResponse(JsonRpcRequest request, T responseType) throws IOException, JsonRpcStatusException {</span>
+<span class="source-line-no">036</span><span id="line-36">        return syncGet(sendRequestForResponseAsync(request, responseType));</span>
+<span class="source-line-no">037</span><span id="line-37">    }</span>
+<span class="source-line-no">038</span><span id="line-38"></span>
+<span class="source-line-no">039</span><span id="line-39">    /**</span>
+<span class="source-line-no">040</span><span id="line-40">     * Send a {@link JsonRpcRequest} for a {@link JsonRpcResponse} asynchronously.</span>
+<span class="source-line-no">041</span><span id="line-41">     * @param &lt;R&gt; Type of result object</span>
+<span class="source-line-no">042</span><span id="line-42">     * @param request The request to send</span>
+<span class="source-line-no">043</span><span id="line-43">     * @param responseType The response type expected (used by Jackson for conversion)</span>
+<span class="source-line-no">044</span><span id="line-44">     * @return A future JSON RPC Response with `result` of type `R`</span>
+<span class="source-line-no">045</span><span id="line-45">     */</span>
+<span class="source-line-no">046</span><span id="line-46">    &lt;R&gt; CompletableFuture&lt;JsonRpcResponse&lt;R&gt;&gt; sendRequestForResponseAsync(JsonRpcRequest request, T responseType);</span>
+<span class="source-line-no">047</span><span id="line-47"></span>
+<span class="source-line-no">048</span><span id="line-48">    /**</span>
+<span class="source-line-no">049</span><span id="line-49">     * Synchronously complete a JSON-RPC request by calling {@link CompletableFuture#get()}, unwrapping nested</span>
+<span class="source-line-no">050</span><span id="line-50">     * {@link JsonRpcException} or {@link IOException} from {@link ExecutionException}.</span>
+<span class="source-line-no">051</span><span id="line-51">     * @param future The {@code CompletableFuture} (result of JSON-RPC request) to unwrap</span>
+<span class="source-line-no">052</span><span id="line-52">     * @return A JSON-RPC result</span>
+<span class="source-line-no">053</span><span id="line-53">     * @param &lt;R&gt; The expected result type</span>
+<span class="source-line-no">054</span><span id="line-54">     * @throws IOException If {@link CompletableFuture#get} threw  {@code ExecutionException} caused by {@code IOException}</span>
+<span class="source-line-no">055</span><span id="line-55">     * @throws JsonRpcException If {@link CompletableFuture#get} threw  {@code ExecutionException} caused by {@code JsonRpcException}</span>
+<span class="source-line-no">056</span><span id="line-56">     * @throws RuntimeException If {@link CompletableFuture#get} threw {@link InterruptedException} or other {@link ExecutionException}.</span>
+<span class="source-line-no">057</span><span id="line-57">     */</span>
+<span class="source-line-no">058</span><span id="line-58">    default &lt;R&gt; R syncGet(CompletableFuture&lt;R&gt; future) throws IOException, JsonRpcException {</span>
+<span class="source-line-no">059</span><span id="line-59">        try {</span>
+<span class="source-line-no">060</span><span id="line-60">            return future.get();</span>
+<span class="source-line-no">061</span><span id="line-61">        } catch (InterruptedException ie) {</span>
+<span class="source-line-no">062</span><span id="line-62">            throw new RuntimeException(ie);</span>
+<span class="source-line-no">063</span><span id="line-63">        } catch (ExecutionException ee) {</span>
+<span class="source-line-no">064</span><span id="line-64">            Throwable cause = ee.getCause();</span>
+<span class="source-line-no">065</span><span id="line-65">            if (cause instanceof JsonRpcException) {</span>
+<span class="source-line-no">066</span><span id="line-66">                throw (JsonRpcException) cause;</span>
+<span class="source-line-no">067</span><span id="line-67">            } else if (cause instanceof IOException) {</span>
+<span class="source-line-no">068</span><span id="line-68">                throw (IOException) cause;</span>
+<span class="source-line-no">069</span><span id="line-69">            } else {</span>
+<span class="source-line-no">070</span><span id="line-70">                throw new RuntimeException(ee);</span>
+<span class="source-line-no">071</span><span id="line-71">            }</span>
+<span class="source-line-no">072</span><span id="line-72">        }</span>
+<span class="source-line-no">073</span><span id="line-73">    }</span>
+<span class="source-line-no">074</span><span id="line-74"></span>
+<span class="source-line-no">075</span><span id="line-75">    /**</span>
+<span class="source-line-no">076</span><span id="line-76">     * Encode username password as Base64 for basic authentication</span>
+<span class="source-line-no">077</span><span id="line-77">     * &lt;p&gt;</span>
+<span class="source-line-no">078</span><span id="line-78">     * We're using {@link java.util.Base64}, which requires Android 8.0 or later.</span>
+<span class="source-line-no">079</span><span id="line-79">     *</span>
+<span class="source-line-no">080</span><span id="line-80">     * @param authString An authorization string of the form `username:password`</span>
+<span class="source-line-no">081</span><span id="line-81">     * @return A compliant Base64 encoding of `authString`</span>
+<span class="source-line-no">082</span><span id="line-82">     */</span>
+<span class="source-line-no">083</span><span id="line-83">    static String base64Encode(String authString) {</span>
+<span class="source-line-no">084</span><span id="line-84">        return Base64.getEncoder().encodeToString(authString.getBytes()).trim();</span>
+<span class="source-line-no">085</span><span id="line-85">    }</span>
+<span class="source-line-no">086</span><span id="line-86"></span>
+<span class="source-line-no">087</span><span id="line-87">    /**</span>
+<span class="source-line-no">088</span><span id="line-88">     *</span>
+<span class="source-line-no">089</span><span id="line-89">     * Return the default {@link SSLContext} without declaring a checked exception</span>
+<span class="source-line-no">090</span><span id="line-90">     * @return The default {@code SSLContext}</span>
+<span class="source-line-no">091</span><span id="line-91">     */</span>
+<span class="source-line-no">092</span><span id="line-92">    static SSLContext getDefaultSSLContext() {</span>
+<span class="source-line-no">093</span><span id="line-93">        try {</span>
+<span class="source-line-no">094</span><span id="line-94">            return SSLContext.getDefault();</span>
+<span class="source-line-no">095</span><span id="line-95">        } catch (NoSuchAlgorithmException e) {</span>
+<span class="source-line-no">096</span><span id="line-96">            throw new RuntimeException(e);</span>
+<span class="source-line-no">097</span><span id="line-97">        }</span>
+<span class="source-line-no">098</span><span id="line-98">    }</span>
+<span class="source-line-no">099</span><span id="line-99">}</span>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+</pre>
+</div>
+</main>
+</body>
+</html>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html
index 86823a953..a34790c2e 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.CommonsCLICall.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli, class: BaseJsonRpcTool, class: CommonsCLICall">
@@ -22,239 +22,237 @@
 <span class="source-line-no">009</span><span id="line-9">import org.apache.commons.cli.HelpFormatter;</span>
 <span class="source-line-no">010</span><span id="line-10">import org.apache.commons.cli.Options;</span>
 <span class="source-line-no">011</span><span id="line-11">import org.apache.commons.cli.ParseException;</span>
-<span class="source-line-no">012</span><span id="line-12">import org.consensusj.jsonrpc.AbstractRpcClient;</span>
+<span class="source-line-no">012</span><span id="line-12">import org.consensusj.jsonrpc.DefaultRpcClient;</span>
 <span class="source-line-no">013</span><span id="line-13">import org.consensusj.jsonrpc.CompositeTrustManager;</span>
 <span class="source-line-no">014</span><span id="line-14">import org.consensusj.jsonrpc.JsonRpcClientJavaNet;</span>
-<span class="source-line-no">015</span><span id="line-15">import org.consensusj.jsonrpc.JsonRpcException;</span>
-<span class="source-line-no">016</span><span id="line-16">import org.consensusj.jsonrpc.JsonRpcMessage;</span>
-<span class="source-line-no">017</span><span id="line-17">import org.consensusj.jsonrpc.JsonRpcRequest;</span>
-<span class="source-line-no">018</span><span id="line-18">import org.consensusj.jsonrpc.JsonRpcResponse;</span>
-<span class="source-line-no">019</span><span id="line-19">import org.slf4j.Logger;</span>
-<span class="source-line-no">020</span><span id="line-20">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">021</span><span id="line-21"></span>
-<span class="source-line-no">022</span><span id="line-22">import javax.net.ssl.SSLContext;</span>
-<span class="source-line-no">023</span><span id="line-23">import java.io.FileNotFoundException;</span>
-<span class="source-line-no">024</span><span id="line-24">import java.io.IOException;</span>
-<span class="source-line-no">025</span><span id="line-25">import java.io.PrintWriter;</span>
-<span class="source-line-no">026</span><span id="line-26">import java.net.URI;</span>
-<span class="source-line-no">027</span><span id="line-27">import java.net.URISyntaxException;</span>
-<span class="source-line-no">028</span><span id="line-28">import java.nio.file.Path;</span>
-<span class="source-line-no">029</span><span id="line-29">import java.security.KeyManagementException;</span>
-<span class="source-line-no">030</span><span id="line-30">import java.security.KeyStoreException;</span>
-<span class="source-line-no">031</span><span id="line-31">import java.security.NoSuchAlgorithmException;</span>
-<span class="source-line-no">032</span><span id="line-32">import java.security.cert.CertificateException;</span>
-<span class="source-line-no">033</span><span id="line-33">import java.util.List;</span>
-<span class="source-line-no">034</span><span id="line-34"></span>
-<span class="source-line-no">035</span><span id="line-35">/**</span>
-<span class="source-line-no">036</span><span id="line-36"> * An abstract base class for JsonRpcClientTool that uses Apache Commons CLI</span>
-<span class="source-line-no">037</span><span id="line-37"> */</span>
-<span class="source-line-no">038</span><span id="line-38">public abstract class BaseJsonRpcTool implements JsonRpcClientTool {</span>
-<span class="source-line-no">039</span><span id="line-39">    private static final Logger log = LoggerFactory.getLogger(BaseJsonRpcTool.class);</span>
-<span class="source-line-no">040</span><span id="line-40">    private static final String name = "jsonrpc";</span>
-<span class="source-line-no">041</span><span id="line-41">    protected static final URI defaultUri = URI.create("http://localhost:8080/");</span>
-<span class="source-line-no">042</span><span id="line-42">    protected final String usage ="usage string";</span>
-<span class="source-line-no">043</span><span id="line-43">    protected final HelpFormatter formatter = new HelpFormatter();</span>
-<span class="source-line-no">044</span><span id="line-44">    protected JsonRpcMessage.Version jsonRpcVersion = JsonRpcMessage.Version.V2;</span>
-<span class="source-line-no">045</span><span id="line-45">    protected JsonRpcClientTool.OutputObject outputObject = OutputObject.RESULT;</span>
-<span class="source-line-no">046</span><span id="line-46">    //protected JsonRpcClientTool.OutputFormat outputFormat = OutputFormat.JSON;</span>
-<span class="source-line-no">047</span><span id="line-47">    protected JsonRpcClientTool.OutputStyle outputStyle = OutputStyle.PRETTY;</span>
-<span class="source-line-no">048</span><span id="line-48"></span>
-<span class="source-line-no">049</span><span id="line-49">    public BaseJsonRpcTool() {</span>
-<span class="source-line-no">050</span><span id="line-50">        formatter.setLongOptPrefix("-");</span>
-<span class="source-line-no">051</span><span id="line-51">    }</span>
-<span class="source-line-no">052</span><span id="line-52"></span>
-<span class="source-line-no">053</span><span id="line-53">    @Override</span>
-<span class="source-line-no">054</span><span id="line-54">    public String name() {</span>
-<span class="source-line-no">055</span><span id="line-55">        return name;</span>
-<span class="source-line-no">056</span><span id="line-56">    }</span>
-<span class="source-line-no">057</span><span id="line-57"></span>
-<span class="source-line-no">058</span><span id="line-58">    public String usage() {</span>
-<span class="source-line-no">059</span><span id="line-59">        return usage;</span>
-<span class="source-line-no">060</span><span id="line-60">    }</span>
-<span class="source-line-no">061</span><span id="line-61"></span>
-<span class="source-line-no">062</span><span id="line-62">    abstract public Options options();</span>
-<span class="source-line-no">063</span><span id="line-63"></span>
-<span class="source-line-no">064</span><span id="line-64">    @Override</span>
-<span class="source-line-no">065</span><span id="line-65">    public CommonsCLICall createCall(PrintWriter out, PrintWriter err, String... args) {</span>
-<span class="source-line-no">066</span><span id="line-66">        return new CommonsCLICall(this, out, err, args);</span>
-<span class="source-line-no">067</span><span id="line-67">    }</span>
-<span class="source-line-no">068</span><span id="line-68"></span>
-<span class="source-line-no">069</span><span id="line-69">    @Override</span>
-<span class="source-line-no">070</span><span id="line-70">    public void run(Call call) {</span>
-<span class="source-line-no">071</span><span id="line-71">        run((CommonsCLICall) call);</span>
-<span class="source-line-no">072</span><span id="line-72">    }</span>
-<span class="source-line-no">073</span><span id="line-73">    </span>
-<span class="source-line-no">074</span><span id="line-74">    public void run(CommonsCLICall call) {</span>
-<span class="source-line-no">075</span><span id="line-75">        List&lt;String&gt; args = call.line.getArgList();</span>
-<span class="source-line-no">076</span><span id="line-76">        if (args.size() == 0) {</span>
-<span class="source-line-no">077</span><span id="line-77">            printError(call, "jsonrpc method required");</span>
-<span class="source-line-no">078</span><span id="line-78">            printHelp(call, usage);</span>
-<span class="source-line-no">079</span><span id="line-79">            throw new ToolException(1, "jsonrpc method required");</span>
-<span class="source-line-no">080</span><span id="line-80">        }</span>
-<span class="source-line-no">081</span><span id="line-81">        if (call.line.hasOption("response")) {</span>
-<span class="source-line-no">082</span><span id="line-82">            // Print full JsonRpcResponse as output</span>
-<span class="source-line-no">083</span><span id="line-83">            outputObject = OutputObject.RESPONSE;</span>
-<span class="source-line-no">084</span><span id="line-84">        }</span>
-<span class="source-line-no">085</span><span id="line-85">        if (call.line.hasOption("V1")) {</span>
-<span class="source-line-no">086</span><span id="line-86">            jsonRpcVersion = JsonRpcMessage.Version.V1;</span>
-<span class="source-line-no">087</span><span id="line-87">        }</span>
-<span class="source-line-no">088</span><span id="line-88">        SSLContext sslSocketFactory = sslContext(call.line);</span>
-<span class="source-line-no">089</span><span id="line-89">        AbstractRpcClient client = call.rpcClient(sslSocketFactory);</span>
-<span class="source-line-no">090</span><span id="line-90">        CliParameterParser parser = new CliParameterParser(jsonRpcVersion, client.getMapper());</span>
-<span class="source-line-no">091</span><span id="line-91">        JsonRpcRequest request = parser.parse(args);</span>
-<span class="source-line-no">092</span><span id="line-92">        JsonRpcResponse&lt;JsonNode&gt; response;</span>
-<span class="source-line-no">093</span><span id="line-93">        try {</span>
-<span class="source-line-no">094</span><span id="line-94">            response = client.sendRequestForResponse(request);</span>
-<span class="source-line-no">095</span><span id="line-95">        } catch (JsonRpcException e) {</span>
-<span class="source-line-no">096</span><span id="line-96">            log.error("send exception: ", e);</span>
-<span class="source-line-no">097</span><span id="line-97">            throw new ToolException(1, e.getMessage());</span>
-<span class="source-line-no">098</span><span id="line-98">        } catch (IOException e) {</span>
-<span class="source-line-no">099</span><span id="line-99">            log.error("send exception: ", e);</span>
-<span class="source-line-no">100</span><span id="line-100">            throw new ToolException(1, e.getMessage());</span>
-<span class="source-line-no">101</span><span id="line-101">        }</span>
-<span class="source-line-no">102</span><span id="line-102">        String resultForPrinting = formatResponse(response, client.getMapper());</span>
-<span class="source-line-no">103</span><span id="line-103">        call.out.println(resultForPrinting);</span>
-<span class="source-line-no">104</span><span id="line-104">    }</span>
-<span class="source-line-no">105</span><span id="line-105"></span>
-<span class="source-line-no">106</span><span id="line-106">    SSLContext sslContext(CommandLine line) {</span>
-<span class="source-line-no">107</span><span id="line-107">        SSLContext sslContext;</span>
-<span class="source-line-no">108</span><span id="line-108">        if (line.hasOption("add-truststore")) {</span>
-<span class="source-line-no">109</span><span id="line-109">            // Create SSL sockets using additional truststore and CompositeTrustManager</span>
-<span class="source-line-no">110</span><span id="line-110">            String trustStorePathString = line.getOptionValue("add-truststore");</span>
-<span class="source-line-no">111</span><span id="line-111">            Path trustStorePath = Path.of(trustStorePathString);</span>
-<span class="source-line-no">112</span><span id="line-112">            try {</span>
-<span class="source-line-no">113</span><span id="line-113">                sslContext = CompositeTrustManager.getCompositeSSLContext(trustStorePath);</span>
-<span class="source-line-no">114</span><span id="line-114">            } catch (NoSuchAlgorithmException | KeyManagementException | FileNotFoundException e) {</span>
-<span class="source-line-no">115</span><span id="line-115">                throw new ToolException(1, e.getMessage());</span>
-<span class="source-line-no">116</span><span id="line-116">            }</span>
-<span class="source-line-no">117</span><span id="line-117">        } else if (line.hasOption("alt-truststore")) {</span>
-<span class="source-line-no">118</span><span id="line-118">            // Create SSL sockets using alternate truststore</span>
-<span class="source-line-no">119</span><span id="line-119">            String trustStorePathString = line.getOptionValue("alt-truststore");</span>
-<span class="source-line-no">120</span><span id="line-120">            Path trustStorePath = Path.of(trustStorePathString);</span>
-<span class="source-line-no">121</span><span id="line-121">            try {</span>
-<span class="source-line-no">122</span><span id="line-122">                sslContext = CompositeTrustManager.getAlternateSSLContext(trustStorePath);</span>
-<span class="source-line-no">123</span><span id="line-123">            } catch (NoSuchAlgorithmException | KeyManagementException | CertificateException | KeyStoreException | IOException e) {</span>
-<span class="source-line-no">124</span><span id="line-124">                throw new ToolException(1, e.getMessage());</span>
-<span class="source-line-no">125</span><span id="line-125">            }</span>
-<span class="source-line-no">126</span><span id="line-126">        } else {</span>
-<span class="source-line-no">127</span><span id="line-127">            // Otherwise, use the default SSLSocketFactory</span>
-<span class="source-line-no">128</span><span id="line-128">            try {</span>
-<span class="source-line-no">129</span><span id="line-129">                sslContext = SSLContext.getDefault();</span>
-<span class="source-line-no">130</span><span id="line-130">            } catch (NoSuchAlgorithmException e) {</span>
-<span class="source-line-no">131</span><span id="line-131">                throw new RuntimeException(e);</span>
-<span class="source-line-no">132</span><span id="line-132">            }</span>
-<span class="source-line-no">133</span><span id="line-133">        }</span>
-<span class="source-line-no">134</span><span id="line-134">        return sslContext;</span>
-<span class="source-line-no">135</span><span id="line-135">    }</span>
-<span class="source-line-no">136</span><span id="line-136"></span>
-<span class="source-line-no">137</span><span id="line-137">    private String formatResponse(JsonRpcResponse&lt;?&gt; response, ObjectMapper mapper) {</span>
-<span class="source-line-no">138</span><span id="line-138">        String string;</span>
-<span class="source-line-no">139</span><span id="line-139">        if (response.getResult() == null || response.getError() != null || outputObject == OutputObject.RESPONSE) {</span>
-<span class="source-line-no">140</span><span id="line-140">            JsonNode reponseAsNode = mapper.valueToTree(response);</span>
-<span class="source-line-no">141</span><span id="line-141">            string = reponseAsNode.toPrettyString();</span>
-<span class="source-line-no">142</span><span id="line-142">        } else {</span>
-<span class="source-line-no">143</span><span id="line-143">            Object result = response.getResult();</span>
-<span class="source-line-no">144</span><span id="line-144">            if (result == null) {</span>
-<span class="source-line-no">145</span><span id="line-145">                log.info("result is null");</span>
-<span class="source-line-no">146</span><span id="line-146">                string = "null";</span>
-<span class="source-line-no">147</span><span id="line-147">            } else if (result instanceof JsonNode) {</span>
-<span class="source-line-no">148</span><span id="line-148">                log.info("result instanceof JsonNode");</span>
-<span class="source-line-no">149</span><span id="line-149">                if (result instanceof TextNode) {</span>
-<span class="source-line-no">150</span><span id="line-150">                    // This will remove the surrounding quotes and not print `\n` for newlines</span>
-<span class="source-line-no">151</span><span id="line-151">                    string = ((TextNode) result).asText();</span>
-<span class="source-line-no">152</span><span id="line-152">                } else if (outputStyle == OutputStyle.PRETTY) {</span>
-<span class="source-line-no">153</span><span id="line-153">                    string = ((JsonNode) result).toPrettyString();</span>
-<span class="source-line-no">154</span><span id="line-154">                } else {</span>
-<span class="source-line-no">155</span><span id="line-155">                    string = result.toString();</span>
-<span class="source-line-no">156</span><span id="line-156">                }</span>
-<span class="source-line-no">157</span><span id="line-157">            } else {</span>
-<span class="source-line-no">158</span><span id="line-158">                log.info("result class is: {}", result.getClass());</span>
-<span class="source-line-no">159</span><span id="line-159">                string = result.toString();</span>
-<span class="source-line-no">160</span><span id="line-160">            }</span>
-<span class="source-line-no">161</span><span id="line-161">        }</span>
-<span class="source-line-no">162</span><span id="line-162">        return string;</span>
-<span class="source-line-no">163</span><span id="line-163">    }</span>
-<span class="source-line-no">164</span><span id="line-164"></span>
-<span class="source-line-no">165</span><span id="line-165">    public void printHelp(Call call, String usage) {</span>
-<span class="source-line-no">166</span><span id="line-166">        int leftPad = 4;</span>
-<span class="source-line-no">167</span><span id="line-167">        int descPad = 2;</span>
-<span class="source-line-no">168</span><span id="line-168">        int helpWidth = 120;</span>
-<span class="source-line-no">169</span><span id="line-169">        String header = "";</span>
-<span class="source-line-no">170</span><span id="line-170">        String footer = "";</span>
-<span class="source-line-no">171</span><span id="line-171">        formatter.printHelp(call.err, helpWidth, usage, header, options(), leftPad, descPad, footer, false);</span>
-<span class="source-line-no">172</span><span id="line-172">    }</span>
-<span class="source-line-no">173</span><span id="line-173"></span>
-<span class="source-line-no">174</span><span id="line-174">    public void printError(Call call, String str) {</span>
-<span class="source-line-no">175</span><span id="line-175">        call.err.println(str);</span>
-<span class="source-line-no">176</span><span id="line-176">    }</span>
-<span class="source-line-no">177</span><span id="line-177"></span>
-<span class="source-line-no">178</span><span id="line-178">    public static class CommonsCLICall extends JsonRpcClientTool.Call {</span>
-<span class="source-line-no">179</span><span id="line-179">        protected final BaseJsonRpcTool rpcTool;</span>
-<span class="source-line-no">180</span><span id="line-180">        public final CommandLine line;</span>
-<span class="source-line-no">181</span><span id="line-181">        public final boolean verbose;</span>
-<span class="source-line-no">182</span><span id="line-182">        private AbstractRpcClient client;</span>
-<span class="source-line-no">183</span><span id="line-183"></span>
-<span class="source-line-no">184</span><span id="line-184">        public CommonsCLICall(BaseJsonRpcTool parentTool, PrintWriter out, PrintWriter err, String[] args) {</span>
-<span class="source-line-no">185</span><span id="line-185">            super(out, err, args);</span>
-<span class="source-line-no">186</span><span id="line-186">            this.rpcTool = parentTool;</span>
-<span class="source-line-no">187</span><span id="line-187">            CommandLineParser parser = new DefaultParser();</span>
-<span class="source-line-no">188</span><span id="line-188">            try {</span>
-<span class="source-line-no">189</span><span id="line-189">                this.line = parser.parse(rpcTool.options(), args);</span>
-<span class="source-line-no">190</span><span id="line-190">            } catch (ParseException e) {</span>
-<span class="source-line-no">191</span><span id="line-191">                rpcTool.printError(this, e.getMessage());</span>
-<span class="source-line-no">192</span><span id="line-192">                rpcTool.printHelp(this, rpcTool.usage());</span>
-<span class="source-line-no">193</span><span id="line-193">                throw new JsonRpcClientTool.ToolException(1, "Parser error");</span>
-<span class="source-line-no">194</span><span id="line-194">            }</span>
-<span class="source-line-no">195</span><span id="line-195">            if (line.hasOption("?")) {</span>
-<span class="source-line-no">196</span><span id="line-196">                rpcTool.printHelp(this, rpcTool.usage());</span>
-<span class="source-line-no">197</span><span id="line-197">                throw new JsonRpcClientTool.ToolException(0, "Help Option was chosen");</span>
-<span class="source-line-no">198</span><span id="line-198">            }</span>
-<span class="source-line-no">199</span><span id="line-199">            verbose = line.hasOption("v");</span>
-<span class="source-line-no">200</span><span id="line-200">            if (verbose) {</span>
-<span class="source-line-no">201</span><span id="line-201">                JavaLoggingSupport.setVerbose();</span>
-<span class="source-line-no">202</span><span id="line-202">            }</span>
-<span class="source-line-no">203</span><span id="line-203">            // TODO: Add rpcwait option for non-Bitcoin JsonRPC???</span>
-<span class="source-line-no">204</span><span id="line-204">        }</span>
-<span class="source-line-no">205</span><span id="line-205"></span>
-<span class="source-line-no">206</span><span id="line-206">        @Override</span>
-<span class="source-line-no">207</span><span id="line-207">        public AbstractRpcClient rpcClient(SSLContext sslContext) {</span>
-<span class="source-line-no">208</span><span id="line-208">            if (client == null) {</span>
-<span class="source-line-no">209</span><span id="line-209">                URI uri;</span>
-<span class="source-line-no">210</span><span id="line-210">                String urlString;</span>
-<span class="source-line-no">211</span><span id="line-211">                if ((urlString = line.getOptionValue("url")) != null ) {</span>
-<span class="source-line-no">212</span><span id="line-212">                    try {</span>
-<span class="source-line-no">213</span><span id="line-213">                        uri = new URI(urlString);</span>
-<span class="source-line-no">214</span><span id="line-214">                    } catch (URISyntaxException e) {</span>
-<span class="source-line-no">215</span><span id="line-215">                        throw new RuntimeException(e);</span>
-<span class="source-line-no">216</span><span id="line-216">                    }</span>
-<span class="source-line-no">217</span><span id="line-217">                } else {</span>
-<span class="source-line-no">218</span><span id="line-218">                    uri = defaultUri;</span>
-<span class="source-line-no">219</span><span id="line-219">                }</span>
-<span class="source-line-no">220</span><span id="line-220">                String rpcUser = null;</span>
-<span class="source-line-no">221</span><span id="line-221">                String rpcPassword = null;</span>
-<span class="source-line-no">222</span><span id="line-222">                String rawUserInfo = uri.getRawUserInfo();</span>
-<span class="source-line-no">223</span><span id="line-223">                if (rawUserInfo != null) {</span>
-<span class="source-line-no">224</span><span id="line-224">                    String[] split = rawUserInfo.split(":");</span>
-<span class="source-line-no">225</span><span id="line-225">                    rpcUser = split[0];</span>
-<span class="source-line-no">226</span><span id="line-226">                    rpcPassword = split[1];</span>
-<span class="source-line-no">227</span><span id="line-227">                }</span>
-<span class="source-line-no">228</span><span id="line-228">                client = new JsonRpcClientJavaNet(sslContext, rpcTool.jsonRpcVersion, uri, rpcUser, rpcPassword);</span>
-<span class="source-line-no">229</span><span id="line-229">            }</span>
-<span class="source-line-no">230</span><span id="line-230">            return client;</span>
-<span class="source-line-no">231</span><span id="line-231">        }</span>
-<span class="source-line-no">232</span><span id="line-232"></span>
-<span class="source-line-no">233</span><span id="line-233">        @Override</span>
-<span class="source-line-no">234</span><span id="line-234">        public AbstractRpcClient rpcClient() {</span>
-<span class="source-line-no">235</span><span id="line-235">            SSLContext sslContext;</span>
-<span class="source-line-no">236</span><span id="line-236">            try {</span>
-<span class="source-line-no">237</span><span id="line-237">                sslContext = SSLContext.getDefault();</span>
-<span class="source-line-no">238</span><span id="line-238">            } catch (NoSuchAlgorithmException e) {</span>
-<span class="source-line-no">239</span><span id="line-239">                throw new RuntimeException(e);</span>
-<span class="source-line-no">240</span><span id="line-240">            }</span>
-<span class="source-line-no">241</span><span id="line-241">            return rpcClient(sslContext);</span>
-<span class="source-line-no">242</span><span id="line-242">        }</span>
-<span class="source-line-no">243</span><span id="line-243">    }</span>
-<span class="source-line-no">244</span><span id="line-244">}</span>
+<span class="source-line-no">015</span><span id="line-15">import org.consensusj.jsonrpc.JsonRpcMessage;</span>
+<span class="source-line-no">016</span><span id="line-16">import org.consensusj.jsonrpc.JsonRpcRequest;</span>
+<span class="source-line-no">017</span><span id="line-17">import org.consensusj.jsonrpc.JsonRpcResponse;</span>
+<span class="source-line-no">018</span><span id="line-18">import org.slf4j.Logger;</span>
+<span class="source-line-no">019</span><span id="line-19">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">020</span><span id="line-20"></span>
+<span class="source-line-no">021</span><span id="line-21">import javax.net.ssl.SSLContext;</span>
+<span class="source-line-no">022</span><span id="line-22">import java.io.FileNotFoundException;</span>
+<span class="source-line-no">023</span><span id="line-23">import java.io.IOException;</span>
+<span class="source-line-no">024</span><span id="line-24">import java.io.PrintWriter;</span>
+<span class="source-line-no">025</span><span id="line-25">import java.net.URI;</span>
+<span class="source-line-no">026</span><span id="line-26">import java.net.URISyntaxException;</span>
+<span class="source-line-no">027</span><span id="line-27">import java.nio.file.Path;</span>
+<span class="source-line-no">028</span><span id="line-28">import java.security.KeyManagementException;</span>
+<span class="source-line-no">029</span><span id="line-29">import java.security.KeyStoreException;</span>
+<span class="source-line-no">030</span><span id="line-30">import java.security.NoSuchAlgorithmException;</span>
+<span class="source-line-no">031</span><span id="line-31">import java.security.cert.CertificateException;</span>
+<span class="source-line-no">032</span><span id="line-32">import java.util.List;</span>
+<span class="source-line-no">033</span><span id="line-33">import java.util.concurrent.ExecutionException;</span>
+<span class="source-line-no">034</span><span id="line-34">import java.util.logging.Level;</span>
+<span class="source-line-no">035</span><span id="line-35"></span>
+<span class="source-line-no">036</span><span id="line-36">/**</span>
+<span class="source-line-no">037</span><span id="line-37"> * An abstract base class for JsonRpcClientTool that uses Apache Commons CLI</span>
+<span class="source-line-no">038</span><span id="line-38"> */</span>
+<span class="source-line-no">039</span><span id="line-39">public abstract class BaseJsonRpcTool implements JsonRpcClientTool {</span>
+<span class="source-line-no">040</span><span id="line-40">    private static final Logger log = LoggerFactory.getLogger(BaseJsonRpcTool.class);</span>
+<span class="source-line-no">041</span><span id="line-41">    private static final String name = "jsonrpc";</span>
+<span class="source-line-no">042</span><span id="line-42">    protected static final URI defaultUri = URI.create("http://localhost:8080/");</span>
+<span class="source-line-no">043</span><span id="line-43">    protected final String usage ="usage string";</span>
+<span class="source-line-no">044</span><span id="line-44">    protected final HelpFormatter formatter = new HelpFormatter();</span>
+<span class="source-line-no">045</span><span id="line-45">    protected JsonRpcMessage.Version jsonRpcVersion = JsonRpcMessage.Version.V2;</span>
+<span class="source-line-no">046</span><span id="line-46">    protected JsonRpcClientTool.OutputObject outputObject = OutputObject.RESULT;</span>
+<span class="source-line-no">047</span><span id="line-47">    //protected JsonRpcClientTool.OutputFormat outputFormat = OutputFormat.JSON;</span>
+<span class="source-line-no">048</span><span id="line-48">    protected final JsonRpcClientTool.OutputStyle outputStyle = OutputStyle.PRETTY;</span>
+<span class="source-line-no">049</span><span id="line-49"></span>
+<span class="source-line-no">050</span><span id="line-50">    public BaseJsonRpcTool() {</span>
+<span class="source-line-no">051</span><span id="line-51">        formatter.setLongOptPrefix("-");</span>
+<span class="source-line-no">052</span><span id="line-52">    }</span>
+<span class="source-line-no">053</span><span id="line-53"></span>
+<span class="source-line-no">054</span><span id="line-54">    @Override</span>
+<span class="source-line-no">055</span><span id="line-55">    public String name() {</span>
+<span class="source-line-no">056</span><span id="line-56">        return name;</span>
+<span class="source-line-no">057</span><span id="line-57">    }</span>
+<span class="source-line-no">058</span><span id="line-58"></span>
+<span class="source-line-no">059</span><span id="line-59">    public String usage() {</span>
+<span class="source-line-no">060</span><span id="line-60">        return usage;</span>
+<span class="source-line-no">061</span><span id="line-61">    }</span>
+<span class="source-line-no">062</span><span id="line-62"></span>
+<span class="source-line-no">063</span><span id="line-63">    abstract public Options options();</span>
+<span class="source-line-no">064</span><span id="line-64"></span>
+<span class="source-line-no">065</span><span id="line-65">    @Override</span>
+<span class="source-line-no">066</span><span id="line-66">    public CommonsCLICall createCall(PrintWriter out, PrintWriter err, String... args) {</span>
+<span class="source-line-no">067</span><span id="line-67">        return new CommonsCLICall(this, out, err, args);</span>
+<span class="source-line-no">068</span><span id="line-68">    }</span>
+<span class="source-line-no">069</span><span id="line-69"></span>
+<span class="source-line-no">070</span><span id="line-70">    @Override</span>
+<span class="source-line-no">071</span><span id="line-71">    public void run(Call call) {</span>
+<span class="source-line-no">072</span><span id="line-72">        run((CommonsCLICall) call);</span>
+<span class="source-line-no">073</span><span id="line-73">    }</span>
+<span class="source-line-no">074</span><span id="line-74">    </span>
+<span class="source-line-no">075</span><span id="line-75">    public void run(CommonsCLICall call) {</span>
+<span class="source-line-no">076</span><span id="line-76">        List&lt;String&gt; args = call.line.getArgList();</span>
+<span class="source-line-no">077</span><span id="line-77">        if (args.isEmpty()) {</span>
+<span class="source-line-no">078</span><span id="line-78">            printError(call, "jsonrpc method required");</span>
+<span class="source-line-no">079</span><span id="line-79">            printHelp(call, usage);</span>
+<span class="source-line-no">080</span><span id="line-80">            throw new ToolException(1, "jsonrpc method required");</span>
+<span class="source-line-no">081</span><span id="line-81">        }</span>
+<span class="source-line-no">082</span><span id="line-82">        if (call.line.hasOption("response")) {</span>
+<span class="source-line-no">083</span><span id="line-83">            // Print full JsonRpcResponse as output</span>
+<span class="source-line-no">084</span><span id="line-84">            outputObject = OutputObject.RESPONSE;</span>
+<span class="source-line-no">085</span><span id="line-85">        }</span>
+<span class="source-line-no">086</span><span id="line-86">        if (call.line.hasOption("V1")) {</span>
+<span class="source-line-no">087</span><span id="line-87">            jsonRpcVersion = JsonRpcMessage.Version.V1;</span>
+<span class="source-line-no">088</span><span id="line-88">        }</span>
+<span class="source-line-no">089</span><span id="line-89">        SSLContext sslContext = sslContext(call.line);</span>
+<span class="source-line-no">090</span><span id="line-90">        DefaultRpcClient client = call.rpcClient(sslContext);</span>
+<span class="source-line-no">091</span><span id="line-91">        CliParameterParser parser = new CliParameterParser(jsonRpcVersion, client.getMapper());</span>
+<span class="source-line-no">092</span><span id="line-92">        JsonRpcRequest request = parser.parse(args);</span>
+<span class="source-line-no">093</span><span id="line-93">        JsonRpcResponse&lt;JsonNode&gt; response;</span>
+<span class="source-line-no">094</span><span id="line-94">        try {</span>
+<span class="source-line-no">095</span><span id="line-95">            response = client.sendRequestForResponseAsync(request).get();</span>
+<span class="source-line-no">096</span><span id="line-96">        } catch (ExecutionException ee) {</span>
+<span class="source-line-no">097</span><span id="line-97">            log.error("send execution exception: ", ee);</span>
+<span class="source-line-no">098</span><span id="line-98">            Throwable t = ee.getCause() != null ? ee.getCause(): ee;</span>
+<span class="source-line-no">099</span><span id="line-99">            throw new ToolException(1, t.getMessage());</span>
+<span class="source-line-no">100</span><span id="line-100">        } catch (InterruptedException e) {</span>
+<span class="source-line-no">101</span><span id="line-101">            log.error("send interrupted exception: ", e);</span>
+<span class="source-line-no">102</span><span id="line-102">            throw new ToolException(1, e.getMessage());</span>
+<span class="source-line-no">103</span><span id="line-103">        }</span>
+<span class="source-line-no">104</span><span id="line-104">        String resultForPrinting = formatResponse(response, client.getMapper());</span>
+<span class="source-line-no">105</span><span id="line-105">        call.out.println(resultForPrinting);</span>
+<span class="source-line-no">106</span><span id="line-106">    }</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108">    SSLContext sslContext(CommandLine line) {</span>
+<span class="source-line-no">109</span><span id="line-109">        SSLContext sslContext;</span>
+<span class="source-line-no">110</span><span id="line-110">        if (line.hasOption("add-truststore")) {</span>
+<span class="source-line-no">111</span><span id="line-111">            // Create SSL sockets using additional truststore and CompositeTrustManager</span>
+<span class="source-line-no">112</span><span id="line-112">            String trustStorePathString = line.getOptionValue("add-truststore");</span>
+<span class="source-line-no">113</span><span id="line-113">            Path trustStorePath = Path.of(trustStorePathString);</span>
+<span class="source-line-no">114</span><span id="line-114">            try {</span>
+<span class="source-line-no">115</span><span id="line-115">                sslContext = CompositeTrustManager.getCompositeSSLContext(trustStorePath);</span>
+<span class="source-line-no">116</span><span id="line-116">            } catch (NoSuchAlgorithmException | KeyManagementException | FileNotFoundException e) {</span>
+<span class="source-line-no">117</span><span id="line-117">                throw new ToolException(1, e.getMessage());</span>
+<span class="source-line-no">118</span><span id="line-118">            }</span>
+<span class="source-line-no">119</span><span id="line-119">        } else if (line.hasOption("alt-truststore")) {</span>
+<span class="source-line-no">120</span><span id="line-120">            // Create SSL sockets using alternate truststore</span>
+<span class="source-line-no">121</span><span id="line-121">            String trustStorePathString = line.getOptionValue("alt-truststore");</span>
+<span class="source-line-no">122</span><span id="line-122">            Path trustStorePath = Path.of(trustStorePathString);</span>
+<span class="source-line-no">123</span><span id="line-123">            try {</span>
+<span class="source-line-no">124</span><span id="line-124">                sslContext = CompositeTrustManager.getAlternateSSLContext(trustStorePath);</span>
+<span class="source-line-no">125</span><span id="line-125">            } catch (NoSuchAlgorithmException | KeyManagementException | CertificateException | KeyStoreException | IOException e) {</span>
+<span class="source-line-no">126</span><span id="line-126">                throw new ToolException(1, e.getMessage());</span>
+<span class="source-line-no">127</span><span id="line-127">            }</span>
+<span class="source-line-no">128</span><span id="line-128">        } else {</span>
+<span class="source-line-no">129</span><span id="line-129">            // Otherwise, use the default SSLContext</span>
+<span class="source-line-no">130</span><span id="line-130">            try {</span>
+<span class="source-line-no">131</span><span id="line-131">                sslContext = SSLContext.getDefault();</span>
+<span class="source-line-no">132</span><span id="line-132">            } catch (NoSuchAlgorithmException e) {</span>
+<span class="source-line-no">133</span><span id="line-133">                throw new RuntimeException(e);</span>
+<span class="source-line-no">134</span><span id="line-134">            }</span>
+<span class="source-line-no">135</span><span id="line-135">        }</span>
+<span class="source-line-no">136</span><span id="line-136">        return sslContext;</span>
+<span class="source-line-no">137</span><span id="line-137">    }</span>
+<span class="source-line-no">138</span><span id="line-138"></span>
+<span class="source-line-no">139</span><span id="line-139">    private String formatResponse(JsonRpcResponse&lt;?&gt; response, ObjectMapper mapper) {</span>
+<span class="source-line-no">140</span><span id="line-140">        return (response.getResult() == null || response.getError() != null || outputObject == OutputObject.RESPONSE)</span>
+<span class="source-line-no">141</span><span id="line-141">            ? mapper.valueToTree(response).toPrettyString() // Pretty print the entire response as JSON</span>
+<span class="source-line-no">142</span><span id="line-142">            : switch (response.getResult()) {</span>
+<span class="source-line-no">143</span><span id="line-143">                case TextNode tn    -&gt; tn.asText();         // Remove the surrounding quotes and don't print `\n` for newlines</span>
+<span class="source-line-no">144</span><span id="line-144">                case JsonNode jn    -&gt; outputStyle == OutputStyle.PRETTY ? jn.toPrettyString() : jn.toString();</span>
+<span class="source-line-no">145</span><span id="line-145">                case Object obj     -&gt; obj.toString();</span>
+<span class="source-line-no">146</span><span id="line-146">            };</span>
+<span class="source-line-no">147</span><span id="line-147">    }</span>
+<span class="source-line-no">148</span><span id="line-148"></span>
+<span class="source-line-no">149</span><span id="line-149">    public void printHelp(Call call, String usage) {</span>
+<span class="source-line-no">150</span><span id="line-150">        int leftPad = 4;</span>
+<span class="source-line-no">151</span><span id="line-151">        int descPad = 2;</span>
+<span class="source-line-no">152</span><span id="line-152">        int helpWidth = 120;</span>
+<span class="source-line-no">153</span><span id="line-153">        String header = "";</span>
+<span class="source-line-no">154</span><span id="line-154">        String footer = "";</span>
+<span class="source-line-no">155</span><span id="line-155">        formatter.printHelp(call.err, helpWidth, usage, header, options(), leftPad, descPad, footer, false);</span>
+<span class="source-line-no">156</span><span id="line-156">    }</span>
+<span class="source-line-no">157</span><span id="line-157"></span>
+<span class="source-line-no">158</span><span id="line-158">    public void printError(Call call, String str) {</span>
+<span class="source-line-no">159</span><span id="line-159">        call.err.println(str);</span>
+<span class="source-line-no">160</span><span id="line-160">    }</span>
+<span class="source-line-no">161</span><span id="line-161"></span>
+<span class="source-line-no">162</span><span id="line-162">    public static class CommonsCLICall extends JsonRpcClientTool.Call {</span>
+<span class="source-line-no">163</span><span id="line-163">        protected final BaseJsonRpcTool rpcTool;</span>
+<span class="source-line-no">164</span><span id="line-164">        public final CommandLine line;</span>
+<span class="source-line-no">165</span><span id="line-165">        public final boolean verbose;</span>
+<span class="source-line-no">166</span><span id="line-166">        private DefaultRpcClient client;</span>
+<span class="source-line-no">167</span><span id="line-167"></span>
+<span class="source-line-no">168</span><span id="line-168">        public CommonsCLICall(BaseJsonRpcTool parentTool, PrintWriter out, PrintWriter err, String[] args) {</span>
+<span class="source-line-no">169</span><span id="line-169">            super(out, err, args);</span>
+<span class="source-line-no">170</span><span id="line-170">            this.rpcTool = parentTool;</span>
+<span class="source-line-no">171</span><span id="line-171">            CommandLineParser parser = new DefaultParser();</span>
+<span class="source-line-no">172</span><span id="line-172">            try {</span>
+<span class="source-line-no">173</span><span id="line-173">                this.line = parser.parse(rpcTool.options(), args);</span>
+<span class="source-line-no">174</span><span id="line-174">            } catch (ParseException e) {</span>
+<span class="source-line-no">175</span><span id="line-175">                rpcTool.printError(this, e.getMessage());</span>
+<span class="source-line-no">176</span><span id="line-176">                rpcTool.printHelp(this, rpcTool.usage());</span>
+<span class="source-line-no">177</span><span id="line-177">                throw new JsonRpcClientTool.ToolException(1, "Parser error");</span>
+<span class="source-line-no">178</span><span id="line-178">            }</span>
+<span class="source-line-no">179</span><span id="line-179">            if (line.hasOption("?")) {</span>
+<span class="source-line-no">180</span><span id="line-180">                rpcTool.printHelp(this, rpcTool.usage());</span>
+<span class="source-line-no">181</span><span id="line-181">                throw new JsonRpcClientTool.ToolException(0, "Help Option was chosen");</span>
+<span class="source-line-no">182</span><span id="line-182">            }</span>
+<span class="source-line-no">183</span><span id="line-183">            verbose = line.hasOption("v");</span>
+<span class="source-line-no">184</span><span id="line-184">            if (verbose) {</span>
+<span class="source-line-no">185</span><span id="line-185">                JavaLoggingSupport.setVerbose();</span>
+<span class="source-line-no">186</span><span id="line-186">            }</span>
+<span class="source-line-no">187</span><span id="line-187">            boolean hasLogLevel = line.hasOption("log");</span>
+<span class="source-line-no">188</span><span id="line-188">            if (hasLogLevel ){</span>
+<span class="source-line-no">189</span><span id="line-189">                String intLevel = line.getOptionValue("log");</span>
+<span class="source-line-no">190</span><span id="line-190">                Level level = switch (intLevel) {</span>
+<span class="source-line-no">191</span><span id="line-191">                    case "0" -&gt; Level.OFF;</span>
+<span class="source-line-no">192</span><span id="line-192">                    case "1" -&gt; Level.SEVERE;</span>
+<span class="source-line-no">193</span><span id="line-193">                    case "2" -&gt; Level.WARNING;</span>
+<span class="source-line-no">194</span><span id="line-194">                    case "3" -&gt; Level.INFO;</span>
+<span class="source-line-no">195</span><span id="line-195">                    case "4" -&gt; Level.FINE;</span>
+<span class="source-line-no">196</span><span id="line-196">                    case "5" -&gt; Level.ALL;</span>
+<span class="source-line-no">197</span><span id="line-197">                    default -&gt; throw new IllegalStateException("Unexpected value: " + intLevel);</span>
+<span class="source-line-no">198</span><span id="line-198">                };</span>
+<span class="source-line-no">199</span><span id="line-199">                JavaLoggingSupport.setLogLevel(level);</span>
+<span class="source-line-no">200</span><span id="line-200">            }</span>
+<span class="source-line-no">201</span><span id="line-201">            // TODO: Add rpcwait option for non-Bitcoin JsonRPC???</span>
+<span class="source-line-no">202</span><span id="line-202">        }</span>
+<span class="source-line-no">203</span><span id="line-203"></span>
+<span class="source-line-no">204</span><span id="line-204">        @Override</span>
+<span class="source-line-no">205</span><span id="line-205">        public DefaultRpcClient rpcClient(SSLContext sslContext) {</span>
+<span class="source-line-no">206</span><span id="line-206">            if (client == null) {</span>
+<span class="source-line-no">207</span><span id="line-207">                URI uri;</span>
+<span class="source-line-no">208</span><span id="line-208">                String urlString;</span>
+<span class="source-line-no">209</span><span id="line-209">                if ((urlString = line.getOptionValue("url")) != null ) {</span>
+<span class="source-line-no">210</span><span id="line-210">                    try {</span>
+<span class="source-line-no">211</span><span id="line-211">                        uri = new URI(urlString);</span>
+<span class="source-line-no">212</span><span id="line-212">                    } catch (URISyntaxException e) {</span>
+<span class="source-line-no">213</span><span id="line-213">                        throw new RuntimeException(e);</span>
+<span class="source-line-no">214</span><span id="line-214">                    }</span>
+<span class="source-line-no">215</span><span id="line-215">                } else {</span>
+<span class="source-line-no">216</span><span id="line-216">                    uri = defaultUri;</span>
+<span class="source-line-no">217</span><span id="line-217">                }</span>
+<span class="source-line-no">218</span><span id="line-218">                String rpcUser = null;</span>
+<span class="source-line-no">219</span><span id="line-219">                String rpcPassword = null;</span>
+<span class="source-line-no">220</span><span id="line-220">                String rawUserInfo = uri.getRawUserInfo();</span>
+<span class="source-line-no">221</span><span id="line-221">                if (rawUserInfo != null) {</span>
+<span class="source-line-no">222</span><span id="line-222">                    String[] split = rawUserInfo.split(":");</span>
+<span class="source-line-no">223</span><span id="line-223">                    rpcUser = split[0];</span>
+<span class="source-line-no">224</span><span id="line-224">                    rpcPassword = split[1];</span>
+<span class="source-line-no">225</span><span id="line-225">                }</span>
+<span class="source-line-no">226</span><span id="line-226">                client = new DefaultRpcClient(sslContext, rpcTool.jsonRpcVersion, uri, rpcUser, rpcPassword);</span>
+<span class="source-line-no">227</span><span id="line-227">            }</span>
+<span class="source-line-no">228</span><span id="line-228">            return client;</span>
+<span class="source-line-no">229</span><span id="line-229">        }</span>
+<span class="source-line-no">230</span><span id="line-230"></span>
+<span class="source-line-no">231</span><span id="line-231">        @Override</span>
+<span class="source-line-no">232</span><span id="line-232">        public DefaultRpcClient rpcClient() {</span>
+<span class="source-line-no">233</span><span id="line-233">            SSLContext sslContext;</span>
+<span class="source-line-no">234</span><span id="line-234">            try {</span>
+<span class="source-line-no">235</span><span id="line-235">                sslContext = SSLContext.getDefault();</span>
+<span class="source-line-no">236</span><span id="line-236">            } catch (NoSuchAlgorithmException e) {</span>
+<span class="source-line-no">237</span><span id="line-237">                throw new RuntimeException(e);</span>
+<span class="source-line-no">238</span><span id="line-238">            }</span>
+<span class="source-line-no">239</span><span id="line-239">            return rpcClient(sslContext);</span>
+<span class="source-line-no">240</span><span id="line-240">        }</span>
+<span class="source-line-no">241</span><span id="line-241">    }</span>
+<span class="source-line-no">242</span><span id="line-242">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html
index a32d1573d..de78b4caf 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/BaseJsonRpcTool.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli, class: BaseJsonRpcTool">
@@ -22,239 +22,237 @@
 <span class="source-line-no">009</span><span id="line-9">import org.apache.commons.cli.HelpFormatter;</span>
 <span class="source-line-no">010</span><span id="line-10">import org.apache.commons.cli.Options;</span>
 <span class="source-line-no">011</span><span id="line-11">import org.apache.commons.cli.ParseException;</span>
-<span class="source-line-no">012</span><span id="line-12">import org.consensusj.jsonrpc.AbstractRpcClient;</span>
+<span class="source-line-no">012</span><span id="line-12">import org.consensusj.jsonrpc.DefaultRpcClient;</span>
 <span class="source-line-no">013</span><span id="line-13">import org.consensusj.jsonrpc.CompositeTrustManager;</span>
 <span class="source-line-no">014</span><span id="line-14">import org.consensusj.jsonrpc.JsonRpcClientJavaNet;</span>
-<span class="source-line-no">015</span><span id="line-15">import org.consensusj.jsonrpc.JsonRpcException;</span>
-<span class="source-line-no">016</span><span id="line-16">import org.consensusj.jsonrpc.JsonRpcMessage;</span>
-<span class="source-line-no">017</span><span id="line-17">import org.consensusj.jsonrpc.JsonRpcRequest;</span>
-<span class="source-line-no">018</span><span id="line-18">import org.consensusj.jsonrpc.JsonRpcResponse;</span>
-<span class="source-line-no">019</span><span id="line-19">import org.slf4j.Logger;</span>
-<span class="source-line-no">020</span><span id="line-20">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">021</span><span id="line-21"></span>
-<span class="source-line-no">022</span><span id="line-22">import javax.net.ssl.SSLContext;</span>
-<span class="source-line-no">023</span><span id="line-23">import java.io.FileNotFoundException;</span>
-<span class="source-line-no">024</span><span id="line-24">import java.io.IOException;</span>
-<span class="source-line-no">025</span><span id="line-25">import java.io.PrintWriter;</span>
-<span class="source-line-no">026</span><span id="line-26">import java.net.URI;</span>
-<span class="source-line-no">027</span><span id="line-27">import java.net.URISyntaxException;</span>
-<span class="source-line-no">028</span><span id="line-28">import java.nio.file.Path;</span>
-<span class="source-line-no">029</span><span id="line-29">import java.security.KeyManagementException;</span>
-<span class="source-line-no">030</span><span id="line-30">import java.security.KeyStoreException;</span>
-<span class="source-line-no">031</span><span id="line-31">import java.security.NoSuchAlgorithmException;</span>
-<span class="source-line-no">032</span><span id="line-32">import java.security.cert.CertificateException;</span>
-<span class="source-line-no">033</span><span id="line-33">import java.util.List;</span>
-<span class="source-line-no">034</span><span id="line-34"></span>
-<span class="source-line-no">035</span><span id="line-35">/**</span>
-<span class="source-line-no">036</span><span id="line-36"> * An abstract base class for JsonRpcClientTool that uses Apache Commons CLI</span>
-<span class="source-line-no">037</span><span id="line-37"> */</span>
-<span class="source-line-no">038</span><span id="line-38">public abstract class BaseJsonRpcTool implements JsonRpcClientTool {</span>
-<span class="source-line-no">039</span><span id="line-39">    private static final Logger log = LoggerFactory.getLogger(BaseJsonRpcTool.class);</span>
-<span class="source-line-no">040</span><span id="line-40">    private static final String name = "jsonrpc";</span>
-<span class="source-line-no">041</span><span id="line-41">    protected static final URI defaultUri = URI.create("http://localhost:8080/");</span>
-<span class="source-line-no">042</span><span id="line-42">    protected final String usage ="usage string";</span>
-<span class="source-line-no">043</span><span id="line-43">    protected final HelpFormatter formatter = new HelpFormatter();</span>
-<span class="source-line-no">044</span><span id="line-44">    protected JsonRpcMessage.Version jsonRpcVersion = JsonRpcMessage.Version.V2;</span>
-<span class="source-line-no">045</span><span id="line-45">    protected JsonRpcClientTool.OutputObject outputObject = OutputObject.RESULT;</span>
-<span class="source-line-no">046</span><span id="line-46">    //protected JsonRpcClientTool.OutputFormat outputFormat = OutputFormat.JSON;</span>
-<span class="source-line-no">047</span><span id="line-47">    protected JsonRpcClientTool.OutputStyle outputStyle = OutputStyle.PRETTY;</span>
-<span class="source-line-no">048</span><span id="line-48"></span>
-<span class="source-line-no">049</span><span id="line-49">    public BaseJsonRpcTool() {</span>
-<span class="source-line-no">050</span><span id="line-50">        formatter.setLongOptPrefix("-");</span>
-<span class="source-line-no">051</span><span id="line-51">    }</span>
-<span class="source-line-no">052</span><span id="line-52"></span>
-<span class="source-line-no">053</span><span id="line-53">    @Override</span>
-<span class="source-line-no">054</span><span id="line-54">    public String name() {</span>
-<span class="source-line-no">055</span><span id="line-55">        return name;</span>
-<span class="source-line-no">056</span><span id="line-56">    }</span>
-<span class="source-line-no">057</span><span id="line-57"></span>
-<span class="source-line-no">058</span><span id="line-58">    public String usage() {</span>
-<span class="source-line-no">059</span><span id="line-59">        return usage;</span>
-<span class="source-line-no">060</span><span id="line-60">    }</span>
-<span class="source-line-no">061</span><span id="line-61"></span>
-<span class="source-line-no">062</span><span id="line-62">    abstract public Options options();</span>
-<span class="source-line-no">063</span><span id="line-63"></span>
-<span class="source-line-no">064</span><span id="line-64">    @Override</span>
-<span class="source-line-no">065</span><span id="line-65">    public CommonsCLICall createCall(PrintWriter out, PrintWriter err, String... args) {</span>
-<span class="source-line-no">066</span><span id="line-66">        return new CommonsCLICall(this, out, err, args);</span>
-<span class="source-line-no">067</span><span id="line-67">    }</span>
-<span class="source-line-no">068</span><span id="line-68"></span>
-<span class="source-line-no">069</span><span id="line-69">    @Override</span>
-<span class="source-line-no">070</span><span id="line-70">    public void run(Call call) {</span>
-<span class="source-line-no">071</span><span id="line-71">        run((CommonsCLICall) call);</span>
-<span class="source-line-no">072</span><span id="line-72">    }</span>
-<span class="source-line-no">073</span><span id="line-73">    </span>
-<span class="source-line-no">074</span><span id="line-74">    public void run(CommonsCLICall call) {</span>
-<span class="source-line-no">075</span><span id="line-75">        List&lt;String&gt; args = call.line.getArgList();</span>
-<span class="source-line-no">076</span><span id="line-76">        if (args.size() == 0) {</span>
-<span class="source-line-no">077</span><span id="line-77">            printError(call, "jsonrpc method required");</span>
-<span class="source-line-no">078</span><span id="line-78">            printHelp(call, usage);</span>
-<span class="source-line-no">079</span><span id="line-79">            throw new ToolException(1, "jsonrpc method required");</span>
-<span class="source-line-no">080</span><span id="line-80">        }</span>
-<span class="source-line-no">081</span><span id="line-81">        if (call.line.hasOption("response")) {</span>
-<span class="source-line-no">082</span><span id="line-82">            // Print full JsonRpcResponse as output</span>
-<span class="source-line-no">083</span><span id="line-83">            outputObject = OutputObject.RESPONSE;</span>
-<span class="source-line-no">084</span><span id="line-84">        }</span>
-<span class="source-line-no">085</span><span id="line-85">        if (call.line.hasOption("V1")) {</span>
-<span class="source-line-no">086</span><span id="line-86">            jsonRpcVersion = JsonRpcMessage.Version.V1;</span>
-<span class="source-line-no">087</span><span id="line-87">        }</span>
-<span class="source-line-no">088</span><span id="line-88">        SSLContext sslSocketFactory = sslContext(call.line);</span>
-<span class="source-line-no">089</span><span id="line-89">        AbstractRpcClient client = call.rpcClient(sslSocketFactory);</span>
-<span class="source-line-no">090</span><span id="line-90">        CliParameterParser parser = new CliParameterParser(jsonRpcVersion, client.getMapper());</span>
-<span class="source-line-no">091</span><span id="line-91">        JsonRpcRequest request = parser.parse(args);</span>
-<span class="source-line-no">092</span><span id="line-92">        JsonRpcResponse&lt;JsonNode&gt; response;</span>
-<span class="source-line-no">093</span><span id="line-93">        try {</span>
-<span class="source-line-no">094</span><span id="line-94">            response = client.sendRequestForResponse(request);</span>
-<span class="source-line-no">095</span><span id="line-95">        } catch (JsonRpcException e) {</span>
-<span class="source-line-no">096</span><span id="line-96">            log.error("send exception: ", e);</span>
-<span class="source-line-no">097</span><span id="line-97">            throw new ToolException(1, e.getMessage());</span>
-<span class="source-line-no">098</span><span id="line-98">        } catch (IOException e) {</span>
-<span class="source-line-no">099</span><span id="line-99">            log.error("send exception: ", e);</span>
-<span class="source-line-no">100</span><span id="line-100">            throw new ToolException(1, e.getMessage());</span>
-<span class="source-line-no">101</span><span id="line-101">        }</span>
-<span class="source-line-no">102</span><span id="line-102">        String resultForPrinting = formatResponse(response, client.getMapper());</span>
-<span class="source-line-no">103</span><span id="line-103">        call.out.println(resultForPrinting);</span>
-<span class="source-line-no">104</span><span id="line-104">    }</span>
-<span class="source-line-no">105</span><span id="line-105"></span>
-<span class="source-line-no">106</span><span id="line-106">    SSLContext sslContext(CommandLine line) {</span>
-<span class="source-line-no">107</span><span id="line-107">        SSLContext sslContext;</span>
-<span class="source-line-no">108</span><span id="line-108">        if (line.hasOption("add-truststore")) {</span>
-<span class="source-line-no">109</span><span id="line-109">            // Create SSL sockets using additional truststore and CompositeTrustManager</span>
-<span class="source-line-no">110</span><span id="line-110">            String trustStorePathString = line.getOptionValue("add-truststore");</span>
-<span class="source-line-no">111</span><span id="line-111">            Path trustStorePath = Path.of(trustStorePathString);</span>
-<span class="source-line-no">112</span><span id="line-112">            try {</span>
-<span class="source-line-no">113</span><span id="line-113">                sslContext = CompositeTrustManager.getCompositeSSLContext(trustStorePath);</span>
-<span class="source-line-no">114</span><span id="line-114">            } catch (NoSuchAlgorithmException | KeyManagementException | FileNotFoundException e) {</span>
-<span class="source-line-no">115</span><span id="line-115">                throw new ToolException(1, e.getMessage());</span>
-<span class="source-line-no">116</span><span id="line-116">            }</span>
-<span class="source-line-no">117</span><span id="line-117">        } else if (line.hasOption("alt-truststore")) {</span>
-<span class="source-line-no">118</span><span id="line-118">            // Create SSL sockets using alternate truststore</span>
-<span class="source-line-no">119</span><span id="line-119">            String trustStorePathString = line.getOptionValue("alt-truststore");</span>
-<span class="source-line-no">120</span><span id="line-120">            Path trustStorePath = Path.of(trustStorePathString);</span>
-<span class="source-line-no">121</span><span id="line-121">            try {</span>
-<span class="source-line-no">122</span><span id="line-122">                sslContext = CompositeTrustManager.getAlternateSSLContext(trustStorePath);</span>
-<span class="source-line-no">123</span><span id="line-123">            } catch (NoSuchAlgorithmException | KeyManagementException | CertificateException | KeyStoreException | IOException e) {</span>
-<span class="source-line-no">124</span><span id="line-124">                throw new ToolException(1, e.getMessage());</span>
-<span class="source-line-no">125</span><span id="line-125">            }</span>
-<span class="source-line-no">126</span><span id="line-126">        } else {</span>
-<span class="source-line-no">127</span><span id="line-127">            // Otherwise, use the default SSLSocketFactory</span>
-<span class="source-line-no">128</span><span id="line-128">            try {</span>
-<span class="source-line-no">129</span><span id="line-129">                sslContext = SSLContext.getDefault();</span>
-<span class="source-line-no">130</span><span id="line-130">            } catch (NoSuchAlgorithmException e) {</span>
-<span class="source-line-no">131</span><span id="line-131">                throw new RuntimeException(e);</span>
-<span class="source-line-no">132</span><span id="line-132">            }</span>
-<span class="source-line-no">133</span><span id="line-133">        }</span>
-<span class="source-line-no">134</span><span id="line-134">        return sslContext;</span>
-<span class="source-line-no">135</span><span id="line-135">    }</span>
-<span class="source-line-no">136</span><span id="line-136"></span>
-<span class="source-line-no">137</span><span id="line-137">    private String formatResponse(JsonRpcResponse&lt;?&gt; response, ObjectMapper mapper) {</span>
-<span class="source-line-no">138</span><span id="line-138">        String string;</span>
-<span class="source-line-no">139</span><span id="line-139">        if (response.getResult() == null || response.getError() != null || outputObject == OutputObject.RESPONSE) {</span>
-<span class="source-line-no">140</span><span id="line-140">            JsonNode reponseAsNode = mapper.valueToTree(response);</span>
-<span class="source-line-no">141</span><span id="line-141">            string = reponseAsNode.toPrettyString();</span>
-<span class="source-line-no">142</span><span id="line-142">        } else {</span>
-<span class="source-line-no">143</span><span id="line-143">            Object result = response.getResult();</span>
-<span class="source-line-no">144</span><span id="line-144">            if (result == null) {</span>
-<span class="source-line-no">145</span><span id="line-145">                log.info("result is null");</span>
-<span class="source-line-no">146</span><span id="line-146">                string = "null";</span>
-<span class="source-line-no">147</span><span id="line-147">            } else if (result instanceof JsonNode) {</span>
-<span class="source-line-no">148</span><span id="line-148">                log.info("result instanceof JsonNode");</span>
-<span class="source-line-no">149</span><span id="line-149">                if (result instanceof TextNode) {</span>
-<span class="source-line-no">150</span><span id="line-150">                    // This will remove the surrounding quotes and not print `\n` for newlines</span>
-<span class="source-line-no">151</span><span id="line-151">                    string = ((TextNode) result).asText();</span>
-<span class="source-line-no">152</span><span id="line-152">                } else if (outputStyle == OutputStyle.PRETTY) {</span>
-<span class="source-line-no">153</span><span id="line-153">                    string = ((JsonNode) result).toPrettyString();</span>
-<span class="source-line-no">154</span><span id="line-154">                } else {</span>
-<span class="source-line-no">155</span><span id="line-155">                    string = result.toString();</span>
-<span class="source-line-no">156</span><span id="line-156">                }</span>
-<span class="source-line-no">157</span><span id="line-157">            } else {</span>
-<span class="source-line-no">158</span><span id="line-158">                log.info("result class is: {}", result.getClass());</span>
-<span class="source-line-no">159</span><span id="line-159">                string = result.toString();</span>
-<span class="source-line-no">160</span><span id="line-160">            }</span>
-<span class="source-line-no">161</span><span id="line-161">        }</span>
-<span class="source-line-no">162</span><span id="line-162">        return string;</span>
-<span class="source-line-no">163</span><span id="line-163">    }</span>
-<span class="source-line-no">164</span><span id="line-164"></span>
-<span class="source-line-no">165</span><span id="line-165">    public void printHelp(Call call, String usage) {</span>
-<span class="source-line-no">166</span><span id="line-166">        int leftPad = 4;</span>
-<span class="source-line-no">167</span><span id="line-167">        int descPad = 2;</span>
-<span class="source-line-no">168</span><span id="line-168">        int helpWidth = 120;</span>
-<span class="source-line-no">169</span><span id="line-169">        String header = "";</span>
-<span class="source-line-no">170</span><span id="line-170">        String footer = "";</span>
-<span class="source-line-no">171</span><span id="line-171">        formatter.printHelp(call.err, helpWidth, usage, header, options(), leftPad, descPad, footer, false);</span>
-<span class="source-line-no">172</span><span id="line-172">    }</span>
-<span class="source-line-no">173</span><span id="line-173"></span>
-<span class="source-line-no">174</span><span id="line-174">    public void printError(Call call, String str) {</span>
-<span class="source-line-no">175</span><span id="line-175">        call.err.println(str);</span>
-<span class="source-line-no">176</span><span id="line-176">    }</span>
-<span class="source-line-no">177</span><span id="line-177"></span>
-<span class="source-line-no">178</span><span id="line-178">    public static class CommonsCLICall extends JsonRpcClientTool.Call {</span>
-<span class="source-line-no">179</span><span id="line-179">        protected final BaseJsonRpcTool rpcTool;</span>
-<span class="source-line-no">180</span><span id="line-180">        public final CommandLine line;</span>
-<span class="source-line-no">181</span><span id="line-181">        public final boolean verbose;</span>
-<span class="source-line-no">182</span><span id="line-182">        private AbstractRpcClient client;</span>
-<span class="source-line-no">183</span><span id="line-183"></span>
-<span class="source-line-no">184</span><span id="line-184">        public CommonsCLICall(BaseJsonRpcTool parentTool, PrintWriter out, PrintWriter err, String[] args) {</span>
-<span class="source-line-no">185</span><span id="line-185">            super(out, err, args);</span>
-<span class="source-line-no">186</span><span id="line-186">            this.rpcTool = parentTool;</span>
-<span class="source-line-no">187</span><span id="line-187">            CommandLineParser parser = new DefaultParser();</span>
-<span class="source-line-no">188</span><span id="line-188">            try {</span>
-<span class="source-line-no">189</span><span id="line-189">                this.line = parser.parse(rpcTool.options(), args);</span>
-<span class="source-line-no">190</span><span id="line-190">            } catch (ParseException e) {</span>
-<span class="source-line-no">191</span><span id="line-191">                rpcTool.printError(this, e.getMessage());</span>
-<span class="source-line-no">192</span><span id="line-192">                rpcTool.printHelp(this, rpcTool.usage());</span>
-<span class="source-line-no">193</span><span id="line-193">                throw new JsonRpcClientTool.ToolException(1, "Parser error");</span>
-<span class="source-line-no">194</span><span id="line-194">            }</span>
-<span class="source-line-no">195</span><span id="line-195">            if (line.hasOption("?")) {</span>
-<span class="source-line-no">196</span><span id="line-196">                rpcTool.printHelp(this, rpcTool.usage());</span>
-<span class="source-line-no">197</span><span id="line-197">                throw new JsonRpcClientTool.ToolException(0, "Help Option was chosen");</span>
-<span class="source-line-no">198</span><span id="line-198">            }</span>
-<span class="source-line-no">199</span><span id="line-199">            verbose = line.hasOption("v");</span>
-<span class="source-line-no">200</span><span id="line-200">            if (verbose) {</span>
-<span class="source-line-no">201</span><span id="line-201">                JavaLoggingSupport.setVerbose();</span>
-<span class="source-line-no">202</span><span id="line-202">            }</span>
-<span class="source-line-no">203</span><span id="line-203">            // TODO: Add rpcwait option for non-Bitcoin JsonRPC???</span>
-<span class="source-line-no">204</span><span id="line-204">        }</span>
-<span class="source-line-no">205</span><span id="line-205"></span>
-<span class="source-line-no">206</span><span id="line-206">        @Override</span>
-<span class="source-line-no">207</span><span id="line-207">        public AbstractRpcClient rpcClient(SSLContext sslContext) {</span>
-<span class="source-line-no">208</span><span id="line-208">            if (client == null) {</span>
-<span class="source-line-no">209</span><span id="line-209">                URI uri;</span>
-<span class="source-line-no">210</span><span id="line-210">                String urlString;</span>
-<span class="source-line-no">211</span><span id="line-211">                if ((urlString = line.getOptionValue("url")) != null ) {</span>
-<span class="source-line-no">212</span><span id="line-212">                    try {</span>
-<span class="source-line-no">213</span><span id="line-213">                        uri = new URI(urlString);</span>
-<span class="source-line-no">214</span><span id="line-214">                    } catch (URISyntaxException e) {</span>
-<span class="source-line-no">215</span><span id="line-215">                        throw new RuntimeException(e);</span>
-<span class="source-line-no">216</span><span id="line-216">                    }</span>
-<span class="source-line-no">217</span><span id="line-217">                } else {</span>
-<span class="source-line-no">218</span><span id="line-218">                    uri = defaultUri;</span>
-<span class="source-line-no">219</span><span id="line-219">                }</span>
-<span class="source-line-no">220</span><span id="line-220">                String rpcUser = null;</span>
-<span class="source-line-no">221</span><span id="line-221">                String rpcPassword = null;</span>
-<span class="source-line-no">222</span><span id="line-222">                String rawUserInfo = uri.getRawUserInfo();</span>
-<span class="source-line-no">223</span><span id="line-223">                if (rawUserInfo != null) {</span>
-<span class="source-line-no">224</span><span id="line-224">                    String[] split = rawUserInfo.split(":");</span>
-<span class="source-line-no">225</span><span id="line-225">                    rpcUser = split[0];</span>
-<span class="source-line-no">226</span><span id="line-226">                    rpcPassword = split[1];</span>
-<span class="source-line-no">227</span><span id="line-227">                }</span>
-<span class="source-line-no">228</span><span id="line-228">                client = new JsonRpcClientJavaNet(sslContext, rpcTool.jsonRpcVersion, uri, rpcUser, rpcPassword);</span>
-<span class="source-line-no">229</span><span id="line-229">            }</span>
-<span class="source-line-no">230</span><span id="line-230">            return client;</span>
-<span class="source-line-no">231</span><span id="line-231">        }</span>
-<span class="source-line-no">232</span><span id="line-232"></span>
-<span class="source-line-no">233</span><span id="line-233">        @Override</span>
-<span class="source-line-no">234</span><span id="line-234">        public AbstractRpcClient rpcClient() {</span>
-<span class="source-line-no">235</span><span id="line-235">            SSLContext sslContext;</span>
-<span class="source-line-no">236</span><span id="line-236">            try {</span>
-<span class="source-line-no">237</span><span id="line-237">                sslContext = SSLContext.getDefault();</span>
-<span class="source-line-no">238</span><span id="line-238">            } catch (NoSuchAlgorithmException e) {</span>
-<span class="source-line-no">239</span><span id="line-239">                throw new RuntimeException(e);</span>
-<span class="source-line-no">240</span><span id="line-240">            }</span>
-<span class="source-line-no">241</span><span id="line-241">            return rpcClient(sslContext);</span>
-<span class="source-line-no">242</span><span id="line-242">        }</span>
-<span class="source-line-no">243</span><span id="line-243">    }</span>
-<span class="source-line-no">244</span><span id="line-244">}</span>
+<span class="source-line-no">015</span><span id="line-15">import org.consensusj.jsonrpc.JsonRpcMessage;</span>
+<span class="source-line-no">016</span><span id="line-16">import org.consensusj.jsonrpc.JsonRpcRequest;</span>
+<span class="source-line-no">017</span><span id="line-17">import org.consensusj.jsonrpc.JsonRpcResponse;</span>
+<span class="source-line-no">018</span><span id="line-18">import org.slf4j.Logger;</span>
+<span class="source-line-no">019</span><span id="line-19">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">020</span><span id="line-20"></span>
+<span class="source-line-no">021</span><span id="line-21">import javax.net.ssl.SSLContext;</span>
+<span class="source-line-no">022</span><span id="line-22">import java.io.FileNotFoundException;</span>
+<span class="source-line-no">023</span><span id="line-23">import java.io.IOException;</span>
+<span class="source-line-no">024</span><span id="line-24">import java.io.PrintWriter;</span>
+<span class="source-line-no">025</span><span id="line-25">import java.net.URI;</span>
+<span class="source-line-no">026</span><span id="line-26">import java.net.URISyntaxException;</span>
+<span class="source-line-no">027</span><span id="line-27">import java.nio.file.Path;</span>
+<span class="source-line-no">028</span><span id="line-28">import java.security.KeyManagementException;</span>
+<span class="source-line-no">029</span><span id="line-29">import java.security.KeyStoreException;</span>
+<span class="source-line-no">030</span><span id="line-30">import java.security.NoSuchAlgorithmException;</span>
+<span class="source-line-no">031</span><span id="line-31">import java.security.cert.CertificateException;</span>
+<span class="source-line-no">032</span><span id="line-32">import java.util.List;</span>
+<span class="source-line-no">033</span><span id="line-33">import java.util.concurrent.ExecutionException;</span>
+<span class="source-line-no">034</span><span id="line-34">import java.util.logging.Level;</span>
+<span class="source-line-no">035</span><span id="line-35"></span>
+<span class="source-line-no">036</span><span id="line-36">/**</span>
+<span class="source-line-no">037</span><span id="line-37"> * An abstract base class for JsonRpcClientTool that uses Apache Commons CLI</span>
+<span class="source-line-no">038</span><span id="line-38"> */</span>
+<span class="source-line-no">039</span><span id="line-39">public abstract class BaseJsonRpcTool implements JsonRpcClientTool {</span>
+<span class="source-line-no">040</span><span id="line-40">    private static final Logger log = LoggerFactory.getLogger(BaseJsonRpcTool.class);</span>
+<span class="source-line-no">041</span><span id="line-41">    private static final String name = "jsonrpc";</span>
+<span class="source-line-no">042</span><span id="line-42">    protected static final URI defaultUri = URI.create("http://localhost:8080/");</span>
+<span class="source-line-no">043</span><span id="line-43">    protected final String usage ="usage string";</span>
+<span class="source-line-no">044</span><span id="line-44">    protected final HelpFormatter formatter = new HelpFormatter();</span>
+<span class="source-line-no">045</span><span id="line-45">    protected JsonRpcMessage.Version jsonRpcVersion = JsonRpcMessage.Version.V2;</span>
+<span class="source-line-no">046</span><span id="line-46">    protected JsonRpcClientTool.OutputObject outputObject = OutputObject.RESULT;</span>
+<span class="source-line-no">047</span><span id="line-47">    //protected JsonRpcClientTool.OutputFormat outputFormat = OutputFormat.JSON;</span>
+<span class="source-line-no">048</span><span id="line-48">    protected final JsonRpcClientTool.OutputStyle outputStyle = OutputStyle.PRETTY;</span>
+<span class="source-line-no">049</span><span id="line-49"></span>
+<span class="source-line-no">050</span><span id="line-50">    public BaseJsonRpcTool() {</span>
+<span class="source-line-no">051</span><span id="line-51">        formatter.setLongOptPrefix("-");</span>
+<span class="source-line-no">052</span><span id="line-52">    }</span>
+<span class="source-line-no">053</span><span id="line-53"></span>
+<span class="source-line-no">054</span><span id="line-54">    @Override</span>
+<span class="source-line-no">055</span><span id="line-55">    public String name() {</span>
+<span class="source-line-no">056</span><span id="line-56">        return name;</span>
+<span class="source-line-no">057</span><span id="line-57">    }</span>
+<span class="source-line-no">058</span><span id="line-58"></span>
+<span class="source-line-no">059</span><span id="line-59">    public String usage() {</span>
+<span class="source-line-no">060</span><span id="line-60">        return usage;</span>
+<span class="source-line-no">061</span><span id="line-61">    }</span>
+<span class="source-line-no">062</span><span id="line-62"></span>
+<span class="source-line-no">063</span><span id="line-63">    abstract public Options options();</span>
+<span class="source-line-no">064</span><span id="line-64"></span>
+<span class="source-line-no">065</span><span id="line-65">    @Override</span>
+<span class="source-line-no">066</span><span id="line-66">    public CommonsCLICall createCall(PrintWriter out, PrintWriter err, String... args) {</span>
+<span class="source-line-no">067</span><span id="line-67">        return new CommonsCLICall(this, out, err, args);</span>
+<span class="source-line-no">068</span><span id="line-68">    }</span>
+<span class="source-line-no">069</span><span id="line-69"></span>
+<span class="source-line-no">070</span><span id="line-70">    @Override</span>
+<span class="source-line-no">071</span><span id="line-71">    public void run(Call call) {</span>
+<span class="source-line-no">072</span><span id="line-72">        run((CommonsCLICall) call);</span>
+<span class="source-line-no">073</span><span id="line-73">    }</span>
+<span class="source-line-no">074</span><span id="line-74">    </span>
+<span class="source-line-no">075</span><span id="line-75">    public void run(CommonsCLICall call) {</span>
+<span class="source-line-no">076</span><span id="line-76">        List&lt;String&gt; args = call.line.getArgList();</span>
+<span class="source-line-no">077</span><span id="line-77">        if (args.isEmpty()) {</span>
+<span class="source-line-no">078</span><span id="line-78">            printError(call, "jsonrpc method required");</span>
+<span class="source-line-no">079</span><span id="line-79">            printHelp(call, usage);</span>
+<span class="source-line-no">080</span><span id="line-80">            throw new ToolException(1, "jsonrpc method required");</span>
+<span class="source-line-no">081</span><span id="line-81">        }</span>
+<span class="source-line-no">082</span><span id="line-82">        if (call.line.hasOption("response")) {</span>
+<span class="source-line-no">083</span><span id="line-83">            // Print full JsonRpcResponse as output</span>
+<span class="source-line-no">084</span><span id="line-84">            outputObject = OutputObject.RESPONSE;</span>
+<span class="source-line-no">085</span><span id="line-85">        }</span>
+<span class="source-line-no">086</span><span id="line-86">        if (call.line.hasOption("V1")) {</span>
+<span class="source-line-no">087</span><span id="line-87">            jsonRpcVersion = JsonRpcMessage.Version.V1;</span>
+<span class="source-line-no">088</span><span id="line-88">        }</span>
+<span class="source-line-no">089</span><span id="line-89">        SSLContext sslContext = sslContext(call.line);</span>
+<span class="source-line-no">090</span><span id="line-90">        DefaultRpcClient client = call.rpcClient(sslContext);</span>
+<span class="source-line-no">091</span><span id="line-91">        CliParameterParser parser = new CliParameterParser(jsonRpcVersion, client.getMapper());</span>
+<span class="source-line-no">092</span><span id="line-92">        JsonRpcRequest request = parser.parse(args);</span>
+<span class="source-line-no">093</span><span id="line-93">        JsonRpcResponse&lt;JsonNode&gt; response;</span>
+<span class="source-line-no">094</span><span id="line-94">        try {</span>
+<span class="source-line-no">095</span><span id="line-95">            response = client.sendRequestForResponseAsync(request).get();</span>
+<span class="source-line-no">096</span><span id="line-96">        } catch (ExecutionException ee) {</span>
+<span class="source-line-no">097</span><span id="line-97">            log.error("send execution exception: ", ee);</span>
+<span class="source-line-no">098</span><span id="line-98">            Throwable t = ee.getCause() != null ? ee.getCause(): ee;</span>
+<span class="source-line-no">099</span><span id="line-99">            throw new ToolException(1, t.getMessage());</span>
+<span class="source-line-no">100</span><span id="line-100">        } catch (InterruptedException e) {</span>
+<span class="source-line-no">101</span><span id="line-101">            log.error("send interrupted exception: ", e);</span>
+<span class="source-line-no">102</span><span id="line-102">            throw new ToolException(1, e.getMessage());</span>
+<span class="source-line-no">103</span><span id="line-103">        }</span>
+<span class="source-line-no">104</span><span id="line-104">        String resultForPrinting = formatResponse(response, client.getMapper());</span>
+<span class="source-line-no">105</span><span id="line-105">        call.out.println(resultForPrinting);</span>
+<span class="source-line-no">106</span><span id="line-106">    }</span>
+<span class="source-line-no">107</span><span id="line-107"></span>
+<span class="source-line-no">108</span><span id="line-108">    SSLContext sslContext(CommandLine line) {</span>
+<span class="source-line-no">109</span><span id="line-109">        SSLContext sslContext;</span>
+<span class="source-line-no">110</span><span id="line-110">        if (line.hasOption("add-truststore")) {</span>
+<span class="source-line-no">111</span><span id="line-111">            // Create SSL sockets using additional truststore and CompositeTrustManager</span>
+<span class="source-line-no">112</span><span id="line-112">            String trustStorePathString = line.getOptionValue("add-truststore");</span>
+<span class="source-line-no">113</span><span id="line-113">            Path trustStorePath = Path.of(trustStorePathString);</span>
+<span class="source-line-no">114</span><span id="line-114">            try {</span>
+<span class="source-line-no">115</span><span id="line-115">                sslContext = CompositeTrustManager.getCompositeSSLContext(trustStorePath);</span>
+<span class="source-line-no">116</span><span id="line-116">            } catch (NoSuchAlgorithmException | KeyManagementException | FileNotFoundException e) {</span>
+<span class="source-line-no">117</span><span id="line-117">                throw new ToolException(1, e.getMessage());</span>
+<span class="source-line-no">118</span><span id="line-118">            }</span>
+<span class="source-line-no">119</span><span id="line-119">        } else if (line.hasOption("alt-truststore")) {</span>
+<span class="source-line-no">120</span><span id="line-120">            // Create SSL sockets using alternate truststore</span>
+<span class="source-line-no">121</span><span id="line-121">            String trustStorePathString = line.getOptionValue("alt-truststore");</span>
+<span class="source-line-no">122</span><span id="line-122">            Path trustStorePath = Path.of(trustStorePathString);</span>
+<span class="source-line-no">123</span><span id="line-123">            try {</span>
+<span class="source-line-no">124</span><span id="line-124">                sslContext = CompositeTrustManager.getAlternateSSLContext(trustStorePath);</span>
+<span class="source-line-no">125</span><span id="line-125">            } catch (NoSuchAlgorithmException | KeyManagementException | CertificateException | KeyStoreException | IOException e) {</span>
+<span class="source-line-no">126</span><span id="line-126">                throw new ToolException(1, e.getMessage());</span>
+<span class="source-line-no">127</span><span id="line-127">            }</span>
+<span class="source-line-no">128</span><span id="line-128">        } else {</span>
+<span class="source-line-no">129</span><span id="line-129">            // Otherwise, use the default SSLContext</span>
+<span class="source-line-no">130</span><span id="line-130">            try {</span>
+<span class="source-line-no">131</span><span id="line-131">                sslContext = SSLContext.getDefault();</span>
+<span class="source-line-no">132</span><span id="line-132">            } catch (NoSuchAlgorithmException e) {</span>
+<span class="source-line-no">133</span><span id="line-133">                throw new RuntimeException(e);</span>
+<span class="source-line-no">134</span><span id="line-134">            }</span>
+<span class="source-line-no">135</span><span id="line-135">        }</span>
+<span class="source-line-no">136</span><span id="line-136">        return sslContext;</span>
+<span class="source-line-no">137</span><span id="line-137">    }</span>
+<span class="source-line-no">138</span><span id="line-138"></span>
+<span class="source-line-no">139</span><span id="line-139">    private String formatResponse(JsonRpcResponse&lt;?&gt; response, ObjectMapper mapper) {</span>
+<span class="source-line-no">140</span><span id="line-140">        return (response.getResult() == null || response.getError() != null || outputObject == OutputObject.RESPONSE)</span>
+<span class="source-line-no">141</span><span id="line-141">            ? mapper.valueToTree(response).toPrettyString() // Pretty print the entire response as JSON</span>
+<span class="source-line-no">142</span><span id="line-142">            : switch (response.getResult()) {</span>
+<span class="source-line-no">143</span><span id="line-143">                case TextNode tn    -&gt; tn.asText();         // Remove the surrounding quotes and don't print `\n` for newlines</span>
+<span class="source-line-no">144</span><span id="line-144">                case JsonNode jn    -&gt; outputStyle == OutputStyle.PRETTY ? jn.toPrettyString() : jn.toString();</span>
+<span class="source-line-no">145</span><span id="line-145">                case Object obj     -&gt; obj.toString();</span>
+<span class="source-line-no">146</span><span id="line-146">            };</span>
+<span class="source-line-no">147</span><span id="line-147">    }</span>
+<span class="source-line-no">148</span><span id="line-148"></span>
+<span class="source-line-no">149</span><span id="line-149">    public void printHelp(Call call, String usage) {</span>
+<span class="source-line-no">150</span><span id="line-150">        int leftPad = 4;</span>
+<span class="source-line-no">151</span><span id="line-151">        int descPad = 2;</span>
+<span class="source-line-no">152</span><span id="line-152">        int helpWidth = 120;</span>
+<span class="source-line-no">153</span><span id="line-153">        String header = "";</span>
+<span class="source-line-no">154</span><span id="line-154">        String footer = "";</span>
+<span class="source-line-no">155</span><span id="line-155">        formatter.printHelp(call.err, helpWidth, usage, header, options(), leftPad, descPad, footer, false);</span>
+<span class="source-line-no">156</span><span id="line-156">    }</span>
+<span class="source-line-no">157</span><span id="line-157"></span>
+<span class="source-line-no">158</span><span id="line-158">    public void printError(Call call, String str) {</span>
+<span class="source-line-no">159</span><span id="line-159">        call.err.println(str);</span>
+<span class="source-line-no">160</span><span id="line-160">    }</span>
+<span class="source-line-no">161</span><span id="line-161"></span>
+<span class="source-line-no">162</span><span id="line-162">    public static class CommonsCLICall extends JsonRpcClientTool.Call {</span>
+<span class="source-line-no">163</span><span id="line-163">        protected final BaseJsonRpcTool rpcTool;</span>
+<span class="source-line-no">164</span><span id="line-164">        public final CommandLine line;</span>
+<span class="source-line-no">165</span><span id="line-165">        public final boolean verbose;</span>
+<span class="source-line-no">166</span><span id="line-166">        private DefaultRpcClient client;</span>
+<span class="source-line-no">167</span><span id="line-167"></span>
+<span class="source-line-no">168</span><span id="line-168">        public CommonsCLICall(BaseJsonRpcTool parentTool, PrintWriter out, PrintWriter err, String[] args) {</span>
+<span class="source-line-no">169</span><span id="line-169">            super(out, err, args);</span>
+<span class="source-line-no">170</span><span id="line-170">            this.rpcTool = parentTool;</span>
+<span class="source-line-no">171</span><span id="line-171">            CommandLineParser parser = new DefaultParser();</span>
+<span class="source-line-no">172</span><span id="line-172">            try {</span>
+<span class="source-line-no">173</span><span id="line-173">                this.line = parser.parse(rpcTool.options(), args);</span>
+<span class="source-line-no">174</span><span id="line-174">            } catch (ParseException e) {</span>
+<span class="source-line-no">175</span><span id="line-175">                rpcTool.printError(this, e.getMessage());</span>
+<span class="source-line-no">176</span><span id="line-176">                rpcTool.printHelp(this, rpcTool.usage());</span>
+<span class="source-line-no">177</span><span id="line-177">                throw new JsonRpcClientTool.ToolException(1, "Parser error");</span>
+<span class="source-line-no">178</span><span id="line-178">            }</span>
+<span class="source-line-no">179</span><span id="line-179">            if (line.hasOption("?")) {</span>
+<span class="source-line-no">180</span><span id="line-180">                rpcTool.printHelp(this, rpcTool.usage());</span>
+<span class="source-line-no">181</span><span id="line-181">                throw new JsonRpcClientTool.ToolException(0, "Help Option was chosen");</span>
+<span class="source-line-no">182</span><span id="line-182">            }</span>
+<span class="source-line-no">183</span><span id="line-183">            verbose = line.hasOption("v");</span>
+<span class="source-line-no">184</span><span id="line-184">            if (verbose) {</span>
+<span class="source-line-no">185</span><span id="line-185">                JavaLoggingSupport.setVerbose();</span>
+<span class="source-line-no">186</span><span id="line-186">            }</span>
+<span class="source-line-no">187</span><span id="line-187">            boolean hasLogLevel = line.hasOption("log");</span>
+<span class="source-line-no">188</span><span id="line-188">            if (hasLogLevel ){</span>
+<span class="source-line-no">189</span><span id="line-189">                String intLevel = line.getOptionValue("log");</span>
+<span class="source-line-no">190</span><span id="line-190">                Level level = switch (intLevel) {</span>
+<span class="source-line-no">191</span><span id="line-191">                    case "0" -&gt; Level.OFF;</span>
+<span class="source-line-no">192</span><span id="line-192">                    case "1" -&gt; Level.SEVERE;</span>
+<span class="source-line-no">193</span><span id="line-193">                    case "2" -&gt; Level.WARNING;</span>
+<span class="source-line-no">194</span><span id="line-194">                    case "3" -&gt; Level.INFO;</span>
+<span class="source-line-no">195</span><span id="line-195">                    case "4" -&gt; Level.FINE;</span>
+<span class="source-line-no">196</span><span id="line-196">                    case "5" -&gt; Level.ALL;</span>
+<span class="source-line-no">197</span><span id="line-197">                    default -&gt; throw new IllegalStateException("Unexpected value: " + intLevel);</span>
+<span class="source-line-no">198</span><span id="line-198">                };</span>
+<span class="source-line-no">199</span><span id="line-199">                JavaLoggingSupport.setLogLevel(level);</span>
+<span class="source-line-no">200</span><span id="line-200">            }</span>
+<span class="source-line-no">201</span><span id="line-201">            // TODO: Add rpcwait option for non-Bitcoin JsonRPC???</span>
+<span class="source-line-no">202</span><span id="line-202">        }</span>
+<span class="source-line-no">203</span><span id="line-203"></span>
+<span class="source-line-no">204</span><span id="line-204">        @Override</span>
+<span class="source-line-no">205</span><span id="line-205">        public DefaultRpcClient rpcClient(SSLContext sslContext) {</span>
+<span class="source-line-no">206</span><span id="line-206">            if (client == null) {</span>
+<span class="source-line-no">207</span><span id="line-207">                URI uri;</span>
+<span class="source-line-no">208</span><span id="line-208">                String urlString;</span>
+<span class="source-line-no">209</span><span id="line-209">                if ((urlString = line.getOptionValue("url")) != null ) {</span>
+<span class="source-line-no">210</span><span id="line-210">                    try {</span>
+<span class="source-line-no">211</span><span id="line-211">                        uri = new URI(urlString);</span>
+<span class="source-line-no">212</span><span id="line-212">                    } catch (URISyntaxException e) {</span>
+<span class="source-line-no">213</span><span id="line-213">                        throw new RuntimeException(e);</span>
+<span class="source-line-no">214</span><span id="line-214">                    }</span>
+<span class="source-line-no">215</span><span id="line-215">                } else {</span>
+<span class="source-line-no">216</span><span id="line-216">                    uri = defaultUri;</span>
+<span class="source-line-no">217</span><span id="line-217">                }</span>
+<span class="source-line-no">218</span><span id="line-218">                String rpcUser = null;</span>
+<span class="source-line-no">219</span><span id="line-219">                String rpcPassword = null;</span>
+<span class="source-line-no">220</span><span id="line-220">                String rawUserInfo = uri.getRawUserInfo();</span>
+<span class="source-line-no">221</span><span id="line-221">                if (rawUserInfo != null) {</span>
+<span class="source-line-no">222</span><span id="line-222">                    String[] split = rawUserInfo.split(":");</span>
+<span class="source-line-no">223</span><span id="line-223">                    rpcUser = split[0];</span>
+<span class="source-line-no">224</span><span id="line-224">                    rpcPassword = split[1];</span>
+<span class="source-line-no">225</span><span id="line-225">                }</span>
+<span class="source-line-no">226</span><span id="line-226">                client = new DefaultRpcClient(sslContext, rpcTool.jsonRpcVersion, uri, rpcUser, rpcPassword);</span>
+<span class="source-line-no">227</span><span id="line-227">            }</span>
+<span class="source-line-no">228</span><span id="line-228">            return client;</span>
+<span class="source-line-no">229</span><span id="line-229">        }</span>
+<span class="source-line-no">230</span><span id="line-230"></span>
+<span class="source-line-no">231</span><span id="line-231">        @Override</span>
+<span class="source-line-no">232</span><span id="line-232">        public DefaultRpcClient rpcClient() {</span>
+<span class="source-line-no">233</span><span id="line-233">            SSLContext sslContext;</span>
+<span class="source-line-no">234</span><span id="line-234">            try {</span>
+<span class="source-line-no">235</span><span id="line-235">                sslContext = SSLContext.getDefault();</span>
+<span class="source-line-no">236</span><span id="line-236">            } catch (NoSuchAlgorithmException e) {</span>
+<span class="source-line-no">237</span><span id="line-237">                throw new RuntimeException(e);</span>
+<span class="source-line-no">238</span><span id="line-238">            }</span>
+<span class="source-line-no">239</span><span id="line-239">            return rpcClient(sslContext);</span>
+<span class="source-line-no">240</span><span id="line-240">        }</span>
+<span class="source-line-no">241</span><span id="line-241">    }</span>
+<span class="source-line-no">242</span><span id="line-242">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html
index 9c7152b66..b8bb11667 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Invalid.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli, interface: CliParameter, record: Invalid">
@@ -13,96 +13,99 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc.cli;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import java.util.stream.Stream;</span>
-<span class="source-line-no">004</span><span id="line-4"></span>
-<span class="source-line-no">005</span><span id="line-5">/**</span>
-<span class="source-line-no">006</span><span id="line-6"> * JSON-RPC method parameter, parsed from the command-line. There are two implementations: {@link Valid} and {@link Invalid}.</span>
-<span class="source-line-no">007</span><span id="line-7"> * A {@code Valid} contains an object that can be serialized to JSON via a converter/mapper like Jackson. An {@code Invalid}</span>
-<span class="source-line-no">008</span><span id="line-8"> * contains the {@link Exception} that occurred while parsing.</span>
-<span class="source-line-no">009</span><span id="line-9"> */</span>
-<span class="source-line-no">010</span><span id="line-10">public sealed interface CliParameter {</span>
-<span class="source-line-no">011</span><span id="line-11">    /**</span>
-<span class="source-line-no">012</span><span id="line-12">     * Return the source (pre-deserialization) JSON string</span>
-<span class="source-line-no">013</span><span id="line-13">     * @return source string</span>
-<span class="source-line-no">014</span><span id="line-14">     */</span>
-<span class="source-line-no">015</span><span id="line-15">    String source();</span>
-<span class="source-line-no">016</span><span id="line-16"></span>
-<span class="source-line-no">017</span><span id="line-17">    default boolean valid() {</span>
-<span class="source-line-no">018</span><span id="line-18">        return this instanceof CliParameter.Valid;</span>
-<span class="source-line-no">019</span><span id="line-19">    }</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">    default boolean invalid() {</span>
-<span class="source-line-no">022</span><span id="line-22">        return !valid();</span>
-<span class="source-line-no">023</span><span id="line-23">    }</span>
-<span class="source-line-no">024</span><span id="line-24"></span>
-<span class="source-line-no">025</span><span id="line-25">    /**</span>
-<span class="source-line-no">026</span><span id="line-26">     * Stream zero or 1 valid objects.</span>
-<span class="source-line-no">027</span><span id="line-27">     * &lt;p&gt;This allows {@code .flatMap(CliParameter::stream)} to filter invalid and unwrap valid objects.</span>
-<span class="source-line-no">028</span><span id="line-28">     * @return A stream of zero or one valid objects.</span>
-<span class="source-line-no">029</span><span id="line-29">     */</span>
-<span class="source-line-no">030</span><span id="line-30">    Stream&lt;Object&gt; stream();</span>
-<span class="source-line-no">031</span><span id="line-31"></span>
-<span class="source-line-no">032</span><span id="line-32">    /**</span>
-<span class="source-line-no">033</span><span id="line-33">     * Create a {@code Valid} object</span>
-<span class="source-line-no">034</span><span id="line-34">     * @param source The source CLI string</span>
-<span class="source-line-no">035</span><span id="line-35">     * @param object The resulting object</span>
-<span class="source-line-no">036</span><span id="line-36">     * @return a valid parameter</span>
-<span class="source-line-no">037</span><span id="line-37">     */</span>
-<span class="source-line-no">038</span><span id="line-38">    static Valid valid(String source, Object object) {</span>
-<span class="source-line-no">039</span><span id="line-39">        return new Valid(source, object);</span>
-<span class="source-line-no">040</span><span id="line-40">    }</span>
-<span class="source-line-no">041</span><span id="line-41"></span>
-<span class="source-line-no">042</span><span id="line-42">    /**</span>
-<span class="source-line-no">043</span><span id="line-43">     * Create a {@code Invalid} object</span>
-<span class="source-line-no">044</span><span id="line-44">     * @param source The source CLI string</span>
-<span class="source-line-no">045</span><span id="line-45">     * @param error The error returned from the parser</span>
-<span class="source-line-no">046</span><span id="line-46">     * @return a valid parameter</span>
-<span class="source-line-no">047</span><span id="line-47">     */</span>
-<span class="source-line-no">048</span><span id="line-48">    static Invalid invalid(String source, Exception error) {</span>
-<span class="source-line-no">049</span><span id="line-49">        return new Invalid(source, error);</span>
-<span class="source-line-no">050</span><span id="line-50">    }</span>
-<span class="source-line-no">051</span><span id="line-51"></span>
-<span class="source-line-no">052</span><span id="line-52">    /**</span>
-<span class="source-line-no">053</span><span id="line-53">     * Parse a string returning either a valid or invalid {@code CliParameter}</span>
-<span class="source-line-no">054</span><span id="line-54">     * @param source the CLI parameter string to parse</span>
-<span class="source-line-no">055</span><span id="line-55">     * @param parseFunction a parsing function</span>
-<span class="source-line-no">056</span><span id="line-56">     * @return wraps either parsed, serializable object or an {@code Exception}</span>
-<span class="source-line-no">057</span><span id="line-57">     */</span>
-<span class="source-line-no">058</span><span id="line-58">    static CliParameter parse(String source, Parser parseFunction) {</span>
-<span class="source-line-no">059</span><span id="line-59">        try {</span>
-<span class="source-line-no">060</span><span id="line-60">            return new CliParameter.Valid(source, parseFunction.apply(source));</span>
-<span class="source-line-no">061</span><span id="line-61">        } catch (Exception e) {</span>
-<span class="source-line-no">062</span><span id="line-62">            return new CliParameter.Invalid(source, e);</span>
-<span class="source-line-no">063</span><span id="line-63">        }</span>
-<span class="source-line-no">064</span><span id="line-64">    }</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66">    /**</span>
-<span class="source-line-no">067</span><span id="line-67">     * Implementation for Valid objects</span>
-<span class="source-line-no">068</span><span id="line-68">     * @param source source JSON string</span>
-<span class="source-line-no">069</span><span id="line-69">     * @param object parsed object</span>
-<span class="source-line-no">070</span><span id="line-70">     */</span>
-<span class="source-line-no">071</span><span id="line-71">    record Valid(String source, Object object) implements CliParameter {</span>
-<span class="source-line-no">072</span><span id="line-72">        public Stream&lt;Object&gt; stream() { return Stream.of(object); }</span>
-<span class="source-line-no">073</span><span id="line-73">    }</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75">    /**</span>
-<span class="source-line-no">076</span><span id="line-76">     * Implementation for Invalid source strings</span>
-<span class="source-line-no">077</span><span id="line-77">     * @param source source JSON string</span>
-<span class="source-line-no">078</span><span id="line-78">     * @param error parsing exception</span>
-<span class="source-line-no">079</span><span id="line-79">     */</span>
-<span class="source-line-no">080</span><span id="line-80">    record Invalid(String source, Exception error) implements CliParameter {</span>
-<span class="source-line-no">081</span><span id="line-81">        public Stream&lt;Object&gt; stream() { return Stream.empty(); }</span>
-<span class="source-line-no">082</span><span id="line-82">    }</span>
-<span class="source-line-no">083</span><span id="line-83"></span>
-<span class="source-line-no">084</span><span id="line-84">    /**</span>
-<span class="source-line-no">085</span><span id="line-85">     * Functional interface for parsing a {@link String} to an {@link Object} possibly</span>
-<span class="source-line-no">086</span><span id="line-86">     * throwing an {@link Exception}.</span>
-<span class="source-line-no">087</span><span id="line-87">     */</span>
-<span class="source-line-no">088</span><span id="line-88">    @FunctionalInterface</span>
-<span class="source-line-no">089</span><span id="line-89">    interface Parser {</span>
-<span class="source-line-no">090</span><span id="line-90">        Object apply(String s) throws Exception;</span>
-<span class="source-line-no">091</span><span id="line-91">    }</span>
-<span class="source-line-no">092</span><span id="line-92">}</span>
+<span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.core.JsonProcessingException;</span>
+<span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JsonNode;</span>
+<span class="source-line-no">005</span><span id="line-5"></span>
+<span class="source-line-no">006</span><span id="line-6">import java.util.stream.Stream;</span>
+<span class="source-line-no">007</span><span id="line-7"></span>
+<span class="source-line-no">008</span><span id="line-8">/**</span>
+<span class="source-line-no">009</span><span id="line-9"> * JSON-RPC method parameter, parsed from the command-line. There are two implementations: {@link Valid} and {@link Invalid}.</span>
+<span class="source-line-no">010</span><span id="line-10"> * A {@code Valid} contains an object that can be serialized to JSON via a converter/mapper like Jackson. An {@code Invalid}</span>
+<span class="source-line-no">011</span><span id="line-11"> * contains the {@link Exception} that occurred while parsing.</span>
+<span class="source-line-no">012</span><span id="line-12"> */</span>
+<span class="source-line-no">013</span><span id="line-13">public sealed interface CliParameter {</span>
+<span class="source-line-no">014</span><span id="line-14">    /**</span>
+<span class="source-line-no">015</span><span id="line-15">     * Return the source (pre-deserialization) JSON string</span>
+<span class="source-line-no">016</span><span id="line-16">     * @return source string</span>
+<span class="source-line-no">017</span><span id="line-17">     */</span>
+<span class="source-line-no">018</span><span id="line-18">    String source();</span>
+<span class="source-line-no">019</span><span id="line-19"></span>
+<span class="source-line-no">020</span><span id="line-20">    default boolean valid() {</span>
+<span class="source-line-no">021</span><span id="line-21">        return this instanceof CliParameter.Valid;</span>
+<span class="source-line-no">022</span><span id="line-22">    }</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">    default boolean invalid() {</span>
+<span class="source-line-no">025</span><span id="line-25">        return !valid();</span>
+<span class="source-line-no">026</span><span id="line-26">    }</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    /**</span>
+<span class="source-line-no">029</span><span id="line-29">     * Stream zero or 1 valid objects.</span>
+<span class="source-line-no">030</span><span id="line-30">     * &lt;p&gt;This allows {@code .flatMap(CliParameter::stream)} to filter invalid and unwrap valid objects.</span>
+<span class="source-line-no">031</span><span id="line-31">     * @return A stream of zero or one valid objects.</span>
+<span class="source-line-no">032</span><span id="line-32">     */</span>
+<span class="source-line-no">033</span><span id="line-33">    Stream&lt;Object&gt; stream();</span>
+<span class="source-line-no">034</span><span id="line-34"></span>
+<span class="source-line-no">035</span><span id="line-35">    /**</span>
+<span class="source-line-no">036</span><span id="line-36">     * Create a {@code Valid} object</span>
+<span class="source-line-no">037</span><span id="line-37">     * @param source The source CLI string</span>
+<span class="source-line-no">038</span><span id="line-38">     * @param object The resulting object</span>
+<span class="source-line-no">039</span><span id="line-39">     * @return a valid parameter</span>
+<span class="source-line-no">040</span><span id="line-40">     */</span>
+<span class="source-line-no">041</span><span id="line-41">    static Valid valid(String source, Object object) {</span>
+<span class="source-line-no">042</span><span id="line-42">        return new Valid(source, object);</span>
+<span class="source-line-no">043</span><span id="line-43">    }</span>
+<span class="source-line-no">044</span><span id="line-44"></span>
+<span class="source-line-no">045</span><span id="line-45">    /**</span>
+<span class="source-line-no">046</span><span id="line-46">     * Create a {@code Invalid} object</span>
+<span class="source-line-no">047</span><span id="line-47">     * @param source The source CLI string</span>
+<span class="source-line-no">048</span><span id="line-48">     * @param error The error returned from the parser</span>
+<span class="source-line-no">049</span><span id="line-49">     * @return a valid parameter</span>
+<span class="source-line-no">050</span><span id="line-50">     */</span>
+<span class="source-line-no">051</span><span id="line-51">    static Invalid invalid(String source, Exception error) {</span>
+<span class="source-line-no">052</span><span id="line-52">        return new Invalid(source, error);</span>
+<span class="source-line-no">053</span><span id="line-53">    }</span>
+<span class="source-line-no">054</span><span id="line-54"></span>
+<span class="source-line-no">055</span><span id="line-55">    /**</span>
+<span class="source-line-no">056</span><span id="line-56">     * Parse a string returning either a valid or invalid {@code CliParameter}</span>
+<span class="source-line-no">057</span><span id="line-57">     * @param source the CLI parameter string to parse</span>
+<span class="source-line-no">058</span><span id="line-58">     * @param parseFunction a parsing function</span>
+<span class="source-line-no">059</span><span id="line-59">     * @return wraps either parsed, serializable object or an {@code Exception}</span>
+<span class="source-line-no">060</span><span id="line-60">     */</span>
+<span class="source-line-no">061</span><span id="line-61">    static CliParameter parse(String source, Parser parseFunction) {</span>
+<span class="source-line-no">062</span><span id="line-62">        try {</span>
+<span class="source-line-no">063</span><span id="line-63">            return new CliParameter.Valid(source, parseFunction.apply(source));</span>
+<span class="source-line-no">064</span><span id="line-64">        } catch (Exception e) {</span>
+<span class="source-line-no">065</span><span id="line-65">            return new CliParameter.Invalid(source, e);</span>
+<span class="source-line-no">066</span><span id="line-66">        }</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69">    /**</span>
+<span class="source-line-no">070</span><span id="line-70">     * Implementation for Valid objects</span>
+<span class="source-line-no">071</span><span id="line-71">     * @param source source JSON string</span>
+<span class="source-line-no">072</span><span id="line-72">     * @param object parsed object</span>
+<span class="source-line-no">073</span><span id="line-73">     */</span>
+<span class="source-line-no">074</span><span id="line-74">    record Valid(String source, Object object) implements CliParameter {</span>
+<span class="source-line-no">075</span><span id="line-75">        public Stream&lt;Object&gt; stream() { return Stream.of(object); }</span>
+<span class="source-line-no">076</span><span id="line-76">    }</span>
+<span class="source-line-no">077</span><span id="line-77"></span>
+<span class="source-line-no">078</span><span id="line-78">    /**</span>
+<span class="source-line-no">079</span><span id="line-79">     * Implementation for Invalid source strings</span>
+<span class="source-line-no">080</span><span id="line-80">     * @param source source JSON string</span>
+<span class="source-line-no">081</span><span id="line-81">     * @param error parsing exception</span>
+<span class="source-line-no">082</span><span id="line-82">     */</span>
+<span class="source-line-no">083</span><span id="line-83">    record Invalid(String source, Exception error) implements CliParameter {</span>
+<span class="source-line-no">084</span><span id="line-84">        public Stream&lt;Object&gt; stream() { return Stream.empty(); }</span>
+<span class="source-line-no">085</span><span id="line-85">    }</span>
+<span class="source-line-no">086</span><span id="line-86"></span>
+<span class="source-line-no">087</span><span id="line-87">    /**</span>
+<span class="source-line-no">088</span><span id="line-88">     * Functional interface for parsing a {@link String} to an {@link Object} possibly</span>
+<span class="source-line-no">089</span><span id="line-89">     * throwing an {@link Exception}.</span>
+<span class="source-line-no">090</span><span id="line-90">     */</span>
+<span class="source-line-no">091</span><span id="line-91">    @FunctionalInterface</span>
+<span class="source-line-no">092</span><span id="line-92">    interface Parser {</span>
+<span class="source-line-no">093</span><span id="line-93">        JsonNode apply(String s) throws JsonProcessingException;</span>
+<span class="source-line-no">094</span><span id="line-94">    }</span>
+<span class="source-line-no">095</span><span id="line-95">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Parser.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Parser.html
index eb7bf898e..e191f09f5 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Parser.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Parser.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli, interface: CliParameter, interface: Parser">
@@ -13,96 +13,99 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc.cli;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import java.util.stream.Stream;</span>
-<span class="source-line-no">004</span><span id="line-4"></span>
-<span class="source-line-no">005</span><span id="line-5">/**</span>
-<span class="source-line-no">006</span><span id="line-6"> * JSON-RPC method parameter, parsed from the command-line. There are two implementations: {@link Valid} and {@link Invalid}.</span>
-<span class="source-line-no">007</span><span id="line-7"> * A {@code Valid} contains an object that can be serialized to JSON via a converter/mapper like Jackson. An {@code Invalid}</span>
-<span class="source-line-no">008</span><span id="line-8"> * contains the {@link Exception} that occurred while parsing.</span>
-<span class="source-line-no">009</span><span id="line-9"> */</span>
-<span class="source-line-no">010</span><span id="line-10">public sealed interface CliParameter {</span>
-<span class="source-line-no">011</span><span id="line-11">    /**</span>
-<span class="source-line-no">012</span><span id="line-12">     * Return the source (pre-deserialization) JSON string</span>
-<span class="source-line-no">013</span><span id="line-13">     * @return source string</span>
-<span class="source-line-no">014</span><span id="line-14">     */</span>
-<span class="source-line-no">015</span><span id="line-15">    String source();</span>
-<span class="source-line-no">016</span><span id="line-16"></span>
-<span class="source-line-no">017</span><span id="line-17">    default boolean valid() {</span>
-<span class="source-line-no">018</span><span id="line-18">        return this instanceof CliParameter.Valid;</span>
-<span class="source-line-no">019</span><span id="line-19">    }</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">    default boolean invalid() {</span>
-<span class="source-line-no">022</span><span id="line-22">        return !valid();</span>
-<span class="source-line-no">023</span><span id="line-23">    }</span>
-<span class="source-line-no">024</span><span id="line-24"></span>
-<span class="source-line-no">025</span><span id="line-25">    /**</span>
-<span class="source-line-no">026</span><span id="line-26">     * Stream zero or 1 valid objects.</span>
-<span class="source-line-no">027</span><span id="line-27">     * &lt;p&gt;This allows {@code .flatMap(CliParameter::stream)} to filter invalid and unwrap valid objects.</span>
-<span class="source-line-no">028</span><span id="line-28">     * @return A stream of zero or one valid objects.</span>
-<span class="source-line-no">029</span><span id="line-29">     */</span>
-<span class="source-line-no">030</span><span id="line-30">    Stream&lt;Object&gt; stream();</span>
-<span class="source-line-no">031</span><span id="line-31"></span>
-<span class="source-line-no">032</span><span id="line-32">    /**</span>
-<span class="source-line-no">033</span><span id="line-33">     * Create a {@code Valid} object</span>
-<span class="source-line-no">034</span><span id="line-34">     * @param source The source CLI string</span>
-<span class="source-line-no">035</span><span id="line-35">     * @param object The resulting object</span>
-<span class="source-line-no">036</span><span id="line-36">     * @return a valid parameter</span>
-<span class="source-line-no">037</span><span id="line-37">     */</span>
-<span class="source-line-no">038</span><span id="line-38">    static Valid valid(String source, Object object) {</span>
-<span class="source-line-no">039</span><span id="line-39">        return new Valid(source, object);</span>
-<span class="source-line-no">040</span><span id="line-40">    }</span>
-<span class="source-line-no">041</span><span id="line-41"></span>
-<span class="source-line-no">042</span><span id="line-42">    /**</span>
-<span class="source-line-no">043</span><span id="line-43">     * Create a {@code Invalid} object</span>
-<span class="source-line-no">044</span><span id="line-44">     * @param source The source CLI string</span>
-<span class="source-line-no">045</span><span id="line-45">     * @param error The error returned from the parser</span>
-<span class="source-line-no">046</span><span id="line-46">     * @return a valid parameter</span>
-<span class="source-line-no">047</span><span id="line-47">     */</span>
-<span class="source-line-no">048</span><span id="line-48">    static Invalid invalid(String source, Exception error) {</span>
-<span class="source-line-no">049</span><span id="line-49">        return new Invalid(source, error);</span>
-<span class="source-line-no">050</span><span id="line-50">    }</span>
-<span class="source-line-no">051</span><span id="line-51"></span>
-<span class="source-line-no">052</span><span id="line-52">    /**</span>
-<span class="source-line-no">053</span><span id="line-53">     * Parse a string returning either a valid or invalid {@code CliParameter}</span>
-<span class="source-line-no">054</span><span id="line-54">     * @param source the CLI parameter string to parse</span>
-<span class="source-line-no">055</span><span id="line-55">     * @param parseFunction a parsing function</span>
-<span class="source-line-no">056</span><span id="line-56">     * @return wraps either parsed, serializable object or an {@code Exception}</span>
-<span class="source-line-no">057</span><span id="line-57">     */</span>
-<span class="source-line-no">058</span><span id="line-58">    static CliParameter parse(String source, Parser parseFunction) {</span>
-<span class="source-line-no">059</span><span id="line-59">        try {</span>
-<span class="source-line-no">060</span><span id="line-60">            return new CliParameter.Valid(source, parseFunction.apply(source));</span>
-<span class="source-line-no">061</span><span id="line-61">        } catch (Exception e) {</span>
-<span class="source-line-no">062</span><span id="line-62">            return new CliParameter.Invalid(source, e);</span>
-<span class="source-line-no">063</span><span id="line-63">        }</span>
-<span class="source-line-no">064</span><span id="line-64">    }</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66">    /**</span>
-<span class="source-line-no">067</span><span id="line-67">     * Implementation for Valid objects</span>
-<span class="source-line-no">068</span><span id="line-68">     * @param source source JSON string</span>
-<span class="source-line-no">069</span><span id="line-69">     * @param object parsed object</span>
-<span class="source-line-no">070</span><span id="line-70">     */</span>
-<span class="source-line-no">071</span><span id="line-71">    record Valid(String source, Object object) implements CliParameter {</span>
-<span class="source-line-no">072</span><span id="line-72">        public Stream&lt;Object&gt; stream() { return Stream.of(object); }</span>
-<span class="source-line-no">073</span><span id="line-73">    }</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75">    /**</span>
-<span class="source-line-no">076</span><span id="line-76">     * Implementation for Invalid source strings</span>
-<span class="source-line-no">077</span><span id="line-77">     * @param source source JSON string</span>
-<span class="source-line-no">078</span><span id="line-78">     * @param error parsing exception</span>
-<span class="source-line-no">079</span><span id="line-79">     */</span>
-<span class="source-line-no">080</span><span id="line-80">    record Invalid(String source, Exception error) implements CliParameter {</span>
-<span class="source-line-no">081</span><span id="line-81">        public Stream&lt;Object&gt; stream() { return Stream.empty(); }</span>
-<span class="source-line-no">082</span><span id="line-82">    }</span>
-<span class="source-line-no">083</span><span id="line-83"></span>
-<span class="source-line-no">084</span><span id="line-84">    /**</span>
-<span class="source-line-no">085</span><span id="line-85">     * Functional interface for parsing a {@link String} to an {@link Object} possibly</span>
-<span class="source-line-no">086</span><span id="line-86">     * throwing an {@link Exception}.</span>
-<span class="source-line-no">087</span><span id="line-87">     */</span>
-<span class="source-line-no">088</span><span id="line-88">    @FunctionalInterface</span>
-<span class="source-line-no">089</span><span id="line-89">    interface Parser {</span>
-<span class="source-line-no">090</span><span id="line-90">        Object apply(String s) throws Exception;</span>
-<span class="source-line-no">091</span><span id="line-91">    }</span>
-<span class="source-line-no">092</span><span id="line-92">}</span>
+<span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.core.JsonProcessingException;</span>
+<span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JsonNode;</span>
+<span class="source-line-no">005</span><span id="line-5"></span>
+<span class="source-line-no">006</span><span id="line-6">import java.util.stream.Stream;</span>
+<span class="source-line-no">007</span><span id="line-7"></span>
+<span class="source-line-no">008</span><span id="line-8">/**</span>
+<span class="source-line-no">009</span><span id="line-9"> * JSON-RPC method parameter, parsed from the command-line. There are two implementations: {@link Valid} and {@link Invalid}.</span>
+<span class="source-line-no">010</span><span id="line-10"> * A {@code Valid} contains an object that can be serialized to JSON via a converter/mapper like Jackson. An {@code Invalid}</span>
+<span class="source-line-no">011</span><span id="line-11"> * contains the {@link Exception} that occurred while parsing.</span>
+<span class="source-line-no">012</span><span id="line-12"> */</span>
+<span class="source-line-no">013</span><span id="line-13">public sealed interface CliParameter {</span>
+<span class="source-line-no">014</span><span id="line-14">    /**</span>
+<span class="source-line-no">015</span><span id="line-15">     * Return the source (pre-deserialization) JSON string</span>
+<span class="source-line-no">016</span><span id="line-16">     * @return source string</span>
+<span class="source-line-no">017</span><span id="line-17">     */</span>
+<span class="source-line-no">018</span><span id="line-18">    String source();</span>
+<span class="source-line-no">019</span><span id="line-19"></span>
+<span class="source-line-no">020</span><span id="line-20">    default boolean valid() {</span>
+<span class="source-line-no">021</span><span id="line-21">        return this instanceof CliParameter.Valid;</span>
+<span class="source-line-no">022</span><span id="line-22">    }</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">    default boolean invalid() {</span>
+<span class="source-line-no">025</span><span id="line-25">        return !valid();</span>
+<span class="source-line-no">026</span><span id="line-26">    }</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    /**</span>
+<span class="source-line-no">029</span><span id="line-29">     * Stream zero or 1 valid objects.</span>
+<span class="source-line-no">030</span><span id="line-30">     * &lt;p&gt;This allows {@code .flatMap(CliParameter::stream)} to filter invalid and unwrap valid objects.</span>
+<span class="source-line-no">031</span><span id="line-31">     * @return A stream of zero or one valid objects.</span>
+<span class="source-line-no">032</span><span id="line-32">     */</span>
+<span class="source-line-no">033</span><span id="line-33">    Stream&lt;Object&gt; stream();</span>
+<span class="source-line-no">034</span><span id="line-34"></span>
+<span class="source-line-no">035</span><span id="line-35">    /**</span>
+<span class="source-line-no">036</span><span id="line-36">     * Create a {@code Valid} object</span>
+<span class="source-line-no">037</span><span id="line-37">     * @param source The source CLI string</span>
+<span class="source-line-no">038</span><span id="line-38">     * @param object The resulting object</span>
+<span class="source-line-no">039</span><span id="line-39">     * @return a valid parameter</span>
+<span class="source-line-no">040</span><span id="line-40">     */</span>
+<span class="source-line-no">041</span><span id="line-41">    static Valid valid(String source, Object object) {</span>
+<span class="source-line-no">042</span><span id="line-42">        return new Valid(source, object);</span>
+<span class="source-line-no">043</span><span id="line-43">    }</span>
+<span class="source-line-no">044</span><span id="line-44"></span>
+<span class="source-line-no">045</span><span id="line-45">    /**</span>
+<span class="source-line-no">046</span><span id="line-46">     * Create a {@code Invalid} object</span>
+<span class="source-line-no">047</span><span id="line-47">     * @param source The source CLI string</span>
+<span class="source-line-no">048</span><span id="line-48">     * @param error The error returned from the parser</span>
+<span class="source-line-no">049</span><span id="line-49">     * @return a valid parameter</span>
+<span class="source-line-no">050</span><span id="line-50">     */</span>
+<span class="source-line-no">051</span><span id="line-51">    static Invalid invalid(String source, Exception error) {</span>
+<span class="source-line-no">052</span><span id="line-52">        return new Invalid(source, error);</span>
+<span class="source-line-no">053</span><span id="line-53">    }</span>
+<span class="source-line-no">054</span><span id="line-54"></span>
+<span class="source-line-no">055</span><span id="line-55">    /**</span>
+<span class="source-line-no">056</span><span id="line-56">     * Parse a string returning either a valid or invalid {@code CliParameter}</span>
+<span class="source-line-no">057</span><span id="line-57">     * @param source the CLI parameter string to parse</span>
+<span class="source-line-no">058</span><span id="line-58">     * @param parseFunction a parsing function</span>
+<span class="source-line-no">059</span><span id="line-59">     * @return wraps either parsed, serializable object or an {@code Exception}</span>
+<span class="source-line-no">060</span><span id="line-60">     */</span>
+<span class="source-line-no">061</span><span id="line-61">    static CliParameter parse(String source, Parser parseFunction) {</span>
+<span class="source-line-no">062</span><span id="line-62">        try {</span>
+<span class="source-line-no">063</span><span id="line-63">            return new CliParameter.Valid(source, parseFunction.apply(source));</span>
+<span class="source-line-no">064</span><span id="line-64">        } catch (Exception e) {</span>
+<span class="source-line-no">065</span><span id="line-65">            return new CliParameter.Invalid(source, e);</span>
+<span class="source-line-no">066</span><span id="line-66">        }</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69">    /**</span>
+<span class="source-line-no">070</span><span id="line-70">     * Implementation for Valid objects</span>
+<span class="source-line-no">071</span><span id="line-71">     * @param source source JSON string</span>
+<span class="source-line-no">072</span><span id="line-72">     * @param object parsed object</span>
+<span class="source-line-no">073</span><span id="line-73">     */</span>
+<span class="source-line-no">074</span><span id="line-74">    record Valid(String source, Object object) implements CliParameter {</span>
+<span class="source-line-no">075</span><span id="line-75">        public Stream&lt;Object&gt; stream() { return Stream.of(object); }</span>
+<span class="source-line-no">076</span><span id="line-76">    }</span>
+<span class="source-line-no">077</span><span id="line-77"></span>
+<span class="source-line-no">078</span><span id="line-78">    /**</span>
+<span class="source-line-no">079</span><span id="line-79">     * Implementation for Invalid source strings</span>
+<span class="source-line-no">080</span><span id="line-80">     * @param source source JSON string</span>
+<span class="source-line-no">081</span><span id="line-81">     * @param error parsing exception</span>
+<span class="source-line-no">082</span><span id="line-82">     */</span>
+<span class="source-line-no">083</span><span id="line-83">    record Invalid(String source, Exception error) implements CliParameter {</span>
+<span class="source-line-no">084</span><span id="line-84">        public Stream&lt;Object&gt; stream() { return Stream.empty(); }</span>
+<span class="source-line-no">085</span><span id="line-85">    }</span>
+<span class="source-line-no">086</span><span id="line-86"></span>
+<span class="source-line-no">087</span><span id="line-87">    /**</span>
+<span class="source-line-no">088</span><span id="line-88">     * Functional interface for parsing a {@link String} to an {@link Object} possibly</span>
+<span class="source-line-no">089</span><span id="line-89">     * throwing an {@link Exception}.</span>
+<span class="source-line-no">090</span><span id="line-90">     */</span>
+<span class="source-line-no">091</span><span id="line-91">    @FunctionalInterface</span>
+<span class="source-line-no">092</span><span id="line-92">    interface Parser {</span>
+<span class="source-line-no">093</span><span id="line-93">        JsonNode apply(String s) throws JsonProcessingException;</span>
+<span class="source-line-no">094</span><span id="line-94">    }</span>
+<span class="source-line-no">095</span><span id="line-95">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html
index 21f04fea7..92a73fcfc 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.Valid.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli, interface: CliParameter, record: Valid">
@@ -13,96 +13,99 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc.cli;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import java.util.stream.Stream;</span>
-<span class="source-line-no">004</span><span id="line-4"></span>
-<span class="source-line-no">005</span><span id="line-5">/**</span>
-<span class="source-line-no">006</span><span id="line-6"> * JSON-RPC method parameter, parsed from the command-line. There are two implementations: {@link Valid} and {@link Invalid}.</span>
-<span class="source-line-no">007</span><span id="line-7"> * A {@code Valid} contains an object that can be serialized to JSON via a converter/mapper like Jackson. An {@code Invalid}</span>
-<span class="source-line-no">008</span><span id="line-8"> * contains the {@link Exception} that occurred while parsing.</span>
-<span class="source-line-no">009</span><span id="line-9"> */</span>
-<span class="source-line-no">010</span><span id="line-10">public sealed interface CliParameter {</span>
-<span class="source-line-no">011</span><span id="line-11">    /**</span>
-<span class="source-line-no">012</span><span id="line-12">     * Return the source (pre-deserialization) JSON string</span>
-<span class="source-line-no">013</span><span id="line-13">     * @return source string</span>
-<span class="source-line-no">014</span><span id="line-14">     */</span>
-<span class="source-line-no">015</span><span id="line-15">    String source();</span>
-<span class="source-line-no">016</span><span id="line-16"></span>
-<span class="source-line-no">017</span><span id="line-17">    default boolean valid() {</span>
-<span class="source-line-no">018</span><span id="line-18">        return this instanceof CliParameter.Valid;</span>
-<span class="source-line-no">019</span><span id="line-19">    }</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">    default boolean invalid() {</span>
-<span class="source-line-no">022</span><span id="line-22">        return !valid();</span>
-<span class="source-line-no">023</span><span id="line-23">    }</span>
-<span class="source-line-no">024</span><span id="line-24"></span>
-<span class="source-line-no">025</span><span id="line-25">    /**</span>
-<span class="source-line-no">026</span><span id="line-26">     * Stream zero or 1 valid objects.</span>
-<span class="source-line-no">027</span><span id="line-27">     * &lt;p&gt;This allows {@code .flatMap(CliParameter::stream)} to filter invalid and unwrap valid objects.</span>
-<span class="source-line-no">028</span><span id="line-28">     * @return A stream of zero or one valid objects.</span>
-<span class="source-line-no">029</span><span id="line-29">     */</span>
-<span class="source-line-no">030</span><span id="line-30">    Stream&lt;Object&gt; stream();</span>
-<span class="source-line-no">031</span><span id="line-31"></span>
-<span class="source-line-no">032</span><span id="line-32">    /**</span>
-<span class="source-line-no">033</span><span id="line-33">     * Create a {@code Valid} object</span>
-<span class="source-line-no">034</span><span id="line-34">     * @param source The source CLI string</span>
-<span class="source-line-no">035</span><span id="line-35">     * @param object The resulting object</span>
-<span class="source-line-no">036</span><span id="line-36">     * @return a valid parameter</span>
-<span class="source-line-no">037</span><span id="line-37">     */</span>
-<span class="source-line-no">038</span><span id="line-38">    static Valid valid(String source, Object object) {</span>
-<span class="source-line-no">039</span><span id="line-39">        return new Valid(source, object);</span>
-<span class="source-line-no">040</span><span id="line-40">    }</span>
-<span class="source-line-no">041</span><span id="line-41"></span>
-<span class="source-line-no">042</span><span id="line-42">    /**</span>
-<span class="source-line-no">043</span><span id="line-43">     * Create a {@code Invalid} object</span>
-<span class="source-line-no">044</span><span id="line-44">     * @param source The source CLI string</span>
-<span class="source-line-no">045</span><span id="line-45">     * @param error The error returned from the parser</span>
-<span class="source-line-no">046</span><span id="line-46">     * @return a valid parameter</span>
-<span class="source-line-no">047</span><span id="line-47">     */</span>
-<span class="source-line-no">048</span><span id="line-48">    static Invalid invalid(String source, Exception error) {</span>
-<span class="source-line-no">049</span><span id="line-49">        return new Invalid(source, error);</span>
-<span class="source-line-no">050</span><span id="line-50">    }</span>
-<span class="source-line-no">051</span><span id="line-51"></span>
-<span class="source-line-no">052</span><span id="line-52">    /**</span>
-<span class="source-line-no">053</span><span id="line-53">     * Parse a string returning either a valid or invalid {@code CliParameter}</span>
-<span class="source-line-no">054</span><span id="line-54">     * @param source the CLI parameter string to parse</span>
-<span class="source-line-no">055</span><span id="line-55">     * @param parseFunction a parsing function</span>
-<span class="source-line-no">056</span><span id="line-56">     * @return wraps either parsed, serializable object or an {@code Exception}</span>
-<span class="source-line-no">057</span><span id="line-57">     */</span>
-<span class="source-line-no">058</span><span id="line-58">    static CliParameter parse(String source, Parser parseFunction) {</span>
-<span class="source-line-no">059</span><span id="line-59">        try {</span>
-<span class="source-line-no">060</span><span id="line-60">            return new CliParameter.Valid(source, parseFunction.apply(source));</span>
-<span class="source-line-no">061</span><span id="line-61">        } catch (Exception e) {</span>
-<span class="source-line-no">062</span><span id="line-62">            return new CliParameter.Invalid(source, e);</span>
-<span class="source-line-no">063</span><span id="line-63">        }</span>
-<span class="source-line-no">064</span><span id="line-64">    }</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66">    /**</span>
-<span class="source-line-no">067</span><span id="line-67">     * Implementation for Valid objects</span>
-<span class="source-line-no">068</span><span id="line-68">     * @param source source JSON string</span>
-<span class="source-line-no">069</span><span id="line-69">     * @param object parsed object</span>
-<span class="source-line-no">070</span><span id="line-70">     */</span>
-<span class="source-line-no">071</span><span id="line-71">    record Valid(String source, Object object) implements CliParameter {</span>
-<span class="source-line-no">072</span><span id="line-72">        public Stream&lt;Object&gt; stream() { return Stream.of(object); }</span>
-<span class="source-line-no">073</span><span id="line-73">    }</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75">    /**</span>
-<span class="source-line-no">076</span><span id="line-76">     * Implementation for Invalid source strings</span>
-<span class="source-line-no">077</span><span id="line-77">     * @param source source JSON string</span>
-<span class="source-line-no">078</span><span id="line-78">     * @param error parsing exception</span>
-<span class="source-line-no">079</span><span id="line-79">     */</span>
-<span class="source-line-no">080</span><span id="line-80">    record Invalid(String source, Exception error) implements CliParameter {</span>
-<span class="source-line-no">081</span><span id="line-81">        public Stream&lt;Object&gt; stream() { return Stream.empty(); }</span>
-<span class="source-line-no">082</span><span id="line-82">    }</span>
-<span class="source-line-no">083</span><span id="line-83"></span>
-<span class="source-line-no">084</span><span id="line-84">    /**</span>
-<span class="source-line-no">085</span><span id="line-85">     * Functional interface for parsing a {@link String} to an {@link Object} possibly</span>
-<span class="source-line-no">086</span><span id="line-86">     * throwing an {@link Exception}.</span>
-<span class="source-line-no">087</span><span id="line-87">     */</span>
-<span class="source-line-no">088</span><span id="line-88">    @FunctionalInterface</span>
-<span class="source-line-no">089</span><span id="line-89">    interface Parser {</span>
-<span class="source-line-no">090</span><span id="line-90">        Object apply(String s) throws Exception;</span>
-<span class="source-line-no">091</span><span id="line-91">    }</span>
-<span class="source-line-no">092</span><span id="line-92">}</span>
+<span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.core.JsonProcessingException;</span>
+<span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JsonNode;</span>
+<span class="source-line-no">005</span><span id="line-5"></span>
+<span class="source-line-no">006</span><span id="line-6">import java.util.stream.Stream;</span>
+<span class="source-line-no">007</span><span id="line-7"></span>
+<span class="source-line-no">008</span><span id="line-8">/**</span>
+<span class="source-line-no">009</span><span id="line-9"> * JSON-RPC method parameter, parsed from the command-line. There are two implementations: {@link Valid} and {@link Invalid}.</span>
+<span class="source-line-no">010</span><span id="line-10"> * A {@code Valid} contains an object that can be serialized to JSON via a converter/mapper like Jackson. An {@code Invalid}</span>
+<span class="source-line-no">011</span><span id="line-11"> * contains the {@link Exception} that occurred while parsing.</span>
+<span class="source-line-no">012</span><span id="line-12"> */</span>
+<span class="source-line-no">013</span><span id="line-13">public sealed interface CliParameter {</span>
+<span class="source-line-no">014</span><span id="line-14">    /**</span>
+<span class="source-line-no">015</span><span id="line-15">     * Return the source (pre-deserialization) JSON string</span>
+<span class="source-line-no">016</span><span id="line-16">     * @return source string</span>
+<span class="source-line-no">017</span><span id="line-17">     */</span>
+<span class="source-line-no">018</span><span id="line-18">    String source();</span>
+<span class="source-line-no">019</span><span id="line-19"></span>
+<span class="source-line-no">020</span><span id="line-20">    default boolean valid() {</span>
+<span class="source-line-no">021</span><span id="line-21">        return this instanceof CliParameter.Valid;</span>
+<span class="source-line-no">022</span><span id="line-22">    }</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">    default boolean invalid() {</span>
+<span class="source-line-no">025</span><span id="line-25">        return !valid();</span>
+<span class="source-line-no">026</span><span id="line-26">    }</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    /**</span>
+<span class="source-line-no">029</span><span id="line-29">     * Stream zero or 1 valid objects.</span>
+<span class="source-line-no">030</span><span id="line-30">     * &lt;p&gt;This allows {@code .flatMap(CliParameter::stream)} to filter invalid and unwrap valid objects.</span>
+<span class="source-line-no">031</span><span id="line-31">     * @return A stream of zero or one valid objects.</span>
+<span class="source-line-no">032</span><span id="line-32">     */</span>
+<span class="source-line-no">033</span><span id="line-33">    Stream&lt;Object&gt; stream();</span>
+<span class="source-line-no">034</span><span id="line-34"></span>
+<span class="source-line-no">035</span><span id="line-35">    /**</span>
+<span class="source-line-no">036</span><span id="line-36">     * Create a {@code Valid} object</span>
+<span class="source-line-no">037</span><span id="line-37">     * @param source The source CLI string</span>
+<span class="source-line-no">038</span><span id="line-38">     * @param object The resulting object</span>
+<span class="source-line-no">039</span><span id="line-39">     * @return a valid parameter</span>
+<span class="source-line-no">040</span><span id="line-40">     */</span>
+<span class="source-line-no">041</span><span id="line-41">    static Valid valid(String source, Object object) {</span>
+<span class="source-line-no">042</span><span id="line-42">        return new Valid(source, object);</span>
+<span class="source-line-no">043</span><span id="line-43">    }</span>
+<span class="source-line-no">044</span><span id="line-44"></span>
+<span class="source-line-no">045</span><span id="line-45">    /**</span>
+<span class="source-line-no">046</span><span id="line-46">     * Create a {@code Invalid} object</span>
+<span class="source-line-no">047</span><span id="line-47">     * @param source The source CLI string</span>
+<span class="source-line-no">048</span><span id="line-48">     * @param error The error returned from the parser</span>
+<span class="source-line-no">049</span><span id="line-49">     * @return a valid parameter</span>
+<span class="source-line-no">050</span><span id="line-50">     */</span>
+<span class="source-line-no">051</span><span id="line-51">    static Invalid invalid(String source, Exception error) {</span>
+<span class="source-line-no">052</span><span id="line-52">        return new Invalid(source, error);</span>
+<span class="source-line-no">053</span><span id="line-53">    }</span>
+<span class="source-line-no">054</span><span id="line-54"></span>
+<span class="source-line-no">055</span><span id="line-55">    /**</span>
+<span class="source-line-no">056</span><span id="line-56">     * Parse a string returning either a valid or invalid {@code CliParameter}</span>
+<span class="source-line-no">057</span><span id="line-57">     * @param source the CLI parameter string to parse</span>
+<span class="source-line-no">058</span><span id="line-58">     * @param parseFunction a parsing function</span>
+<span class="source-line-no">059</span><span id="line-59">     * @return wraps either parsed, serializable object or an {@code Exception}</span>
+<span class="source-line-no">060</span><span id="line-60">     */</span>
+<span class="source-line-no">061</span><span id="line-61">    static CliParameter parse(String source, Parser parseFunction) {</span>
+<span class="source-line-no">062</span><span id="line-62">        try {</span>
+<span class="source-line-no">063</span><span id="line-63">            return new CliParameter.Valid(source, parseFunction.apply(source));</span>
+<span class="source-line-no">064</span><span id="line-64">        } catch (Exception e) {</span>
+<span class="source-line-no">065</span><span id="line-65">            return new CliParameter.Invalid(source, e);</span>
+<span class="source-line-no">066</span><span id="line-66">        }</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69">    /**</span>
+<span class="source-line-no">070</span><span id="line-70">     * Implementation for Valid objects</span>
+<span class="source-line-no">071</span><span id="line-71">     * @param source source JSON string</span>
+<span class="source-line-no">072</span><span id="line-72">     * @param object parsed object</span>
+<span class="source-line-no">073</span><span id="line-73">     */</span>
+<span class="source-line-no">074</span><span id="line-74">    record Valid(String source, Object object) implements CliParameter {</span>
+<span class="source-line-no">075</span><span id="line-75">        public Stream&lt;Object&gt; stream() { return Stream.of(object); }</span>
+<span class="source-line-no">076</span><span id="line-76">    }</span>
+<span class="source-line-no">077</span><span id="line-77"></span>
+<span class="source-line-no">078</span><span id="line-78">    /**</span>
+<span class="source-line-no">079</span><span id="line-79">     * Implementation for Invalid source strings</span>
+<span class="source-line-no">080</span><span id="line-80">     * @param source source JSON string</span>
+<span class="source-line-no">081</span><span id="line-81">     * @param error parsing exception</span>
+<span class="source-line-no">082</span><span id="line-82">     */</span>
+<span class="source-line-no">083</span><span id="line-83">    record Invalid(String source, Exception error) implements CliParameter {</span>
+<span class="source-line-no">084</span><span id="line-84">        public Stream&lt;Object&gt; stream() { return Stream.empty(); }</span>
+<span class="source-line-no">085</span><span id="line-85">    }</span>
+<span class="source-line-no">086</span><span id="line-86"></span>
+<span class="source-line-no">087</span><span id="line-87">    /**</span>
+<span class="source-line-no">088</span><span id="line-88">     * Functional interface for parsing a {@link String} to an {@link Object} possibly</span>
+<span class="source-line-no">089</span><span id="line-89">     * throwing an {@link Exception}.</span>
+<span class="source-line-no">090</span><span id="line-90">     */</span>
+<span class="source-line-no">091</span><span id="line-91">    @FunctionalInterface</span>
+<span class="source-line-no">092</span><span id="line-92">    interface Parser {</span>
+<span class="source-line-no">093</span><span id="line-93">        JsonNode apply(String s) throws JsonProcessingException;</span>
+<span class="source-line-no">094</span><span id="line-94">    }</span>
+<span class="source-line-no">095</span><span id="line-95">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.html
index 195b2a904..ac10b33d6 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameter.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli, interface: CliParameter">
@@ -13,96 +13,99 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.jsonrpc.cli;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import java.util.stream.Stream;</span>
-<span class="source-line-no">004</span><span id="line-4"></span>
-<span class="source-line-no">005</span><span id="line-5">/**</span>
-<span class="source-line-no">006</span><span id="line-6"> * JSON-RPC method parameter, parsed from the command-line. There are two implementations: {@link Valid} and {@link Invalid}.</span>
-<span class="source-line-no">007</span><span id="line-7"> * A {@code Valid} contains an object that can be serialized to JSON via a converter/mapper like Jackson. An {@code Invalid}</span>
-<span class="source-line-no">008</span><span id="line-8"> * contains the {@link Exception} that occurred while parsing.</span>
-<span class="source-line-no">009</span><span id="line-9"> */</span>
-<span class="source-line-no">010</span><span id="line-10">public sealed interface CliParameter {</span>
-<span class="source-line-no">011</span><span id="line-11">    /**</span>
-<span class="source-line-no">012</span><span id="line-12">     * Return the source (pre-deserialization) JSON string</span>
-<span class="source-line-no">013</span><span id="line-13">     * @return source string</span>
-<span class="source-line-no">014</span><span id="line-14">     */</span>
-<span class="source-line-no">015</span><span id="line-15">    String source();</span>
-<span class="source-line-no">016</span><span id="line-16"></span>
-<span class="source-line-no">017</span><span id="line-17">    default boolean valid() {</span>
-<span class="source-line-no">018</span><span id="line-18">        return this instanceof CliParameter.Valid;</span>
-<span class="source-line-no">019</span><span id="line-19">    }</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">    default boolean invalid() {</span>
-<span class="source-line-no">022</span><span id="line-22">        return !valid();</span>
-<span class="source-line-no">023</span><span id="line-23">    }</span>
-<span class="source-line-no">024</span><span id="line-24"></span>
-<span class="source-line-no">025</span><span id="line-25">    /**</span>
-<span class="source-line-no">026</span><span id="line-26">     * Stream zero or 1 valid objects.</span>
-<span class="source-line-no">027</span><span id="line-27">     * &lt;p&gt;This allows {@code .flatMap(CliParameter::stream)} to filter invalid and unwrap valid objects.</span>
-<span class="source-line-no">028</span><span id="line-28">     * @return A stream of zero or one valid objects.</span>
-<span class="source-line-no">029</span><span id="line-29">     */</span>
-<span class="source-line-no">030</span><span id="line-30">    Stream&lt;Object&gt; stream();</span>
-<span class="source-line-no">031</span><span id="line-31"></span>
-<span class="source-line-no">032</span><span id="line-32">    /**</span>
-<span class="source-line-no">033</span><span id="line-33">     * Create a {@code Valid} object</span>
-<span class="source-line-no">034</span><span id="line-34">     * @param source The source CLI string</span>
-<span class="source-line-no">035</span><span id="line-35">     * @param object The resulting object</span>
-<span class="source-line-no">036</span><span id="line-36">     * @return a valid parameter</span>
-<span class="source-line-no">037</span><span id="line-37">     */</span>
-<span class="source-line-no">038</span><span id="line-38">    static Valid valid(String source, Object object) {</span>
-<span class="source-line-no">039</span><span id="line-39">        return new Valid(source, object);</span>
-<span class="source-line-no">040</span><span id="line-40">    }</span>
-<span class="source-line-no">041</span><span id="line-41"></span>
-<span class="source-line-no">042</span><span id="line-42">    /**</span>
-<span class="source-line-no">043</span><span id="line-43">     * Create a {@code Invalid} object</span>
-<span class="source-line-no">044</span><span id="line-44">     * @param source The source CLI string</span>
-<span class="source-line-no">045</span><span id="line-45">     * @param error The error returned from the parser</span>
-<span class="source-line-no">046</span><span id="line-46">     * @return a valid parameter</span>
-<span class="source-line-no">047</span><span id="line-47">     */</span>
-<span class="source-line-no">048</span><span id="line-48">    static Invalid invalid(String source, Exception error) {</span>
-<span class="source-line-no">049</span><span id="line-49">        return new Invalid(source, error);</span>
-<span class="source-line-no">050</span><span id="line-50">    }</span>
-<span class="source-line-no">051</span><span id="line-51"></span>
-<span class="source-line-no">052</span><span id="line-52">    /**</span>
-<span class="source-line-no">053</span><span id="line-53">     * Parse a string returning either a valid or invalid {@code CliParameter}</span>
-<span class="source-line-no">054</span><span id="line-54">     * @param source the CLI parameter string to parse</span>
-<span class="source-line-no">055</span><span id="line-55">     * @param parseFunction a parsing function</span>
-<span class="source-line-no">056</span><span id="line-56">     * @return wraps either parsed, serializable object or an {@code Exception}</span>
-<span class="source-line-no">057</span><span id="line-57">     */</span>
-<span class="source-line-no">058</span><span id="line-58">    static CliParameter parse(String source, Parser parseFunction) {</span>
-<span class="source-line-no">059</span><span id="line-59">        try {</span>
-<span class="source-line-no">060</span><span id="line-60">            return new CliParameter.Valid(source, parseFunction.apply(source));</span>
-<span class="source-line-no">061</span><span id="line-61">        } catch (Exception e) {</span>
-<span class="source-line-no">062</span><span id="line-62">            return new CliParameter.Invalid(source, e);</span>
-<span class="source-line-no">063</span><span id="line-63">        }</span>
-<span class="source-line-no">064</span><span id="line-64">    }</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66">    /**</span>
-<span class="source-line-no">067</span><span id="line-67">     * Implementation for Valid objects</span>
-<span class="source-line-no">068</span><span id="line-68">     * @param source source JSON string</span>
-<span class="source-line-no">069</span><span id="line-69">     * @param object parsed object</span>
-<span class="source-line-no">070</span><span id="line-70">     */</span>
-<span class="source-line-no">071</span><span id="line-71">    record Valid(String source, Object object) implements CliParameter {</span>
-<span class="source-line-no">072</span><span id="line-72">        public Stream&lt;Object&gt; stream() { return Stream.of(object); }</span>
-<span class="source-line-no">073</span><span id="line-73">    }</span>
-<span class="source-line-no">074</span><span id="line-74"></span>
-<span class="source-line-no">075</span><span id="line-75">    /**</span>
-<span class="source-line-no">076</span><span id="line-76">     * Implementation for Invalid source strings</span>
-<span class="source-line-no">077</span><span id="line-77">     * @param source source JSON string</span>
-<span class="source-line-no">078</span><span id="line-78">     * @param error parsing exception</span>
-<span class="source-line-no">079</span><span id="line-79">     */</span>
-<span class="source-line-no">080</span><span id="line-80">    record Invalid(String source, Exception error) implements CliParameter {</span>
-<span class="source-line-no">081</span><span id="line-81">        public Stream&lt;Object&gt; stream() { return Stream.empty(); }</span>
-<span class="source-line-no">082</span><span id="line-82">    }</span>
-<span class="source-line-no">083</span><span id="line-83"></span>
-<span class="source-line-no">084</span><span id="line-84">    /**</span>
-<span class="source-line-no">085</span><span id="line-85">     * Functional interface for parsing a {@link String} to an {@link Object} possibly</span>
-<span class="source-line-no">086</span><span id="line-86">     * throwing an {@link Exception}.</span>
-<span class="source-line-no">087</span><span id="line-87">     */</span>
-<span class="source-line-no">088</span><span id="line-88">    @FunctionalInterface</span>
-<span class="source-line-no">089</span><span id="line-89">    interface Parser {</span>
-<span class="source-line-no">090</span><span id="line-90">        Object apply(String s) throws Exception;</span>
-<span class="source-line-no">091</span><span id="line-91">    }</span>
-<span class="source-line-no">092</span><span id="line-92">}</span>
+<span class="source-line-no">003</span><span id="line-3">import com.fasterxml.jackson.core.JsonProcessingException;</span>
+<span class="source-line-no">004</span><span id="line-4">import com.fasterxml.jackson.databind.JsonNode;</span>
+<span class="source-line-no">005</span><span id="line-5"></span>
+<span class="source-line-no">006</span><span id="line-6">import java.util.stream.Stream;</span>
+<span class="source-line-no">007</span><span id="line-7"></span>
+<span class="source-line-no">008</span><span id="line-8">/**</span>
+<span class="source-line-no">009</span><span id="line-9"> * JSON-RPC method parameter, parsed from the command-line. There are two implementations: {@link Valid} and {@link Invalid}.</span>
+<span class="source-line-no">010</span><span id="line-10"> * A {@code Valid} contains an object that can be serialized to JSON via a converter/mapper like Jackson. An {@code Invalid}</span>
+<span class="source-line-no">011</span><span id="line-11"> * contains the {@link Exception} that occurred while parsing.</span>
+<span class="source-line-no">012</span><span id="line-12"> */</span>
+<span class="source-line-no">013</span><span id="line-13">public sealed interface CliParameter {</span>
+<span class="source-line-no">014</span><span id="line-14">    /**</span>
+<span class="source-line-no">015</span><span id="line-15">     * Return the source (pre-deserialization) JSON string</span>
+<span class="source-line-no">016</span><span id="line-16">     * @return source string</span>
+<span class="source-line-no">017</span><span id="line-17">     */</span>
+<span class="source-line-no">018</span><span id="line-18">    String source();</span>
+<span class="source-line-no">019</span><span id="line-19"></span>
+<span class="source-line-no">020</span><span id="line-20">    default boolean valid() {</span>
+<span class="source-line-no">021</span><span id="line-21">        return this instanceof CliParameter.Valid;</span>
+<span class="source-line-no">022</span><span id="line-22">    }</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">    default boolean invalid() {</span>
+<span class="source-line-no">025</span><span id="line-25">        return !valid();</span>
+<span class="source-line-no">026</span><span id="line-26">    }</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    /**</span>
+<span class="source-line-no">029</span><span id="line-29">     * Stream zero or 1 valid objects.</span>
+<span class="source-line-no">030</span><span id="line-30">     * &lt;p&gt;This allows {@code .flatMap(CliParameter::stream)} to filter invalid and unwrap valid objects.</span>
+<span class="source-line-no">031</span><span id="line-31">     * @return A stream of zero or one valid objects.</span>
+<span class="source-line-no">032</span><span id="line-32">     */</span>
+<span class="source-line-no">033</span><span id="line-33">    Stream&lt;Object&gt; stream();</span>
+<span class="source-line-no">034</span><span id="line-34"></span>
+<span class="source-line-no">035</span><span id="line-35">    /**</span>
+<span class="source-line-no">036</span><span id="line-36">     * Create a {@code Valid} object</span>
+<span class="source-line-no">037</span><span id="line-37">     * @param source The source CLI string</span>
+<span class="source-line-no">038</span><span id="line-38">     * @param object The resulting object</span>
+<span class="source-line-no">039</span><span id="line-39">     * @return a valid parameter</span>
+<span class="source-line-no">040</span><span id="line-40">     */</span>
+<span class="source-line-no">041</span><span id="line-41">    static Valid valid(String source, Object object) {</span>
+<span class="source-line-no">042</span><span id="line-42">        return new Valid(source, object);</span>
+<span class="source-line-no">043</span><span id="line-43">    }</span>
+<span class="source-line-no">044</span><span id="line-44"></span>
+<span class="source-line-no">045</span><span id="line-45">    /**</span>
+<span class="source-line-no">046</span><span id="line-46">     * Create a {@code Invalid} object</span>
+<span class="source-line-no">047</span><span id="line-47">     * @param source The source CLI string</span>
+<span class="source-line-no">048</span><span id="line-48">     * @param error The error returned from the parser</span>
+<span class="source-line-no">049</span><span id="line-49">     * @return a valid parameter</span>
+<span class="source-line-no">050</span><span id="line-50">     */</span>
+<span class="source-line-no">051</span><span id="line-51">    static Invalid invalid(String source, Exception error) {</span>
+<span class="source-line-no">052</span><span id="line-52">        return new Invalid(source, error);</span>
+<span class="source-line-no">053</span><span id="line-53">    }</span>
+<span class="source-line-no">054</span><span id="line-54"></span>
+<span class="source-line-no">055</span><span id="line-55">    /**</span>
+<span class="source-line-no">056</span><span id="line-56">     * Parse a string returning either a valid or invalid {@code CliParameter}</span>
+<span class="source-line-no">057</span><span id="line-57">     * @param source the CLI parameter string to parse</span>
+<span class="source-line-no">058</span><span id="line-58">     * @param parseFunction a parsing function</span>
+<span class="source-line-no">059</span><span id="line-59">     * @return wraps either parsed, serializable object or an {@code Exception}</span>
+<span class="source-line-no">060</span><span id="line-60">     */</span>
+<span class="source-line-no">061</span><span id="line-61">    static CliParameter parse(String source, Parser parseFunction) {</span>
+<span class="source-line-no">062</span><span id="line-62">        try {</span>
+<span class="source-line-no">063</span><span id="line-63">            return new CliParameter.Valid(source, parseFunction.apply(source));</span>
+<span class="source-line-no">064</span><span id="line-64">        } catch (Exception e) {</span>
+<span class="source-line-no">065</span><span id="line-65">            return new CliParameter.Invalid(source, e);</span>
+<span class="source-line-no">066</span><span id="line-66">        }</span>
+<span class="source-line-no">067</span><span id="line-67">    }</span>
+<span class="source-line-no">068</span><span id="line-68"></span>
+<span class="source-line-no">069</span><span id="line-69">    /**</span>
+<span class="source-line-no">070</span><span id="line-70">     * Implementation for Valid objects</span>
+<span class="source-line-no">071</span><span id="line-71">     * @param source source JSON string</span>
+<span class="source-line-no">072</span><span id="line-72">     * @param object parsed object</span>
+<span class="source-line-no">073</span><span id="line-73">     */</span>
+<span class="source-line-no">074</span><span id="line-74">    record Valid(String source, Object object) implements CliParameter {</span>
+<span class="source-line-no">075</span><span id="line-75">        public Stream&lt;Object&gt; stream() { return Stream.of(object); }</span>
+<span class="source-line-no">076</span><span id="line-76">    }</span>
+<span class="source-line-no">077</span><span id="line-77"></span>
+<span class="source-line-no">078</span><span id="line-78">    /**</span>
+<span class="source-line-no">079</span><span id="line-79">     * Implementation for Invalid source strings</span>
+<span class="source-line-no">080</span><span id="line-80">     * @param source source JSON string</span>
+<span class="source-line-no">081</span><span id="line-81">     * @param error parsing exception</span>
+<span class="source-line-no">082</span><span id="line-82">     */</span>
+<span class="source-line-no">083</span><span id="line-83">    record Invalid(String source, Exception error) implements CliParameter {</span>
+<span class="source-line-no">084</span><span id="line-84">        public Stream&lt;Object&gt; stream() { return Stream.empty(); }</span>
+<span class="source-line-no">085</span><span id="line-85">    }</span>
+<span class="source-line-no">086</span><span id="line-86"></span>
+<span class="source-line-no">087</span><span id="line-87">    /**</span>
+<span class="source-line-no">088</span><span id="line-88">     * Functional interface for parsing a {@link String} to an {@link Object} possibly</span>
+<span class="source-line-no">089</span><span id="line-89">     * throwing an {@link Exception}.</span>
+<span class="source-line-no">090</span><span id="line-90">     */</span>
+<span class="source-line-no">091</span><span id="line-91">    @FunctionalInterface</span>
+<span class="source-line-no">092</span><span id="line-92">    interface Parser {</span>
+<span class="source-line-no">093</span><span id="line-93">        JsonNode apply(String s) throws JsonProcessingException;</span>
+<span class="source-line-no">094</span><span id="line-94">    }</span>
+<span class="source-line-no">095</span><span id="line-95">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameterParser.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameterParser.html
index 2e55d2057..257d195a7 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameterParser.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/CliParameterParser.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli, class: CliParameterParser">
@@ -72,7 +72,7 @@
 <span class="source-line-no">059</span><span id="line-59">    }</span>
 <span class="source-line-no">060</span><span id="line-60"></span>
 <span class="source-line-no">061</span><span id="line-61">    /**</span>
-<span class="source-line-no">062</span><span id="line-62">     * Convert a single param from a command-line option {@code String} to a type more appropriate</span>
+<span class="source-line-no">062</span><span id="line-62">     * Convert a single param from a command-line argument {@code String} to a type more appropriate</span>
 <span class="source-line-no">063</span><span id="line-63">     * for serialization by Jackson/JSON-RPC.</span>
 <span class="source-line-no">064</span><span id="line-64">     *</span>
 <span class="source-line-no">065</span><span id="line-65">     * @param param A string parameter to convert</span>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html
index 50c847539..b63849293 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/GenericJsonRpcTool.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli, class: GenericJsonRpcTool">
@@ -26,7 +26,7 @@
 <span class="source-line-no">013</span><span id="line-13">public class GenericJsonRpcTool extends BaseJsonRpcTool {</span>
 <span class="source-line-no">014</span><span id="line-14">    public final static String commandName = "jsonrpc";</span>
 <span class="source-line-no">015</span><span id="line-15"></span>
-<span class="source-line-no">016</span><span id="line-16">    // For a GraalVM command-line tool we muse configure Java Logging in main</span>
+<span class="source-line-no">016</span><span id="line-16">    // For a GraalVM command-line tool we must configure Java Logging in main</span>
 <span class="source-line-no">017</span><span id="line-17">    // before initializing this Logger object</span>
 <span class="source-line-no">018</span><span id="line-18">    private static Logger log;</span>
 <span class="source-line-no">019</span><span id="line-19"></span>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html
index c2a8c3ac3..38671e515 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/JavaLoggingSupport.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli, class: JavaLoggingSupport">
@@ -54,12 +54,22 @@
 <span class="source-line-no">041</span><span id="line-41"></span>
 <span class="source-line-no">042</span><span id="line-42">    /**</span>
 <span class="source-line-no">043</span><span id="line-43">     * Change log level (eg. as a result of `-v` command-line option)</span>
-<span class="source-line-no">044</span><span id="line-44">     */</span>
-<span class="source-line-no">045</span><span id="line-45">    public static void setVerbose() {</span>
-<span class="source-line-no">046</span><span id="line-46">        final Logger app = Logger.getLogger(loggerName);</span>
-<span class="source-line-no">047</span><span id="line-47">        app.setLevel(Level.FINE);</span>
+<span class="source-line-no">044</span><span id="line-44">     * This sets the level to {@link Level#FINE}</span>
+<span class="source-line-no">045</span><span id="line-45">     */</span>
+<span class="source-line-no">046</span><span id="line-46">    public static void setVerbose() {</span>
+<span class="source-line-no">047</span><span id="line-47">        setLogLevel(Level.FINE);</span>
 <span class="source-line-no">048</span><span id="line-48">    }</span>
-<span class="source-line-no">049</span><span id="line-49">}</span>
+<span class="source-line-no">049</span><span id="line-49"></span>
+<span class="source-line-no">050</span><span id="line-50">    /**</span>
+<span class="source-line-no">051</span><span id="line-51">     * Change log level (eg. as a result of `-log=level` command-line option)</span>
+<span class="source-line-no">052</span><span id="line-52">     * @param level j.u.logging log level</span>
+<span class="source-line-no">053</span><span id="line-53">     */</span>
+<span class="source-line-no">054</span><span id="line-54">    public static void setLogLevel(Level level) {</span>
+<span class="source-line-no">055</span><span id="line-55">        final Logger app = Logger.getLogger(loggerName);</span>
+<span class="source-line-no">056</span><span id="line-56">        app.setLevel(level);</span>
+<span class="source-line-no">057</span><span id="line-57">    }</span>
+<span class="source-line-no">058</span><span id="line-58"></span>
+<span class="source-line-no">059</span><span id="line-59">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html
index e9d360368..92f6c7588 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/JsonRpcToolOptions.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli, class: JsonRpcToolOptions">
@@ -26,63 +26,69 @@
 <span class="source-line-no">013</span><span id="line-13">        this.addOption("?", "help", false, "This help message")</span>
 <span class="source-line-no">014</span><span id="line-14">            .addOption((Option.builder("v")</span>
 <span class="source-line-no">015</span><span id="line-15">                    .longOpt("verbose")</span>
-<span class="source-line-no">016</span><span id="line-16">                    .desc("Print verbose output")</span>
+<span class="source-line-no">016</span><span id="line-16">                    .desc("Print verbose output (log-level = 3/INFO")</span>
 <span class="source-line-no">017</span><span id="line-17">                    .build()))</span>
-<span class="source-line-no">018</span><span id="line-18">            .addOption(Option.builder()</span>
-<span class="source-line-no">019</span><span id="line-19">                    .longOpt("V1")</span>
-<span class="source-line-no">020</span><span id="line-20">                    .desc("Send '1.0' in the request 'jsonrpc' field as the JSON-RPC version")</span>
-<span class="source-line-no">021</span><span id="line-21">                    .build())</span>
-<span class="source-line-no">022</span><span id="line-22">            .addOption(Option.builder("u")</span>
-<span class="source-line-no">023</span><span id="line-23">                    .longOpt("url")</span>
-<span class="source-line-no">024</span><span id="line-24">                    .desc("URL for the JSON-RPC endpoint")</span>
-<span class="source-line-no">025</span><span id="line-25">                    .hasArg()</span>
-<span class="source-line-no">026</span><span id="line-26">                    .argName("url")</span>
+<span class="source-line-no">018</span><span id="line-18">            .addOption((Option.builder()</span>
+<span class="source-line-no">019</span><span id="line-19">                    .longOpt("log")</span>
+<span class="source-line-no">020</span><span id="line-20">                    .desc("log-level (0-5: OFF, SEVERE, WARNING, INFO, FINE, ALL)")</span>
+<span class="source-line-no">021</span><span id="line-21">                    .hasArg()</span>
+<span class="source-line-no">022</span><span id="line-22">                    .argName("level")</span>
+<span class="source-line-no">023</span><span id="line-23">                    .build()))</span>
+<span class="source-line-no">024</span><span id="line-24">            .addOption(Option.builder()</span>
+<span class="source-line-no">025</span><span id="line-25">                    .longOpt("V1")</span>
+<span class="source-line-no">026</span><span id="line-26">                    .desc("Send '1.0' in the request 'jsonrpc' field as the JSON-RPC version")</span>
 <span class="source-line-no">027</span><span id="line-27">                    .build())</span>
-<span class="source-line-no">028</span><span id="line-28">            .addOption(Option.builder()</span>
-<span class="source-line-no">029</span><span id="line-29">                    .longOpt("add-truststore")</span>
-<span class="source-line-no">030</span><span id="line-30">                    .desc("Additional truststore")</span>
+<span class="source-line-no">028</span><span id="line-28">            .addOption(Option.builder("u")</span>
+<span class="source-line-no">029</span><span id="line-29">                    .longOpt("url")</span>
+<span class="source-line-no">030</span><span id="line-30">                    .desc("URL for the JSON-RPC endpoint")</span>
 <span class="source-line-no">031</span><span id="line-31">                    .hasArg()</span>
-<span class="source-line-no">032</span><span id="line-32">                    .argName("path")</span>
+<span class="source-line-no">032</span><span id="line-32">                    .argName("url")</span>
 <span class="source-line-no">033</span><span id="line-33">                    .build())</span>
 <span class="source-line-no">034</span><span id="line-34">            .addOption(Option.builder()</span>
-<span class="source-line-no">035</span><span id="line-35">                    .longOpt("alt-truststore")</span>
-<span class="source-line-no">036</span><span id="line-36">                    .desc("Alternate truststore (password must be 'changeit')")</span>
+<span class="source-line-no">035</span><span id="line-35">                    .longOpt("add-truststore")</span>
+<span class="source-line-no">036</span><span id="line-36">                    .desc("Additional truststore")</span>
 <span class="source-line-no">037</span><span id="line-37">                    .hasArg()</span>
 <span class="source-line-no">038</span><span id="line-38">                    .argName("path")</span>
 <span class="source-line-no">039</span><span id="line-39">                    .build())</span>
 <span class="source-line-no">040</span><span id="line-40">            .addOption(Option.builder()</span>
-<span class="source-line-no">041</span><span id="line-41">                    .longOpt("response")</span>
-<span class="source-line-no">042</span><span id="line-42">                    .desc("Output entire JsonRpcResponse, not just the result")</span>
-<span class="source-line-no">043</span><span id="line-43">                    .build())</span>
-<span class="source-line-no">044</span><span id="line-44">            // Bitcoin-CLI style options</span>
-<span class="source-line-no">045</span><span id="line-45">            .addOption(Option.builder()</span>
-<span class="source-line-no">046</span><span id="line-46">                    .longOpt("rpcconnect")</span>
-<span class="source-line-no">047</span><span id="line-47">                    .desc("Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)")</span>
-<span class="source-line-no">048</span><span id="line-48">                    .hasArg()</span>
-<span class="source-line-no">049</span><span id="line-49">                    .argName("ip")</span>
-<span class="source-line-no">050</span><span id="line-50">                    .build())</span>
+<span class="source-line-no">041</span><span id="line-41">                    .longOpt("alt-truststore")</span>
+<span class="source-line-no">042</span><span id="line-42">                    .desc("Alternate truststore (password must be 'changeit')")</span>
+<span class="source-line-no">043</span><span id="line-43">                    .hasArg()</span>
+<span class="source-line-no">044</span><span id="line-44">                    .argName("path")</span>
+<span class="source-line-no">045</span><span id="line-45">                    .build())</span>
+<span class="source-line-no">046</span><span id="line-46">            .addOption(Option.builder()</span>
+<span class="source-line-no">047</span><span id="line-47">                    .longOpt("response")</span>
+<span class="source-line-no">048</span><span id="line-48">                    .desc("Output entire JsonRpcResponse, not just the result")</span>
+<span class="source-line-no">049</span><span id="line-49">                    .build())</span>
+<span class="source-line-no">050</span><span id="line-50">            // Bitcoin-CLI style options</span>
 <span class="source-line-no">051</span><span id="line-51">            .addOption(Option.builder()</span>
-<span class="source-line-no">052</span><span id="line-52">                    .longOpt("rpcport")</span>
-<span class="source-line-no">053</span><span id="line-53">                    .desc("Connect to JSON-RPC on &lt;port&gt; (default: 8080)")</span>
+<span class="source-line-no">052</span><span id="line-52">                    .longOpt("rpcconnect")</span>
+<span class="source-line-no">053</span><span id="line-53">                    .desc("Send commands to node running on &lt;ip&gt; (default: 127.0.0.1)")</span>
 <span class="source-line-no">054</span><span id="line-54">                    .hasArg()</span>
-<span class="source-line-no">055</span><span id="line-55">                    .argName("port")</span>
+<span class="source-line-no">055</span><span id="line-55">                    .argName("ip")</span>
 <span class="source-line-no">056</span><span id="line-56">                    .build())</span>
 <span class="source-line-no">057</span><span id="line-57">            .addOption(Option.builder()</span>
-<span class="source-line-no">058</span><span id="line-58">                    .longOpt("rpcuser")</span>
-<span class="source-line-no">059</span><span id="line-59">                    .desc("Username for JSON-RPC connections")</span>
+<span class="source-line-no">058</span><span id="line-58">                    .longOpt("rpcport")</span>
+<span class="source-line-no">059</span><span id="line-59">                    .desc("Connect to JSON-RPC on &lt;port&gt; (default: 8080)")</span>
 <span class="source-line-no">060</span><span id="line-60">                    .hasArg()</span>
-<span class="source-line-no">061</span><span id="line-61">                    .argName("user")</span>
+<span class="source-line-no">061</span><span id="line-61">                    .argName("port")</span>
 <span class="source-line-no">062</span><span id="line-62">                    .build())</span>
 <span class="source-line-no">063</span><span id="line-63">            .addOption(Option.builder()</span>
-<span class="source-line-no">064</span><span id="line-64">                    .longOpt("rpcpassword")</span>
-<span class="source-line-no">065</span><span id="line-65">                    .desc("Password for JSON-RPC connections")</span>
+<span class="source-line-no">064</span><span id="line-64">                    .longOpt("rpcuser")</span>
+<span class="source-line-no">065</span><span id="line-65">                    .desc("Username for JSON-RPC connections")</span>
 <span class="source-line-no">066</span><span id="line-66">                    .hasArg()</span>
-<span class="source-line-no">067</span><span id="line-67">                    .argName("pw")</span>
+<span class="source-line-no">067</span><span id="line-67">                    .argName("user")</span>
 <span class="source-line-no">068</span><span id="line-68">                    .build())</span>
-<span class="source-line-no">069</span><span id="line-69">            .addOption(null, "rpcssl", false, "Use https for JSON-RPC connections");</span>
-<span class="source-line-no">070</span><span id="line-70">    }</span>
-<span class="source-line-no">071</span><span id="line-71"></span>
-<span class="source-line-no">072</span><span id="line-72">}</span>
+<span class="source-line-no">069</span><span id="line-69">            .addOption(Option.builder()</span>
+<span class="source-line-no">070</span><span id="line-70">                    .longOpt("rpcpassword")</span>
+<span class="source-line-no">071</span><span id="line-71">                    .desc("Password for JSON-RPC connections")</span>
+<span class="source-line-no">072</span><span id="line-72">                    .hasArg()</span>
+<span class="source-line-no">073</span><span id="line-73">                    .argName("pw")</span>
+<span class="source-line-no">074</span><span id="line-74">                    .build())</span>
+<span class="source-line-no">075</span><span id="line-75">            .addOption(null, "rpcssl", false, "Use https for JSON-RPC connections");</span>
+<span class="source-line-no">076</span><span id="line-76">    }</span>
+<span class="source-line-no">077</span><span id="line-77"></span>
+<span class="source-line-no">078</span><span id="line-78">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/test/CLICommandResult.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/test/CLICommandResult.html
index de4776d38..e1d2abd5f 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/test/CLICommandResult.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/test/CLICommandResult.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli.test, class: CLICommandResult">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/cli/test/CLITestSupport.html b/apidoc/src-html/org/consensusj/jsonrpc/cli/test/CLITestSupport.html
index 0747266cf..d901b08f7 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/cli/test/CLITestSupport.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/cli/test/CLITestSupport.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.cli.test, interface: CLITestSupport">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/daemon/Application.html b/apidoc/src-html/org/consensusj/jsonrpc/daemon/Application.html
index 30afd97e4..254a5f8c2 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/daemon/Application.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/daemon/Application.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.daemon, class: Application">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/daemon/EchoJsonRpcService.html b/apidoc/src-html/org/consensusj/jsonrpc/daemon/EchoJsonRpcService.html
index 7ad527fa4..1f4b85bbd 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/daemon/EchoJsonRpcService.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/daemon/EchoJsonRpcService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.daemon, class: EchoJsonRpcService">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/daemon/JsonRpcController.html b/apidoc/src-html/org/consensusj/jsonrpc/daemon/JsonRpcController.html
index 101221991..3a1c94a29 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/daemon/JsonRpcController.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/daemon/JsonRpcController.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.daemon, class: JsonRpcController">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/groovy/Dummy.html b/apidoc/src-html/org/consensusj/jsonrpc/groovy/Dummy.html
index 942c3d178..d63ae811d 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/groovy/Dummy.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/groovy/Dummy.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.groovy, class: Dummy">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/internal/NumberStringSerializer.html b/apidoc/src-html/org/consensusj/jsonrpc/internal/NumberStringSerializer.html
index abbf7b119..f7a4fc57e 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/internal/NumberStringSerializer.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/internal/NumberStringSerializer.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.internal, class: NumberStringSerializer">
@@ -25,7 +25,7 @@
 <span class="source-line-no">012</span><span id="line-12"> * If string is an integer (valid long) serialize as Number, else serialize as String</span>
 <span class="source-line-no">013</span><span id="line-13"> */</span>
 <span class="source-line-no">014</span><span id="line-14">public class NumberStringSerializer extends JsonSerializer&lt;String&gt; {</span>
-<span class="source-line-no">015</span><span id="line-15">    private static Pattern numberRegEx = Pattern.compile("^-?\\d+$");</span>
+<span class="source-line-no">015</span><span id="line-15">    private static final Pattern numberRegEx = Pattern.compile("^-?\\d+$");</span>
 <span class="source-line-no">016</span><span id="line-16"></span>
 <span class="source-line-no">017</span><span id="line-17">    @Override</span>
 <span class="source-line-no">018</span><span id="line-18">    public void serialize(String numberOrString, JsonGenerator jsonGenerator,</span>
@@ -34,7 +34,7 @@
 <span class="source-line-no">021</span><span id="line-21"></span>
 <span class="source-line-no">022</span><span id="line-22">        if (numberRegEx.matcher(numberOrString).matches()) {</span>
 <span class="source-line-no">023</span><span id="line-23">            try {</span>
-<span class="source-line-no">024</span><span id="line-24">                jsonGenerator.writeNumber(Long.valueOf(numberOrString));</span>
+<span class="source-line-no">024</span><span id="line-24">                jsonGenerator.writeNumber(Long.parseLong(numberOrString));</span>
 <span class="source-line-no">025</span><span id="line-25">                return;</span>
 <span class="source-line-no">026</span><span id="line-26">            } catch (NumberFormatException ignored) {}</span>
 <span class="source-line-no">027</span><span id="line-27">        }</span>
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html b/apidoc/src-html/org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html
index 94eb42873..5c57a8090 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/introspection/AbstractJsonRpcService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.introspection, class: AbstractJsonRpcService">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html b/apidoc/src-html/org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html
index a1b6c4ca0..db504638d 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/introspection/DelegatingJsonRpcService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.introspection, class: DelegatingJsonRpcService">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html b/apidoc/src-html/org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html
index 203936c1b..a7f04970a 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/introspection/JsonRpcServiceWrapper.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.introspection, interface: JsonRpcServiceWrapper">
diff --git a/apidoc/src-html/org/consensusj/jsonrpc/introspection/sample/MathService.html b/apidoc/src-html/org/consensusj/jsonrpc/introspection/sample/MathService.html
index 1e8bec9d6..6766e6ca4 100644
--- a/apidoc/src-html/org/consensusj/jsonrpc/introspection/sample/MathService.html
+++ b/apidoc/src-html/org/consensusj/jsonrpc/introspection/sample/MathService.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.jsonrpc.introspection.sample, class: MathService">
diff --git a/apidoc/src-html/org/consensusj/namecoin/jsonrpc/NamecoinClient.html b/apidoc/src-html/org/consensusj/namecoin/jsonrpc/NamecoinClient.html
index 391b6d1f8..6e831680b 100644
--- a/apidoc/src-html/org/consensusj/namecoin/jsonrpc/NamecoinClient.html
+++ b/apidoc/src-html/org/consensusj/namecoin/jsonrpc/NamecoinClient.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.namecoin.jsonrpc, class: NamecoinClient">
diff --git a/apidoc/src-html/org/consensusj/namecoin/jsonrpc/cli/NmcLookup.html b/apidoc/src-html/org/consensusj/namecoin/jsonrpc/cli/NmcLookup.html
index 800393547..1241e466a 100644
--- a/apidoc/src-html/org/consensusj/namecoin/jsonrpc/cli/NmcLookup.html
+++ b/apidoc/src-html/org/consensusj/namecoin/jsonrpc/cli/NmcLookup.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.namecoin.jsonrpc.cli, class: NmcLookup">
diff --git a/apidoc/src-html/org/consensusj/namecoin/jsonrpc/core/NMCMainNetParams.html b/apidoc/src-html/org/consensusj/namecoin/jsonrpc/core/NMCMainNetParams.html
index db77d649d..6d2e02849 100644
--- a/apidoc/src-html/org/consensusj/namecoin/jsonrpc/core/NMCMainNetParams.html
+++ b/apidoc/src-html/org/consensusj/namecoin/jsonrpc/core/NMCMainNetParams.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.namecoin.jsonrpc.core, class: NMCMainNetParams">
diff --git a/apidoc/src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html b/apidoc/src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html
index 76e137009..2df21f37f 100644
--- a/apidoc/src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html
+++ b/apidoc/src-html/org/consensusj/namecoin/jsonrpc/core/NameCoinNetwork.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.namecoin.jsonrpc.core, enum: NameCoinNetwork">
@@ -17,191 +17,190 @@
 <span class="source-line-no">004</span><span id="line-4">import org.bitcoinj.base.LegacyAddress;</span>
 <span class="source-line-no">005</span><span id="line-5">import org.bitcoinj.base.Monetary;</span>
 <span class="source-line-no">006</span><span id="line-6">import org.bitcoinj.base.Network;</span>
-<span class="source-line-no">007</span><span id="line-7">import org.bitcoinj.base.SegwitAddress;</span>
-<span class="source-line-no">008</span><span id="line-8"></span>
-<span class="source-line-no">009</span><span id="line-9">import java.util.ArrayList;</span>
-<span class="source-line-no">010</span><span id="line-10">import java.util.Arrays;</span>
-<span class="source-line-no">011</span><span id="line-11">import java.util.Collections;</span>
-<span class="source-line-no">012</span><span id="line-12">import java.util.HashMap;</span>
-<span class="source-line-no">013</span><span id="line-13">import java.util.List;</span>
-<span class="source-line-no">014</span><span id="line-14">import java.util.Locale;</span>
-<span class="source-line-no">015</span><span id="line-15">import java.util.Map;</span>
-<span class="source-line-no">016</span><span id="line-16">import java.util.Optional;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.util.stream.Stream;</span>
-<span class="source-line-no">018</span><span id="line-18"></span>
-<span class="source-line-no">019</span><span id="line-19">import static org.bitcoinj.base.Coin.COIN;</span>
-<span class="source-line-no">020</span><span id="line-20"></span>
-<span class="source-line-no">021</span><span id="line-21">/**</span>
-<span class="source-line-no">022</span><span id="line-22"> *</span>
-<span class="source-line-no">023</span><span id="line-23"> */</span>
-<span class="source-line-no">024</span><span id="line-24">public enum NameCoinNetwork implements Network {</span>
-<span class="source-line-no">025</span><span id="line-25">    MAINNET("org.namecoin.mainnet"),</span>
-<span class="source-line-no">026</span><span id="line-26">    TESTNET("org.namecoin.testnet"),</span>
-<span class="source-line-no">027</span><span id="line-27">    SIGNET("org.namecoin.signet"),</span>
-<span class="source-line-no">028</span><span id="line-28">    REGTEST("org.namecoin.regtest");</span>
-<span class="source-line-no">029</span><span id="line-29"></span>
-<span class="source-line-no">030</span><span id="line-30">    /**</span>
-<span class="source-line-no">031</span><span id="line-31">     * Scheme part for Bitcoin URIs.</span>
-<span class="source-line-no">032</span><span id="line-32">     */</span>
-<span class="source-line-no">033</span><span id="line-33">    public static final String BITCOIN_SCHEME = "bitcoin";</span>
-<span class="source-line-no">034</span><span id="line-34"></span>
-<span class="source-line-no">035</span><span id="line-35">    /**</span>
-<span class="source-line-no">036</span><span id="line-36">     * The maximum number of coins to be generated</span>
-<span class="source-line-no">037</span><span id="line-37">     */</span>
-<span class="source-line-no">038</span><span id="line-38">    private static final long MAX_COINS = 21_000_000;</span>
-<span class="source-line-no">039</span><span id="line-39"></span>
-<span class="source-line-no">040</span><span id="line-40">    /**</span>
-<span class="source-line-no">041</span><span id="line-41">     * The maximum money to be generated</span>
-<span class="source-line-no">042</span><span id="line-42">     */</span>
-<span class="source-line-no">043</span><span id="line-43">    public static final Coin MAX_MONEY = COIN.multiply(MAX_COINS);</span>
-<span class="source-line-no">044</span><span id="line-44"></span>
-<span class="source-line-no">045</span><span id="line-45">    /** The ID string for the main, production network where people trade things. */</span>
-<span class="source-line-no">046</span><span id="line-46">    public static final String ID_MAINNET = MAINNET.id();</span>
-<span class="source-line-no">047</span><span id="line-47">    /** The ID string for the testnet. */</span>
-<span class="source-line-no">048</span><span id="line-48">    public static final String ID_TESTNET = TESTNET.id();</span>
-<span class="source-line-no">049</span><span id="line-49">    /** The ID string for the signet. */</span>
-<span class="source-line-no">050</span><span id="line-50">    public static final String ID_SIGNET = SIGNET.id();</span>
-<span class="source-line-no">051</span><span id="line-51">    /** The ID string for regtest mode. */</span>
-<span class="source-line-no">052</span><span id="line-52">    public static final String ID_REGTEST = REGTEST.id();</span>
-<span class="source-line-no">053</span><span id="line-53">    /** The ID string for the Unit test network -- there is no corresponding {@code enum}. */</span>
-<span class="source-line-no">054</span><span id="line-54">    public static final String ID_UNITTESTNET = "org.bitcoinj.unittest";</span>
-<span class="source-line-no">055</span><span id="line-55"></span>
-<span class="source-line-no">056</span><span id="line-56">    private final String id;</span>
-<span class="source-line-no">057</span><span id="line-57"></span>
-<span class="source-line-no">058</span><span id="line-58">    // All supported names for this BitcoinNetwork</span>
-<span class="source-line-no">059</span><span id="line-59">    private final List&lt;String&gt; allNames;</span>
-<span class="source-line-no">060</span><span id="line-60"></span>
-<span class="source-line-no">061</span><span id="line-61">    // Maps from names and alternateNames to BitcoinNetwork</span>
-<span class="source-line-no">062</span><span id="line-62">    private static final Map&lt;String, NameCoinNetwork&gt; stringToEnum = mergedNameMap();</span>
-<span class="source-line-no">063</span><span id="line-63"></span>
-<span class="source-line-no">064</span><span id="line-64">    NameCoinNetwork(String networkId, String... alternateNames) {</span>
-<span class="source-line-no">065</span><span id="line-65">        this.id = networkId;</span>
-<span class="source-line-no">066</span><span id="line-66">        this.allNames = combine(this.toString(), alternateNames);</span>
-<span class="source-line-no">067</span><span id="line-67">    }</span>
-<span class="source-line-no">068</span><span id="line-68"></span>
-<span class="source-line-no">069</span><span id="line-69">    /**</span>
-<span class="source-line-no">070</span><span id="line-70">     * Return the canonical, lowercase, user-facing {@code String} for an {@code enum}</span>
-<span class="source-line-no">071</span><span id="line-71">     * @return canonical lowercase value</span>
-<span class="source-line-no">072</span><span id="line-72">     */</span>
-<span class="source-line-no">073</span><span id="line-73">    @Override</span>
-<span class="source-line-no">074</span><span id="line-74">    public String toString() {</span>
-<span class="source-line-no">075</span><span id="line-75">        return name().toLowerCase(Locale.ROOT);</span>
-<span class="source-line-no">076</span><span id="line-76">    }</span>
-<span class="source-line-no">077</span><span id="line-77"></span>
-<span class="source-line-no">078</span><span id="line-78">    /**</span>
-<span class="source-line-no">079</span><span id="line-79">     * Return the network ID string (previously specified in {@code NetworkParameters})</span>
-<span class="source-line-no">080</span><span id="line-80">     *</span>
-<span class="source-line-no">081</span><span id="line-81">     * @return The network ID string</span>
-<span class="source-line-no">082</span><span id="line-82">     */</span>
-<span class="source-line-no">083</span><span id="line-83">    @Override</span>
-<span class="source-line-no">084</span><span id="line-84">    public String id() {</span>
-<span class="source-line-no">085</span><span id="line-85">        return id;</span>
-<span class="source-line-no">086</span><span id="line-86">    }</span>
-<span class="source-line-no">087</span><span id="line-87"></span>
-<span class="source-line-no">088</span><span id="line-88">    /**</span>
-<span class="source-line-no">089</span><span id="line-89">     * Header byte of base58 encoded legacy P2PKH addresses for this network.</span>
-<span class="source-line-no">090</span><span id="line-90">     * @return header byte as an {@code int}.</span>
-<span class="source-line-no">091</span><span id="line-91">     * @see LegacyAddress.AddressHeader</span>
-<span class="source-line-no">092</span><span id="line-92">     */</span>
-<span class="source-line-no">093</span><span id="line-93">    public int legacyAddressHeader() {</span>
-<span class="source-line-no">094</span><span id="line-94">        //return LegacyAddress.AddressHeader.ofNetwork(this).headerByte();</span>
-<span class="source-line-no">095</span><span id="line-95">        return 52;</span>
-<span class="source-line-no">096</span><span id="line-96">    }</span>
-<span class="source-line-no">097</span><span id="line-97"></span>
-<span class="source-line-no">098</span><span id="line-98">    /**</span>
-<span class="source-line-no">099</span><span id="line-99">     * Header byte of base58 encoded legacy P2SH addresses for this network.</span>
-<span class="source-line-no">100</span><span id="line-100">     * @return header byte as an {@code int}.</span>
-<span class="source-line-no">101</span><span id="line-101">     * @see LegacyAddress.P2SHHeader</span>
-<span class="source-line-no">102</span><span id="line-102">     */</span>
-<span class="source-line-no">103</span><span id="line-103">    public int legacyP2SHHeader() {</span>
-<span class="source-line-no">104</span><span id="line-104">        //return LegacyAddress.P2SHHeader.ofNetwork(this).headerByte();</span>
-<span class="source-line-no">105</span><span id="line-105">        return 5;</span>
-<span class="source-line-no">106</span><span id="line-106">    }</span>
-<span class="source-line-no">107</span><span id="line-107"></span>
-<span class="source-line-no">108</span><span id="line-108">    /**</span>
-<span class="source-line-no">109</span><span id="line-109">     * Return the standard Bech32 {@link org.bitcoinj.base.SegwitAddress.SegwitHrp} (as a {@code String}) for</span>
-<span class="source-line-no">110</span><span id="line-110">     * this network.</span>
-<span class="source-line-no">111</span><span id="line-111">     * @return The HRP as a (lowercase) string.</span>
-<span class="source-line-no">112</span><span id="line-112">     */</span>
-<span class="source-line-no">113</span><span id="line-113">    public String segwitAddressHrp() {</span>
-<span class="source-line-no">114</span><span id="line-114">        //return LegacyAddress.P2SHHeader.ofNetwork(this).headerByte();</span>
-<span class="source-line-no">115</span><span id="line-115">        return "??";</span>
-<span class="source-line-no">116</span><span id="line-116">    }</span>
-<span class="source-line-no">117</span><span id="line-117"></span>
-<span class="source-line-no">118</span><span id="line-118">    /**</span>
-<span class="source-line-no">119</span><span id="line-119">     * The URI scheme for Bitcoin.</span>
-<span class="source-line-no">120</span><span id="line-120">     * @see &lt;a href="https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki"&gt;BIP 0021&lt;/a&gt;</span>
-<span class="source-line-no">121</span><span id="line-121">     * @return string containing the URI scheme</span>
-<span class="source-line-no">122</span><span id="line-122">     */</span>
-<span class="source-line-no">123</span><span id="line-123">    @Override</span>
-<span class="source-line-no">124</span><span id="line-124">    public String uriScheme() {</span>
-<span class="source-line-no">125</span><span id="line-125">        return BITCOIN_SCHEME;</span>
-<span class="source-line-no">126</span><span id="line-126">    }</span>
-<span class="source-line-no">127</span><span id="line-127"></span>
-<span class="source-line-no">128</span><span id="line-128">    @Override</span>
-<span class="source-line-no">129</span><span id="line-129">    public boolean hasMaxMoney() {</span>
-<span class="source-line-no">130</span><span id="line-130">        return true;</span>
-<span class="source-line-no">131</span><span id="line-131">    }</span>
-<span class="source-line-no">132</span><span id="line-132"></span>
-<span class="source-line-no">133</span><span id="line-133">    @Override</span>
-<span class="source-line-no">134</span><span id="line-134">    public Coin maxMoney() {</span>
-<span class="source-line-no">135</span><span id="line-135">        return MAX_MONEY;</span>
-<span class="source-line-no">136</span><span id="line-136">    }</span>
-<span class="source-line-no">137</span><span id="line-137"></span>
-<span class="source-line-no">138</span><span id="line-138">    @Override</span>
-<span class="source-line-no">139</span><span id="line-139">    public boolean exceedsMaxMoney(Monetary amount) {</span>
-<span class="source-line-no">140</span><span id="line-140">        if (amount instanceof Coin) {</span>
-<span class="source-line-no">141</span><span id="line-141">            return ((Coin) amount).compareTo(MAX_MONEY) &gt; 0;</span>
-<span class="source-line-no">142</span><span id="line-142">        } else {</span>
-<span class="source-line-no">143</span><span id="line-143">            throw new IllegalArgumentException("amount must be a Coin type");</span>
-<span class="source-line-no">144</span><span id="line-144">        }</span>
-<span class="source-line-no">145</span><span id="line-145">    }</span>
-<span class="source-line-no">146</span><span id="line-146"></span>
-<span class="source-line-no">147</span><span id="line-147">    /**</span>
-<span class="source-line-no">148</span><span id="line-148">     * Find the {@code BitcoinNetwork} from a name string, e.g. "mainnet", "testnet" or "signet".</span>
-<span class="source-line-no">149</span><span id="line-149">     * A number of common alternate names are allowed too, e.g. "main" or "prod".</span>
-<span class="source-line-no">150</span><span id="line-150">     * @param nameString A name string</span>
-<span class="source-line-no">151</span><span id="line-151">     * @return An {@code Optional} containing the matching enum or empty</span>
-<span class="source-line-no">152</span><span id="line-152">     */</span>
-<span class="source-line-no">153</span><span id="line-153">    public static Optional&lt;NameCoinNetwork&gt; fromString(String nameString) {</span>
-<span class="source-line-no">154</span><span id="line-154">        return Optional.ofNullable(stringToEnum.get(nameString));</span>
-<span class="source-line-no">155</span><span id="line-155">    }</span>
-<span class="source-line-no">156</span><span id="line-156"></span>
-<span class="source-line-no">157</span><span id="line-157">    /**</span>
-<span class="source-line-no">158</span><span id="line-158">     * Find the {@code BitcoinNetwork} from an ID String</span>
-<span class="source-line-no">159</span><span id="line-159">     * &lt;p&gt;</span>
-<span class="source-line-no">160</span><span id="line-160">     * Note: {@link #ID_UNITTESTNET} is not supported as an enum</span>
-<span class="source-line-no">161</span><span id="line-161">     * @param idString specifies the network</span>
-<span class="source-line-no">162</span><span id="line-162">     * @return An {@code Optional} containing the matching enum or empty</span>
-<span class="source-line-no">163</span><span id="line-163">     */</span>
-<span class="source-line-no">164</span><span id="line-164">    public static Optional&lt;NameCoinNetwork&gt; fromIdString(String idString) {</span>
-<span class="source-line-no">165</span><span id="line-165">        return Arrays.stream(values())</span>
-<span class="source-line-no">166</span><span id="line-166">                .filter(n -&gt; n.id.equals(idString))</span>
-<span class="source-line-no">167</span><span id="line-167">                .findFirst();</span>
-<span class="source-line-no">168</span><span id="line-168">    }</span>
-<span class="source-line-no">169</span><span id="line-169"></span>
-<span class="source-line-no">170</span><span id="line-170">    // Create a Map that maps name Strings to networks for all instances</span>
-<span class="source-line-no">171</span><span id="line-171">    private static Map&lt;String, NameCoinNetwork&gt; mergedNameMap() {</span>
-<span class="source-line-no">172</span><span id="line-172">        return Stream.of(values())</span>
-<span class="source-line-no">173</span><span id="line-173">                .collect(HashMap::new,                  // Supply HashMaps as mutable containers</span>
-<span class="source-line-no">174</span><span id="line-174">                        NameCoinNetwork::accumulateNames,    // Accumulate one network into hashmap</span>
-<span class="source-line-no">175</span><span id="line-175">                        Map::putAll);                       // Combine two containers</span>
-<span class="source-line-no">176</span><span id="line-176">    }</span>
-<span class="source-line-no">177</span><span id="line-177"></span>
-<span class="source-line-no">178</span><span id="line-178">    // Add allNames for this Network as keys to a map that can be used to find it</span>
-<span class="source-line-no">179</span><span id="line-179">    private static void accumulateNames(Map&lt;String, NameCoinNetwork&gt; map, NameCoinNetwork net) {</span>
-<span class="source-line-no">180</span><span id="line-180">        net.allNames.forEach(name -&gt; map.put(name, net));</span>
-<span class="source-line-no">181</span><span id="line-181">    }</span>
-<span class="source-line-no">182</span><span id="line-182"></span>
-<span class="source-line-no">183</span><span id="line-183">    // Combine a String and an array of String and return as an unmodifiable list</span>
-<span class="source-line-no">184</span><span id="line-184">    private static List&lt;String&gt; combine(String canonical, String[] alternateNames) {</span>
-<span class="source-line-no">185</span><span id="line-185">        List&lt;String&gt; temp = new ArrayList&lt;&gt;();</span>
-<span class="source-line-no">186</span><span id="line-186">        temp.add(canonical);</span>
-<span class="source-line-no">187</span><span id="line-187">        temp.addAll(Arrays.asList(alternateNames));</span>
-<span class="source-line-no">188</span><span id="line-188">        return Collections.unmodifiableList(temp);</span>
-<span class="source-line-no">189</span><span id="line-189">    }</span>
-<span class="source-line-no">190</span><span id="line-190"></span>
-<span class="source-line-no">191</span><span id="line-191">}</span>
+<span class="source-line-no">007</span><span id="line-7"></span>
+<span class="source-line-no">008</span><span id="line-8">import java.util.ArrayList;</span>
+<span class="source-line-no">009</span><span id="line-9">import java.util.Arrays;</span>
+<span class="source-line-no">010</span><span id="line-10">import java.util.Collections;</span>
+<span class="source-line-no">011</span><span id="line-11">import java.util.HashMap;</span>
+<span class="source-line-no">012</span><span id="line-12">import java.util.List;</span>
+<span class="source-line-no">013</span><span id="line-13">import java.util.Locale;</span>
+<span class="source-line-no">014</span><span id="line-14">import java.util.Map;</span>
+<span class="source-line-no">015</span><span id="line-15">import java.util.Optional;</span>
+<span class="source-line-no">016</span><span id="line-16">import java.util.stream.Stream;</span>
+<span class="source-line-no">017</span><span id="line-17"></span>
+<span class="source-line-no">018</span><span id="line-18">import static org.bitcoinj.base.Coin.COIN;</span>
+<span class="source-line-no">019</span><span id="line-19"></span>
+<span class="source-line-no">020</span><span id="line-20">/**</span>
+<span class="source-line-no">021</span><span id="line-21"> *</span>
+<span class="source-line-no">022</span><span id="line-22"> */</span>
+<span class="source-line-no">023</span><span id="line-23">public enum NameCoinNetwork implements Network {</span>
+<span class="source-line-no">024</span><span id="line-24">    MAINNET("org.namecoin.mainnet"),</span>
+<span class="source-line-no">025</span><span id="line-25">    TESTNET("org.namecoin.testnet"),</span>
+<span class="source-line-no">026</span><span id="line-26">    SIGNET("org.namecoin.signet"),</span>
+<span class="source-line-no">027</span><span id="line-27">    REGTEST("org.namecoin.regtest");</span>
+<span class="source-line-no">028</span><span id="line-28"></span>
+<span class="source-line-no">029</span><span id="line-29">    /**</span>
+<span class="source-line-no">030</span><span id="line-30">     * Scheme part for Bitcoin URIs.</span>
+<span class="source-line-no">031</span><span id="line-31">     */</span>
+<span class="source-line-no">032</span><span id="line-32">    public static final String BITCOIN_SCHEME = "bitcoin";</span>
+<span class="source-line-no">033</span><span id="line-33"></span>
+<span class="source-line-no">034</span><span id="line-34">    /**</span>
+<span class="source-line-no">035</span><span id="line-35">     * The maximum number of coins to be generated</span>
+<span class="source-line-no">036</span><span id="line-36">     */</span>
+<span class="source-line-no">037</span><span id="line-37">    private static final long MAX_COINS = 21_000_000;</span>
+<span class="source-line-no">038</span><span id="line-38"></span>
+<span class="source-line-no">039</span><span id="line-39">    /**</span>
+<span class="source-line-no">040</span><span id="line-40">     * The maximum money to be generated</span>
+<span class="source-line-no">041</span><span id="line-41">     */</span>
+<span class="source-line-no">042</span><span id="line-42">    public static final Coin MAX_MONEY = COIN.multiply(MAX_COINS);</span>
+<span class="source-line-no">043</span><span id="line-43"></span>
+<span class="source-line-no">044</span><span id="line-44">    /** The ID string for the main, production network where people trade things. */</span>
+<span class="source-line-no">045</span><span id="line-45">    public static final String ID_MAINNET = MAINNET.id();</span>
+<span class="source-line-no">046</span><span id="line-46">    /** The ID string for the testnet. */</span>
+<span class="source-line-no">047</span><span id="line-47">    public static final String ID_TESTNET = TESTNET.id();</span>
+<span class="source-line-no">048</span><span id="line-48">    /** The ID string for the signet. */</span>
+<span class="source-line-no">049</span><span id="line-49">    public static final String ID_SIGNET = SIGNET.id();</span>
+<span class="source-line-no">050</span><span id="line-50">    /** The ID string for regtest mode. */</span>
+<span class="source-line-no">051</span><span id="line-51">    public static final String ID_REGTEST = REGTEST.id();</span>
+<span class="source-line-no">052</span><span id="line-52">    /** The ID string for the Unit test network -- there is no corresponding {@code enum}. */</span>
+<span class="source-line-no">053</span><span id="line-53">    public static final String ID_UNITTESTNET = "org.bitcoinj.unittest";</span>
+<span class="source-line-no">054</span><span id="line-54"></span>
+<span class="source-line-no">055</span><span id="line-55">    private final String id;</span>
+<span class="source-line-no">056</span><span id="line-56"></span>
+<span class="source-line-no">057</span><span id="line-57">    // All supported names for this BitcoinNetwork</span>
+<span class="source-line-no">058</span><span id="line-58">    private final List&lt;String&gt; allNames;</span>
+<span class="source-line-no">059</span><span id="line-59"></span>
+<span class="source-line-no">060</span><span id="line-60">    // Maps from names and alternateNames to BitcoinNetwork</span>
+<span class="source-line-no">061</span><span id="line-61">    private static final Map&lt;String, NameCoinNetwork&gt; stringToEnum = mergedNameMap();</span>
+<span class="source-line-no">062</span><span id="line-62"></span>
+<span class="source-line-no">063</span><span id="line-63">    NameCoinNetwork(String networkId, String... alternateNames) {</span>
+<span class="source-line-no">064</span><span id="line-64">        this.id = networkId;</span>
+<span class="source-line-no">065</span><span id="line-65">        this.allNames = combine(this.toString(), alternateNames);</span>
+<span class="source-line-no">066</span><span id="line-66">    }</span>
+<span class="source-line-no">067</span><span id="line-67"></span>
+<span class="source-line-no">068</span><span id="line-68">    /**</span>
+<span class="source-line-no">069</span><span id="line-69">     * Return the canonical, lowercase, user-facing {@code String} for an {@code enum}</span>
+<span class="source-line-no">070</span><span id="line-70">     * @return canonical lowercase value</span>
+<span class="source-line-no">071</span><span id="line-71">     */</span>
+<span class="source-line-no">072</span><span id="line-72">    @Override</span>
+<span class="source-line-no">073</span><span id="line-73">    public String toString() {</span>
+<span class="source-line-no">074</span><span id="line-74">        return name().toLowerCase(Locale.ROOT);</span>
+<span class="source-line-no">075</span><span id="line-75">    }</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">    /**</span>
+<span class="source-line-no">078</span><span id="line-78">     * Return the network ID string (specified by a {@code Network})</span>
+<span class="source-line-no">079</span><span id="line-79">     *</span>
+<span class="source-line-no">080</span><span id="line-80">     * @return The network ID string</span>
+<span class="source-line-no">081</span><span id="line-81">     */</span>
+<span class="source-line-no">082</span><span id="line-82">    @Override</span>
+<span class="source-line-no">083</span><span id="line-83">    public String id() {</span>
+<span class="source-line-no">084</span><span id="line-84">        return id;</span>
+<span class="source-line-no">085</span><span id="line-85">    }</span>
+<span class="source-line-no">086</span><span id="line-86"></span>
+<span class="source-line-no">087</span><span id="line-87">    /**</span>
+<span class="source-line-no">088</span><span id="line-88">     * Header byte of base58 encoded legacy P2PKH addresses for this network.</span>
+<span class="source-line-no">089</span><span id="line-89">     * @return header byte as an {@code int}.</span>
+<span class="source-line-no">090</span><span id="line-90">     * @see LegacyAddress.AddressHeader</span>
+<span class="source-line-no">091</span><span id="line-91">     */</span>
+<span class="source-line-no">092</span><span id="line-92">    public int legacyAddressHeader() {</span>
+<span class="source-line-no">093</span><span id="line-93">        //return LegacyAddress.AddressHeader.ofNetwork(this).headerByte();</span>
+<span class="source-line-no">094</span><span id="line-94">        return 52;</span>
+<span class="source-line-no">095</span><span id="line-95">    }</span>
+<span class="source-line-no">096</span><span id="line-96"></span>
+<span class="source-line-no">097</span><span id="line-97">    /**</span>
+<span class="source-line-no">098</span><span id="line-98">     * Header byte of base58 encoded legacy P2SH addresses for this network.</span>
+<span class="source-line-no">099</span><span id="line-99">     * @return header byte as an {@code int}.</span>
+<span class="source-line-no">100</span><span id="line-100">     * @see LegacyAddress.P2SHHeader</span>
+<span class="source-line-no">101</span><span id="line-101">     */</span>
+<span class="source-line-no">102</span><span id="line-102">    public int legacyP2SHHeader() {</span>
+<span class="source-line-no">103</span><span id="line-103">        //return LegacyAddress.P2SHHeader.ofNetwork(this).headerByte();</span>
+<span class="source-line-no">104</span><span id="line-104">        return 5;</span>
+<span class="source-line-no">105</span><span id="line-105">    }</span>
+<span class="source-line-no">106</span><span id="line-106"></span>
+<span class="source-line-no">107</span><span id="line-107">    /**</span>
+<span class="source-line-no">108</span><span id="line-108">     * Return the standard Bech32 {@link org.bitcoinj.base.SegwitAddress.SegwitHrp} (as a {@code String}) for</span>
+<span class="source-line-no">109</span><span id="line-109">     * this network.</span>
+<span class="source-line-no">110</span><span id="line-110">     * @return The HRP as a (lowercase) string.</span>
+<span class="source-line-no">111</span><span id="line-111">     */</span>
+<span class="source-line-no">112</span><span id="line-112">    public String segwitAddressHrp() {</span>
+<span class="source-line-no">113</span><span id="line-113">        //return LegacyAddress.P2SHHeader.ofNetwork(this).headerByte();</span>
+<span class="source-line-no">114</span><span id="line-114">        return "??";</span>
+<span class="source-line-no">115</span><span id="line-115">    }</span>
+<span class="source-line-no">116</span><span id="line-116"></span>
+<span class="source-line-no">117</span><span id="line-117">    /**</span>
+<span class="source-line-no">118</span><span id="line-118">     * The URI scheme for Bitcoin.</span>
+<span class="source-line-no">119</span><span id="line-119">     * @see &lt;a href="https://github.com/bitcoin/bips/blob/master/bip-0021.mediawiki"&gt;BIP 0021&lt;/a&gt;</span>
+<span class="source-line-no">120</span><span id="line-120">     * @return string containing the URI scheme</span>
+<span class="source-line-no">121</span><span id="line-121">     */</span>
+<span class="source-line-no">122</span><span id="line-122">    @Override</span>
+<span class="source-line-no">123</span><span id="line-123">    public String uriScheme() {</span>
+<span class="source-line-no">124</span><span id="line-124">        return BITCOIN_SCHEME;</span>
+<span class="source-line-no">125</span><span id="line-125">    }</span>
+<span class="source-line-no">126</span><span id="line-126"></span>
+<span class="source-line-no">127</span><span id="line-127">    @Override</span>
+<span class="source-line-no">128</span><span id="line-128">    public boolean hasMaxMoney() {</span>
+<span class="source-line-no">129</span><span id="line-129">        return true;</span>
+<span class="source-line-no">130</span><span id="line-130">    }</span>
+<span class="source-line-no">131</span><span id="line-131"></span>
+<span class="source-line-no">132</span><span id="line-132">    @Override</span>
+<span class="source-line-no">133</span><span id="line-133">    public Coin maxMoney() {</span>
+<span class="source-line-no">134</span><span id="line-134">        return MAX_MONEY;</span>
+<span class="source-line-no">135</span><span id="line-135">    }</span>
+<span class="source-line-no">136</span><span id="line-136"></span>
+<span class="source-line-no">137</span><span id="line-137">    @Override</span>
+<span class="source-line-no">138</span><span id="line-138">    public boolean exceedsMaxMoney(Monetary amount) {</span>
+<span class="source-line-no">139</span><span id="line-139">        if (amount instanceof Coin) {</span>
+<span class="source-line-no">140</span><span id="line-140">            return ((Coin) amount).compareTo(MAX_MONEY) &gt; 0;</span>
+<span class="source-line-no">141</span><span id="line-141">        } else {</span>
+<span class="source-line-no">142</span><span id="line-142">            throw new IllegalArgumentException("amount must be a Coin type");</span>
+<span class="source-line-no">143</span><span id="line-143">        }</span>
+<span class="source-line-no">144</span><span id="line-144">    }</span>
+<span class="source-line-no">145</span><span id="line-145"></span>
+<span class="source-line-no">146</span><span id="line-146">    /**</span>
+<span class="source-line-no">147</span><span id="line-147">     * Find the {@code BitcoinNetwork} from a name string, e.g. "mainnet", "testnet" or "signet".</span>
+<span class="source-line-no">148</span><span id="line-148">     * A number of common alternate names are allowed too, e.g. "main" or "prod".</span>
+<span class="source-line-no">149</span><span id="line-149">     * @param nameString A name string</span>
+<span class="source-line-no">150</span><span id="line-150">     * @return An {@code Optional} containing the matching enum or empty</span>
+<span class="source-line-no">151</span><span id="line-151">     */</span>
+<span class="source-line-no">152</span><span id="line-152">    public static Optional&lt;NameCoinNetwork&gt; fromString(String nameString) {</span>
+<span class="source-line-no">153</span><span id="line-153">        return Optional.ofNullable(stringToEnum.get(nameString));</span>
+<span class="source-line-no">154</span><span id="line-154">    }</span>
+<span class="source-line-no">155</span><span id="line-155"></span>
+<span class="source-line-no">156</span><span id="line-156">    /**</span>
+<span class="source-line-no">157</span><span id="line-157">     * Find the {@code BitcoinNetwork} from an ID String</span>
+<span class="source-line-no">158</span><span id="line-158">     * &lt;p&gt;</span>
+<span class="source-line-no">159</span><span id="line-159">     * Note: {@link #ID_UNITTESTNET} is not supported as an enum</span>
+<span class="source-line-no">160</span><span id="line-160">     * @param idString specifies the network</span>
+<span class="source-line-no">161</span><span id="line-161">     * @return An {@code Optional} containing the matching enum or empty</span>
+<span class="source-line-no">162</span><span id="line-162">     */</span>
+<span class="source-line-no">163</span><span id="line-163">    public static Optional&lt;NameCoinNetwork&gt; fromIdString(String idString) {</span>
+<span class="source-line-no">164</span><span id="line-164">        return Arrays.stream(values())</span>
+<span class="source-line-no">165</span><span id="line-165">                .filter(n -&gt; n.id.equals(idString))</span>
+<span class="source-line-no">166</span><span id="line-166">                .findFirst();</span>
+<span class="source-line-no">167</span><span id="line-167">    }</span>
+<span class="source-line-no">168</span><span id="line-168"></span>
+<span class="source-line-no">169</span><span id="line-169">    // Create a Map that maps name Strings to networks for all instances</span>
+<span class="source-line-no">170</span><span id="line-170">    private static Map&lt;String, NameCoinNetwork&gt; mergedNameMap() {</span>
+<span class="source-line-no">171</span><span id="line-171">        return Stream.of(values())</span>
+<span class="source-line-no">172</span><span id="line-172">                .collect(HashMap::new,                  // Supply HashMaps as mutable containers</span>
+<span class="source-line-no">173</span><span id="line-173">                        NameCoinNetwork::accumulateNames,    // Accumulate one network into hashmap</span>
+<span class="source-line-no">174</span><span id="line-174">                        Map::putAll);                       // Combine two containers</span>
+<span class="source-line-no">175</span><span id="line-175">    }</span>
+<span class="source-line-no">176</span><span id="line-176"></span>
+<span class="source-line-no">177</span><span id="line-177">    // Add allNames for this Network as keys to a map that can be used to find it</span>
+<span class="source-line-no">178</span><span id="line-178">    private static void accumulateNames(Map&lt;String, NameCoinNetwork&gt; map, NameCoinNetwork net) {</span>
+<span class="source-line-no">179</span><span id="line-179">        net.allNames.forEach(name -&gt; map.put(name, net));</span>
+<span class="source-line-no">180</span><span id="line-180">    }</span>
+<span class="source-line-no">181</span><span id="line-181"></span>
+<span class="source-line-no">182</span><span id="line-182">    // Combine a String and an array of String and return as an unmodifiable list</span>
+<span class="source-line-no">183</span><span id="line-183">    private static List&lt;String&gt; combine(String canonical, String[] alternateNames) {</span>
+<span class="source-line-no">184</span><span id="line-184">        List&lt;String&gt; temp = new ArrayList&lt;&gt;();</span>
+<span class="source-line-no">185</span><span id="line-185">        temp.add(canonical);</span>
+<span class="source-line-no">186</span><span id="line-186">        temp.addAll(Arrays.asList(alternateNames));</span>
+<span class="source-line-no">187</span><span id="line-187">        return Collections.unmodifiableList(temp);</span>
+<span class="source-line-no">188</span><span id="line-188">    }</span>
+<span class="source-line-no">189</span><span id="line-189"></span>
+<span class="source-line-no">190</span><span id="line-190">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/namecoin/jsonrpc/pojo/NameData.html b/apidoc/src-html/org/consensusj/namecoin/jsonrpc/pojo/NameData.html
index 16ea92fb8..9e4ee9860 100644
--- a/apidoc/src-html/org/consensusj/namecoin/jsonrpc/pojo/NameData.html
+++ b/apidoc/src-html/org/consensusj/namecoin/jsonrpc/pojo/NameData.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.namecoin.jsonrpc.pojo, class: NameData">
diff --git a/apidoc/src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html b/apidoc/src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html
index ec4488862..73667f9b0 100644
--- a/apidoc/src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html
+++ b/apidoc/src-html/org/consensusj/rx/jsonrpc/RxJsonRpcClient.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.rx.jsonrpc, interface: RxJsonRpcClient">
@@ -13,89 +13,143 @@
 <div class="source-container">
 <pre><span class="source-line-no">001</span><span id="line-1">package org.consensusj.rx.jsonrpc;</span>
 <span class="source-line-no">002</span><span id="line-2"></span>
-<span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.Maybe;</span>
-<span class="source-line-no">004</span><span id="line-4">import io.reactivex.rxjava3.core.Single;</span>
-<span class="source-line-no">005</span><span id="line-5">import org.consensusj.jsonrpc.AsyncSupport;</span>
-<span class="source-line-no">006</span><span id="line-6">import org.slf4j.Logger;</span>
-<span class="source-line-no">007</span><span id="line-7">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">008</span><span id="line-8"></span>
-<span class="source-line-no">009</span><span id="line-9">import java.io.IOError;</span>
-<span class="source-line-no">010</span><span id="line-10">import java.util.concurrent.CompletionStage;</span>
-<span class="source-line-no">011</span><span id="line-11">import java.util.function.Supplier;</span>
-<span class="source-line-no">012</span><span id="line-12"></span>
-<span class="source-line-no">013</span><span id="line-13">/**</span>
-<span class="source-line-no">014</span><span id="line-14"> * RxJava support for calling JSON-RPC clients. Extend/implement this interface to inherit {@code default} methods</span>
-<span class="source-line-no">015</span><span id="line-15"> * {@link #call(ThrowingSupplier)}, {@link #defer(Supplier)}, and {@link #pollOnce(ThrowingSupplier)}.</span>
-<span class="source-line-no">016</span><span id="line-16"> */</span>
-<span class="source-line-no">017</span><span id="line-17">public interface RxJsonRpcClient extends AsyncSupport {</span>
-<span class="source-line-no">018</span><span id="line-18">    Logger log = LoggerFactory.getLogger(RxJsonRpcClient.class);</span>
-<span class="source-line-no">019</span><span id="line-19"></span>
-<span class="source-line-no">020</span><span id="line-20">    /**</span>
-<span class="source-line-no">021</span><span id="line-21">     * Return a &lt;i&gt;cold&lt;/i&gt; {@link Single} for calling a provided &lt;b&gt;synchronous&lt;/b&gt; JSON-RPC method.</span>
-<span class="source-line-no">022</span><span id="line-22">     * &lt;p&gt;</span>
-<span class="source-line-no">023</span><span id="line-23">     *  A  &lt;i&gt;cold&lt;/i&gt; stream does not begin processing until someone subscribes to it.</span>
-<span class="source-line-no">024</span><span id="line-24">     * @param method A {@link org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier} wrapper for a method call.</span>
-<span class="source-line-no">025</span><span id="line-25">     * @param &lt;RSLT&gt; The type of the expected result</span>
-<span class="source-line-no">026</span><span id="line-26">     * @return A &lt;i&gt;cold&lt;/i&gt; {@link Single} for calling the method.</span>
-<span class="source-line-no">027</span><span id="line-27">     */</span>
-<span class="source-line-no">028</span><span id="line-28">    default &lt;RSLT&gt; Single&lt;RSLT&gt; call(AsyncSupport.ThrowingSupplier&lt;RSLT&gt; method) {</span>
-<span class="source-line-no">029</span><span id="line-29">        return Single.defer(() -&gt; Single.fromCompletionStage(supplyAsync(method)));</span>
-<span class="source-line-no">030</span><span id="line-30">    }</span>
-<span class="source-line-no">031</span><span id="line-31"></span>
-<span class="source-line-no">032</span><span id="line-32">    /**</span>
-<span class="source-line-no">033</span><span id="line-33">     * Return a &lt;i&gt;cold&lt;/i&gt; {@link Single} for calling a provided &lt;b&gt;asynchronous&lt;/b&gt; JSON-RPC method.</span>
-<span class="source-line-no">034</span><span id="line-34">     * (Uses a supplier to make sure the async call isn't made until subscription time)</span>
-<span class="source-line-no">035</span><span id="line-35">     * &lt;p&gt;</span>
-<span class="source-line-no">036</span><span id="line-36">     *  A  &lt;i&gt;cold&lt;/i&gt; stream does not begin processing until someone subscribes to it.</span>
-<span class="source-line-no">037</span><span id="line-37">     * @param supplier of completable</span>
-<span class="source-line-no">038</span><span id="line-38">     * @param &lt;RSLT&gt; The type of the expected result</span>
-<span class="source-line-no">039</span><span id="line-39">     * @return A &lt;i&gt;cold&lt;/i&gt; {@link Single} for calling the method.</span>
-<span class="source-line-no">040</span><span id="line-40">     */</span>
-<span class="source-line-no">041</span><span id="line-41">    default &lt;RSLT&gt; Single&lt;RSLT&gt; defer(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt; supplier) {</span>
-<span class="source-line-no">042</span><span id="line-42">        return Single.defer(() -&gt; Single.fromCompletionStage(supplier.get()));</span>
-<span class="source-line-no">043</span><span id="line-43">    }</span>
-<span class="source-line-no">044</span><span id="line-44"></span>
-<span class="source-line-no">045</span><span id="line-45">    /**</span>
-<span class="source-line-no">046</span><span id="line-46">     * Poll a method, ignoring {@link IOError}.</span>
-<span class="source-line-no">047</span><span id="line-47">     * The returned {@link Maybe} will:</span>
-<span class="source-line-no">048</span><span id="line-48">     * &lt;ol&gt;</span>
-<span class="source-line-no">049</span><span id="line-49">     *     &lt;li&gt;Emit a value if successful&lt;/li&gt;</span>
-<span class="source-line-no">050</span><span id="line-50">     *     &lt;li&gt;Empty Complete on IOError&lt;/li&gt;</span>
-<span class="source-line-no">051</span><span id="line-51">     *     &lt;li&gt;Error out if any other Exception occurs&lt;/li&gt;</span>
-<span class="source-line-no">052</span><span id="line-52">     * &lt;/ol&gt;</span>
-<span class="source-line-no">053</span><span id="line-53">     *</span>
-<span class="source-line-no">054</span><span id="line-54">     * @param method A supplier (should be an RPC Method) that can throw {@link Exception}.</span>
-<span class="source-line-no">055</span><span id="line-55">     * @param &lt;RSLT&gt; The type of the expected result</span>
-<span class="source-line-no">056</span><span id="line-56">     * @return A Maybe for the expected result type</span>
-<span class="source-line-no">057</span><span id="line-57">     */</span>
-<span class="source-line-no">058</span><span id="line-58">    default &lt;RSLT&gt; Maybe&lt;RSLT&gt; pollOnce(AsyncSupport.ThrowingSupplier&lt;RSLT&gt; method) {</span>
-<span class="source-line-no">059</span><span id="line-59">        return call(method)</span>
-<span class="source-line-no">060</span><span id="line-60">                .doOnSuccess(this::logSuccess)</span>
-<span class="source-line-no">061</span><span id="line-61">                .doOnError(this::logError)</span>
-<span class="source-line-no">062</span><span id="line-62">                .toMaybe()</span>
-<span class="source-line-no">063</span><span id="line-63">                .onErrorComplete(this::isTransientError);    // Empty completion if IOError</span>
-<span class="source-line-no">064</span><span id="line-64">    }</span>
-<span class="source-line-no">065</span><span id="line-65"></span>
-<span class="source-line-no">066</span><span id="line-66">    /**</span>
-<span class="source-line-no">067</span><span id="line-67">     * Determine if error is transient and should be ignored.</span>
-<span class="source-line-no">068</span><span id="line-68">     * &lt;p&gt;</span>
-<span class="source-line-no">069</span><span id="line-69">     * TODO: Ignoring all IOError is too broad</span>
-<span class="source-line-no">070</span><span id="line-70">     * </span>
-<span class="source-line-no">071</span><span id="line-71">     * @param t Error thrown from calling an RPC method</span>
-<span class="source-line-no">072</span><span id="line-72">     * @return true if the error is transient and can be ignored</span>
-<span class="source-line-no">073</span><span id="line-73">     */</span>
-<span class="source-line-no">074</span><span id="line-74">    private boolean isTransientError(Throwable t) {</span>
-<span class="source-line-no">075</span><span id="line-75">        return t instanceof IOError;</span>
-<span class="source-line-no">076</span><span id="line-76">    }</span>
-<span class="source-line-no">077</span><span id="line-77">    </span>
-<span class="source-line-no">078</span><span id="line-78">    private &lt;RSLT&gt; void logSuccess(RSLT result) {</span>
-<span class="source-line-no">079</span><span id="line-79">        log.debug("RPC call returned: {}", result);</span>
-<span class="source-line-no">080</span><span id="line-80">    }</span>
-<span class="source-line-no">081</span><span id="line-81"></span>
-<span class="source-line-no">082</span><span id="line-82">    private void logError(Throwable throwable) {</span>
-<span class="source-line-no">083</span><span id="line-83">        log.error("Exception in RPCCall", throwable);</span>
-<span class="source-line-no">084</span><span id="line-84">    }</span>
-<span class="source-line-no">085</span><span id="line-85">}</span>
+<span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.Flowable;</span>
+<span class="source-line-no">004</span><span id="line-4">import io.reactivex.rxjava3.core.Maybe;</span>
+<span class="source-line-no">005</span><span id="line-5">import io.reactivex.rxjava3.core.Single;</span>
+<span class="source-line-no">006</span><span id="line-6">import org.consensusj.jsonrpc.DefaultRpcClient;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.consensusj.jsonrpc.AsyncSupport;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.slf4j.Logger;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">011</span><span id="line-11"></span>
+<span class="source-line-no">012</span><span id="line-12">import java.io.IOError;</span>
+<span class="source-line-no">013</span><span id="line-13">import java.util.Optional;</span>
+<span class="source-line-no">014</span><span id="line-14">import java.util.concurrent.CompletableFuture;</span>
+<span class="source-line-no">015</span><span id="line-15">import java.util.concurrent.CompletionStage;</span>
+<span class="source-line-no">016</span><span id="line-16">import java.util.function.Function;</span>
+<span class="source-line-no">017</span><span id="line-17">import java.util.function.Supplier;</span>
+<span class="source-line-no">018</span><span id="line-18"></span>
+<span class="source-line-no">019</span><span id="line-19">/**</span>
+<span class="source-line-no">020</span><span id="line-20"> * RxJava support for calling JSON-RPC clients. Extend/implement this interface to inherit {@code default} methods</span>
+<span class="source-line-no">021</span><span id="line-21"> * such as {@link #pollOnceAsPublisher(Supplier, DefaultRpcClient.TransientErrorFilter)}.</span>
+<span class="source-line-no">022</span><span id="line-22"> */</span>
+<span class="source-line-no">023</span><span id="line-23">public interface RxJsonRpcClient extends AsyncSupport {</span>
+<span class="source-line-no">024</span><span id="line-24">    Logger log = LoggerFactory.getLogger(RxJsonRpcClient.class);</span>
+<span class="source-line-no">025</span><span id="line-25"></span>
+<span class="source-line-no">026</span><span id="line-26">    /**</span>
+<span class="source-line-no">027</span><span id="line-27">     * Return a &lt;i&gt;cold&lt;/i&gt; {@link Single} for calling a provided &lt;b&gt;synchronous&lt;/b&gt; JSON-RPC method.</span>
+<span class="source-line-no">028</span><span id="line-28">     * &lt;p&gt;</span>
+<span class="source-line-no">029</span><span id="line-29">     *  A  &lt;i&gt;cold&lt;/i&gt; stream does not begin processing until someone subscribes to it.</span>
+<span class="source-line-no">030</span><span id="line-30">     * @param method A {@link org.consensusj.jsonrpc.AsyncSupport.ThrowingSupplier} wrapper for a method call.</span>
+<span class="source-line-no">031</span><span id="line-31">     * @param &lt;RSLT&gt; The type of the expected result</span>
+<span class="source-line-no">032</span><span id="line-32">     * @return A &lt;i&gt;cold&lt;/i&gt; {@link Single} for calling the method.</span>
+<span class="source-line-no">033</span><span id="line-33">     */</span>
+<span class="source-line-no">034</span><span id="line-34">    @Deprecated</span>
+<span class="source-line-no">035</span><span id="line-35">    default &lt;RSLT&gt; Single&lt;RSLT&gt; call(AsyncSupport.ThrowingSupplier&lt;RSLT&gt; method) {</span>
+<span class="source-line-no">036</span><span id="line-36">        return Single.defer(() -&gt; Single.fromCompletionStage(supplyAsync(method)));</span>
+<span class="source-line-no">037</span><span id="line-37">    }</span>
+<span class="source-line-no">038</span><span id="line-38"></span>
+<span class="source-line-no">039</span><span id="line-39">    @Deprecated</span>
+<span class="source-line-no">040</span><span id="line-40">    default &lt;RSLT&gt; Single&lt;RSLT&gt; callAsync(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt; supplier) {</span>
+<span class="source-line-no">041</span><span id="line-41">        return defer(supplier);</span>
+<span class="source-line-no">042</span><span id="line-42">    }</span>
+<span class="source-line-no">043</span><span id="line-43"></span>
+<span class="source-line-no">044</span><span id="line-44">    /**</span>
+<span class="source-line-no">045</span><span id="line-45">     * Return a &lt;i&gt;cold&lt;/i&gt; {@link Single} for calling a provided &lt;b&gt;asynchronous&lt;/b&gt; JSON-RPC method.</span>
+<span class="source-line-no">046</span><span id="line-46">     * (Uses a supplier to make sure the async call isn't made until subscription time)</span>
+<span class="source-line-no">047</span><span id="line-47">     * &lt;p&gt;</span>
+<span class="source-line-no">048</span><span id="line-48">     *  A  &lt;i&gt;cold&lt;/i&gt; stream does not begin processing until someone subscribes to it.</span>
+<span class="source-line-no">049</span><span id="line-49">     * @param supplier of completable</span>
+<span class="source-line-no">050</span><span id="line-50">     * @param &lt;RSLT&gt; The type of the expected result</span>
+<span class="source-line-no">051</span><span id="line-51">     * @return A &lt;i&gt;cold&lt;/i&gt; {@link Single} for calling the method.</span>
+<span class="source-line-no">052</span><span id="line-52">     */</span>
+<span class="source-line-no">053</span><span id="line-53">    @Deprecated</span>
+<span class="source-line-no">054</span><span id="line-54">    static &lt;RSLT&gt; Single&lt;RSLT&gt; defer(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt; supplier) {</span>
+<span class="source-line-no">055</span><span id="line-55">        return Single.defer(() -&gt; Single.fromCompletionStage(supplier.get()));</span>
+<span class="source-line-no">056</span><span id="line-56">    }</span>
+<span class="source-line-no">057</span><span id="line-57"></span>
+<span class="source-line-no">058</span><span id="line-58">    /**</span>
+<span class="source-line-no">059</span><span id="line-59">     * Takes a supplier of computable futures and returns a publisher that when subscribed to returns 0 or 1 items.</span>
+<span class="source-line-no">060</span><span id="line-60">     * @param supplier supplier for delaying invocation of "hot" futures so they can be "cold" publishers.</span>
+<span class="source-line-no">061</span><span id="line-61">     * @param filter Filters and logs transient errors</span>
+<span class="source-line-no">062</span><span id="line-62">     * @return A publisher of a "cold" stream of items (temporarily Flowable, but will change to Publisher, then Flow.Publisher)</span>
+<span class="source-line-no">063</span><span id="line-63">     * @param &lt;T&gt; result type</span>
+<span class="source-line-no">064</span><span id="line-64">     */</span>
+<span class="source-line-no">065</span><span id="line-65">    default &lt;T&gt; Publisher&lt;T&gt; pollOnceAsPublisher(Supplier&lt;CompletionStage&lt;T&gt;&gt; supplier, DefaultRpcClient.TransientErrorFilter filter) {</span>
+<span class="source-line-no">066</span><span id="line-66">        return Flowable.defer(() -&gt; Flowable.fromCompletionStage(supplier.get()</span>
+<span class="source-line-no">067</span><span id="line-67">                        .handle(filter::handle)</span>
+<span class="source-line-no">068</span><span id="line-68">                        .thenCompose(Function.identity())))</span>
+<span class="source-line-no">069</span><span id="line-69">                .flatMapStream(Optional::stream);</span>
+<span class="source-line-no">070</span><span id="line-70">    }</span>
+<span class="source-line-no">071</span><span id="line-71"></span>
+<span class="source-line-no">072</span><span id="line-72">    // This version doesn't filter or log any exceptions</span>
+<span class="source-line-no">073</span><span id="line-73">    default &lt;T&gt; Publisher&lt;T&gt; pollOnceAsPublisher(Supplier&lt;CompletionStage&lt;T&gt;&gt; supplier) {</span>
+<span class="source-line-no">074</span><span id="line-74">        return Flowable.defer(() -&gt; Flowable.fromCompletionStage(supplier.get()));</span>
+<span class="source-line-no">075</span><span id="line-75">    }</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77">    /**</span>
+<span class="source-line-no">078</span><span id="line-78">     * Poll a method, ignoring {@link IOError}.</span>
+<span class="source-line-no">079</span><span id="line-79">     * The returned {@link Maybe} will:</span>
+<span class="source-line-no">080</span><span id="line-80">     * &lt;ol&gt;</span>
+<span class="source-line-no">081</span><span id="line-81">     *     &lt;li&gt;Emit a value if successful&lt;/li&gt;</span>
+<span class="source-line-no">082</span><span id="line-82">     *     &lt;li&gt;Empty Complete on IOError&lt;/li&gt;</span>
+<span class="source-line-no">083</span><span id="line-83">     *     &lt;li&gt;Error out if any other Exception occurs&lt;/li&gt;</span>
+<span class="source-line-no">084</span><span id="line-84">     * &lt;/ol&gt;</span>
+<span class="source-line-no">085</span><span id="line-85">     *</span>
+<span class="source-line-no">086</span><span id="line-86">     * @param method A supplier (should be an RPC Method) that can throw {@link Exception}.</span>
+<span class="source-line-no">087</span><span id="line-87">     * @param &lt;RSLT&gt; The type of the expected result</span>
+<span class="source-line-no">088</span><span id="line-88">     * @return A Maybe for the expected result type</span>
+<span class="source-line-no">089</span><span id="line-89">     * @deprecated Use {@link #pollOnceAsPublisher(Supplier, TransientErrorFilter)} (Supplier)}</span>
+<span class="source-line-no">090</span><span id="line-90">     */</span>
+<span class="source-line-no">091</span><span id="line-91">    @Deprecated</span>
+<span class="source-line-no">092</span><span id="line-92">    default &lt;RSLT&gt; Maybe&lt;RSLT&gt; pollOnce(AsyncSupport.ThrowingSupplier&lt;RSLT&gt; method) {</span>
+<span class="source-line-no">093</span><span id="line-93">        return call(method)</span>
+<span class="source-line-no">094</span><span id="line-94">                .doOnSuccess(this::logSuccess)</span>
+<span class="source-line-no">095</span><span id="line-95">                .doOnError(this::logError)</span>
+<span class="source-line-no">096</span><span id="line-96">                .toMaybe()</span>
+<span class="source-line-no">097</span><span id="line-97">                .onErrorComplete(this::isTransientError);    // Empty completion if IOError</span>
+<span class="source-line-no">098</span><span id="line-98">    }</span>
+<span class="source-line-no">099</span><span id="line-99"></span>
+<span class="source-line-no">100</span><span id="line-100">    /**</span>
+<span class="source-line-no">101</span><span id="line-101">     * Poll a method, ignoring {@link IOError}.</span>
+<span class="source-line-no">102</span><span id="line-102">     * The returned {@link Maybe} will:</span>
+<span class="source-line-no">103</span><span id="line-103">     * &lt;ol&gt;</span>
+<span class="source-line-no">104</span><span id="line-104">     *     &lt;li&gt;Emit a value if successful&lt;/li&gt;</span>
+<span class="source-line-no">105</span><span id="line-105">     *     &lt;li&gt;Empty Complete on IOError&lt;/li&gt;</span>
+<span class="source-line-no">106</span><span id="line-106">     *     &lt;li&gt;Error out if any other Exception occurs&lt;/li&gt;</span>
+<span class="source-line-no">107</span><span id="line-107">     * &lt;/ol&gt;</span>
+<span class="source-line-no">108</span><span id="line-108">     *</span>
+<span class="source-line-no">109</span><span id="line-109">     * @param supplier A supplier (should call an async RPC Method and return a {@code CompletableFuture}).</span>
+<span class="source-line-no">110</span><span id="line-110">     * @param &lt;RSLT&gt; The type of the expected result</span>
+<span class="source-line-no">111</span><span id="line-111">     * @return A Maybe for the expected result type</span>
+<span class="source-line-no">112</span><span id="line-112">     */</span>
+<span class="source-line-no">113</span><span id="line-113">    @Deprecated</span>
+<span class="source-line-no">114</span><span id="line-114">    default &lt;RSLT&gt; Maybe&lt;RSLT&gt; pollOnceAsync(Supplier&lt;CompletionStage&lt;RSLT&gt;&gt; supplier) {</span>
+<span class="source-line-no">115</span><span id="line-115">        return Flowable.fromPublisher(pollOnceAsPublisher(supplier, TransientErrorFilter.of(this::isTransientError, this::logError)))</span>
+<span class="source-line-no">116</span><span id="line-116">                .firstElement();</span>
+<span class="source-line-no">117</span><span id="line-117">    }</span>
+<span class="source-line-no">118</span><span id="line-118"></span>
+<span class="source-line-no">119</span><span id="line-119"></span>
+<span class="source-line-no">120</span><span id="line-120">    /**</span>
+<span class="source-line-no">121</span><span id="line-121">     * Determine if error is transient and should be ignored.</span>
+<span class="source-line-no">122</span><span id="line-122">     * &lt;p&gt;</span>
+<span class="source-line-no">123</span><span id="line-123">     * TODO: Ignoring all IOError is too broad</span>
+<span class="source-line-no">124</span><span id="line-124">     * </span>
+<span class="source-line-no">125</span><span id="line-125">     * @param t Error thrown from calling an RPC method</span>
+<span class="source-line-no">126</span><span id="line-126">     * @return true if the error is transient and can be ignored</span>
+<span class="source-line-no">127</span><span id="line-127">     */</span>
+<span class="source-line-no">128</span><span id="line-128">    private boolean isTransientError(Throwable t) {</span>
+<span class="source-line-no">129</span><span id="line-129">        return t instanceof IOError;</span>
+<span class="source-line-no">130</span><span id="line-130">    }</span>
+<span class="source-line-no">131</span><span id="line-131">    </span>
+<span class="source-line-no">132</span><span id="line-132">    private &lt;RSLT&gt; void logSuccess(RSLT result) {</span>
+<span class="source-line-no">133</span><span id="line-133">        log.debug("RPC call returned: {}", result);</span>
+<span class="source-line-no">134</span><span id="line-134">    }</span>
+<span class="source-line-no">135</span><span id="line-135"></span>
+<span class="source-line-no">136</span><span id="line-136">    private void logError(Throwable throwable) {</span>
+<span class="source-line-no">137</span><span id="line-137">        log.error("Exception in RPCCall", throwable);</span>
+<span class="source-line-no">138</span><span id="line-138">    }</span>
+<span class="source-line-no">139</span><span id="line-139">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/rx/zeromq/RxZmqContext.html b/apidoc/src-html/org/consensusj/rx/zeromq/RxZmqContext.html
index 3f443c9bd..ed2c0eb64 100644
--- a/apidoc/src-html/org/consensusj/rx/zeromq/RxZmqContext.html
+++ b/apidoc/src-html/org/consensusj/rx/zeromq/RxZmqContext.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.rx.zeromq, class: RxZmqContext">
@@ -18,110 +18,111 @@
 <span class="source-line-no">005</span><span id="line-5">import io.reactivex.rxjava3.disposables.Disposable;</span>
 <span class="source-line-no">006</span><span id="line-6">import io.reactivex.rxjava3.processors.FlowableProcessor;</span>
 <span class="source-line-no">007</span><span id="line-7">import io.reactivex.rxjava3.processors.PublishProcessor;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.reactivestreams.Subscriber;</span>
-<span class="source-line-no">009</span><span id="line-9">import org.slf4j.Logger;</span>
-<span class="source-line-no">010</span><span id="line-10">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">011</span><span id="line-11">import org.zeromq.SocketType;</span>
-<span class="source-line-no">012</span><span id="line-12">import org.zeromq.ZContext;</span>
-<span class="source-line-no">013</span><span id="line-13">import org.zeromq.ZMQ;</span>
-<span class="source-line-no">014</span><span id="line-14">import org.zeromq.ZMsg;</span>
-<span class="source-line-no">015</span><span id="line-15"></span>
-<span class="source-line-no">016</span><span id="line-16">import java.io.Closeable;</span>
-<span class="source-line-no">017</span><span id="line-17">import java.net.URI;</span>
-<span class="source-line-no">018</span><span id="line-18">import java.nio.charset.StandardCharsets;</span>
-<span class="source-line-no">019</span><span id="line-19">import java.util.List;</span>
-<span class="source-line-no">020</span><span id="line-20">import java.util.concurrent.ConcurrentHashMap;</span>
-<span class="source-line-no">021</span><span id="line-21">import java.util.concurrent.ThreadFactory;</span>
-<span class="source-line-no">022</span><span id="line-22"></span>
-<span class="source-line-no">023</span><span id="line-23">/**</span>
-<span class="source-line-no">024</span><span id="line-24"> * ZMQ Context with a single socket and one {@code FlowableProcessor&lt;ZMsg&gt;} per topic.</span>
-<span class="source-line-no">025</span><span id="line-25"> * It subscribes {@code SUB} to one or more topics using ZMQ and receives a multiplexed</span>
-<span class="source-line-no">026</span><span id="line-26"> * stream of {@link ZMsg} from the {@link ZMsgSocketFlowable}. In {@link RxZmqContext#onNext} the {@code ZMsg}</span>
-<span class="source-line-no">027</span><span id="line-27"> * are de-multiplexed by the {@code topic} {@code String} and placed in a per-topic</span>
-<span class="source-line-no">028</span><span id="line-28"> * {@code FlowableProcessor&lt;ZMsg&gt;}.</span>
-<span class="source-line-no">029</span><span id="line-29"> * &lt;p&gt;</span>
-<span class="source-line-no">030</span><span id="line-30"> * Topics (at least for now) must be passed to the constructor.</span>
-<span class="source-line-no">031</span><span id="line-31"> * It would be nice to be able to subscribe to topics at the ZMQ level when we first get</span>
-<span class="source-line-no">032</span><span id="line-32"> * subscriptions at the Rx level. This will probably require using a ZPoller or something like that.</span>
-<span class="source-line-no">033</span><span id="line-33"> */</span>
-<span class="source-line-no">034</span><span id="line-34">public class RxZmqContext implements Closeable {</span>
-<span class="source-line-no">035</span><span id="line-35">    private static final Logger log = LoggerFactory.getLogger(RxZmqContext.class);</span>
-<span class="source-line-no">036</span><span id="line-36">    private final ZContext zContext;</span>
-<span class="source-line-no">037</span><span id="line-37">    private final Disposable disposable;</span>
-<span class="source-line-no">038</span><span id="line-38"></span>
-<span class="source-line-no">039</span><span id="line-39">    // Map of topic names to per-topic FlowableProcessor</span>
-<span class="source-line-no">040</span><span id="line-40">    private final ConcurrentHashMap&lt;String, FlowableProcessor&lt;ZMsg&gt;&gt; processors = new ConcurrentHashMap&lt;&gt;();</span>
-<span class="source-line-no">041</span><span id="line-41"></span>
-<span class="source-line-no">042</span><span id="line-42">    public RxZmqContext(URI tcpAddress, List&lt;String&gt; topics) {</span>
-<span class="source-line-no">043</span><span id="line-43">        this(tcpAddress, topics, (Runnable r) -&gt; new Thread(r, "ZeroMQ Subscriber"));</span>
-<span class="source-line-no">044</span><span id="line-44">    }</span>
-<span class="source-line-no">045</span><span id="line-45"></span>
-<span class="source-line-no">046</span><span id="line-46">    /**</span>
-<span class="source-line-no">047</span><span id="line-47">     * @param tcpAddress Address of ZMQ server to connect to</span>
-<span class="source-line-no">048</span><span id="line-48">     * @param topics a list of topics to subscribe to</span>
-<span class="source-line-no">049</span><span id="line-49">     * @param threadFactory factory to create a thread for the receive loop (see {@link ZMsgSocketFlowable#createFromSocket(ZMQ.Socket, BackpressureStrategy, ThreadFactory)})</span>
-<span class="source-line-no">050</span><span id="line-50">     */</span>
-<span class="source-line-no">051</span><span id="line-51">    public RxZmqContext(URI tcpAddress, List&lt;String&gt; topics, ThreadFactory threadFactory) {</span>
-<span class="source-line-no">052</span><span id="line-52">        zContext = new ZContext();</span>
-<span class="source-line-no">053</span><span id="line-53">        //  Socket to talk to server</span>
-<span class="source-line-no">054</span><span id="line-54">        log.info("Connecting to Zmq server at: {}", tcpAddress);</span>
-<span class="source-line-no">055</span><span id="line-55"></span>
-<span class="source-line-no">056</span><span id="line-56">        ZMQ.Socket socket = zContext.createSocket(SocketType.SUB);</span>
-<span class="source-line-no">057</span><span id="line-57">        socket.connect(tcpAddress.toString());</span>
-<span class="source-line-no">058</span><span id="line-58"></span>
-<span class="source-line-no">059</span><span id="line-59">        topics.forEach(topic -&gt; {</span>
-<span class="source-line-no">060</span><span id="line-60">            log.info("Subscribing to topic: {}", topic);</span>
-<span class="source-line-no">061</span><span id="line-61">            this.addTopic(topic);</span>
-<span class="source-line-no">062</span><span id="line-62">            socket.subscribe(topic);</span>
-<span class="source-line-no">063</span><span id="line-63">        });</span>
-<span class="source-line-no">064</span><span id="line-64"></span>
-<span class="source-line-no">065</span><span id="line-65">        disposable = ZMsgSocketFlowable.createFromSocket(socket, BackpressureStrategy.LATEST, threadFactory)</span>
-<span class="source-line-no">066</span><span id="line-66">                .subscribe(this::onNext, this::onError, this::onComplete);</span>
-<span class="source-line-no">067</span><span id="line-67">        log.info("Connected.. Waiting for subscribers.");</span>
-<span class="source-line-no">068</span><span id="line-68">    }</span>
-<span class="source-line-no">069</span><span id="line-69"></span>
-<span class="source-line-no">070</span><span id="line-70">    /**</span>
-<span class="source-line-no">071</span><span id="line-71">     * Get a Publisher (Flowable) for a given topic</span>
-<span class="source-line-no">072</span><span id="line-72">     *</span>
-<span class="source-line-no">073</span><span id="line-73">     * @param topic a valid topic as passed to the constructor</span>
-<span class="source-line-no">074</span><span id="line-74">     * @return A Publisher (Flowable) for the topic</span>
-<span class="source-line-no">075</span><span id="line-75">     * @throws IllegalArgumentException if topic wasn't configured in the constructor</span>
-<span class="source-line-no">076</span><span id="line-76">     */</span>
-<span class="source-line-no">077</span><span id="line-77">    public Flowable&lt;ZMsg&gt; topicPublisher(String topic) {</span>
-<span class="source-line-no">078</span><span id="line-78">        Flowable&lt;ZMsg&gt; flowable = processors.get(topic);</span>
-<span class="source-line-no">079</span><span id="line-79">        if (flowable == null) {</span>
-<span class="source-line-no">080</span><span id="line-80">            throw new IllegalArgumentException("topic unavailable -- topics must be passed to constructor");</span>
-<span class="source-line-no">081</span><span id="line-81">        }</span>
-<span class="source-line-no">082</span><span id="line-82">        return flowable;</span>
-<span class="source-line-no">083</span><span id="line-83">    }</span>
-<span class="source-line-no">084</span><span id="line-84"></span>
-<span class="source-line-no">085</span><span id="line-85">    @Override</span>
-<span class="source-line-no">086</span><span id="line-86">    public void close() {</span>
-<span class="source-line-no">087</span><span id="line-87">        disposable.dispose();</span>
-<span class="source-line-no">088</span><span id="line-88">        zContext.close();</span>
-<span class="source-line-no">089</span><span id="line-89">    }</span>
-<span class="source-line-no">090</span><span id="line-90"></span>
-<span class="source-line-no">091</span><span id="line-91">    private void onNext(ZMsg zMsg) {</span>
-<span class="source-line-no">092</span><span id="line-92">        // Deliver message to correct processor for topic</span>
-<span class="source-line-no">093</span><span id="line-93">        String topic = zMsg.getFirst().getString(StandardCharsets.UTF_8);</span>
-<span class="source-line-no">094</span><span id="line-94">        Subscriber&lt;ZMsg&gt; subscriber = processors.get(topic);</span>
-<span class="source-line-no">095</span><span id="line-95">        subscriber.onNext(zMsg);</span>
-<span class="source-line-no">096</span><span id="line-96">    }</span>
-<span class="source-line-no">097</span><span id="line-97"></span>
-<span class="source-line-no">098</span><span id="line-98">    private void onError(Throwable throwable) {</span>
-<span class="source-line-no">099</span><span id="line-99">        // Propagate upstream onError to all downstream</span>
-<span class="source-line-no">100</span><span id="line-100">        processors.values().forEach(p -&gt; p.onError(throwable));</span>
-<span class="source-line-no">101</span><span id="line-101">    }</span>
-<span class="source-line-no">102</span><span id="line-102"></span>
-<span class="source-line-no">103</span><span id="line-103">    private void onComplete() {</span>
-<span class="source-line-no">104</span><span id="line-104">        // Propagate upstream onComplete to all downstream</span>
-<span class="source-line-no">105</span><span id="line-105">        processors.values().forEach(Subscriber::onComplete);</span>
-<span class="source-line-no">106</span><span id="line-106">    }</span>
-<span class="source-line-no">107</span><span id="line-107"></span>
-<span class="source-line-no">108</span><span id="line-108">    private void addTopic(String topic) {</span>
-<span class="source-line-no">109</span><span id="line-109">        processors.computeIfAbsent(topic, t -&gt; PublishProcessor.create());</span>
-<span class="source-line-no">110</span><span id="line-110">    }</span>
-<span class="source-line-no">111</span><span id="line-111">}</span>
+<span class="source-line-no">008</span><span id="line-8">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.reactivestreams.Subscriber;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.slf4j.Logger;</span>
+<span class="source-line-no">011</span><span id="line-11">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">012</span><span id="line-12">import org.zeromq.SocketType;</span>
+<span class="source-line-no">013</span><span id="line-13">import org.zeromq.ZContext;</span>
+<span class="source-line-no">014</span><span id="line-14">import org.zeromq.ZMQ;</span>
+<span class="source-line-no">015</span><span id="line-15">import org.zeromq.ZMsg;</span>
+<span class="source-line-no">016</span><span id="line-16"></span>
+<span class="source-line-no">017</span><span id="line-17">import java.io.Closeable;</span>
+<span class="source-line-no">018</span><span id="line-18">import java.net.URI;</span>
+<span class="source-line-no">019</span><span id="line-19">import java.nio.charset.StandardCharsets;</span>
+<span class="source-line-no">020</span><span id="line-20">import java.util.List;</span>
+<span class="source-line-no">021</span><span id="line-21">import java.util.concurrent.ConcurrentHashMap;</span>
+<span class="source-line-no">022</span><span id="line-22">import java.util.concurrent.ThreadFactory;</span>
+<span class="source-line-no">023</span><span id="line-23"></span>
+<span class="source-line-no">024</span><span id="line-24">/**</span>
+<span class="source-line-no">025</span><span id="line-25"> * ZMQ Context with a single socket and one {@code Processor&lt;ZMsg&gt;} per topic.</span>
+<span class="source-line-no">026</span><span id="line-26"> * It subscribes {@code SUB} to one or more topics using ZMQ and receives a multiplexed</span>
+<span class="source-line-no">027</span><span id="line-27"> * stream of {@link ZMsg} from the {@link ZMsgSocketFlowable}. In {@link RxZmqContext#onNext} the {@code ZMsg}</span>
+<span class="source-line-no">028</span><span id="line-28"> * are de-multiplexed by the {@code topic} {@code String} and placed in a per-topic</span>
+<span class="source-line-no">029</span><span id="line-29"> * {@code Processor&lt;ZMsg&gt;}.</span>
+<span class="source-line-no">030</span><span id="line-30"> * &lt;p&gt;</span>
+<span class="source-line-no">031</span><span id="line-31"> * Topics (at least for now) must be passed to the constructor.</span>
+<span class="source-line-no">032</span><span id="line-32"> * It would be nice to be able to subscribe to topics at the ZMQ level when we first get</span>
+<span class="source-line-no">033</span><span id="line-33"> * subscriptions at the Rx level. This will probably require using a ZPoller or something like that.</span>
+<span class="source-line-no">034</span><span id="line-34"> */</span>
+<span class="source-line-no">035</span><span id="line-35">public class RxZmqContext implements Closeable {</span>
+<span class="source-line-no">036</span><span id="line-36">    private static final Logger log = LoggerFactory.getLogger(RxZmqContext.class);</span>
+<span class="source-line-no">037</span><span id="line-37">    private final ZContext zContext;</span>
+<span class="source-line-no">038</span><span id="line-38">    private final Disposable disposable;</span>
+<span class="source-line-no">039</span><span id="line-39"></span>
+<span class="source-line-no">040</span><span id="line-40">    // Map of topic names to per-topic Processor</span>
+<span class="source-line-no">041</span><span id="line-41">    private final ConcurrentHashMap&lt;String, FlowableProcessor&lt;ZMsg&gt;&gt; processors = new ConcurrentHashMap&lt;&gt;();</span>
+<span class="source-line-no">042</span><span id="line-42"></span>
+<span class="source-line-no">043</span><span id="line-43">    public RxZmqContext(URI tcpAddress, List&lt;String&gt; topics) {</span>
+<span class="source-line-no">044</span><span id="line-44">        this(tcpAddress, topics, (Runnable r) -&gt; new Thread(r, "ZeroMQ Subscriber"));</span>
+<span class="source-line-no">045</span><span id="line-45">    }</span>
+<span class="source-line-no">046</span><span id="line-46"></span>
+<span class="source-line-no">047</span><span id="line-47">    /**</span>
+<span class="source-line-no">048</span><span id="line-48">     * @param tcpAddress Address of ZMQ server to connect to</span>
+<span class="source-line-no">049</span><span id="line-49">     * @param topics a list of topics to subscribe to</span>
+<span class="source-line-no">050</span><span id="line-50">     * @param threadFactory factory to create a thread for the receive loop (see {@link ZMsgSocketFlowable#createFromSocket(ZMQ.Socket, ThreadFactory)})</span>
+<span class="source-line-no">051</span><span id="line-51">     */</span>
+<span class="source-line-no">052</span><span id="line-52">    public RxZmqContext(URI tcpAddress, List&lt;String&gt; topics, ThreadFactory threadFactory) {</span>
+<span class="source-line-no">053</span><span id="line-53">        zContext = new ZContext();</span>
+<span class="source-line-no">054</span><span id="line-54">        //  Socket to talk to server</span>
+<span class="source-line-no">055</span><span id="line-55">        log.info("Connecting to Zmq server at: {}", tcpAddress);</span>
+<span class="source-line-no">056</span><span id="line-56"></span>
+<span class="source-line-no">057</span><span id="line-57">        ZMQ.Socket socket = zContext.createSocket(SocketType.SUB);</span>
+<span class="source-line-no">058</span><span id="line-58">        socket.connect(tcpAddress.toString());</span>
+<span class="source-line-no">059</span><span id="line-59"></span>
+<span class="source-line-no">060</span><span id="line-60">        topics.forEach(topic -&gt; {</span>
+<span class="source-line-no">061</span><span id="line-61">            log.info("Subscribing to topic: {}", topic);</span>
+<span class="source-line-no">062</span><span id="line-62">            this.addTopic(topic);</span>
+<span class="source-line-no">063</span><span id="line-63">            socket.subscribe(topic);</span>
+<span class="source-line-no">064</span><span id="line-64">        });</span>
+<span class="source-line-no">065</span><span id="line-65"></span>
+<span class="source-line-no">066</span><span id="line-66">        disposable = Flowable.fromPublisher(ZMsgSocketFlowable.createFromSocket(socket, threadFactory))</span>
+<span class="source-line-no">067</span><span id="line-67">                .subscribe(this::onNext, this::onError, this::onComplete);</span>
+<span class="source-line-no">068</span><span id="line-68">        log.info("Connected.. Waiting for subscribers.");</span>
+<span class="source-line-no">069</span><span id="line-69">    }</span>
+<span class="source-line-no">070</span><span id="line-70"></span>
+<span class="source-line-no">071</span><span id="line-71">    /**</span>
+<span class="source-line-no">072</span><span id="line-72">     * Get a Publisher (internally is an RxJava3 Flowable) for a given topic</span>
+<span class="source-line-no">073</span><span id="line-73">     *</span>
+<span class="source-line-no">074</span><span id="line-74">     * @param topic a valid topic as passed to the constructor</span>
+<span class="source-line-no">075</span><span id="line-75">     * @return A Publisher for the topic</span>
+<span class="source-line-no">076</span><span id="line-76">     * @throws IllegalArgumentException if topic wasn't configured in the constructor</span>
+<span class="source-line-no">077</span><span id="line-77">     */</span>
+<span class="source-line-no">078</span><span id="line-78">    public Publisher&lt;ZMsg&gt; topicPublisher(String topic) {</span>
+<span class="source-line-no">079</span><span id="line-79">        Publisher&lt;ZMsg&gt; publisher = processors.get(topic);</span>
+<span class="source-line-no">080</span><span id="line-80">        if (publisher == null) {</span>
+<span class="source-line-no">081</span><span id="line-81">            throw new IllegalArgumentException("topic unavailable -- topics must be passed to constructor");</span>
+<span class="source-line-no">082</span><span id="line-82">        }</span>
+<span class="source-line-no">083</span><span id="line-83">        return publisher;</span>
+<span class="source-line-no">084</span><span id="line-84">    }</span>
+<span class="source-line-no">085</span><span id="line-85"></span>
+<span class="source-line-no">086</span><span id="line-86">    @Override</span>
+<span class="source-line-no">087</span><span id="line-87">    public void close() {</span>
+<span class="source-line-no">088</span><span id="line-88">        disposable.dispose();</span>
+<span class="source-line-no">089</span><span id="line-89">        zContext.close();</span>
+<span class="source-line-no">090</span><span id="line-90">    }</span>
+<span class="source-line-no">091</span><span id="line-91"></span>
+<span class="source-line-no">092</span><span id="line-92">    private void onNext(ZMsg zMsg) {</span>
+<span class="source-line-no">093</span><span id="line-93">        // Deliver message to correct processor for topic</span>
+<span class="source-line-no">094</span><span id="line-94">        String topic = zMsg.getFirst().getString(StandardCharsets.UTF_8);</span>
+<span class="source-line-no">095</span><span id="line-95">        Subscriber&lt;ZMsg&gt; subscriber = processors.get(topic);</span>
+<span class="source-line-no">096</span><span id="line-96">        subscriber.onNext(zMsg);</span>
+<span class="source-line-no">097</span><span id="line-97">    }</span>
+<span class="source-line-no">098</span><span id="line-98"></span>
+<span class="source-line-no">099</span><span id="line-99">    private void onError(Throwable throwable) {</span>
+<span class="source-line-no">100</span><span id="line-100">        // Propagate upstream onError to all downstream</span>
+<span class="source-line-no">101</span><span id="line-101">        processors.values().forEach(p -&gt; p.onError(throwable));</span>
+<span class="source-line-no">102</span><span id="line-102">    }</span>
+<span class="source-line-no">103</span><span id="line-103"></span>
+<span class="source-line-no">104</span><span id="line-104">    private void onComplete() {</span>
+<span class="source-line-no">105</span><span id="line-105">        // Propagate upstream onComplete to all downstream</span>
+<span class="source-line-no">106</span><span id="line-106">        processors.values().forEach(Subscriber::onComplete);</span>
+<span class="source-line-no">107</span><span id="line-107">    }</span>
+<span class="source-line-no">108</span><span id="line-108"></span>
+<span class="source-line-no">109</span><span id="line-109">    private void addTopic(String topic) {</span>
+<span class="source-line-no">110</span><span id="line-110">        processors.computeIfAbsent(topic, keyTopic -&gt; PublishProcessor.create());</span>
+<span class="source-line-no">111</span><span id="line-111">    }</span>
+<span class="source-line-no">112</span><span id="line-112">}</span>
 
 
 
diff --git a/apidoc/src-html/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html b/apidoc/src-html/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html
index 3001f38e4..8f52afe12 100644
--- a/apidoc/src-html/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html
+++ b/apidoc/src-html/org/consensusj/rx/zeromq/ZMsgSocketFlowable.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML>
 <html lang="en">
 <head>
-<!-- Generated by javadoc (17) -->
+<!-- Generated by javadoc (21) -->
 <title>Source code</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <meta name="description" content="source: package: org.consensusj.rx.zeromq, class: ZMsgSocketFlowable">
@@ -16,100 +16,126 @@
 <span class="source-line-no">003</span><span id="line-3">import io.reactivex.rxjava3.core.BackpressureStrategy;</span>
 <span class="source-line-no">004</span><span id="line-4">import io.reactivex.rxjava3.core.Flowable;</span>
 <span class="source-line-no">005</span><span id="line-5">import io.reactivex.rxjava3.core.FlowableEmitter;</span>
-<span class="source-line-no">006</span><span id="line-6">import org.slf4j.Logger;</span>
-<span class="source-line-no">007</span><span id="line-7">import org.slf4j.LoggerFactory;</span>
-<span class="source-line-no">008</span><span id="line-8">import org.zeromq.ZMQ;</span>
-<span class="source-line-no">009</span><span id="line-9">import org.zeromq.ZMQException;</span>
-<span class="source-line-no">010</span><span id="line-10">import org.zeromq.ZMsg;</span>
-<span class="source-line-no">011</span><span id="line-11">import zmq.ZError;</span>
-<span class="source-line-no">012</span><span id="line-12"></span>
-<span class="source-line-no">013</span><span id="line-13">import java.util.concurrent.ThreadFactory;</span>
-<span class="source-line-no">014</span><span id="line-14"></span>
-<span class="source-line-no">015</span><span id="line-15">/**</span>
-<span class="source-line-no">016</span><span id="line-16"> *  Factory class for creating {@code Flowable&lt;ZMsg&gt;} from a {@link ZMQ.Socket}. The created {@link Flowable}</span>
-<span class="source-line-no">017</span><span id="line-17"> *  will receive a multiplexed stream of {@link ZMsg} (i.e. {@code ZMsg} for all topics.) Typically</span>
-<span class="source-line-no">018</span><span id="line-18"> *  these multiplexed {@code Flowable&lt;ZMsg&gt;} are created by a {@link RxZmqContext} which also de-multiplexes them.</span>
-<span class="source-line-no">019</span><span id="line-19"> *  &lt;p&gt;</span>
-<span class="source-line-no">020</span><span id="line-20"> *  TODO: Write some tests!!</span>
-<span class="source-line-no">021</span><span id="line-21"> */</span>
-<span class="source-line-no">022</span><span id="line-22">public class ZMsgSocketFlowable {</span>
-<span class="source-line-no">023</span><span id="line-23">    private static final Logger log = LoggerFactory.getLogger(ZMsgSocketFlowable.class);</span>
-<span class="source-line-no">024</span><span id="line-24">    private static final ThreadFactory defaultThreadFactory = runnable -&gt; new Thread(runnable, "ZeroMQ Receiver");</span>
-<span class="source-line-no">025</span><span id="line-25"></span>
-<span class="source-line-no">026</span><span id="line-26">    static Flowable&lt;ZMsg&gt; createFromSocket(ZMQ.Socket socket, BackpressureStrategy backpressureStrategy) {</span>
-<span class="source-line-no">027</span><span id="line-27">        return createFromSocket(socket, backpressureStrategy, defaultThreadFactory);</span>
-<span class="source-line-no">028</span><span id="line-28">    }</span>
-<span class="source-line-no">029</span><span id="line-29"></span>
-<span class="source-line-no">030</span><span id="line-30">    /**</span>
-<span class="source-line-no">031</span><span id="line-31">     * The created {@link Flowable} will create a new receiving loop thread per subscriber, which may</span>
-<span class="source-line-no">032</span><span id="line-32">     * not be what you want. To support multiple subscribers use {@link RxZmqContext}, or something</span>
-<span class="source-line-no">033</span><span id="line-33">     * similar, or directly use a {@link io.reactivex.rxjava3.processors.FlowableProcessor}.</span>
-<span class="source-line-no">034</span><span id="line-34">     * </span>
-<span class="source-line-no">035</span><span id="line-35">     * @param socket A connected socket, ready to receive messages with {@link ZMsg#recvMsg(ZMQ.Socket)}</span>
-<span class="source-line-no">036</span><span id="line-36">     * @param backpressureStrategy specifies what to do if subscribers aren't able to receive data fast enough</span>
-<span class="source-line-no">037</span><span id="line-37">     * @param threadFactory used to create the thread that runs the receive loop</span>
-<span class="source-line-no">038</span><span id="line-38">     * @return A "cold" Flowable</span>
-<span class="source-line-no">039</span><span id="line-39">     */</span>
-<span class="source-line-no">040</span><span id="line-40">    static Flowable&lt;ZMsg&gt; createFromSocket(ZMQ.Socket socket, BackpressureStrategy backpressureStrategy, ThreadFactory threadFactory) {</span>
-<span class="source-line-no">041</span><span id="line-41">        return Flowable.create(emitter -&gt; {</span>
-<span class="source-line-no">042</span><span id="line-42">            Thread thread = threadFactory.newThread(new ZmqReceiveLoop(socket, emitter));</span>
-<span class="source-line-no">043</span><span id="line-43">            thread.start();</span>
-<span class="source-line-no">044</span><span id="line-44">            emitter.setCancellable(() -&gt; {</span>
-<span class="source-line-no">045</span><span id="line-45">                thread.interrupt();</span>
-<span class="source-line-no">046</span><span id="line-46">                thread.join();</span>
-<span class="source-line-no">047</span><span id="line-47">            });</span>
-<span class="source-line-no">048</span><span id="line-48">        }, backpressureStrategy);</span>
-<span class="source-line-no">049</span><span id="line-49">    }</span>
-<span class="source-line-no">050</span><span id="line-50"></span>
-<span class="source-line-no">051</span><span id="line-51">    /**</span>
-<span class="source-line-no">052</span><span id="line-52">     * A runnable {@link ZMQ.Socket} receive loop that can be cancelled with {@link Thread#interrupt}</span>
-<span class="source-line-no">053</span><span id="line-53">     * and sends messages and errors to the supplied {@link FlowableEmitter}.</span>
-<span class="source-line-no">054</span><span id="line-54">     */</span>
-<span class="source-line-no">055</span><span id="line-55">    private static class ZmqReceiveLoop implements Runnable {</span>
-<span class="source-line-no">056</span><span id="line-56">        private final ZMQ.Socket socket;</span>
-<span class="source-line-no">057</span><span id="line-57">        private final FlowableEmitter&lt;ZMsg&gt; emitter;</span>
-<span class="source-line-no">058</span><span id="line-58"></span>
-<span class="source-line-no">059</span><span id="line-59">        /**</span>
-<span class="source-line-no">060</span><span id="line-60">         * @param socket A connected socket, ready to receive messages with {@link ZMsg#recvMsg(ZMQ.Socket)}</span>
-<span class="source-line-no">061</span><span id="line-61">         * @param emitter should be supplied by {link @Flowable#create}</span>
-<span class="source-line-no">062</span><span id="line-62">         */</span>
-<span class="source-line-no">063</span><span id="line-63">        private ZmqReceiveLoop(ZMQ.Socket socket, FlowableEmitter&lt;ZMsg&gt; emitter) {</span>
-<span class="source-line-no">064</span><span id="line-64">            this.socket = socket;</span>
-<span class="source-line-no">065</span><span id="line-65">            this.emitter = emitter;</span>
-<span class="source-line-no">066</span><span id="line-66">        }</span>
-<span class="source-line-no">067</span><span id="line-67"></span>
-<span class="source-line-no">068</span><span id="line-68">        @Override</span>
-<span class="source-line-no">069</span><span id="line-69">        public void run() {</span>
-<span class="source-line-no">070</span><span id="line-70">            log.info("Starting receiving thread.");</span>
-<span class="source-line-no">071</span><span id="line-71">            while (!Thread.currentThread().isInterrupted()) {</span>
-<span class="source-line-no">072</span><span id="line-72">                try {</span>
-<span class="source-line-no">073</span><span id="line-73">                    ZMsg message = ZMsg.recvMsg(socket);</span>
-<span class="source-line-no">074</span><span id="line-74">                    if (message != null) {</span>
-<span class="source-line-no">075</span><span id="line-75">                        emitter.onNext(message);</span>
-<span class="source-line-no">076</span><span id="line-76">                    }</span>
-<span class="source-line-no">077</span><span id="line-77">                } catch (Exception e) {</span>
-<span class="source-line-no">078</span><span id="line-78">                    if (e instanceof ZMQException &amp;&amp; ((ZMQException) e).getErrorCode() == ZError.ETERM) {</span>
-<span class="source-line-no">079</span><span id="line-79">                        log.info("Got ZError.ETERM");</span>
-<span class="source-line-no">080</span><span id="line-80">                        // Is this the error we get when upstream closes the channel?</span>
-<span class="source-line-no">081</span><span id="line-81">                        emitter.onComplete();</span>
-<span class="source-line-no">082</span><span id="line-82">                    } else if (e instanceof ZMQException &amp;&amp; ((ZMQException) e).getErrorCode() == ZError.EINTR) {</span>
-<span class="source-line-no">083</span><span id="line-83">                        log.info("Ignoring ZError.EINTR");</span>
-<span class="source-line-no">084</span><span id="line-84">                        // Should we send an onComplete when we are cancelled?</span>
-<span class="source-line-no">085</span><span id="line-85">                        emitter.onComplete();</span>
-<span class="source-line-no">086</span><span id="line-86">                    } else {</span>
-<span class="source-line-no">087</span><span id="line-87">                        log.error("Exception: ", e);</span>
-<span class="source-line-no">088</span><span id="line-88">                        emitter.onError(e);</span>
-<span class="source-line-no">089</span><span id="line-89">                    }</span>
-<span class="source-line-no">090</span><span id="line-90">                    break;</span>
-<span class="source-line-no">091</span><span id="line-91">                }</span>
-<span class="source-line-no">092</span><span id="line-92">            }</span>
-<span class="source-line-no">093</span><span id="line-93">            log.info("Closing ZMQ.Socket.");</span>
-<span class="source-line-no">094</span><span id="line-94">            socket.setLinger(0);</span>
-<span class="source-line-no">095</span><span id="line-95">            socket.close();</span>
-<span class="source-line-no">096</span><span id="line-96">        }</span>
-<span class="source-line-no">097</span><span id="line-97">    }</span>
-<span class="source-line-no">098</span><span id="line-98"></span>
-<span class="source-line-no">099</span><span id="line-99">}</span>
+<span class="source-line-no">006</span><span id="line-6">import org.reactivestreams.Publisher;</span>
+<span class="source-line-no">007</span><span id="line-7">import org.slf4j.Logger;</span>
+<span class="source-line-no">008</span><span id="line-8">import org.slf4j.LoggerFactory;</span>
+<span class="source-line-no">009</span><span id="line-9">import org.zeromq.ZMQ;</span>
+<span class="source-line-no">010</span><span id="line-10">import org.zeromq.ZMQException;</span>
+<span class="source-line-no">011</span><span id="line-11">import org.zeromq.ZMsg;</span>
+<span class="source-line-no">012</span><span id="line-12">import zmq.ZError;</span>
+<span class="source-line-no">013</span><span id="line-13"></span>
+<span class="source-line-no">014</span><span id="line-14">import java.util.concurrent.ThreadFactory;</span>
+<span class="source-line-no">015</span><span id="line-15"></span>
+<span class="source-line-no">016</span><span id="line-16">// TODO: Consider a mechanism to configure backpressure strategy without using RxJava 3. Is there a need?</span>
+<span class="source-line-no">017</span><span id="line-17">/**</span>
+<span class="source-line-no">018</span><span id="line-18"> *  Factory class for creating {@code Publisher&lt;ZMsg&gt;} from a {@link ZMQ.Socket}. The created {@link Publisher}</span>
+<span class="source-line-no">019</span><span id="line-19"> *  will receive a multiplexed stream of {@link ZMsg} (i.e. {@code ZMsg} for all topics.) Typically</span>
+<span class="source-line-no">020</span><span id="line-20"> *  these multiplexed {@code Publisher&lt;ZMsg&gt;} are created by a {@link RxZmqContext} which also de-multiplexes them.</span>
+<span class="source-line-no">021</span><span id="line-21"> *  &lt;p&gt;</span>
+<span class="source-line-no">022</span><span id="line-22"> *  TODO: Write some tests!!</span>
+<span class="source-line-no">023</span><span id="line-23"> */</span>
+<span class="source-line-no">024</span><span id="line-24">public class ZMsgSocketFlowable {</span>
+<span class="source-line-no">025</span><span id="line-25">    private static final Logger log = LoggerFactory.getLogger(ZMsgSocketFlowable.class);</span>
+<span class="source-line-no">026</span><span id="line-26">    private static final ThreadFactory defaultThreadFactory = runnable -&gt; new Thread(runnable, "ZeroMQ Receiver");</span>
+<span class="source-line-no">027</span><span id="line-27"></span>
+<span class="source-line-no">028</span><span id="line-28">    static Publisher&lt;ZMsg&gt; createFromSocket(ZMQ.Socket socket) {</span>
+<span class="source-line-no">029</span><span id="line-29">        return createFromSocket(socket, defaultThreadFactory);</span>
+<span class="source-line-no">030</span><span id="line-30">    }</span>
+<span class="source-line-no">031</span><span id="line-31"></span>
+<span class="source-line-no">032</span><span id="line-32">    /**</span>
+<span class="source-line-no">033</span><span id="line-33">     * @deprecated Use {@link #createFromSocket(ZMQ.Socket)}</span>
+<span class="source-line-no">034</span><span id="line-34">     */</span>
+<span class="source-line-no">035</span><span id="line-35">    @Deprecated</span>
+<span class="source-line-no">036</span><span id="line-36">    static Publisher&lt;ZMsg&gt; createFromSocket(ZMQ.Socket socket, BackpressureStrategy backpressureStrategy) {</span>
+<span class="source-line-no">037</span><span id="line-37">        return createFromSocket(socket, backpressureStrategy, defaultThreadFactory);</span>
+<span class="source-line-no">038</span><span id="line-38">    }</span>
+<span class="source-line-no">039</span><span id="line-39"></span>
+<span class="source-line-no">040</span><span id="line-40">    /**</span>
+<span class="source-line-no">041</span><span id="line-41">     * The created {@link Flowable} will create a new receiving loop thread per subscriber, which may</span>
+<span class="source-line-no">042</span><span id="line-42">     * not be what you want. To support multiple subscribers use {@link RxZmqContext}, or something</span>
+<span class="source-line-no">043</span><span id="line-43">     * similar, or directly use a {@link io.reactivex.rxjava3.processors.FlowableProcessor}</span>
+<span class="source-line-no">044</span><span id="line-44">     * &lt;p&gt;</span>
+<span class="source-line-no">045</span><span id="line-45">     *     Note: {@code BackpressureStrategy.LATEST} is hard-coded internally</span>
+<span class="source-line-no">046</span><span id="line-46">     * </span>
+<span class="source-line-no">047</span><span id="line-47">     * @param socket A connected socket, ready to receive messages with {@link ZMsg#recvMsg(ZMQ.Socket)}</span>
+<span class="source-line-no">048</span><span id="line-48">     * @param threadFactory used to create the thread that runs the receive loop</span>
+<span class="source-line-no">049</span><span id="line-49">     * @return A "cold" Flowable</span>
+<span class="source-line-no">050</span><span id="line-50">     */</span>
+<span class="source-line-no">051</span><span id="line-51">    static Publisher&lt;ZMsg&gt; createFromSocket(ZMQ.Socket socket, ThreadFactory threadFactory) {</span>
+<span class="source-line-no">052</span><span id="line-52">        return Flowable.create(emitter -&gt; {</span>
+<span class="source-line-no">053</span><span id="line-53">            Thread thread = threadFactory.newThread(new ZmqReceiveLoop(socket, emitter));</span>
+<span class="source-line-no">054</span><span id="line-54">            thread.start();</span>
+<span class="source-line-no">055</span><span id="line-55">            emitter.setCancellable(() -&gt; {</span>
+<span class="source-line-no">056</span><span id="line-56">                thread.interrupt();</span>
+<span class="source-line-no">057</span><span id="line-57">                thread.join();</span>
+<span class="source-line-no">058</span><span id="line-58">            });</span>
+<span class="source-line-no">059</span><span id="line-59">        }, BackpressureStrategy.LATEST);</span>
+<span class="source-line-no">060</span><span id="line-60">    }</span>
+<span class="source-line-no">061</span><span id="line-61"></span>
+<span class="source-line-no">062</span><span id="line-62">    /**</span>
+<span class="source-line-no">063</span><span id="line-63">     * @deprecated Use {@link #createFromSocket(ZMQ.Socket, ThreadFactory)}</span>
+<span class="source-line-no">064</span><span id="line-64">     */</span>
+<span class="source-line-no">065</span><span id="line-65">    @Deprecated</span>
+<span class="source-line-no">066</span><span id="line-66">    static Publisher&lt;ZMsg&gt; createFromSocket(ZMQ.Socket socket, BackpressureStrategy backpressureStrategy, ThreadFactory threadFactory) {</span>
+<span class="source-line-no">067</span><span id="line-67">        return Flowable.create(emitter -&gt; {</span>
+<span class="source-line-no">068</span><span id="line-68">            Thread thread = threadFactory.newThread(new ZmqReceiveLoop(socket, emitter));</span>
+<span class="source-line-no">069</span><span id="line-69">            thread.start();</span>
+<span class="source-line-no">070</span><span id="line-70">            emitter.setCancellable(() -&gt; {</span>
+<span class="source-line-no">071</span><span id="line-71">                thread.interrupt();</span>
+<span class="source-line-no">072</span><span id="line-72">                thread.join();</span>
+<span class="source-line-no">073</span><span id="line-73">            });</span>
+<span class="source-line-no">074</span><span id="line-74">        }, backpressureStrategy);</span>
+<span class="source-line-no">075</span><span id="line-75">    }</span>
+<span class="source-line-no">076</span><span id="line-76"></span>
+<span class="source-line-no">077</span><span id="line-77"></span>
+<span class="source-line-no">078</span><span id="line-78">    /**</span>
+<span class="source-line-no">079</span><span id="line-79">     * A runnable {@link ZMQ.Socket} receive loop that can be cancelled with {@link Thread#interrupt}</span>
+<span class="source-line-no">080</span><span id="line-80">     * and sends messages and errors to the supplied {@link FlowableEmitter}.</span>
+<span class="source-line-no">081</span><span id="line-81">     */</span>
+<span class="source-line-no">082</span><span id="line-82">    private static class ZmqReceiveLoop implements Runnable {</span>
+<span class="source-line-no">083</span><span id="line-83">        private final ZMQ.Socket socket;</span>
+<span class="source-line-no">084</span><span id="line-84">        private final FlowableEmitter&lt;ZMsg&gt; emitter;</span>
+<span class="source-line-no">085</span><span id="line-85"></span>
+<span class="source-line-no">086</span><span id="line-86">        /**</span>
+<span class="source-line-no">087</span><span id="line-87">         * @param socket A connected socket, ready to receive messages with {@link ZMsg#recvMsg(ZMQ.Socket)}</span>
+<span class="source-line-no">088</span><span id="line-88">         * @param emitter should be supplied by {link @Flowable#create}</span>
+<span class="source-line-no">089</span><span id="line-89">         */</span>
+<span class="source-line-no">090</span><span id="line-90">        private ZmqReceiveLoop(ZMQ.Socket socket, FlowableEmitter&lt;ZMsg&gt; emitter) {</span>
+<span class="source-line-no">091</span><span id="line-91">            this.socket = socket;</span>
+<span class="source-line-no">092</span><span id="line-92">            this.emitter = emitter;</span>
+<span class="source-line-no">093</span><span id="line-93">        }</span>
+<span class="source-line-no">094</span><span id="line-94"></span>
+<span class="source-line-no">095</span><span id="line-95">        @Override</span>
+<span class="source-line-no">096</span><span id="line-96">        public void run() {</span>
+<span class="source-line-no">097</span><span id="line-97">            log.info("Starting receiving thread.");</span>
+<span class="source-line-no">098</span><span id="line-98">            while (!Thread.currentThread().isInterrupted()) {</span>
+<span class="source-line-no">099</span><span id="line-99">                try {</span>
+<span class="source-line-no">100</span><span id="line-100">                    ZMsg message = ZMsg.recvMsg(socket);</span>
+<span class="source-line-no">101</span><span id="line-101">                    if (message != null) {</span>
+<span class="source-line-no">102</span><span id="line-102">                        emitter.onNext(message);</span>
+<span class="source-line-no">103</span><span id="line-103">                    }</span>
+<span class="source-line-no">104</span><span id="line-104">                } catch (Exception e) {</span>
+<span class="source-line-no">105</span><span id="line-105">                    if (e instanceof ZMQException &amp;&amp; ((ZMQException) e).getErrorCode() == ZError.ETERM) {</span>
+<span class="source-line-no">106</span><span id="line-106">                        log.info("Got ZError.ETERM");</span>
+<span class="source-line-no">107</span><span id="line-107">                        // Is this the error we get when upstream closes the channel?</span>
+<span class="source-line-no">108</span><span id="line-108">                        emitter.onComplete();</span>
+<span class="source-line-no">109</span><span id="line-109">                    } else if (e instanceof ZMQException &amp;&amp; ((ZMQException) e).getErrorCode() == ZError.EINTR) {</span>
+<span class="source-line-no">110</span><span id="line-110">                        log.info("Ignoring ZError.EINTR");</span>
+<span class="source-line-no">111</span><span id="line-111">                        // Should we send an onComplete when we are cancelled?</span>
+<span class="source-line-no">112</span><span id="line-112">                        emitter.onComplete();</span>
+<span class="source-line-no">113</span><span id="line-113">                    } else {</span>
+<span class="source-line-no">114</span><span id="line-114">                        log.error("Exception: ", e);</span>
+<span class="source-line-no">115</span><span id="line-115">                        emitter.onError(e);</span>
+<span class="source-line-no">116</span><span id="line-116">                    }</span>
+<span class="source-line-no">117</span><span id="line-117">                    break;</span>
+<span class="source-line-no">118</span><span id="line-118">                }</span>
+<span class="source-line-no">119</span><span id="line-119">            }</span>
+<span class="source-line-no">120</span><span id="line-120">            log.info("Closing ZMQ.Socket.");</span>
+<span class="source-line-no">121</span><span id="line-121">            socket.setLinger(0);</span>
+<span class="source-line-no">122</span><span id="line-122">            socket.close();</span>
+<span class="source-line-no">123</span><span id="line-123">        }</span>
+<span class="source-line-no">124</span><span id="line-124">    }</span>
+<span class="source-line-no">125</span><span id="line-125">}</span>
 
 
 
diff --git a/apidoc/stylesheet.css b/apidoc/stylesheet.css
index 4a576bd24..f71489f86 100644
--- a/apidoc/stylesheet.css
+++ b/apidoc/stylesheet.css
@@ -4,18 +4,73 @@
 
 @import url('resources/fonts/dejavu.css');
 
+/*
+ * These CSS custom properties (variables) define the core color and font
+ * properties used in this stylesheet.
+ */
+:root {
+    /* body, block and code fonts */
+    --body-font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
+    --block-font-family: 'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    --code-font-family: 'DejaVu Sans Mono', monospace;
+    /* Base font sizes for body and code elements */
+    --body-font-size: 14px;
+    --code-font-size: 14px;
+    /* Text colors for body and block elements */
+    --body-text-color: #353833;
+    --block-text-color: #474747;
+    /* Background colors for various structural elements */
+    --body-background-color: #ffffff;
+    --section-background-color: #f8f8f8;
+    --detail-background-color: #ffffff;
+    /* Colors for navigation bar and table captions */
+    --navbar-background-color: #4D7A97;
+    --navbar-text-color: #ffffff;
+    /* Background color for subnavigation and various headers */
+    --subnav-background-color: #dee3e9;
+    /* Background and text colors for selected tabs and navigation items */
+    --selected-background-color: #f8981d;
+    --selected-text-color: #253441;
+    --selected-link-color: #1f389c;
+    /* Background colors for generated tables */
+    --even-row-color: #ffffff;
+    --odd-row-color: #eeeeef;
+    /* Text color for page title */
+    --title-color: #2c4557;
+    /* Text colors for links */
+    --link-color: #4A6782;
+    --link-color-active: #bb7a2a;
+    /* Snippet colors */
+    --snippet-background-color: #ebecee;
+    --snippet-text-color: var(--block-text-color);
+    --snippet-highlight-color: #f7c590;
+    /* Border colors for structural elements and user defined tables */
+    --border-color: #ededed;
+    --table-border-color: #000000;
+    /* Search input colors */
+    --search-input-background-color: #ffffff;
+    --search-input-text-color: #000000;
+    --search-input-placeholder-color: #909090;
+    /* Highlight color for active search tag target */
+    --search-tag-highlight-color: #ffff00;
+    /* Adjustments for icon and active background colors of copy-to-clipboard buttons */
+    --copy-icon-brightness: 100%;
+    --copy-button-background-color-active: rgba(168, 168, 176, 0.3);
+    /* Colors for invalid tag notifications */
+    --invalid-tag-background-color: #ffe6e6;
+    --invalid-tag-text-color: #000000;
+}
 /*
  * Styles for individual HTML elements.
  *
  * These are styles that are specific to individual HTML elements. Changing them affects the style of a particular
  * HTML element throughout the page.
  */
-
 body {
-    background-color:#ffffff;
-    color:#353833;
-    font-family:'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size:14px;
+    background-color:var(--body-background-color);
+    color:var(--body-text-color);
+    font-family:var(--body-font-family);
+    font-size:var(--body-font-size);
     margin:0;
     padding:0;
     height:100%;
@@ -31,58 +86,59 @@ iframe {
 }
 a:link, a:visited {
     text-decoration:none;
-    color:#4A6782;
+    color:var(--link-color);
 }
 a[href]:hover, a[href]:focus {
     text-decoration:none;
-    color:#bb7a2a;
-}
-a[name] {
-    color:#353833;
+    color:var(--link-color-active);
 }
 pre {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-family:var(--code-font-family);
+    font-size:1em;
 }
 h1 {
-    font-size:20px;
+    font-size:1.428em;
 }
 h2 {
-    font-size:18px;
+    font-size:1.285em;
 }
 h3 {
-    font-size:16px;
+    font-size:1.14em;
 }
 h4 {
-    font-size:15px;
+    font-size:1.072em;
 }
 h5 {
-    font-size:14px;
+    font-size:1.001em;
 }
 h6 {
-    font-size:13px;
+    font-size:0.93em;
+}
+/* Disable font boosting for selected elements */
+h1, h2, h3, h4, h5, h6, div.member-signature {
+    max-height: 1000em;
 }
 ul {
     list-style-type:disc;
 }
 code, tt {
-    font-family:'DejaVu Sans Mono', monospace;
+    font-family:var(--code-font-family);
 }
 :not(h1, h2, h3, h4, h5, h6) > code,
 :not(h1, h2, h3, h4, h5, h6) > tt {
-    font-size:14px;
+    font-size:var(--code-font-size);
     padding-top:4px;
     margin-top:8px;
     line-height:1.4em;
 }
 dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-family:var(--code-font-family);
+    font-size:1em;
     padding-top:4px;
 }
 .summary-table dt code {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-family:var(--code-font-family);
+    font-size:1em;
     vertical-align:top;
     padding-top:4px;
 }
@@ -90,8 +146,8 @@ sup {
     font-size:8px;
 }
 button {
-    font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size: 14px;
+    font-family: var(--body-font-family);
+    font-size: 1em;
 }
 /*
  * Styles for HTML generated by javadoc.
@@ -102,74 +158,67 @@ button {
 /*
  * Styles for document title and copyright.
  */
-.clear {
-    clear:both;
-    height:0;
-    overflow:hidden;
-}
 .about-language {
     float:right;
     padding:0 21px 8px 8px;
-    font-size:11px;
+    font-size:0.915em;
     margin-top:-9px;
     height:2.9em;
 }
 .legal-copy {
     margin-left:.5em;
 }
-.tab {
-    background-color:#0066FF;
-    color:#ffffff;
-    padding:8px;
-    width:5em;
-    font-weight:bold;
-}
 /*
  * Styles for navigation bar.
  */
 @media screen {
-    .flex-box {
+    div.flex-box {
         position:fixed;
         display:flex;
         flex-direction:column;
         height: 100%;
         width: 100%;
     }
-    .flex-header {
+    header.flex-header {
         flex: 0 0 auto;
     }
-    .flex-content {
+    div.flex-content {
         flex: 1 1 auto;
         overflow-y: auto;
     }
 }
 .top-nav {
-    background-color:#4D7A97;
-    color:#FFFFFF;
+    background-color:var(--navbar-background-color);
+    color:var(--navbar-text-color);
     float:left;
-    padding:0;
     width:100%;
     clear:right;
     min-height:2.8em;
-    padding-top:10px;
+    padding:10px 0 0 0;
     overflow:hidden;
-    font-size:12px;
+    font-size:0.857em;
+}
+button#navbar-toggle-button {
+    display:none;
+}
+ul.sub-nav-list-small {
+    display: none;
 }
 .sub-nav {
-    background-color:#dee3e9;
+    background-color:var(--subnav-background-color);
     float:left;
     width:100%;
     overflow:hidden;
-    font-size:12px;
+    font-size:0.857em;
 }
 .sub-nav div {
     clear:left;
     float:left;
-    padding:0 0 5px 6px;
+    padding:6px;
     text-transform:uppercase;
 }
-.sub-nav .nav-list {
-    padding-top:5px;
+.sub-nav .sub-nav-list {
+    padding-top:4px;
 }
 ul.nav-list {
     display:block;
@@ -189,32 +238,27 @@ ul.nav-list li {
 }
 .sub-nav .nav-list-search {
     float:right;
-    margin:0 0 0 0;
-    padding:5px 6px;
+    margin:0;
+    padding:6px;
     clear:none;
-}
-.nav-list-search label {
+    text-align:right;
     position:relative;
-    right:-16px;
 }
 ul.sub-nav-list li {
     list-style:none;
     float:left;
-    padding-top:10px;
 }
 .top-nav a:link, .top-nav a:active, .top-nav a:visited {
-    color:#FFFFFF;
+    color:var(--navbar-text-color);
     text-decoration:none;
     text-transform:uppercase;
 }
 .top-nav a:hover {
-    text-decoration:none;
-    color:#bb7a2a;
-    text-transform:uppercase;
+    color:var(--link-color-active);
 }
 .nav-bar-cell1-rev {
-    background-color:#F8981D;
-    color:#253441;
+    background-color:var(--selected-background-color);
+    color:var(--selected-text-color);
     margin: auto 5px;
 }
 .skip-nav {
@@ -232,30 +276,30 @@ ul.sub-nav-list li {
     }
 }
 /*
- * Styles for page header and footer.
+ * Styles for page header.
  */
 .title {
-    color:#2c4557;
+    color:var(--title-color);
     margin:10px 0;
 }
 .sub-title {
     margin:5px 0 0 0;
 }
-.header ul {
-    margin:0 0 15px 0;
-    padding:0;
+ul.contents-list {
+    margin: 0 0 15px 0;
+    padding: 0;
+    list-style: none;
 }
-.header ul li, .footer ul li {
-    list-style:none;
-    font-size:13px;
+ul.contents-list li {
+    font-size:0.93em;
 }
 /*
  * Styles for headings.
  */
 body.class-declaration-page .summary h2,
 body.class-declaration-page .details h2,
-body.class-use-page  h2,
-body.module-declaration-page  .block-list h2 {
+body.class-use-page h2,
+body.module-declaration-page .block-list h2 {
     font-style: italic;
     padding:0;
     margin:15px 0;
@@ -263,8 +307,8 @@ body.module-declaration-page  .block-list h2 {
 body.class-declaration-page .summary h3,
 body.class-declaration-page .details h3,
 body.class-declaration-page .summary .inherited-list h2 {
-    background-color:#dee3e9;
-    border:1px solid #d0d9e0;
+    background-color:var(--subnav-background-color);
+    border:1px solid var(--border-color);
     margin:0 0 6px -8px;
     padding:7px 5px;
 }
@@ -277,16 +321,16 @@ main {
     position:relative;
 }
 dl.notes > dt {
-    font-family: 'DejaVu Sans', Arial, Helvetica, sans-serif;
-    font-size:12px;
+    font-family: var(--body-font-family);
+    font-size:0.856em;
     font-weight:bold;
     margin:10px 0 0 0;
-    color:#4E4E4E;
+    color:var(--body-text-color);
 }
 dl.notes > dd {
     margin:5px 10px 10px 0;
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    font-size:1em;
+    font-family:var(--block-font-family)
 }
 dl.name-value > dt {
     margin-left:1px;
@@ -331,121 +375,160 @@ ul.summary-list > li {
     margin-bottom:15px;
     line-height:1.4;
 }
+ul.ref-list {
+  padding:0;
+  margin:0;
+}
+ul.ref-list > li {
+    list-style:none;
+}
 .summary-table dl, .summary-table dl dt, .summary-table dl dd {
     margin-top:0;
     margin-bottom:1px;
 }
-ul.see-list, ul.see-list-long {
+ul.tag-list, ul.tag-list-long {
     padding-left: 0;
     list-style: none;
 }
-ul.see-list li {
+ul.tag-list li {
     display: inline;
 }
-ul.see-list li:not(:last-child):after,
-ul.see-list-long li:not(:last-child):after {
+ul.tag-list li:not(:last-child):after,
+ul.tag-list-long li:not(:last-child):after
+{
     content: ", ";
     white-space: pre-wrap;
 }
+ul.preview-feature-list {
+    list-style: none;
+    margin:0;
+    padding:0.1em;
+    line-height: 1.6em;
+}
 /*
  * Styles for tables.
  */
 .summary-table, .details-table {
     width:100%;
     border-spacing:0;
-    border-left:1px solid #EEE;
-    border-right:1px solid #EEE;
-    border-bottom:1px solid #EEE;
+    border:1px solid var(--border-color);
+    border-top:0;
     padding:0;
 }
 .caption {
     position:relative;
     text-align:left;
     background-repeat:no-repeat;
-    color:#253441;
-    font-weight:bold;
+    color:var(--selected-text-color);
     clear:none;
     overflow:hidden;
-    padding:0;
-    padding-top:10px;
-    padding-left:1px;
+    padding: 10px 0 0 1px;
     margin:0;
-    white-space:pre;
 }
 .caption a:link, .caption a:visited {
-    color:#1f389c;
+    color:var(--selected-link-color);
 }
 .caption a:hover,
 .caption a:active {
-    color:#FFFFFF;
+    color:var(--navbar-text-color);
 }
 .caption span {
+    font-weight:bold;
     white-space:nowrap;
-    padding-top:5px;
-    padding-left:12px;
-    padding-right:12px;
-    padding-bottom:7px;
+    padding:5px 12px 7px 12px;
     display:inline-block;
     float:left;
-    background-color:#F8981D;
+    background-color:var(--selected-background-color);
     border: none;
     height:16px;
 }
 div.table-tabs {
     padding:10px 0 0 1px;
-    margin:0;
+    margin:10px 0 0 0;
 }
 div.table-tabs > button {
-   border: none;
-   cursor: pointer;
-   padding: 5px 12px 7px 12px;
-   font-weight: bold;
-   margin-right: 3px;
+    border: none;
+    cursor: pointer;
+    padding: 5px 12px 7px 12px;
+    font-weight: bold;
+    margin-right: 8px;
 }
-div.table-tabs > button.active-table-tab {
-   background: #F8981D;
-   color: #253441;
+div.table-tabs > .active-table-tab {
+    background: var(--selected-background-color);
+    color: var(--selected-text-color);
 }
 div.table-tabs > button.table-tab {
-   background: #4D7A97;
-   color: #FFFFFF;
+    background: var(--navbar-background-color);
+    color: var(--navbar-text-color);
+}
+.two-column-search-results {
+    display: grid;
+    grid-template-columns: minmax(400px, max-content) minmax(400px, auto);
+}
+div.checkboxes {
+    line-height: 2em;
+}
+div.checkboxes > span {
+    margin-left: 10px;
+}
+div.checkboxes > label {
+    margin-left: 8px;
+    white-space: nowrap;
+}
+div.checkboxes > label > input {
+    margin: 0 2px;
 }
 .two-column-summary {
     display: grid;
-    grid-template-columns: minmax(15%, max-content) minmax(15%, auto);
+    grid-template-columns: minmax(25%, max-content) minmax(25%, auto);
 }
 .three-column-summary {
     display: grid;
-    grid-template-columns: minmax(10%, max-content) minmax(15%, max-content) minmax(15%, auto);
+    grid-template-columns: minmax(15%, max-content) minmax(20%, max-content) minmax(20%, auto);
+}
+.three-column-release-summary {
+    display: grid;
+    grid-template-columns: minmax(40%, max-content) minmax(10%, max-content) minmax(40%, auto);
 }
 .four-column-summary {
     display: grid;
-    grid-template-columns: minmax(10%, max-content) minmax(10%, max-content) minmax(10%, max-content) minmax(10%, auto);
+    grid-template-columns: minmax(10%, max-content) minmax(15%, max-content) minmax(15%, max-content) minmax(15%, auto);
 }
-@media screen and (max-width: 600px) {
-    .two-column-summary {
+@media screen and (max-width: 1000px) {
+    .four-column-summary {
         display: grid;
-        grid-template-columns: 1fr;
+        grid-template-columns: minmax(15%, max-content) minmax(15%, auto);
     }
 }
 @media screen and (max-width: 800px) {
+    .two-column-search-results {
+        display: grid;
+        grid-template-columns: minmax(40%, max-content) minmax(40%, auto);
+    }
     .three-column-summary {
         display: grid;
         grid-template-columns: minmax(10%, max-content) minmax(25%, auto);
     }
-    .three-column-summary .col-last {
+    .three-column-release-summary {
+        display: grid;
+        grid-template-columns: minmax(70%, max-content) minmax(30%, max-content)
+    }
+    .three-column-summary .col-last,
+    .three-column-release-summary .col-last{
         grid-column-end: span 2;
     }
 }
-@media screen and (max-width: 1000px) {
-    .four-column-summary {
+@media screen and (max-width: 600px) {
+    .two-column-summary {
         display: grid;
-        grid-template-columns: minmax(15%, max-content) minmax(15%, auto);
+        grid-template-columns: 1fr;
     }
 }
 .summary-table > div, .details-table > div {
     text-align:left;
     padding: 8px 3px 3px 7px;
+    overflow-x: auto;
+    scrollbar-width: thin;
 }
 .col-first, .col-second, .col-last, .col-constructor-name, .col-summary-item-name {
     vertical-align:top;
@@ -454,14 +537,43 @@ div.table-tabs > button.table-tab {
     padding-bottom:3px;
 }
 .table-header {
-    background:#dee3e9;
+    background:var(--subnav-background-color);
     font-weight: bold;
 }
+/* Sortable table columns */
+.table-header[onclick] {
+    cursor: pointer;
+}
+.table-header[onclick]::after {
+    content:"";
+    display:inline-block;
+    background-image:url('data:image/svg+xml; utf8, \
+    <svg xmlns="http://www.w3.org/2000/svg" width="125" height="170"> \
+    <path d="M10.101 57.059L63.019 4.142l52.917 52.917M10.101 86.392l52.917 52.917 52.917-52.917" style="opacity:.35;"/></svg>');
+    background-size:100% 100%;
+    width:9px;
+    height:14px;
+    margin-left:4px;
+    margin-bottom:-3px;
+}
+.table-header[onclick].sort-asc::after {
+    background-image:url('data:image/svg+xml; utf8, \
+    <svg xmlns="http://www.w3.org/2000/svg" width="125" height="170"> \
+    <path d="M10.101 57.059L63.019 4.142l52.917 52.917" style="opacity:.75;"/> \
+    <path d="M10.101 86.392l52.917 52.917 52.917-52.917" style="opacity:.35;"/></svg>');
+
+}
+.table-header[onclick].sort-desc::after {
+    background-image:url('data:image/svg+xml; utf8, \
+    <svg xmlns="http://www.w3.org/2000/svg" width="125" height="170"> \
+    <path d="M10.101 57.059L63.019 4.142l52.917 52.917" style="opacity:.35;"/> \
+    <path d="M10.101 86.392l52.917 52.917 52.917-52.917" style="opacity:.75;"/></svg>');
+}
 .col-first, .col-first {
-    font-size:13px;
+    font-size:0.93em;
 }
 .col-second, .col-second, .col-last, .col-constructor-name, .col-summary-item-name, .col-last {
-    font-size:13px;
+    font-size:0.93em;
 }
 .col-first, .col-second, .col-constructor-name {
     vertical-align:top;
@@ -475,31 +587,21 @@ div.table-tabs > button.table-tab {
 .col-first a:link, .col-first a:visited,
 .col-second a:link, .col-second a:visited,
 .col-constructor-name a:link, .col-constructor-name a:visited,
-.col-summary-item-name a:link, .col-summary-item-name a:visited,
-.constant-values-container a:link, .constant-values-container a:visited,
-.all-classes-container a:link, .all-classes-container a:visited,
-.all-packages-container a:link, .all-packages-container a:visited {
+.col-summary-item-name a:link, .col-summary-item-name a:visited {
     font-weight:bold;
 }
-.table-sub-heading-color {
-    background-color:#EEEEFF;
-}
 .even-row-color, .even-row-color .table-header {
-    background-color:#FFFFFF;
+    background-color:var(--even-row-color);
 }
 .odd-row-color, .odd-row-color .table-header {
-    background-color:#EEEEEF;
+    background-color:var(--odd-row-color);
 }
 /*
  * Styles for contents.
  */
-.deprecated-content {
-    margin:0;
-    padding:10px 0;
-}
 div.block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    font-size:var(--body-font-size);
+    font-family:var(--block-font-family);
 }
 .col-last div {
     padding-top:0;
@@ -511,8 +613,8 @@ div.block {
 .package-signature,
 .type-signature,
 .member-signature {
-    font-family:'DejaVu Sans Mono', monospace;
-    font-size:14px;
+    font-family:var(--code-font-family);
+    font-size:1em;
     margin:14px 0;
     white-space: pre-wrap;
 }
@@ -535,21 +637,17 @@ div.block {
  * Styles for formatting effect.
  */
 .source-line-no {
-    color:green;
+    /* Color of line numbers in source pages can be set via custom property below */
+    color:var(--source-linenumber-color, green);
     padding:0 30px 0 0;
 }
-h1.hidden {
-    visibility:hidden;
-    overflow:hidden;
-    font-size:10px;
-}
 .block {
     display:block;
     margin:0 10px 5px 0;
-    color:#474747;
+    color:var(--block-text-color);
 }
-.deprecated-label, .descfrm-type-label, .implementation-label, .member-name-label, .member-name-link,
-.module-label-in-package, .module-label-in-type, .override-specify-label, .package-label-in-type,
+.deprecated-label, .description-from-type-label, .implementation-label, .member-name-link,
+.module-label-in-package, .module-label-in-type, .package-label-in-type,
 .package-hierarchy-label, .type-name-label, .type-name-link, .search-tag-link, .preview-label {
     font-weight:bold;
 }
@@ -557,8 +655,8 @@ h1.hidden {
     font-style:italic;
 }
 .deprecation-block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    font-size:1em;
+    font-family:var(--block-font-family);
     border-style:solid;
     border-width:thin;
     border-radius:10px;
@@ -568,8 +666,8 @@ h1.hidden {
     display:inline-block;
 }
 .preview-block {
-    font-size:14px;
-    font-family:'DejaVu Serif', Georgia, "Times New Roman", Times, serif;
+    font-size:1em;
+    font-family:var(--block-font-family);
     border-style:solid;
     border-width:thin;
     border-radius:10px;
@@ -581,6 +679,19 @@ h1.hidden {
 div.block div.deprecation-comment {
     font-style:normal;
 }
+details.invalid-tag, span.invalid-tag {
+    font-size:1em;
+    font-family:var(--block-font-family);
+    color: var(--invalid-tag-text-color);
+    background: var(--invalid-tag-background-color);
+    border: thin solid var(--table-border-color);
+    border-radius:2px;
+    padding: 2px 4px;
+    display:inline-block;
+}
+details summary {
+    cursor: pointer;
+}
 /*
  * Styles specific to HTML5 elements.
  */
@@ -590,66 +701,93 @@ main, nav, header, footer, section {
 /*
  * Styles for javadoc search.
  */
+.ui-state-active {
+    /* Overrides the color of selection used in jQuery UI */
+    background: var(--selected-background-color);
+    border: 1px solid var(--selected-background-color);
+    color: var(--selected-text-color);
+}
 .ui-autocomplete-category {
     font-weight:bold;
     font-size:15px;
     padding:7px 0 7px 3px;
-    background-color:#4D7A97;
-    color:#FFFFFF;
-}
-.result-item {
-    font-size:13px;
+    background-color:var(--navbar-background-color);
+    color:var(--navbar-text-color);
 }
 .ui-autocomplete {
     max-height:85%;
     max-width:65%;
-    overflow-y:scroll;
-    overflow-x:scroll;
+    overflow-y:auto;
+    overflow-x:auto;
+    scrollbar-width: thin;
     white-space:nowrap;
     box-shadow: 0 3px 6px rgba(0,0,0,0.16), 0 3px 6px rgba(0,0,0,0.23);
 }
 ul.ui-autocomplete {
     position:fixed;
-    z-index:999999;
-    background-color: #FFFFFF;
+    z-index:1;
+    background-color: var(--body-background-color);
 }
-ul.ui-autocomplete  li {
+ul.ui-autocomplete li {
     float:left;
     clear:both;
-    width:100%;
-}
-.result-highlight {
-    font-weight:bold;
+    min-width:100%;
+}
+ul.ui-autocomplete li.ui-static-link {
+    position:sticky;
+    bottom:0;
+    left:0;
+    background: var(--subnav-background-color);
+    padding: 5px 0;
+    font-family: var(--body-font-family);
+    font-size: 0.93em;
+    font-weight: bolder;
+    z-index: 2;
+}
+li.ui-static-link a, li.ui-static-link a:visited {
+    text-decoration:none;
+    color:var(--link-color);
+    float:right;
+    margin-right:20px;
 }
 .ui-autocomplete .result-item {
     font-size: inherit;
 }
-#search-input {
+.ui-autocomplete .result-highlight {
+    font-weight:bold;
+}
+#search-input, #page-search-input {
     background-image:url('resources/glass.png');
     background-size:13px;
     background-repeat:no-repeat;
     background-position:2px 3px;
+    background-color: var(--search-input-background-color);
+    color: var(--search-input-text-color);
+    border-color: var(--border-color);
     padding-left:20px;
-    position:relative;
-    right:-18px;
-    width:400px;
+    width: 250px;
+    margin: 0;
+}
+#search-input {
+    margin-left: 4px;
 }
 #reset-button {
-    background-color: rgb(255,255,255);
+    background-color: transparent;
     background-image:url('resources/x.png');
-    background-position:center;
     background-repeat:no-repeat;
-    background-size:12px;
-    border:0 none;
-    width:16px;
-    height:16px;
-    position:relative;
-    left:-4px;
-    top:-4px;
-    font-size:0px;
+    background-size:contain;
+    border:0;
+    border-radius:0;
+    width:12px;
+    height:12px;
+    position:absolute;
+    right:12px;
+    top:10px;
+    font-size:0;
 }
-.watermark {
-    color:#545454;
+::placeholder {
+    color:var(--search-input-placeholder-color);
+    opacity: 1;
 }
 .search-tag-desc-result {
     font-style:italic;
@@ -660,13 +798,55 @@ ul.ui-autocomplete  li {
     font-size:12px;
 }
 .search-tag-result:target {
-    background-color:yellow;
+    background-color:var(--search-tag-highlight-color);
+}
+details.page-search-details {
+    display: inline-block;
+}
+div#result-container {
+    font-size: 1em;
+}
+div#result-container a.search-result-link {
+    padding: 0;
+    margin: 4px 0;
+    width: 100%;
 }
-.module-graph span {
+#result-container .result-highlight {
+    font-weight:bolder;
+}
+.page-search-info {
+    background-color: var(--subnav-background-color);
+    border-radius: 3px;
+    border: 0 solid var(--border-color);
+    padding: 0 8px;
+    overflow: hidden;
+    height: 0;
+    transition: all 0.2s ease;
+}
+div.table-tabs > button.table-tab {
+    background: var(--navbar-background-color);
+    color: var(--navbar-text-color);
+}
+.page-search-header {
+    padding: 5px 12px 7px 12px;
+    font-weight: bold;
+    margin-right: 3px;
+    background-color:var(--navbar-background-color);
+    color:var(--navbar-text-color);
+    display: inline-block;
+}
+button.page-search-header {
+    border: none;
+    cursor: pointer;
+}
+span#page-search-link {
+    text-decoration: underline;
+}
+.module-graph span, .sealed-graph span {
     display:none;
     position:absolute;
 }
-.module-graph:hover span {
+.module-graph:hover span, .sealed-graph:hover span {
     display:block;
     margin: -100px 0 0 100px;
     z-index: 1;
@@ -679,13 +859,13 @@ section.class-description {
 }
 .summary section[class$="-summary"], .details section[class$="-details"],
 .class-uses .detail, .serialized-class-details {
-    padding: 0px 20px 5px 10px;
-    border: 1px solid #ededed;
-    background-color: #f8f8f8;
+    padding: 0 20px 5px 10px;
+    border: 1px solid var(--border-color);
+    background-color: var(--section-background-color);
 }
 .inherited-list, section[class$="-details"] .detail {
     padding:0 0 5px 8px;
-    background-color:#ffffff;
+    background-color:var(--detail-background-color);
     border:none;
 }
 .vertical-separator {
@@ -703,7 +883,7 @@ ul.help-subtoc > li::before {
   content: "\2022" ;
   padding-right:2px;
 }
-span.help-note {
+.help-note {
     font-style: italic;
 }
 /*
@@ -731,7 +911,111 @@ main a[href*="://"]:focus::after {
         132-240 240 120 120 240-240 132 132V0z" fill="%23bb7a2a"/>\
       </svg>');
 }
-
+/*
+ * Styles for header/section anchor links
+ */
+a.anchor-link {
+    opacity: 0;
+    transition: opacity 0.1s;
+}
+:hover > a.anchor-link {
+    opacity: 80%;
+}
+a.anchor-link:hover,
+a.anchor-link:focus-visible,
+a.anchor-link.visible {
+    opacity: 100%;
+}
+a.anchor-link > img {
+    width: 0.9em;
+    height: 0.9em;
+}
+/*
+ * Styles for copy-to-clipboard buttons
+ */
+button.copy {
+    opacity: 70%;
+    border: none;
+    border-radius: 3px;
+    position: relative;
+    background:none;
+    transition: opacity 0.3s;
+    cursor: pointer;
+}
+:hover > button.copy {
+    opacity: 80%;
+}
+button.copy:hover,
+button.copy:active,
+button.copy:focus-visible,
+button.copy.visible {
+    opacity: 100%;
+}
+button.copy img {
+    position: relative;
+    background: none;
+    filter: brightness(var(--copy-icon-brightness));
+}
+button.copy:active {
+    background-color: var(--copy-button-background-color-active);
+}
+button.copy span {
+    color: var(--body-text-color);
+    position: relative;
+    top: -0.1em;
+    transition: all 0.1s;
+    font-size: 0.76rem;
+    line-height: 1.2em;
+    opacity: 0;
+}
+button.copy:hover span,
+button.copy:focus-visible span,
+button.copy.visible span {
+    opacity: 100%;
+}
+/* search page copy button */
+button#page-search-copy {
+    margin-left: 0.4em;
+    padding:0.3em;
+    top:0.13em;
+}
+button#page-search-copy img {
+    width: 1.2em;
+    height: 1.2em;
+    padding: 0.01em 0;
+    top: 0.15em;
+}
+button#page-search-copy span {
+    color: var(--body-text-color);
+    line-height: 1.2em;
+    padding: 0.2em;
+    top: -0.18em;
+}
+div.page-search-info:hover button#page-search-copy span {
+    opacity: 100%;
+}
+/* snippet copy button */
+button.snippet-copy {
+    position: absolute;
+    top: 6px;
+    right: 6px;
+    height: 1.7em;
+    padding: 2px;
+}
+button.snippet-copy img {
+    width: 18px;
+    height: 18px;
+    padding: 0.05em 0;
+}
+button.snippet-copy span {
+    line-height: 1.2em;
+    padding: 0.2em;
+    position: relative;
+    top: -0.5em;
+}
+div.snippet-container:hover button.snippet-copy span {
+    opacity: 100%;
+}
 /*
  * Styles for user-provided tables.
  *
@@ -778,67 +1062,146 @@ table.borderless > thead > tr, table.borderless > tbody > tr, table.borderless >
 }
 table.plain {
     border-collapse: collapse;
-    border: 1px solid black;
+    border: 1px solid var(--table-border-color);
 }
 table.plain > thead > tr, table.plain > tbody tr, table.plain > tr {
     background-color: transparent;
 }
 table.plain > thead > tr > th, table.plain > tbody > tr > th, table.plain > tr > th,
 table.plain > thead > tr > td, table.plain > tbody > tr > td, table.plain > tr > td {
-    border: 1px solid black;
+    border: 1px solid var(--table-border-color);
 }
 table.striped {
     border-collapse: collapse;
-    border: 1px solid black;
+    border: 1px solid var(--table-border-color);
 }
 table.striped > thead {
-    background-color: #E3E3E3;
+    background-color: var(--subnav-background-color);
 }
 table.striped > thead > tr > th, table.striped > thead > tr > td {
-    border: 1px solid black;
+    border: 1px solid var(--table-border-color);
 }
 table.striped > tbody > tr:nth-child(even) {
-    background-color: #EEE
+    background-color: var(--odd-row-color)
 }
 table.striped > tbody > tr:nth-child(odd) {
-    background-color: #FFF
+    background-color: var(--even-row-color)
 }
 table.striped > tbody > tr > th, table.striped > tbody > tr > td {
-    border-left: 1px solid black;
-    border-right: 1px solid black;
+    border-left: 1px solid var(--table-border-color);
+    border-right: 1px solid var(--table-border-color);
 }
 table.striped > tbody > tr > th {
     font-weight: normal;
 }
 /**
- * Tweak font sizes and paddings for small screens.
+ * Tweak style for small screens.
  */
-@media screen and (max-width: 1050px) {
-    #search-input {
-        width: 300px;
+@media screen and (max-width: 920px) {
+    header.flex-header {
+        max-height: 100vh;
+        overflow-y: auto;
     }
-}
-@media screen and (max-width: 800px) {
-    #search-input {
-        width: 200px;
+    div#navbar-top {
+        height: 2.8em;
+        transition: height 0.35s ease;
     }
-    .top-nav,
-    .bottom-nav {
-        font-size: 11px;
-        padding-top: 6px;
+    ul.nav-list {
+        display: block;
+        width: 40%;
+        float:left;
+        clear: left;
+        margin: 10px 0 0 0;
+        padding: 0;
     }
-    .sub-nav {
-        font-size: 11px;
+    ul.nav-list li {
+        float: none;
+        padding: 6px;
+        margin-left: 10px;
+        margin-top: 2px;
+    }
+    ul.sub-nav-list-small {
+        display:block;
+        height: 100%;
+        width: 50%;
+        float: right;
+        clear: right;
+        background-color: var(--subnav-background-color);
+        color: var(--body-text-color);
+        margin: 6px 0 0 0;
+        padding: 0;
     }
+    ul.sub-nav-list-small ul {
+        padding-left: 20px;
+    }
+    ul.sub-nav-list-small a:link, ul.sub-nav-list-small a:visited {
+        color:var(--link-color);
+    }
+    ul.sub-nav-list-small a:hover {
+        color:var(--link-color-active);
+    }
+    ul.sub-nav-list-small li {
+        list-style:none;
+        float:none;
+        padding: 6px;
+        margin-top: 1px;
+        text-transform:uppercase;
+    }
+    ul.sub-nav-list-small > li {
+        margin-left: 10px;
+    }
+    ul.sub-nav-list-small li p {
+        margin: 5px 0;
+    }
+    div#navbar-sub-list {
+        display: none;
+    }
+    .top-nav a:link, .top-nav a:active, .top-nav a:visited {
+        display: block;
+    }
+    button#navbar-toggle-button {
+        width: 3.4em;
+        height: 2.8em;
+        background-color: transparent;
+        display: block;
+        float: left;
+        border: 0;
+        margin: 0 10px;
+        cursor: pointer;
+        font-size: 10px;
+    }
+    button#navbar-toggle-button .nav-bar-toggle-icon {
+        display: block;
+        width: 24px;
+        height: 3px;
+        margin: 1px 0 4px 0;
+        border-radius: 2px;
+        transition: all 0.1s;
+        background-color: var(--navbar-text-color);
+    }
+    button#navbar-toggle-button.expanded span.nav-bar-toggle-icon:nth-child(1) {
+        transform: rotate(45deg);
+        transform-origin: 10% 10%;
+        width: 26px;
+    }
+    button#navbar-toggle-button.expanded span.nav-bar-toggle-icon:nth-child(2) {
+        opacity: 0;
+    }
+    button#navbar-toggle-button.expanded span.nav-bar-toggle-icon:nth-child(3) {
+        transform: rotate(-45deg);
+        transform-origin: 10% 90%;
+        width: 26px;
+    }
+}
+@media screen and (max-width: 800px) {
     .about-language {
         padding-right: 16px;
     }
-    ul.nav-list li,
-    .sub-nav .nav-list-search {
-        padding: 6px;
+    ul.nav-list li {
+        margin-left: 5px;
     }
-    ul.sub-nav-list li {
-        padding-top: 5px;
+    ul.sub-nav-list-small > li {
+        margin-left: 5px;
     }
     main {
         padding: 10px;
@@ -851,19 +1214,59 @@ table.striped > tbody > tr > th {
         -webkit-text-size-adjust: none;
     }
 }
-@media screen and (max-width: 500px) {
-    #search-input {
-        width: 150px;
-    }
-    .top-nav,
-    .bottom-nav {
-        font-size: 10px;
-    }
-    .sub-nav {
-        font-size: 10px;
-    }
+@media screen and (max-width: 400px) {
     .about-language {
         font-size: 10px;
         padding-right: 12px;
     }
 }
+@media screen and (max-width: 400px) {
+    .nav-list-search {
+        width: 94%;
+    }
+    #search-input, #page-search-input {
+        width: 70%;
+    }
+}
+@media screen and (max-width: 320px) {
+    .nav-list-search > label {
+        display: none;
+    }
+    .nav-list-search {
+        width: 90%;
+    }
+    #search-input, #page-search-input {
+        width: 80%;
+    }
+}
+
+pre.snippet {
+    background-color: var(--snippet-background-color);
+    color: var(--snippet-text-color);
+    padding: 10px;
+    margin: 12px 0;
+    overflow: auto;
+    white-space: pre;
+}
+div.snippet-container {
+    position: relative;
+}
+@media screen and (max-width: 800px) {
+    pre.snippet {
+        padding-top: 26px;
+    }
+    button.snippet-copy {
+        top: 4px;
+        right: 4px;
+    }
+}
+pre.snippet .italic {
+    font-style: italic;
+}
+pre.snippet .bold {
+    font-weight: bold;
+}
+pre.snippet .highlighted {
+    background-color: var(--snippet-highlight-color);
+    border-radius: 10%;
+}
diff --git a/apidoc/type-search-index.js b/apidoc/type-search-index.js
index 519178a4e..c9d61fc75 100644
--- a/apidoc/type-search-index.js
+++ b/apidoc/type-search-index.js
@@ -1 +1 @@
-typeSearchIndex = [{"p":"org.consensusj.jsonrpc.introspection","l":"AbstractJsonRpcService"},{"p":"org.consensusj.jsonrpc","l":"AbstractRpcClient"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","l":"AddressBalanceInfo"},{"p":"org.consensusj.bitcoin.json.conversion","l":"AddressDeserializer"},{"p":"org.consensusj.bitcoin.json.pojo","l":"AddressGroupingItem"},{"p":"org.consensusj.bitcoin.json.pojo","l":"AddressInfo"},{"p":"org.consensusj.bitcoin.json.conversion","l":"AddressKeyDeserializer"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","l":"AddressRequest"},{"p":"org.consensusj.bitcoin.json.conversion","l":"AddressSerializer"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","l":"AddressUtxoInfo"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","l":"AddressUtxoResult"},{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"org.consensusj.daemon.micronaut","l":"Application"},{"p":"org.consensusj.jsonrpc.daemon","l":"Application"},{"p":"org.consensusj.jsonrpc","l":"AsyncSupport"},{"p":"org.consensusj.jsonrpc.cli","l":"BaseJsonRpcTool"},{"p":"org.consensusj.bitcoinj.signing","l":"BaseTransactionSigner"},{"p":"org.consensusj.exchange","l":"BaseXChangeExchangeRateProvider"},{"p":"org.consensusj.bitcoinj.signing","l":"Utxo.Basic"},{"p":"org.consensusj.bitcoinj.wallet","l":"BipStandardDeterministicKeyChain"},{"p":"org.consensusj.bitcoinj.wallet","l":"BipStandardKeyChainGroupStructure"},{"p":"org.consensusj.bitcoin.cli","l":"BitcoinCLITool.BitcoinCLICall"},{"p":"org.consensusj.bitcoin.jsonrpc","l":"BitcoinClient"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"BitcoinClientAccessor"},{"p":"org.consensusj.bitcoin.jsonrpc.internal","l":"BitcoinClientThreadFactory"},{"p":"org.consensusj.bitcoin.cli","l":"BitcoinCLITool"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","l":"BitcoinConf"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","l":"BitcoinConfFile"},{"p":"org.consensusj.currency","l":"BitcoinCurrencyProvider"},{"p":"org.consensusj.daemon.micronaut","l":"BitcoinDaemonConfig"},{"p":"org.consensusj.bitcoin.jsonrpc","l":"BitcoinExtendedClient"},{"p":"org.consensusj.daemon.micronaut","l":"BitcoinFactory"},{"p":"org.consensusj.bitcoin.json.rpc","l":"BitcoinJsonRpc"},{"p":"org.consensusj.daemon.micronaut","l":"BitcoinRestController"},{"p":"org.consensusj.bitcoin.cli","l":"BitcoinRpcCliOptions"},{"p":"org.consensusj.bitcoin.json.pojo","l":"BitcoinTransactionInfo"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"BitcoinZmqMessage"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"BitcoinZmqPortFinder"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"BlockChainEnvironment"},{"p":"org.consensusj.bitcoin.json.pojo","l":"BlockChainInfo"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"BlockchainSyncing"},{"p":"org.consensusj.bitcoin.json.conversion","l":"BlockHexDeserializer"},{"p":"org.consensusj.bitcoin.json.pojo","l":"BlockInfo"},{"p":"org.consensusj.bitcoinj.util","l":"BlockUtil"},{"p":"org.consensusj.decentralizedid.btcr","l":"BtcrDid"},{"p":"org.consensusj.bitcoin.json.pojo","l":"ChainTip"},{"p":"org.consensusj.bitcoin.jsonrpc","l":"ChainTipClient"},{"p":"org.consensusj.bitcoin.rx","l":"ChainTipService"},{"p":"org.consensusj.jsonrpc.cli.test","l":"CLICommandResult"},{"p":"org.consensusj.jsonrpc.cli","l":"CliParameter"},{"p":"org.consensusj.jsonrpc.cli","l":"CliParameterParser"},{"p":"org.consensusj.jsonrpc.cli.test","l":"CLITestSupport"},{"p":"org.consensusj.bitcoin.json.conversion","l":"CoinDeserializer"},{"p":"org.consensusj.bitcoin.json.conversion","l":"CoinSerializer"},{"p":"org.consensusj.jsonrpc.cli","l":"BaseJsonRpcTool.CommonsCLICall"},{"p":"org.consensusj.bitcoinj.signing","l":"Utxo.Complete"},{"p":"org.consensusj.jsonrpc","l":"CompositeTrustManager"},{"p":"org.consensusj.exchange","l":"CurrencyUnitPair"},{"p":"org.consensusj.bitcoinj.signing","l":"DefaultSigningRequest"},{"p":"org.consensusj.jsonrpc.introspection","l":"DelegatingJsonRpcService"},{"p":"org.consensusj.bitcoinj.dsl.js","l":"Demo"},{"p":"org.consensusj.bitcoin.json.pojo","l":"WalletTransactionInfo.Detail"},{"p":"org.consensusj.bitcoin.json.pojo","l":"WalletTransactionInfo.DetailList"},{"p":"org.consensusj.decentralizedid","l":"Did"},{"p":"org.consensusj.jsonrpc.groovy","l":"Dummy"},{"p":"org.consensusj.jsonrpc.daemon","l":"EchoJsonRpcService"},{"p":"org.consensusj.bitcoin.json.conversion","l":"ECKeyDeserializer"},{"p":"org.consensusj.bitcoin.json.conversion","l":"ECKeySerializer"},{"p":"org.consensusj.bitcoinj.signing","l":"ECKeySigner"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcError.Error"},{"p":"org.consensusj.ethereum.jsonrpc","l":"EthereumClient"},{"p":"org.consensusj.ethereum.jsonrpc","l":"EthTxCallObject"},{"p":"org.consensusj.exchange","l":"ExchangeRateChange"},{"p":"org.consensusj.exchange","l":"ExchangeRateObserver"},{"p":"org.consensusj.exchange.rx","l":"ExchangeRateUpdate"},{"p":"org.consensusj.exchange","l":"ExchangeUtils"},{"p":"org.consensusj.decentralizedid.btcr","l":"ExtendedTxRef"},{"p":"org.consensusj.bitcoinj.signing","l":"FeeCalculator"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"FundingSource"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"FundingSourceAccessor"},{"p":"org.consensusj.jsonrpc.cli","l":"GenericJsonRpcTool"},{"p":"org.consensusj.bitcoinj.signing","l":"HDKeychainSigner"},{"p":"org.consensusj.bitcoin.json.conversion","l":"HexUtil"},{"p":"org.consensusj.bitcoin.json.pojo","l":"BlockInfo.IncludeTxFlag"},{"p":"org.consensusj.jsonrpc.cli","l":"CliParameter.Invalid"},{"p":"org.consensusj.jsonrpc","l":"JacksonRpcClient"},{"p":"org.consensusj.jsonrpc.cli","l":"JavaLoggingSupport"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcClient"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcClientHttpUrlConnection"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcClientJavaNet"},{"p":"org.consensusj.daemon.micronaut","l":"JsonRpcController"},{"p":"org.consensusj.jsonrpc.daemon","l":"JsonRpcController"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcError"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcErrorException"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcException"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcMessage"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcRequest"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcResponse"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcService"},{"p":"org.consensusj.jsonrpc.introspection","l":"JsonRpcServiceWrapper"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcStatusException"},{"p":"org.consensusj.jsonrpc.cli","l":"JsonRpcToolOptions"},{"p":"org.consensusj.exchange.knowm","l":"KnowmExchangeRateProvider"},{"p":"org.consensusj.analytics.util.collector","l":"LargestSliceAccumulator"},{"p":"org.consensusj.analytics.util.collector","l":"LargestSliceCollector"},{"p":"org.consensusj.analytics.util.collector","l":"LargestSliceList"},{"p":"org.consensusj.analytics.util.collector","l":"LargestSliceListImpl"},{"p":"org.consensusj.bitcoin.json.pojo","l":"LoadWalletResult"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcClientJavaNet.MappingFunction"},{"p":"org.consensusj.jsonrpc.introspection.sample","l":"MathService"},{"p":"org.consensusj.bitcoin.json.pojo","l":"MethodHelpEntry"},{"p":"org.consensusj.daemon.micronaut","l":"MicronautWalletAppKitService"},{"p":"org.consensusj.exchange.knowm","l":"KnowmExchangeRateProvider.MonitoredCurrency"},{"p":"org.consensusj.exchange.knowm","l":"ReactiveKnowmExchangeProvider.MonitoredCurrency"},{"p":"org.consensusj.namecoin.jsonrpc","l":"NamecoinClient"},{"p":"org.consensusj.namecoin.jsonrpc.core","l":"NameCoinNetwork"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","l":"NameData"},{"p":"org.consensusj.bitcoin.json.pojo","l":"NetworkInfo"},{"p":"org.consensusj.namecoin.jsonrpc.cli","l":"NmcLookup"},{"p":"org.consensusj.namecoin.jsonrpc.core","l":"NMCMainNetParams"},{"p":"org.consensusj.jsonrpc.internal","l":"NumberStringSerializer"},{"p":"org.consensusj.exchange","l":"ObservableExchangeRateProvider"},{"p":"org.consensusj.exchange.rx","l":"ObservablePair"},{"p":"org.consensusj.bitcoin.json.pojo","l":"Outpoint"},{"p":"org.consensusj.jsonrpc.cli","l":"CliParameter.Parser"},{"p":"org.consensusj.bitcoin.json.conversion","l":"PeerSerializer"},{"p":"org.consensusj.exchange.rx","l":"PolledObservablePair"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","l":"PollingChainTipService"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","l":"PollingChainTipServiceImpl"},{"p":"org.consensusj.bitcoin.json.pojo","l":"PrevTxOutInfo"},{"p":"org.consensusj.bitcoinj.signing","l":"RawTransactionSigningRequest.RawInput"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo"},{"p":"org.consensusj.bitcoinj.signing","l":"RawTransactionSigningRequest"},{"p":"org.consensusj.exchange.rx","l":"ReactiveExchange"},{"p":"org.consensusj.exchange.knowm","l":"ReactiveKnowmExchangeProvider"},{"p":"org.consensusj.bitcoin.json.pojo","l":"ReceivedByAddressInfo"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"RegTestEnvironment"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"RegTestFundingSource"},{"p":"org.consensusj.analytics.service","l":"RichListService"},{"p":"org.consensusj.bitcoin.json.conversion","l":"RpcClientModule"},{"p":"org.consensusj.bitcoin.jsonrpc","l":"RpcConfig"},{"p":"org.consensusj.bitcoin.json.conversion","l":"RpcServerModule"},{"p":"org.consensusj.bitcoin.jsonrpc","l":"RpcURI"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","l":"RxBitcoinClient"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"RxBitcoinSinglePortZmqService"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"RxBitcoinZmqBinaryService"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"RxBitcoinZmqService"},{"p":"org.consensusj.bitcoin.rx","l":"RxBlockchainBinaryService"},{"p":"org.consensusj.bitcoin.rx","l":"RxBlockchainService"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","l":"RxJsonChainTipClient"},{"p":"org.consensusj.rx.jsonrpc","l":"RxJsonRpcClient"},{"p":"org.consensusj.bitcoin.rx.peergroup","l":"RxPeerGroup"},{"p":"org.consensusj.rx.zeromq","l":"RxZmqContext"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"SampleBitcoinZmqClient"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo.ScriptPubKeyInfo"},{"p":"org.consensusj.bitcoinj.dsl.js","l":"ScriptRunner"},{"p":"org.consensusj.bitcoin.json.conversion","l":"ScriptSerializer"},{"p":"org.consensusj.bitcoinj.service","l":"SendTransactionService"},{"p":"org.consensusj.bitcoin.json.pojo","l":"ServerInfo"},{"p":"org.consensusj.bitcoin.json.conversion","l":"Sha256HashDeserializer"},{"p":"org.consensusj.bitcoin.json.pojo","l":"BlockInfo.Sha256HashList"},{"p":"org.consensusj.bitcoin.json.conversion","l":"Sha256HashSerializer"},{"p":"org.consensusj.bitcoinj.signing","l":"Utxo.Signable"},{"p":"org.consensusj.bitcoin.json.pojo","l":"SignedRawTransaction"},{"p":"org.consensusj.bitcoinj.signing","l":"SigningRequest"},{"p":"org.consensusj.bitcoinj.signing","l":"SigningUtils"},{"p":"org.consensusj.bitcoinj.service","l":"SignTransactionService"},{"p":"org.consensusj.bitcoinj.signing","l":"TestnetFeeCalculator"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"TestServers"},{"p":"org.consensusj.jsonrpc","l":"AsyncSupport.ThrowingSupplier"},{"p":"org.consensusj.analytics.service","l":"TokenRichList.TokenBalancePair"},{"p":"org.consensusj.analytics.service","l":"TokenRichList"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"BitcoinZmqMessage.Topic"},{"p":"org.consensusj.bitcoin.json.conversion","l":"TransactionHexSerializer"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"TransactionIngredients"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionInputData"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionInputDataUtxo"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionOutputAddress"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionOutputData"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionOutputDataScript"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionOutputOpReturn"},{"p":"org.consensusj.bitcoin.json.conversion","l":"TransactionSerializer"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionSigner"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionVerification"},{"p":"org.consensusj.bitcoin.json.pojo","l":"TxOutInfo"},{"p":"org.consensusj.bitcoin.json.pojo","l":"TxOutSetInfo"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.service","l":"TxOutSetService"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","l":"TxOutSetWatcherSample"},{"p":"org.consensusj.bitcoin.json.pojo","l":"UnloadWalletResult"},{"p":"org.consensusj.bitcoin.json.pojo","l":"UnspentOutput"},{"p":"org.consensusj.bitcoinj.signing","l":"Utxo"},{"p":"org.consensusj.bitcoin.json.pojo","l":"UtxoInfo"},{"p":"org.consensusj.jsonrpc.cli","l":"CliParameter.Valid"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcMessage.Version"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo.Vin"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo.VinList"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo.Vout"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo.VoutList"},{"p":"org.consensusj.daemon.micronaut","l":"WalletAppKitJsonRpcService"},{"p":"org.consensusj.bitcoin.services","l":"WalletAppKitService"},{"p":"org.consensusj.bitcoin.json.pojo","l":"WalletTransactionInfo.WalletConflictList"},{"p":"org.consensusj.bitcoin.services","l":"WalletSigningService"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"WalletTestUtil"},{"p":"org.consensusj.bitcoin.json.pojo","l":"WalletTransactionInfo"},{"p":"org.consensusj.bitcoin.json.pojo","l":"ZmqNotification"},{"p":"org.consensusj.rx.zeromq","l":"ZMsgSocketFlowable"}];updateSearchResults();
\ No newline at end of file
+typeSearchIndex = [{"p":"org.consensusj.jsonrpc.introspection","l":"AbstractJsonRpcService"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","l":"AddressBalanceInfo"},{"p":"org.consensusj.bitcoin.json.conversion","l":"AddressDeserializer"},{"p":"org.consensusj.bitcoin.json.pojo","l":"AddressGroupingItem"},{"p":"org.consensusj.bitcoin.json.pojo","l":"AddressInfo"},{"p":"org.consensusj.bitcoin.json.conversion","l":"AddressKeyDeserializer"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","l":"AddressRequest"},{"p":"org.consensusj.bitcoin.json.conversion","l":"AddressSerializer"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","l":"AddressUtxoInfo"},{"p":"org.consensusj.bitcoin.json.pojo.bitcore","l":"AddressUtxoResult"},{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"org.consensusj.daemon.micronaut","l":"Application"},{"p":"org.consensusj.jsonrpc.daemon","l":"Application"},{"p":"org.consensusj.jsonrpc","l":"AsyncSupport"},{"p":"org.consensusj.jsonrpc.cli","l":"BaseJsonRpcTool"},{"p":"org.consensusj.bitcoinj.signing","l":"BaseTransactionSigner"},{"p":"org.consensusj.exchange","l":"BaseXChangeExchangeRateProvider"},{"p":"org.consensusj.bitcoinj.signing","l":"Utxo.Basic"},{"p":"org.consensusj.bitcoinj.wallet","l":"BipStandardDeterministicKeyChain"},{"p":"org.consensusj.bitcoinj.wallet","l":"BipStandardKeyChainGroupStructure"},{"p":"org.consensusj.bitcoin.cli","l":"BitcoinCLITool.BitcoinCLICall"},{"p":"org.consensusj.bitcoin.jsonrpc","l":"BitcoinClient"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"BitcoinClientAccessor"},{"p":"org.consensusj.bitcoin.jsonrpc.internal","l":"BitcoinClientThreadFactory"},{"p":"org.consensusj.bitcoin.cli","l":"BitcoinCLITool"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","l":"BitcoinConf"},{"p":"org.consensusj.bitcoin.jsonrpc.bitcoind","l":"BitcoinConfFile"},{"p":"org.consensusj.currency","l":"BitcoinCurrencyProvider"},{"p":"org.consensusj.daemon.micronaut","l":"BitcoinDaemonConfig"},{"p":"org.consensusj.bitcoin.jsonrpc","l":"BitcoinExtendedClient"},{"p":"org.consensusj.daemon.micronaut","l":"BitcoinFactory"},{"p":"org.consensusj.bitcoin.json.rpc","l":"BitcoinJsonRpc"},{"p":"org.consensusj.daemon.micronaut","l":"BitcoinRestController"},{"p":"org.consensusj.bitcoin.cli","l":"BitcoinRpcCliOptions"},{"p":"org.consensusj.bitcoin.json.pojo","l":"BitcoinTransactionInfo"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"BitcoinZmqMessage"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"BitcoinZmqPortFinder"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"BlockChainEnvironment"},{"p":"org.consensusj.bitcoin.json.pojo","l":"BlockChainInfo"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"BlockchainSyncing"},{"p":"org.consensusj.bitcoin.json.conversion","l":"BlockHexDeserializer"},{"p":"org.consensusj.bitcoin.json.pojo","l":"BlockInfo"},{"p":"org.consensusj.bitcoinj.util","l":"BlockUtil"},{"p":"org.consensusj.decentralizedid.btcr","l":"BtcrDid"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"BTCTestSupport"},{"p":"org.consensusj.bitcoin.json.pojo","l":"ChainTip"},{"p":"org.consensusj.bitcoin.jsonrpc","l":"ChainTipClient"},{"p":"org.consensusj.bitcoin.rx","l":"ChainTipPublisher"},{"p":"org.consensusj.bitcoin.rx","l":"ChainTipService"},{"p":"org.consensusj.jsonrpc.cli.test","l":"CLICommandResult"},{"p":"org.consensusj.jsonrpc.cli","l":"CliParameter"},{"p":"org.consensusj.jsonrpc.cli","l":"CliParameterParser"},{"p":"org.consensusj.jsonrpc.cli.test","l":"CLITestSupport"},{"p":"org.consensusj.bitcoin.json.conversion","l":"CoinDeserializer"},{"p":"org.consensusj.bitcoin.json.conversion","l":"CoinSerializer"},{"p":"org.consensusj.jsonrpc.cli","l":"BaseJsonRpcTool.CommonsCLICall"},{"p":"org.consensusj.bitcoinj.signing","l":"Utxo.Complete"},{"p":"org.consensusj.jsonrpc","l":"CompositeTrustManager"},{"p":"org.consensusj.exchange","l":"CurrencyUnitPair"},{"p":"org.consensusj.jsonrpc","l":"DefaultRpcClient"},{"p":"org.consensusj.bitcoinj.signing","l":"DefaultSigningRequest"},{"p":"org.consensusj.jsonrpc.introspection","l":"DelegatingJsonRpcService"},{"p":"org.consensusj.bitcoinj.dsl.js","l":"Demo"},{"p":"org.consensusj.bitcoin.json.pojo","l":"WalletTransactionInfo.Detail"},{"p":"org.consensusj.bitcoin.json.pojo","l":"WalletTransactionInfo.DetailList"},{"p":"org.consensusj.decentralizedid","l":"Did"},{"p":"org.consensusj.jsonrpc.groovy","l":"Dummy"},{"p":"org.consensusj.jsonrpc.daemon","l":"EchoJsonRpcService"},{"p":"org.consensusj.bitcoin.json.conversion","l":"ECKeyDeserializer"},{"p":"org.consensusj.bitcoin.json.conversion","l":"ECKeySerializer"},{"p":"org.consensusj.bitcoinj.signing","l":"ECKeySigner"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcError.Error"},{"p":"org.consensusj.ethereum.jsonrpc","l":"EthereumClient"},{"p":"org.consensusj.ethereum.jsonrpc","l":"EthTxCallObject"},{"p":"org.consensusj.exchange","l":"ExchangeRateChange"},{"p":"org.consensusj.exchange","l":"ExchangeRateObserver"},{"p":"org.consensusj.exchange.rx","l":"ExchangeRateUpdate"},{"p":"org.consensusj.exchange","l":"ExchangeUtils"},{"p":"org.consensusj.decentralizedid.btcr","l":"ExtendedTxRef"},{"p":"org.consensusj.bitcoinj.signing","l":"FeeCalculator"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"FundingSource"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"FundingSourceAccessor"},{"p":"org.consensusj.jsonrpc.cli","l":"GenericJsonRpcTool"},{"p":"org.consensusj.bitcoinj.signing","l":"HDKeychainSigner"},{"p":"org.consensusj.bitcoin.json.conversion","l":"HexUtil"},{"p":"org.consensusj.bitcoin.json.pojo","l":"BlockInfo.IncludeTxFlag"},{"p":"org.consensusj.jsonrpc.cli","l":"CliParameter.Invalid"},{"p":"org.consensusj.jsonrpc.cli","l":"JavaLoggingSupport"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcClient"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcClientHttpUrlConnection"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcClientJavaNet"},{"p":"org.consensusj.daemon.micronaut","l":"JsonRpcController"},{"p":"org.consensusj.jsonrpc.daemon","l":"JsonRpcController"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcError"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcErrorException"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcException"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcMessage"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcRequest"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcResponse"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcService"},{"p":"org.consensusj.jsonrpc.introspection","l":"JsonRpcServiceWrapper"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcStatusException"},{"p":"org.consensusj.jsonrpc.cli","l":"JsonRpcToolOptions"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcTransport"},{"p":"org.consensusj.exchange.knowm","l":"KnowmExchangeRateProvider"},{"p":"org.consensusj.analytics.util.collector","l":"LargestSliceAccumulator"},{"p":"org.consensusj.analytics.util.collector","l":"LargestSliceCollector"},{"p":"org.consensusj.analytics.util.collector","l":"LargestSliceList"},{"p":"org.consensusj.analytics.util.collector","l":"LargestSliceListImpl"},{"p":"org.consensusj.bitcoin.json.pojo","l":"LoadWalletResult"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcClientJavaNet.MappingFunction"},{"p":"org.consensusj.jsonrpc.introspection.sample","l":"MathService"},{"p":"org.consensusj.bitcoin.json.pojo","l":"MethodHelpEntry"},{"p":"org.consensusj.daemon.micronaut","l":"MicronautWalletAppKitService"},{"p":"org.consensusj.exchange.knowm","l":"KnowmExchangeRateProvider.MonitoredCurrency"},{"p":"org.consensusj.exchange.knowm","l":"ReactiveKnowmExchangeProvider.MonitoredCurrency"},{"p":"org.consensusj.namecoin.jsonrpc","l":"NamecoinClient"},{"p":"org.consensusj.namecoin.jsonrpc.core","l":"NameCoinNetwork"},{"p":"org.consensusj.namecoin.jsonrpc.pojo","l":"NameData"},{"p":"org.consensusj.bitcoin.json.pojo","l":"NetworkInfo"},{"p":"org.consensusj.namecoin.jsonrpc.cli","l":"NmcLookup"},{"p":"org.consensusj.namecoin.jsonrpc.core","l":"NMCMainNetParams"},{"p":"org.consensusj.jsonrpc.internal","l":"NumberStringSerializer"},{"p":"org.consensusj.exchange","l":"ObservableExchangeRateProvider"},{"p":"org.consensusj.exchange.rx","l":"ObservablePair"},{"p":"org.consensusj.bitcoin.json.pojo","l":"Outpoint"},{"p":"org.consensusj.jsonrpc.cli","l":"CliParameter.Parser"},{"p":"org.consensusj.bitcoin.json.conversion","l":"PeerSerializer"},{"p":"org.consensusj.exchange.rx","l":"PolledObservablePair"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","l":"PollingChainTipService"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","l":"PollingChainTipServiceImpl"},{"p":"org.consensusj.bitcoin.json.pojo","l":"PrevTxOutInfo"},{"p":"org.consensusj.bitcoinj.signing","l":"RawTransactionSigningRequest.RawInput"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo"},{"p":"org.consensusj.bitcoinj.signing","l":"RawTransactionSigningRequest"},{"p":"org.consensusj.exchange.rx","l":"ReactiveExchange"},{"p":"org.consensusj.exchange.knowm","l":"ReactiveKnowmExchangeProvider"},{"p":"org.consensusj.bitcoin.json.pojo","l":"ReceivedByAddressInfo"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"RegTestEnvironment"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"RegTestFundingSource"},{"p":"org.consensusj.analytics.service","l":"RichListService"},{"p":"org.consensusj.bitcoin.json.conversion","l":"RpcClientModule"},{"p":"org.consensusj.bitcoin.jsonrpc","l":"RpcConfig"},{"p":"org.consensusj.bitcoin.json.conversion","l":"RpcServerModule"},{"p":"org.consensusj.bitcoin.jsonrpc","l":"RpcURI"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","l":"RxBitcoinClient"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"RxBitcoinSinglePortZmqService"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"RxBitcoinZmqBinaryService"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"RxBitcoinZmqService"},{"p":"org.consensusj.bitcoin.rx","l":"RxBlockchainBinaryService"},{"p":"org.consensusj.bitcoin.rx","l":"RxBlockchainService"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","l":"RxJsonChainTipClient"},{"p":"org.consensusj.rx.jsonrpc","l":"RxJsonRpcClient"},{"p":"org.consensusj.bitcoin.rx.peergroup","l":"RxPeerGroup"},{"p":"org.consensusj.rx.zeromq","l":"RxZmqContext"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"SampleBitcoinZmqClient"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo.ScriptPubKeyInfo"},{"p":"org.consensusj.bitcoinj.dsl.js","l":"ScriptRunner"},{"p":"org.consensusj.bitcoin.json.conversion","l":"ScriptSerializer"},{"p":"org.consensusj.bitcoinj.service","l":"SendTransactionService"},{"p":"org.consensusj.bitcoin.json.pojo","l":"ServerInfo"},{"p":"org.consensusj.bitcoin.json.conversion","l":"Sha256HashDeserializer"},{"p":"org.consensusj.bitcoin.json.pojo","l":"BlockInfo.Sha256HashList"},{"p":"org.consensusj.bitcoin.json.conversion","l":"Sha256HashSerializer"},{"p":"org.consensusj.bitcoinj.signing","l":"Utxo.Signable"},{"p":"org.consensusj.bitcoin.json.pojo","l":"SignedRawTransaction"},{"p":"org.consensusj.bitcoinj.signing","l":"SigningRequest"},{"p":"org.consensusj.bitcoinj.signing","l":"SigningUtils"},{"p":"org.consensusj.bitcoinj.service","l":"SignTransactionService"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.test","l":"TestChainTipPublishers"},{"p":"org.consensusj.bitcoinj.signing","l":"TestnetFeeCalculator"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"TestServers"},{"p":"org.consensusj.jsonrpc","l":"AsyncSupport.ThrowingSupplier"},{"p":"org.consensusj.analytics.service","l":"TokenRichList.TokenBalancePair"},{"p":"org.consensusj.analytics.service","l":"TokenRichList"},{"p":"org.consensusj.bitcoin.rx.zeromq","l":"BitcoinZmqMessage.Topic"},{"p":"org.consensusj.bitcoin.json.conversion","l":"TransactionHexSerializer"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"TransactionIngredients"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionInputData"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionInputDataUtxo"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionOutputAddress"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionOutputData"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionOutputDataScript"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionOutputOpReturn"},{"p":"org.consensusj.bitcoin.json.conversion","l":"TransactionSerializer"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionSigner"},{"p":"org.consensusj.bitcoinj.signing","l":"TransactionVerification"},{"p":"org.consensusj.jsonrpc","l":"AsyncSupport.TransientErrorFilter"},{"p":"org.consensusj.jsonrpc","l":"DefaultRpcClient.TransientErrorMapper"},{"p":"org.consensusj.jsonrpc","l":"DefaultRpcClient.TransportFactory"},{"p":"org.consensusj.bitcoin.json.pojo","l":"TxOutInfo"},{"p":"org.consensusj.bitcoin.json.pojo","l":"TxOutSetInfo"},{"p":"org.consensusj.bitcoin.rx.jsonrpc.service","l":"TxOutSetService"},{"p":"org.consensusj.bitcoin.rx.jsonrpc","l":"TxOutSetWatcherSample"},{"p":"org.consensusj.bitcoin.json.pojo","l":"UnloadWalletResult"},{"p":"org.consensusj.bitcoin.json.pojo","l":"UnspentOutput"},{"p":"org.consensusj.bitcoinj.signing","l":"Utxo"},{"p":"org.consensusj.bitcoin.json.pojo","l":"UtxoInfo"},{"p":"org.consensusj.jsonrpc.cli","l":"CliParameter.Valid"},{"p":"org.consensusj.jsonrpc","l":"JsonRpcMessage.Version"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo.Vin"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo.VinList"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo.Vout"},{"p":"org.consensusj.bitcoin.json.pojo","l":"RawTransactionInfo.VoutList"},{"p":"org.consensusj.daemon.micronaut","l":"WalletAppKitJsonRpcService"},{"p":"org.consensusj.bitcoin.services","l":"WalletAppKitService"},{"p":"org.consensusj.bitcoin.json.pojo","l":"WalletTransactionInfo.WalletConflictList"},{"p":"org.consensusj.bitcoin.services","l":"WalletSigningService"},{"p":"org.consensusj.bitcoin.jsonrpc.test","l":"WalletTestUtil"},{"p":"org.consensusj.bitcoin.json.pojo","l":"WalletTransactionInfo"},{"p":"org.consensusj.bitcoin.rx","l":"ChainTipPublisher.Wrapper"},{"p":"org.consensusj.bitcoin.json.pojo","l":"ZmqNotification"},{"p":"org.consensusj.rx.zeromq","l":"ZMsgSocketFlowable"}];updateSearchResults();
\ No newline at end of file
diff --git a/consensusj-user-guide.html b/consensusj-user-guide.html
index 306e92290..5cdaa8e7a 100644
--- a/consensusj-user-guide.html
+++ b/consensusj-user-guide.html
@@ -442,7 +442,7 @@
 <h1>ConsensusJ User Guide</h1>
 <div class="details">
 <span id="author" class="author">Sean Gilligan</span><br>
-<span id="revnumber">version 0.7.0-alpha2,</span>
+<span id="revnumber">version 0.7.0-alpha3,</span>
 <span id="revdate">June 1, 2023</span>
 <br><span id="revremark">Draft</span>
 </div>
@@ -535,7 +535,7 @@ <h3 id="_core_json_rpc">3.2. Core JSON-RPC</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 0.7.0-alpha2<br>
+Version 0.7.0-alpha3<br>
 Last updated 2023-08-30 19:33:57 -0700
 </div>
 </div>
diff --git a/images/diag-3348d96e2962ab53d6af536a30171a16.svg b/images/diag-3348d96e2962ab53d6af536a30171a16.svg
index 6931052bd..188cd76e1 100644
--- a/images/diag-3348d96e2962ab53d6af536a30171a16.svg
+++ b/images/diag-3348d96e2962ab53d6af536a30171a16.svg
@@ -66,21 +66,21 @@ class org.consensusj.bitcoin.jsonrpc.groovy.BitcoinScriptingClient-->
     </text>
     <!--MD5=[ff1f07209556703b9dc20fa62e76f680]
 reverse link org.consensusj.jsonrpc.JsonRpcClient to org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback-->
-    <path d='M179.7,111.18 C174.92,124.68 169.63,139.6 165.6,150.99 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClient&lt;-org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
-    <polygon fill='none' points='173.27,109.36,186.55,92.85,186.47,114.04,173.27,109.36' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <path d='M179.53,111.66 C174.79,125.03 169.58,139.74 165.6,150.99 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClient&lt;-org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
+    <polygon fill='none' points='172.77,109.79,186.05,93.27,185.96,114.46,172.77,109.79' style='stroke: #A80036; stroke-width: 1.0;'/>
     <!--MD5=[f9b13b3b4fd44aae865b4aab470b4851]
 reverse link org.consensusj.jsonrpc.JsonRpcClient to org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient-->
-    <path d='M249.89,99.61 C257.33,102.59 264.85,105.6 272,108.47 C310.67,123.98 354.86,141.76 385.59,154.13 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClient&lt;-org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
-    <polygon fill='none' points='247.63,105.85,231.66,91.92,252.83,92.85,247.63,105.85' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <path d='M250.55,99.87 C257.77,102.77 265.06,105.68 272,108.47 C310.67,123.98 354.86,141.76 385.59,154.13 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClient&lt;-org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
+    <polygon fill='none' points='248.04,106.41,232.07,92.48,253.24,93.41,248.04,106.41' style='stroke: #A80036; stroke-width: 1.0;'/>
     <!--MD5=[62a22a9d8b219e737de4efab4f6cc8bb]
 reverse link org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback to org.consensusj.bitcoin.jsonrpc.groovy.BitcoinScriptingClient-->
-    <path d='M215.5,199.29 C269.78,225.9 350.28,265.35 397.22,288.35 ' fill='none' id='org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback&lt;-org.consensusj.bitcoin.jsonrpc.groovy.BitcoinScriptingClient' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
-    <polygon fill='none' points='212.68,205.21,197.8,190.13,218.84,192.64,212.68,205.21' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <path d='M215.86,199.47 C270.14,226.07 350.39,265.4 397.22,288.35 ' fill='none' id='org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback&lt;-org.consensusj.bitcoin.jsonrpc.groovy.BitcoinScriptingClient' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
+    <polygon fill='none' points='213.04,205.88,198.16,190.79,219.2,193.31,213.04,205.88' style='stroke: #A80036; stroke-width: 1.0;'/>
     <!--MD5=[7bd8ebe65fb5e91b0a6ae39edc7da5c7]
 reverse link org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient to org.consensusj.bitcoin.jsonrpc.groovy.BitcoinScriptingClient-->
-    <path d='M426.92,207.49 C429.04,233.54 431.82,267.71 433.5,288.44 ' fill='none' id='org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient&lt;-org.consensusj.bitcoin.jsonrpc.groovy.BitcoinScriptingClient' style='stroke: #A80036; stroke-width: 1.0;'/>
-    <polygon fill='none' points='419.88,208.36,425.24,187.86,433.84,207.22,419.88,208.36' style='stroke: #A80036; stroke-width: 1.0;'/>
-    <!--MD5=[e7d9a42f451ceb8c088bc57290bca210]
+    <path d='M426.98,208.29 C429.09,234.23 431.83,267.92 433.5,288.44 ' fill='none' id='org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient&lt;-org.consensusj.bitcoin.jsonrpc.groovy.BitcoinScriptingClient' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <polygon fill='none' points='420.01,208.87,425.36,188.36,433.96,207.73,420.01,208.87' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <!--MD5=[ca5b1445615a51e435171165e9a7a1d6]
 @startuml
 skinparam packageStyle Rect
 skinparam shadowing false
@@ -117,7 +117,7 @@ PlantUML version 1.2020.06(Sun Apr 05 05:38:32 PDT 2020)
 (APACHE source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
-Java Version: 17.0.8+7
+Java Version: 21+35-2513
 Operating System: Mac OS X
 Default Encoding: UTF-8
 Language: en
diff --git a/images/diag-3facb78677f4a0f5cdc17730e261fb25.svg b/images/diag-3facb78677f4a0f5cdc17730e261fb25.svg
index cf0306784..e1b3db0dd 100644
--- a/images/diag-3facb78677f4a0f5cdc17730e261fb25.svg
+++ b/images/diag-3facb78677f4a0f5cdc17730e261fb25.svg
@@ -54,21 +54,21 @@ class org.consensusj.jsonrpc.groovy.DynamicRPCClient-->
     </text>
     <!--MD5=[38007ac204c8ece275af148089ad1d69]
 reverse link org.consensusj.jsonrpc.JsonRpcClient to org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection-->
-    <path d='M227.91,104.71 C207.13,120.97 181.83,140.78 164.68,154.2 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClient&lt;-org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
-    <polygon fill='none' points='223.29,98.66,243.35,91.85,231.91,109.69,223.29,98.66' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <path d='M227.6,104.96 C206.88,121.17 181.74,140.85 164.68,154.2 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClient&lt;-org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
+    <polygon fill='none' points='223.09,99.59,243.16,92.78,231.72,110.62,223.09,99.59' style='stroke: #A80036; stroke-width: 1.0;'/>
     <!--MD5=[ff1f07209556703b9dc20fa62e76f680]
 reverse link org.consensusj.jsonrpc.JsonRpcClient to org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback-->
-    <path d='M300.21,104.57 C319.58,119.6 342.9,137.71 360.02,150.99 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClient&lt;-org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
-    <polygon fill='none' points='296.32,109.64,284.82,91.85,304.91,98.58,296.32,109.64' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <path d='M300.8,105.03 C320.05,119.97 343.08,137.84 360.02,150.99 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClient&lt;-org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
+    <polygon fill='none' points='296.52,110.57,285.01,92.78,305.1,99.51,296.52,110.57' style='stroke: #A80036; stroke-width: 1.0;'/>
     <!--MD5=[136309c1916f5149a10adbefbc8e65b4]
 reverse link org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection to org.consensusj.jsonrpc.groovy.DynamicRPCClient-->
-    <path d='M200.25,195.35 C238.99,212 290.05,233.94 325.81,249.31 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection&lt;-org.consensusj.jsonrpc.groovy.DynamicRPCClient' style='stroke: #A80036; stroke-width: 1.0;'/>
-    <polygon fill='none' points='197.6,201.4,181.99,187.07,203.13,188.53,197.6,201.4' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <path d='M200.52,195.46 C239.23,212.1 290.13,233.97 325.81,249.31 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection&lt;-org.consensusj.jsonrpc.groovy.DynamicRPCClient' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <polygon fill='none' points='197.99,201.99,182.38,187.67,203.52,189.13,197.99,201.99' style='stroke: #A80036; stroke-width: 1.0;'/>
     <!--MD5=[46cc87d9bba02c79c3641f77a6c91460]
 reverse link org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback to org.consensusj.jsonrpc.groovy.DynamicRPCClient-->
-    <path d='M377.95,210.43 C375.85,223.87 373.6,238.32 371.88,249.36 ' fill='none' id='org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback&lt;-org.consensusj.jsonrpc.groovy.DynamicRPCClient' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
-    <polygon fill='none' points='371.11,209.85,381.11,191.16,384.95,212,371.11,209.85' style='stroke: #A80036; stroke-width: 1.0;'/>
-    <!--MD5=[de05e712e14bc9a8d9f872e22c042c90]
+    <path d='M377.8,211.41 C375.75,224.57 373.56,238.59 371.88,249.36 ' fill='none' id='org.consensusj.jsonrpc.groovy.DynamicRPCMethodFallback&lt;-org.consensusj.jsonrpc.groovy.DynamicRPCClient' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
+    <polygon fill='none' points='370.88,210.34,380.87,191.66,384.71,212.5,370.88,210.34' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <!--MD5=[9e9b9e7923f1670084aafeb7aaf2a548]
 @startuml
 skinparam packageStyle Rect
 skinparam shadowing false
@@ -97,7 +97,7 @@ PlantUML version 1.2020.06(Sun Apr 05 05:38:32 PDT 2020)
 (APACHE source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
-Java Version: 17.0.8+7
+Java Version: 21+35-2513
 Operating System: Mac OS X
 Default Encoding: UTF-8
 Language: en
diff --git a/images/diag-41ca7dae269320574b69fad172266e22.svg b/images/diag-41ca7dae269320574b69fad172266e22.svg
index 94e9c7580..8d167e17f 100644
--- a/images/diag-41ca7dae269320574b69fad172266e22.svg
+++ b/images/diag-41ca7dae269320574b69fad172266e22.svg
@@ -64,25 +64,25 @@ class org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient-->
     </text>
     <!--MD5=[ee3ee4b41ebf5943cf940e0be8ae8d5d]
 reverse link org.consensusj.jsonrpc.JsonRpcClient to org.consensusj.jsonrpc.JacksonRpcClient-->
-    <path d='M145,111.97 C145,125.44 145,140.04 145,150.66 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClient&lt;-org.consensusj.jsonrpc.JacksonRpcClient' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
-    <polygon fill='none' points='138,112.27,145,92.27,152,112.27,138,112.27' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <path d='M145,112.47 C145,125.8 145,140.17 145,150.66 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClient&lt;-org.consensusj.jsonrpc.JacksonRpcClient' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
+    <polygon fill='none' points='138,112.78,145,92.78,152,112.78,138,112.78' style='stroke: #A80036; stroke-width: 1.0;'/>
     <!--MD5=[01a6255b291b6021c6fc5088994f3a7f]
 reverse link org.consensusj.jsonrpc.JacksonRpcClient to org.consensusj.jsonrpc.AbstractRPCClient-->
-    <path d='M145,203.97 C145,217.44 145,232.04 145,242.66 ' fill='none' id='org.consensusj.jsonrpc.JacksonRpcClient&lt;-org.consensusj.jsonrpc.AbstractRPCClient' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
-    <polygon fill='none' points='138,204.27,145,184.27,152,204.27,138,204.27' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <path d='M145,204.47 C145,217.8 145,232.17 145,242.66 ' fill='none' id='org.consensusj.jsonrpc.JacksonRpcClient&lt;-org.consensusj.jsonrpc.AbstractRPCClient' style='stroke: #A80036; stroke-width: 1.0; stroke-dasharray: 7.0,7.0;'/>
+    <polygon fill='none' points='138,204.78,145,184.78,152,204.78,138,204.78' style='stroke: #A80036; stroke-width: 1.0;'/>
     <!--MD5=[6fefed0810bfb0de7547e92017e56dc8]
 reverse link org.consensusj.jsonrpc.AbstractRPCClient to org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection-->
-    <path d='M145,295.97 C145,309.44 145,324.04 145,334.66 ' fill='none' id='org.consensusj.jsonrpc.AbstractRPCClient&lt;-org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection' style='stroke: #A80036; stroke-width: 1.0;'/>
-    <polygon fill='none' points='138,296.27,145,276.27,152,296.27,138,296.27' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <path d='M145,296.47 C145,309.8 145,324.17 145,334.66 ' fill='none' id='org.consensusj.jsonrpc.AbstractRPCClient&lt;-org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <polygon fill='none' points='138,296.78,145,276.78,152,296.78,138,296.78' style='stroke: #A80036; stroke-width: 1.0;'/>
     <!--MD5=[97eb4b56aaa5fa0000f831636e80729d]
 reverse link org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection to org.consensusj.bitcoin.jsonrpc.BitcoinClient-->
-    <path d='M145,388.35 C145,406.65 145,427.84 145,441.78 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection&lt;-org.consensusj.bitcoin.jsonrpc.BitcoinClient' style='stroke: #A80036; stroke-width: 1.0;'/>
-    <polygon fill='none' points='138,388.49,145,368.49,152,388.49,138,388.49' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <path d='M145,388.96 C145,407.12 145,428 145,441.78 ' fill='none' id='org.consensusj.jsonrpc.JsonRpcClientHttpUrlConnection&lt;-org.consensusj.bitcoin.jsonrpc.BitcoinClient' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <polygon fill='none' points='138,389.01,145,369.01,152,389.01,138,389.01' style='stroke: #A80036; stroke-width: 1.0;'/>
     <!--MD5=[f516eecb5980a42e8201f221adf3561d]
 reverse link org.consensusj.bitcoin.jsonrpc.BitcoinClient to org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient-->
-    <path d='M145,494.97 C145,508.44 145,523.04 145,533.66 ' fill='none' id='org.consensusj.bitcoin.jsonrpc.BitcoinClient&lt;-org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient' style='stroke: #A80036; stroke-width: 1.0;'/>
-    <polygon fill='none' points='138,495.27,145,475.27,152,495.27,138,495.27' style='stroke: #A80036; stroke-width: 1.0;'/>
-    <!--MD5=[167148275b157a619485cdb3199553fb]
+    <path d='M145,495.47 C145,508.8 145,523.17 145,533.66 ' fill='none' id='org.consensusj.bitcoin.jsonrpc.BitcoinClient&lt;-org.consensusj.bitcoin.jsonrpc.BitcoinExtendedClient' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <polygon fill='none' points='138,495.78,145,475.78,152,495.78,138,495.78' style='stroke: #A80036; stroke-width: 1.0;'/>
+    <!--MD5=[ff38c8269d999b4281acdfad8dc2e538]
 @startuml
 skinparam packageStyle Rect
 skinparam shadowing false
@@ -117,7 +117,7 @@ PlantUML version 1.2020.06(Sun Apr 05 05:38:32 PDT 2020)
 (APACHE source distribution)
 Java Runtime: OpenJDK Runtime Environment
 JVM: OpenJDK 64-Bit Server VM
-Java Version: 17.0.8+7
+Java Version: 21+35-2513
 Operating System: Mac OS X
 Default Encoding: UTF-8
 Language: en
diff --git a/index.html b/index.html
index e6796c7af..d0a120e84 100644
--- a/index.html
+++ b/index.html
@@ -442,7 +442,7 @@
 <h1>ConsensusJ GitHub Pages</h1>
 <div class="details">
 <span id="author" class="author">Sean Gilligan</span><br>
-<span id="revnumber">version 0.7.0-alpha2,</span>
+<span id="revnumber">version 0.7.0-alpha3,</span>
 <span id="revdate">March 26, 2019</span>
 <br><span id="revremark">Stub</span>
 </div>
@@ -472,7 +472,7 @@ <h2 id="_project_documentation">Project Documentation</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 0.7.0-alpha2<br>
+Version 0.7.0-alpha3<br>
 Last updated 2022-09-01 09:51:50 -0700
 </div>
 </div>
diff --git a/javadoc-overview.html b/javadoc-overview.html
index d1f019b66..3a692f025 100644
--- a/javadoc-overview.html
+++ b/javadoc-overview.html
@@ -440,7 +440,7 @@
 <div id="header">
 <h1>ConsensusJ: JSON-RPC client and server, command-line tool, DSL, and more</h1>
 <div class="details">
-<span id="revnumber">version 0.7.0-alpha2</span>
+<span id="revnumber">version 0.7.0-alpha3</span>
 </div>
 </div>
 <div id="content">
@@ -481,7 +481,7 @@ <h1>ConsensusJ: JSON-RPC client and server, command-line tool, DSL, and more</h1
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 0.7.0-alpha2<br>
+Version 0.7.0-alpha3<br>
 Last updated 2021-11-01 22:13:11 -0700
 </div>
 </div>
diff --git a/manpage-cj-bitcoin-cli.html b/manpage-cj-bitcoin-cli.html
index 127361967..d98b9ddf1 100644
--- a/manpage-cj-bitcoin-cli.html
+++ b/manpage-cj-bitcoin-cli.html
@@ -624,7 +624,7 @@ <h2 id="_copying">COPYING</h2>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 0.7.0-alpha2<br>
+Version 0.7.0-alpha3<br>
 Last updated 2021-02-09 19:09:02 -0800
 </div>
 </div>
diff --git a/release-process.html b/release-process.html
index 01d2c7b14..4ebccfaf1 100644
--- a/release-process.html
+++ b/release-process.html
@@ -440,7 +440,7 @@
 <div id="header">
 <h1>ConsensusJ Release Process</h1>
 <div class="details">
-<span id="revnumber">version 0.7.0-alpha2</span>
+<span id="revnumber">version 0.7.0-alpha3</span>
 </div>
 </div>
 <div id="content">
@@ -450,14 +450,14 @@ <h2 id="_main_release_process">Main Release Process</h2>
 <div class="olist arabic">
 <ol class="arabic">
 <li>
-<p>Use Java 17 for official builds</p>
+<p>Use Java 21 for official builds</p>
 <div class="olist loweralpha">
 <ol class="loweralpha" type="a">
 <li>
-<p><code>sdk use 17.0.8-tem</code></p>
+<p><code>sdk use 21-tem</code> (not available yet!)</p>
 </li>
 <li>
-<p><code>sdk use 17.0.8-graalce</code> (for GraalVM build)</p>
+<p><code>sdk use 17.0.8-graalce</code> (for GraalVM build, used for 0.7.0-alpha3 official build)</p>
 </li>
 </ol>
 </div>
@@ -583,6 +583,38 @@ <h2 id="_after_release">After release</h2>
 </div>
 </div>
 <div class="sect1">
+<h2 id="_verify_local_build_vs_ci_build">Verify local build vs. CI build</h2>
+<div class="sectionbody">
+<div class="paragraph">
+<p>At present, builds made with Temurin Java 21-ea (or equivalent) should be reproducible on
+either <strong>macOS</strong> or <strong>Linux</strong>. You can verify with the following procedure:</p>
+</div>
+<div class="olist arabic">
+<ol class="arabic">
+<li>
+<p>Build locally with <code>./gradlew installDist</code></p>
+</li>
+<li>
+<p>Generate <code>SHA256SUMS</code></p>
+<div class="olist loweralpha">
+<ol class="loweralpha" type="a">
+<li>
+<p><code>cd build ; sha256sum artifacts/*/* &gt; SHA256SUMS</code></p>
+</li>
+</ol>
+</div>
+</li>
+<li>
+<p>Download <code>SHA256SUMS</code> from a compatible CI server build</p>
+</li>
+<li>
+<p><code>diff build/SHA256SUMS &lt;path-to-download&gt;/SHA256SUMS</code></p>
+</li>
+</ol>
+</div>
+</div>
+</div>
+<div class="sect1">
 <h2 id="_publish_snapshot_to_public_maven_repo_on_gitlab">Publish Snapshot to public Maven Repo on GitLab</h2>
 <div class="sectionbody">
 <div class="olist arabic">
@@ -636,8 +668,8 @@ <h2 id="_update_the_graalvm_resource_json_files_for_the_bitcoin_daemon">Update t
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 0.7.0-alpha2<br>
-Last updated 2023-08-30 19:33:57 -0700
+Version 0.7.0-alpha3<br>
+Last updated 2023-10-05 21:13:48 -0700
 </div>
 </div>
 </body>
diff --git a/rpc-client-inheritance.html b/rpc-client-inheritance.html
index 3465f451f..1b1c3b3de 100644
--- a/rpc-client-inheritance.html
+++ b/rpc-client-inheritance.html
@@ -442,7 +442,7 @@
 <h1>ConsensusJ JSON-RPC Client Inheritance</h1>
 <div class="details">
 <span id="author" class="author">Sean Gilligan</span><br>
-<span id="revnumber">version 0.7.0-alpha2,</span>
+<span id="revnumber">version 0.7.0-alpha3,</span>
 <span id="revdate">June 1, 2023</span>
 <br><span id="revremark">First version as separate document</span>
 </div>
@@ -509,7 +509,7 @@ <h3 id="_groovy">2.1. Groovy</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Version 0.7.0-alpha2<br>
+Version 0.7.0-alpha3<br>
 Last updated 2023-08-30 19:33:57 -0700
 </div>
 </div>
