Regen docsite

docs/build/html/_sources/building-the-docs.txt

@@ -38,7 +38,7 @@ documentation by running the following script:
 
 .. sourcecode:: shell
 
-    scripts/generate-docsite.sh
+    docs/generate-docsite.sh
 
 Alternatively you can build non-HTML formats from the ``docs`` folder. Change directory to the folder and then run the
 following to see a list of all available formats:

docs/build/html/_sources/clientrpc.txt

@@ -17,6 +17,14 @@ detail on how to use this is provided in the docs for the proxy method.
 
 For a brief tutorial on how one can use the RPC API see :doc:`tutorial-clientrpc-api`.
 
+Security
+--------
+
+Users wanting to use the RPC library are first required to authenticate themselves with the node using a valid username
+and password. These are kept in ``rpc-users.properties`` in the node base directory. This file also specifies
+permissions for each user, which the RPC implementation can use to control access. The file format is described in
+:doc:`corda-configuration-files`.
+
 Observables
 -----------
 

docs/build/html/_sources/corda-configuration-files.txt

@@ -4,7 +4,7 @@ The Corda Configuration File
 Configuration File Location
 ---------------------------
 
-The Corda all in one ``corda.jar`` file is generated by the ``gradle buildCordaJAR`` task and defaults to reading configuration from a ``node.conf`` file in the present working directory.
+The Corda all-in-one ``corda.jar`` file is generated by the ``gradle buildCordaJAR`` task and defaults to reading configuration from a ``node.conf`` file in the present working directory.
 This behaviour can be overidden using the ``--config-file`` command line option to target configuration files with different names, or different file location (relative paths are relative to the current working directory).
 Also, the ``--base-directory`` command line option alters the Corda node workspace location and if specified a ``node.conf`` configuration file is then expected in the root of the workspace.
 
@@ -97,6 +97,20 @@ Configuration File Fields
 
 :useHTTPS: If false the node's web server will be plain HTTP. If true the node will use the same certificate and private key from the ``<workspace>/certificates/sslkeystore.jks`` file as the ArtemisMQ port for HTTPS. If HTTPS is enabled then unencrypted HTTP traffic to the node's **webAddress** port is not supported.
 
+RPC Users File
+==============
 
+Corda also uses the ``rpc-users.properties`` file, found in the base directory, to control access to the RPC subsystem.
+This is a Java properties file (details can be found in the `Javadocs <https://docs.oracle.com/javase/8/docs/api/java/util/Properties.html#load-java.io.Reader->`_)
+which specifies a list of users with their password and list of permissions they're enabled for.
 
+.. code-block:: text
+    :caption: Sample
 
+    admin=notsecure,ADMIN
+    user1=letmein,CASH,PAPER
+
+In this example ``user1`` has password ``letmein`` and has permissions for ``CASH`` and ``PAPER``. The permissions are
+free-form strings which can be used by the RPC methods to control access.
+
+If ``rpc-users.properties`` is empty or doesn't exist then the RPC subsystem is effectively locked down.

docs/build/html/_sources/creating-a-cordapp.txt

@@ -101,9 +101,9 @@ root directory of Corda
 
 .. code-block:: shell
 
-    ./gradlew publishToMavenLocal
+    ./gradlew install
 
-This will publish corda-$version.jar, contracts-$version.jar, core-$version.jar and node-$version.jar to the
+This will publish corda-$version.jar, finance-$version.jar, core-$version.jar and node-$version.jar to the
 group com.r3corda. You can now depend on these as you normally would a Maven dependency.
 
 Gradle Plugins for Cordapps
@@ -120,7 +120,7 @@ root of the Corda project:
 
 .. code-block:: text
 
-    ./gradlew publishToMavenLocal
+    ./gradlew install
 
 The plugins will now be installed to your local Maven repository in ~/.m2 on Unix and %HOMEPATH%\.m2 on Windows.
 
@@ -131,7 +131,7 @@ To use the plugins, if you are not already using the Cordapp template project, y
 the following segments to the relevant part of your build.gradle.
 
 Template build.gradle
-=====================
+---------------------
 
 To build against Corda and the plugins that cordapps use, update your build.gradle to contain the following:
 
@@ -165,7 +165,7 @@ To build against Corda and the plugins that cordapps use, update your build.grad
 
     dependencies {
         compile "com.r3corda:core:$corda_version"
-        compile "com.r3corda:contracts:$corda_version"
+        compile "com.r3corda:finance:$corda_version"
         compile "com.r3corda:node:$corda_version"
         compile "com.r3corda:corda:$corda_version"
         ... other dependencies here ...
@@ -191,7 +191,7 @@ To build against Corda and the plugins that cordapps use, update your build.grad
 
 
 Cordformation
-=============
+-------------
 
 Cordformation is the local node deployment system for Cordapps, the nodes generated are intended to be used for
 experimenting, debugging, and testing node configurations and setups but not intended for production or testnet

docs/build/html/_sources/index.txt

@@ -1,26 +1,22 @@
-Welcome to the Corda repository!
-================================
+Welcome to the Corda!
+=====================
 
 .. warning:: This build of the docs is from the *master branch*, not a milestone release. It may not reflect the
    current state of the code.
 
-This documentation describes Corda, a proposed architecture for distributed ledgers, the vision for which is outlined in the `Corda Introductory Whitepaper`_.
+This is the developer guide for Corda, a proposed architecture for distributed ledgers. Here are the sources
+of documentation you may find useful, from highest level to lowest:
 
-.. _`Corda Introductory Whitepaper`: _static/corda-introductory-whitepaper.pdf
+1. The `Introductory white paper`_ describes the motivating vision and background of the project. It is the kind
+   of document your boss should read. It describes why the project exists and briefly compares it to alternative
+   systems on the market.
+2. This user guide. It describes *how* to use the system to write apps. It assumes you already have read the
+   relevant sections of the technology white paper and now wish to learn how to use it.
+3. The `API docs`_.
 
-The goal of this prototype is to explore fundamentally better designs for distributed ledgers than what presently exists
-on the market, tailor made for the needs of the financial industry. We are attempting to prove or disprove the
-following hypothesis:
-
-The combination of
-
-* An upgraded state transition model
-* Industry standard, production quality virtual machines and languages
-* An advanced orchestration framework
-* Limited data propagation
-* Conflict resolution without proof of work or blocks
-
-is sufficiently powerful to justify the creation of a new platform implementation.
+.. _`Introductory white paper`: _static/corda-introductory-whitepaper.pdf
+.. _`Technical white paper`: _static/corda-technical-whitepaper.pdf
+.. _`API docs`: api/index.html
 
 Read on to learn:
 
@@ -53,7 +49,6 @@ Read on to learn:
    oracles
    tutorial-attachments
    event-scheduling
-   secure-coding-guidelines
 
 .. toctree::
    :maxdepth: 2
@@ -61,6 +56,7 @@ Read on to learn:
 
    contract-catalogue
    contract-irs
+   initialmarginagreement
 
 .. toctree::
    :maxdepth: 2
@@ -72,8 +68,10 @@ Read on to learn:
    :maxdepth: 2
    :caption: Appendix
 
+   secure-coding-guidelines
    release-process
    release-notes
    network-simulator
+   node-explorer
    codestyle
    building-the-docs

docs/build/html/_sources/initialmarginagreement.txt

@@ -0,0 +1,73 @@
+Initial Margin Agreements
+=========================
+
+This app is a demonstration of how Corda can be used for the real world requirement of initial margin calculation and
+agreement; featuring the integration of complex and industry proven third party libraries into Corda nodes.
+
+SIMM Introduction
+-----------------
+
+SIMM is an acronym for "Standard Initial Margin Model". It is effectively the calculation of a "margin" that is paid
+by one party to another when they agree a trade on certain types of transaction. This margin is
+paid such that, in the event of one of the counterparties suffering a credit event
+(a financial term and a polite way to say defaulting, not paying the debts that are due, or potentially even bankruptcy),
+then the party that is owed any sum already has some of the amount that it should have been paid. This payment to the
+receiving party is a preventative measure in order to reduce the risk of a potentially catastrophic default domino
+effect that caused the `Great Financial Crisis <https://en.wikipedia.org/wiki/Financial_crisis_of_2007%E2%80%932008>`_,
+as it means that they can be assured that if they need to pay another party, they will have a proportion of the funds
+that they have been relying on.
+
+To enact this, in September 2016, the ISDA committee - with full backing from various governing bodies -
+`issued a ruling on what is known as the ISDA SIMM ™ model <http://www2.isda.org/news/isda-simm-deployed-today-new-industry-standard-for-calculating-initial-margin-widely-adopted-by-market-participants>`_,
+a way of fairly and consistently calculating this margin. Any parties wishing to trade a financial product that is
+covered under this ruling would, independently, use this model and calculate their margin payment requirement,
+agree it with their trading counterparty and then pay (or receive, depending on the results of this calculation)
+this amount. In the case of disagreement that is not resolved in a timely fashion, this payment would increase
+and so therefore it is in the parties interest to reach agreement in a short as time frame as possible.
+
+To be more accurate, the SIMM calculation is not performed on just one trade - it is calculated on an aggregate of
+intermediary values (which in this model are sensitivities to risk factors) from a portfolio of trades; therefore
+the input to a SIMM is actually this data, not the individual trades itself.
+
+Also note that implementations of the SIMM are actually protected and subject to license restrictions by ISDA
+(this is due to the model itself being protected). We were fortunate enough to technically partner with
+`OpenGamma <http://www.opengamma.com>`_  who allowed us to demonstrate the SIMM process using their proprietary model.
+In the source code released, we have replaced their analytics engine with very simple stub functions that allow
+the process to run and can easily be swapped out in place for their real libraries.
+
+Process steps
+-------------
+
+Preliminaries
+    - Ensure that there are a number of live trades with another party financial products that are covered under the
+     ISDA SIMM agreement (if none, then use the demo to enter some simple trades as described below).
+
+Initial Margin Agreement Process
+    - Agree that one will be performing the margining calculation against a portfolio of trades with another party, and agree the trades in that portfolio. In practice, one node will start the protocol but it does not matter which node does.
+    - Individually (at the node level), identify the data (static, reference etc) one will need in order to be able to calculate the metrics on those trades
+    - Confirm with the other counterparty the dataset from the above set
+    - Calculate any intermediary steps and values needed for the margin calculation (ie sensitivities to risk factors)
+    - Agree on the results of these steps
+    - Calculate the initial margin
+    - Agree on the calculation of the above with the other party
+    - In practice, pay (or receive) this margin (omitted for the sake of complexity for this example)
+
+
+Running the app
+---------------
+
+The demonstration can be run in two ways - via IntelliJ (which will allow you to add breakpoints, debug, etc), or via gradle and the command line.
+
+Run with IntelliJ::
+
+    1. Open the `cordapp-samples` project with IntelliJ
+    2. Run the shared run configuration "SIMM Valuation Demo"
+    3. Browse to http://localhost:10005/web/simmvaluationdemo
+
+Run via CLI::
+
+    1. Navigate to the `cordapp-samples` directory in your shell
+    2. Run the gradle target `deployNodes` (ie; ./gradlew deployNodes for Unix or gradlew.bat on Windows)
+        1. Unix: `cd simm-valuation-demo/build/nodes && ./runnodes`.
+        2. Windows: Open a command line window in each subdirectory of `simm-valuation-demo/build/nodes` and run `java -jar corda.jar`
+    4. Browse to http://localhost:10005/web/simmvaluationdemo

docs/build/html/_sources/node-explorer.txt

@@ -0,0 +1,70 @@
+Node Explorer
+=============
+
+The node explorer provide views to the node's vault and transaction data using Corda's RPC framework.
+The user can execute cash transaction commands to issue and move cash to other party on the network or exit cash using the user interface.
+
+Running the UI
+--------------
+**Windows**::
+
+    gradlew.bat tools:explorer:run
+
+**Other**::
+
+    ./gradlew tools:explorer:run
+    
+
+Running Demo Nodes
+------------------
+**Windows**::
+
+    gradlew.bat tools:explorer:runDemoNodes
+
+**Other**::
+
+    ./gradlew tools:explorer:runDemoNodes
+
+.. note:: 3 Corda nodes will be created on the following port on localhost by default.
+
+   * Notary -> 20002
+   * Alice -> 20004
+   * Bob -> 20006
+
+Interface
+---------
+Login
+  User can login to any Corda node using the explorer, alternately, `gradlew explorer:runDemoNodes` can be used to start up demo nodes for testing.  
+  Corda node address, username and password are required for login, the address is defaulted to localhost:0 if leave blank.
+  Username and password can be configured in node's configuration file; for demo nodes, it is defaulted to ``user1`` and ``test``.
+.. note:: If you are connecting to the demo nodes, only Alice and Bob (20004, 20006) are accessible using user1 credential, you won't be able to connect to the notary.
+
+.. image:: resources/explorer/login.png
+   :scale: 50 %
+   :align: center
+     
+Home
+  Home view shows the top level state of node and vault; currently, it shows your cash balance and the numbers of transaction executed.
+  The dashboard is intended to house widgets from different CordApp's and provide useful information to system admin at a glance. 
+
+.. image:: resources/explorer/dashboard.png
+  
+Cash
+  The cash view shows all currencies you currently own in a tree table format, it is grouped by issuer -> currency.
+  Individual cash transactions can be viewed by clicking on the table row. The user can also use the search field to narrow down the scope.
+
+.. image:: resources/explorer/vault.png
+
+Transactions
+  The transaction view contains all transactions handled by the node in a table view. It shows basic information on the table e.g. Transaction ID, 
+  command type, USD equivalence value etc. User can expand the row by double clicking to view the inputs, 
+  outputs and the signatures details for that transaction.  
+  
+.. image:: resources/explorer/transactionView.png
+
+New Transaction
+  This is where you can create new transaction; currently only the cash contract is supported. 
+  The user can choose from three transaction types (issue, move and exit) and any party visible on the network. 
+  The result of the transaction will be visible in the transaction screen when executed.
+
+.. image:: resources/explorer/newTransaction.png

docs/build/html/_sources/persistence.txt

@@ -85,5 +85,5 @@ to initialise the ORM layer.
 Several examples of entities and mappings are provided in the codebase, including ``Cash.State`` and
 ``CommercialPaper.State``.  For example, here's the first version of the cash schema.
 
-.. literalinclude:: ../../contracts/src/main/kotlin/com/r3corda/schemas/CashSchemaV1.kt
+.. literalinclude:: ../../finance/src/main/kotlin/com/r3corda/schemas/CashSchemaV1.kt
     :language: kotlin

docs/build/html/_sources/protocol-state-machines.txt

@@ -91,7 +91,7 @@ Our protocol has two parties (B and S for buyer and seller) and will proceed as
    it lacks a signature from S authorising movement of the asset.
 3. S signs it and hands the now finalised ``SignedTransaction`` back to B.
 
-You can find the implementation of this protocol in the file ``contracts/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt``.
+You can find the implementation of this protocol in the file ``finance/src/main/kotlin/com/r3corda/protocols/TwoPartyTradeProtocol.kt``.
 
 Assuming no malicious termination, they both end the protocol being in posession of a valid, signed transaction that
 represents an atomic asset swap.

docs/build/html/_sources/release-notes.txt

@@ -3,6 +3,44 @@ Release notes
 
 Here are brief summaries of what's changed between each snapshot release.
 
+Milestone 5
+-----------
+
+* A simple RPC access control mechanism. Users, passwords and permissions can be defined in a configuration file.
+  This mechanism will be extended in future to support standard authentication systems like LDAP.
+
+* New features in the explorer app and RPC API for working with cash:
+
+    * Cash can now be sent, issued and exited via RPC.
+    * Notes can now be associated with transactions.
+    * Hashes are visually represented using identicons.
+    * Lots of functional work on the explorer UI. You can try it out by running ``gradle tools:explorer:runDemoNodes`` to run
+      a local network of nodes that swap cash with each other, and then run ``gradle tools:explorer:run`` to start
+      the app.
+
+* A new demo showing shared valuation of derivatives portfolios using the ISDA SIMM has been added. Note that this app
+  relies on a proprietary implementation of the ISDA SIMM business logic from OpenGamma. A stub library is provided
+  to ensure it compiles but if you want to use the app for real please contact us.
+
+* Developer experience (we plan to do lots more here in milestone 6):
+
+    * Demos and samples have been split out of the main repository, and the initial developer experience continues to be
+      refined. All necessary JARs can now be installed to Maven Local by simply running ``gradle install``.
+    * It's now easier to define a set of nodes to run locally using the new "CordFormation" gradle plugin, which
+      defines a simple DSL for creating networks of nodes.
+    * The template CorDapp has been upgraded with more documentation and showing more features.
+
+* Privacy: transactions are now structured as Merkle trees, and can have sections "torn off" - presented for
+  verification and signing without revealing the rest of the transaction.
+
+* Lots of bug fixes, tweaks and polish starting the run up to the open source release.
+
+API changes:
+
+* Plugin service classes now take a ``PluginServiceHub`` rather than a ``ServiceHubInternal``.
+* ``UniqueIdentifier`` equality has changed to only take into account the underlying UUID.
+* The contracts module has been renamed to finance, to better reflect what it is for.
+
 Milestone 4
 -----------
 

docs/build/html/_sources/running-the-demos.txt

@@ -174,3 +174,48 @@ In the second terminal, run:
     ./build/install/r3prototyping/bin/attachment-demo --role=SENDER
 
 You should see some log lines scroll past, and within a few seconds the message "File received - we're happy!" should be printed.
+
+SIMM and Portfolio Demo
+-----------------------
+
+.. note:: Read more about this demo at :doc:`initialmarginagreement`.
+
+To run the demo run:
+
+**Windows**
+
+Open a terminal window and navigate to the root directory of Corda and run:
+
+.. sourcecode:: shell
+
+    gradlew apps:vega:installTemplateNodes
+    cd build\nodes\nameserver
+    java -jar corda.jar
+
+Now open another terminal in the root directory of Corda and run:
+
+.. sourcecode:: shell
+
+    cd build\nodes\nodea
+    java -jar corda.jar
+
+Now open a third terminal in the root directory of Corda and run:
+
+.. sourcecode:: shell
+
+    cd build\nodes\nodeb
+    java -jar corda.jar
+
+**Other**
+
+Open one terminal window and run the following commands from the root directory of Corda:
+
+.. sourcecode:: shell
+
+     ./gradlew apps:vega:installTemplateNodes
+     cd build/nodes
+     ./runnodes
+
+Now open http://localhost:31339/web/vega and http://localhost:31340/web/vega to view the two nodes that this
+will have started respectively.
+

docs/build/html/_sources/tutorial-clientrpc-api.txt

@@ -16,7 +16,7 @@ we also need to access the certificates of the node, we will access the node's `
     :start-after: START 1
     :end-before: END 1
 
-Now we can connect to the node itself:
+Now we can connect to the node itself using a valid RPC login. By default the user `user1` is available with password `test`.
 
 .. literalinclude:: example-code/src/main/kotlin/com/r3corda/docs/ClientRpcTutorial.kt
     :language: kotlin

docs/build/html/_sources/where-to-start.txt

@@ -36,7 +36,7 @@ The process of implementing a scenario looks like this:
 
 1. First of all, design your states and transaction types. Read about the :doc:`data-model` if you aren't sure what that
    involves.
-2. Now, create a new file in the contracts/src/main directory. You can either any JVM language but we only provide examples
+2. Now, create a new file in the finance/src/main directory. You can either any JVM language but we only provide examples
    in Java and Kotlin. The file should define your state classes and your contract class, which will define the
    allowable state transitions. You can learn how these are constructed by reading the ":doc:`tutorial-contract`" tutorial.
 3. It isn't enough to just define static data and logic that controls what's allowed. You must also orchestrate the

docs/build/html/_static/basic.css

@@ -85,10 +85,6 @@ div.sphinxsidebar #searchbox input[type="text"] {
     width: 170px;
 }
 
-div.sphinxsidebar #searchbox input[type="submit"] {
-    width: 30px;
-}
-
 img {
     border: 0;
     max-width: 100%;

docs/build/html/api/alltypes/index.html

@@ -192,6 +192,13 @@ amount used in whatever underlying thing the amount represents.</p>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.core.utilities/-api-utils/index.html">com.r3corda.core.utilities.ApiUtils</a></td>
+<td>
+<p>Utility functions to reduce boilerplate when developing HTTP APIs</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.core.protocols/-app-context/index.html">com.r3corda.core.protocols.AppContext</a></td>
 <td>
 <p>This is just some way to track what attachments need to be in the class loader, but may later include some app
@@ -262,14 +269,6 @@ file paths.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.demos.protocols/-auto-offer-protocol/index.html">com.r3corda.demos.protocols.AutoOfferProtocol</a></td>
-<td>
-<p>This whole class is really part of a demo just to initiate the agreement of a deal with a simple
-API call from a single party without bi-directional access to the database of offers etc.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.transactions/-base-transaction/index.html">com.r3corda.core.transactions.BaseTransaction</a></td>
 <td>
 <p>An abstract class defining fields shared by all transaction types in the system.</p>
@@ -406,19 +405,6 @@ provided directly by this clause.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.demos/-cli-params/index.html">com.r3corda.demos.CliParams</a></td>
-<td>
-<p>Parsed command line parameters.</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.demos/-cli-params-spec/index.html">com.r3corda.demos.CliParamsSpec</a></td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.node.services.messaging/-client-r-p-c-request-message/index.html">com.r3corda.node.services.messaging.ClientRPCRequestMessage</a></td>
 <td>
 <p>The contents of an RPC request message, separated from the MQ layer.</p>
@@ -638,6 +624,14 @@ client apps and are implemented by the node in the <a href="#">ServerRPCOps</a>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.node.internal/-corda-r-p-c-ops-impl/index.html">com.r3corda.node.internal.CordaRPCOpsImpl</a></td>
+<td>
+<p>Server side implementations of RPCs available to MQ based client tools. Execution takes place on the server
+thread (i.e. serially). Arguments are serialised and deserialised automatically.</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.core.math/-cubic-spline-interpolator/index.html">com.r3corda.core.math.CubicSplineInterpolator</a></td>
 <td>
 <p>Interpolates values between the given data points using a <a href="../com.r3corda.core.math/-spline-function/index.html">SplineFunction</a>.</p>
@@ -664,6 +658,13 @@ client apps and are implemented by the node in the <a href="#">ServerRPCOps</a>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.node.services.persistence/-d-b-transaction-mapping-storage/index.html">com.r3corda.node.services.persistence.DBTransactionMappingStorage</a></td>
+<td>
+<p>Database storage of a txhash -&gt; state machine id mapping.</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.node.services.persistence/-d-b-transaction-storage/index.html">com.r3corda.node.services.persistence.DBTransactionStorage</a></td>
 <td>
 </td>
@@ -724,13 +725,6 @@ implementation of general protocols that manipulate many agreement types.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.demos/-demo-clock/index.html">com.r3corda.demos.DemoClock</a></td>
-<td>
-<p>A <a href="http://docs.oracle.com/javase/6/docs/api/java/time/Clock.html">Clock</a> that can have the date advanced for use in demos.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.serialization/-deserialize-as-kotlin-object-def.html">com.r3corda.core.serialization.DeserializeAsKotlinObjectDef</a></td>
 <td>
 <p>Marker interface for kotlin object definitions so that they are deserialized as the singleton instance.</p>
@@ -844,13 +838,6 @@ building partially signed transactions.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts/-event/index.html">com.r3corda.contracts.Event</a></td>
-<td>
-<p>Event superclass - everything happens on a date.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.client.mock/-event-generator/index.html">com.r3corda.client.mock.EventGenerator</a></td>
 <td>
 <p><a href="../com.r3corda.client.mock/-generator/index.html">Generator</a>s for incoming/outgoing events to/from the <a href="#">WalletMonitorService</a>. Internally it keeps track of owned
@@ -879,12 +866,6 @@ TODO hook up an actual oracle</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.demos.protocols/-exit-server-protocol/index.html">com.r3corda.demos.protocols.ExitServerProtocol</a></td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.contracts/-expression/index.html">com.r3corda.core.contracts.Expression</a></td>
 <td>
 <p>Represents a textual expression of e.g. a formula</p>
@@ -933,6 +914,14 @@ attachments are saved to local storage automatically.</p>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.core.transactions/-filter-funs/index.html">com.r3corda.core.transactions.FilterFuns</a></td>
+<td>
+<p>Holds filter functions on transactions fields.
+Functions are used to build a partial tree only out of some subset of original transaction fields.</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.core.contracts.clauses/-filter-on/index.html">com.r3corda.core.contracts.clauses.FilterOn</a></td>
 <td>
 <p>Filter the states that are passed through to the wrapped clause, to restrict them to a specific type.</p>
@@ -940,6 +929,20 @@ attachments are saved to local storage automatically.</p>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.core.transactions/-filtered-leaves/index.html">com.r3corda.core.transactions.FilteredLeaves</a></td>
+<td>
+<p>Class that holds filtered leaves for a partial Merkle transaction. We assume mixed leaves types.</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../com.r3corda.core.transactions/-filtered-transaction/index.html">com.r3corda.core.transactions.FilteredTransaction</a></td>
+<td>
+<p>Class representing merkleized filtered transaction.</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.protocols/-finality-protocol/index.html">com.r3corda.protocols.FinalityProtocol</a></td>
 <td>
 <p>Finalise a transaction by notarising it, then recording it locally, and then sending it to all involved parties.</p>
@@ -975,29 +978,6 @@ attachments are saved to local storage automatically.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts/-fixed-rate/index.html">com.r3corda.contracts.FixedRate</a></td>
-<td>
-<p>A very basic subclass to represent a fixed rate.</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.contracts/-fixed-rate-payment-event/index.html">com.r3corda.contracts.FixedRatePaymentEvent</a></td>
-<td>
-<p>Basic class for the Fixed Rate Payments on the fixed leg - see <a href="../com.r3corda.contracts/-rate-payment-event/index.html">RatePaymentEvent</a>.
-Assumes that the rate is valid.</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.node.services.clientapi/-fixing-session-initiation/index.html">com.r3corda.node.services.clientapi.FixingSessionInitiation</a></td>
-<td>
-<p>This is a temporary handler required for establishing random sessionIDs for the <a href="../com.r3corda.protocols/-two-party-deal-protocol/-fixer/index.html">Fixer</a> and <a href="../com.r3corda.protocols/-two-party-deal-protocol/-floater/index.html">Floater</a> as part of
-running scheduled fixings for the <a href="#">InterestRateSwap</a> contract.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.client.fxutils/-flattened-list/index.html">com.r3corda.client.fxutils.FlattenedList</a></td>
 <td>
 <p><a href="../com.r3corda.client.fxutils/-flattened-list/index.html">FlattenedList</a> flattens the passed in list of <a href="#">ObservableValue</a>s so that changes in individual updates to the values
@@ -1006,21 +986,6 @@ are reflected in the exposed list as expected.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts/-floating-rate/index.html">com.r3corda.contracts.FloatingRate</a></td>
-<td>
-<p>The parent class of the Floating rate classes.</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.contracts/-floating-rate-payment-event/index.html">com.r3corda.contracts.FloatingRatePaymentEvent</a></td>
-<td>
-<p>Basic class for the Floating Rate Payments on the floating leg - see <a href="../com.r3corda.contracts/-rate-payment-event/index.html">RatePaymentEvent</a>.
-If the rate is null returns a zero payment. // TODO: Is this the desired behaviour?</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.contracts/-frequency/index.html">com.r3corda.core.contracts.Frequency</a></td>
 <td>
 <p>Frequency at which an event occurs - the enumerator also casts to an integer specifying the number of times per year
@@ -1059,7 +1024,7 @@ that would divide into (eg annually = 1, semiannual = 2, monthly = 12 etc).</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts.asset/-fungible-asset/index.html">com.r3corda.contracts.asset.FungibleAsset</a></td>
+<a href="../com.r3corda.core.contracts/-fungible-asset/index.html">com.r3corda.core.contracts.FungibleAsset</a></td>
 <td>
 <p>Interface for contract states representing assets which are fungible, countable and issued by a
 specific party. States contain assets which are equivalent (such as cash of the same currency),
@@ -1110,32 +1075,6 @@ container), shares of the same class in a specific company are fungible and coun
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.demos/-i-r-s-demo-node/index.html">com.r3corda.demos.IRSDemoNode</a></td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.demos/-i-r-s-demo-plugin-registry/index.html">com.r3corda.demos.IRSDemoPluginRegistry</a></td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.demos/-i-r-s-demo-role/index.html">com.r3corda.demos.IRSDemoRole</a></td>
-<td>
-<p>Roles. There are 4 modes this demo can be run:</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.simulation/-i-r-s-simulation/index.html">com.r3corda.simulation.IRSSimulation</a></td>
-<td>
-<p>A simulation in which banks execute interest rate swaps with each other, including the fixing events.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.node.services/-identity-service/index.html">com.r3corda.core.node.services.IdentityService</a></td>
 <td>
 <p>An identity service maintains an bidirectional map of <a href="../com.r3corda.core.crypto/-party/index.html">Party</a>s to their associated public keys and thus supports
@@ -1193,11 +1132,15 @@ set via the constructor and the class is immutable.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.core.testing/-in-memory-vault-service/index.html">com.r3corda.core.testing.InMemoryVaultService</a></td>
+<a href="../com.r3corda.core/java.io.-input-stream/index.html">java.io.InputStream</a> (extensions in package com.r3corda.core)</td>
 <td>
-<p>This class implements a simple, in memory vault that tracks states that are owned by us, and also has a convenience
-method to auto-generate some self-issued cash states that can be used for test trading. A real vault would persist
-states relevant to us into a database and once such a vault is implemented, this scaffolding can be removed.</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../com.r3corda.node.utilities/-instant-column-type/index.html">com.r3corda.node.utilities.InstantColumnType</a></td>
+<td>
+<p><a href="#">ColumnType</a> for marshalling to/from database on behalf of <a href="#">java.time.Instant</a>.</p>
 </td>
 </tr>
 <tr>
@@ -1208,7 +1151,7 @@ states relevant to us into a database and once such a vault is implemented, this
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts.asset/-insufficient-balance-exception/index.html">com.r3corda.contracts.asset.InsufficientBalanceException</a></td>
+<a href="../com.r3corda.core.contracts/-insufficient-balance-exception/index.html">com.r3corda.core.contracts.InsufficientBalanceException</a></td>
 <td>
 </td>
 </tr>
@@ -1226,30 +1169,6 @@ states relevant to us into a database and once such a vault is implemented, this
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts/kotlin.-int/index.html">kotlin.Int</a> (extensions in package com.r3corda.contracts)</td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.contracts/-interest-rate-swap/index.html">com.r3corda.contracts.InterestRateSwap</a></td>
-<td>
-<p>The Interest Rate Swap class. For a quick overview of what an IRS is, see here - http://www.pimco.co.uk/EN/Education/Pages/InterestRateSwapsBasics1-08.aspx (no endorsement).
-This contract has 4 significant data classes within it, the "Common", "Calculation", "FixedLeg" and "FloatingLeg".
-It also has 4 commands, "Agree", "Fix", "Pay" and "Mature".
-Currently, we are not interested (excuse pun) in valuing the swap, calculating the PVs, DFs and all that good stuff (soon though).
-This is just a representation of a vanilla Fixed vs Floating (same currency) IRS in the R3 prototype model.</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.demos.api/-interest-rate-swap-a-p-i/index.html">com.r3corda.demos.api.InterestRateSwapAPI</a></td>
-<td>
-<p>This provides a simplified API, currently for demonstration use only.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.math/-interpolator/index.html">com.r3corda.core.math.Interpolator</a></td>
 <td>
 </td>
@@ -1432,6 +1351,13 @@ tables.</p>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.node.utilities/-local-date-time-column-type/index.html">com.r3corda.node.utilities.LocalDateTimeColumnType</a></td>
+<td>
+<p><a href="#">ColumnType</a> for marshalling to/from database on behalf of <a href="#">java.time.LocalDateTime</a>.</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.core.utilities/-log-helper/index.html">com.r3corda.core.utilities.LogHelper</a></td>
 <td>
 <p>A configuration helper that allows modifying the log level for specific loggers</p>
@@ -1477,6 +1403,19 @@ also list the classes that may be used in the generated object graph in order to
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.core.transactions/-merkle-tree/index.html">com.r3corda.core.transactions.MerkleTree</a></td>
+<td>
+<p>Creation and verification of a Merkle Tree for a Wire Transaction.</p>
+</td>
+</tr>
+<tr>
+<td>
+<a href="../com.r3corda.core.crypto/-merkle-tree-exception/index.html">com.r3corda.core.crypto.MerkleTreeException</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.core.messaging/-message/index.html">com.r3corda.core.messaging.Message</a></td>
 <td>
 <p>A message is defined, at this level, to be a (topic, timestamp, byte arrays) triple, where the topic is a string in
@@ -1639,6 +1578,12 @@ for each type of netting is left to the contract to determine.</p>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.client.model/-network-identity-model/index.html">com.r3corda.client.model.NetworkIdentityModel</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.core.node.services/-network-map-cache/index.html">com.r3corda.core.node.services.NetworkMapCache</a></td>
 <td>
 <p>A network map contains lists of nodes on the network along with information about their identity keys, services
@@ -1708,10 +1653,8 @@ loads important data off disk and starts listening for connections.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.demos.api/-node-interest-rates/index.html">com.r3corda.demos.api.NodeInterestRates</a></td>
+<a href="../com.r3corda.node.driver/-node-info-and-config/index.html">com.r3corda.node.driver.NodeInfoAndConfig</a></td>
 <td>
-<p>An interest rates service is an oracle that signs transactions which contain embedded assertions about an interest
-rate fix (e.g. LIBOR, EURIBOR ...).</p>
 </td>
 </tr>
 <tr>
@@ -1759,7 +1702,7 @@ Artemis is a message queue broker and here we run a client connecting to the spe
 <td>
 <a href="../com.r3corda.node.services.events/-node-scheduler-service/index.html">com.r3corda.node.services.events.NodeSchedulerService</a></td>
 <td>
-<p>A first pass of a simple <a href="../com.r3corda.core.node.services/-scheduler-service/index.html">SchedulerService</a> that works with <a href="#">MutableClock</a>s for testing, demonstrations and simulations
+<p>A first pass of a simple <a href="../com.r3corda.core.node.services/-scheduler-service/index.html">SchedulerService</a> that works with <a href="../com.r3corda.node.utilities/-mutable-clock/index.html">MutableClock</a>s for testing, demonstrations and simulations
 that also encompasses the <a href="#">Vault</a> observer for processing transactions.</p>
 </td>
 </tr>
@@ -1903,6 +1846,12 @@ functionality to Java, but it wont arrive for a few years yet</p>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.core.serialization/-ordered-serializer/index.html">com.r3corda.core.serialization.OrderedSerializer</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.core.contracts/-ownable-state/index.html">com.r3corda.core.contracts.OwnableState</a></td>
 <td>
 <p>A contract state that can have a single owner.</p>
@@ -1922,6 +1871,14 @@ functionality to Java, but it wont arrive for a few years yet</p>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.core.crypto/-partial-merkle-tree/index.html">com.r3corda.core.crypto.PartialMerkleTree</a></td>
+<td>
+<p>Building and verification of Partial Merkle Tree.
+Partial Merkle Tree is a minimal tree needed to check that a given set of leaves belongs to a full Merkle Tree.</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.client.model/-partially-resolved-transaction/index.html">com.r3corda.client.model.PartiallyResolvedTransaction</a></td>
 <td>
 <p><a href="../com.r3corda.client.model/-partially-resolved-transaction/index.html">PartiallyResolvedTransaction</a> holds a <a href="../com.r3corda.core.transactions/-signed-transaction/index.html">SignedTransaction</a> that has zero or more inputs resolved. The intent is
@@ -1970,13 +1927,6 @@ ledger. The reference is intended to be encrypted so its meaningless to anyone o
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts/-payment-event/index.html">com.r3corda.contracts.PaymentEvent</a></td>
-<td>
-<p>Top level PaymentEvent class - represents an obligation to pay an amount on a given date, which may be either in the past or the future.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.contracts/-payment-rule/index.html">com.r3corda.core.contracts.PaymentRule</a></td>
 <td>
 <p>Whether the payment should be made before the due date, or after it.</p>
@@ -1984,23 +1934,8 @@ ledger. The reference is intended to be encrypted so its meaningless to anyone o
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.node.services.persistence/-per-file-checkpoint-storage/index.html">com.r3corda.node.services.persistence.PerFileCheckpointStorage</a></td>
+<a href="../com.r3corda.node.services.messaging/-permission-exception/index.html">com.r3corda.node.services.messaging.PermissionException</a></td>
 <td>
-<p>File-based checkpoint storage, storing checkpoints per file.</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.node.services.persistence/-per-file-transaction-storage/index.html">com.r3corda.node.services.persistence.PerFileTransactionStorage</a></td>
-<td>
-<p>File-based transaction storage, storing transactions per file.</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.contracts/-percentage-ratio-unit/index.html">com.r3corda.contracts.PercentageRatioUnit</a></td>
-<td>
-<p>A class to reprecent a percentage in an unambiguous way.</p>
 </td>
 </tr>
 <tr>
@@ -2049,6 +1984,13 @@ Labels should not refer to non-landmarks, for example, they should not contain t
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.core.node/-plugin-service-hub/index.html">com.r3corda.core.node.PluginServiceHub</a></td>
+<td>
+<p>A service hub to be used by the <a href="../com.r3corda.core.node/-corda-plugin-registry/index.html">CordaPluginRegistry</a></p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.core.math/-polynomial/index.html">com.r3corda.core.math.Polynomial</a></td>
 <td>
 <p>Represents a polynomial function of arbitrary degree.</p>
@@ -2089,6 +2031,12 @@ a singleton).</p>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.node.services/-properties-file-r-p-c-user-service/index.html">com.r3corda.node.services.PropertiesFileRPCUserService</a></td>
+<td>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.node.api/-protocol-class-ref/index.html">com.r3corda.node.api.ProtocolClassRef</a></td>
 <td>
 </td>
@@ -2246,37 +2194,11 @@ will buffer up on the server until theyre consumed by the client.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts/-rate/index.html">com.r3corda.contracts.Rate</a></td>
+<a href="../com.r3corda.node.services/-r-p-c-user-service/index.html">com.r3corda.node.services.RPCUserService</a></td>
 <td>
-<p>Parent of the Rate family. Used to denote fixed rates, floating rates, reference rates etc.</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.contracts/-rate-payment-event/index.html">com.r3corda.contracts.RatePaymentEvent</a></td>
-<td>
-<p>A <a href="../com.r3corda.contracts/-rate-payment-event/index.html">RatePaymentEvent</a> represents a dated obligation of payment.
-It is a specialisation / modification of a basic cash flow event (to be written) that has some additional assistance
-functions for interest rate swap legs of the fixed and floating nature.
-For the fixed leg, the rate is already known at creation and therefore the flows can be pre-determined.
-For the floating leg, the rate refers to a reference rate which is to be "fixed" at a point in the future.</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.protocols/-rates-fix-protocol/index.html">com.r3corda.protocols.RatesFixProtocol</a></td>
-<td>
-<p>This protocol queries the given oracle for an interest rate fix, and if it is within the given tolerance embeds the
-fix in the transaction and then proceeds to get the oracle to sign it. Although the <a href="../com.r3corda.protocols/-rates-fix-protocol/call.html">call</a> method combines the query
-and signing step, you can run the steps individually by constructing this object and then using the public methods
-for each step.</p>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.contracts/-ratio-unit/index.html">com.r3corda.contracts.RatioUnit</a></td>
-<td>
-<p>A utility class to prevent the various mixups between percentages, decimals, bips etc.</p>
+<p>Service for retrieving <a href="../com.r3corda.node.services/-user/index.html">User</a> objects representing RPC users who are authorised to use the RPC system. A <a href="../com.r3corda.node.services/-user/index.html">User</a>
+contains their login username and password along with a set of permissions for RPC services they are allowed access
+to. These permissions are represented as <a href="#">String</a>s to allow RPC implementations to add their own permissioning.</p>
 </td>
 </tr>
 <tr>
@@ -2308,14 +2230,6 @@ using a backing HashMap that subclasses should modify.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts/-reference-rate/index.html">com.r3corda.contracts.ReferenceRate</a></td>
-<td>
-<p>So a reference rate is a rate that takes its value from a source at a given date
-e.g. LIBOR 6M as of 17 March 2016. Hence it requires a source (name) and a value date in the getAsOf(..) method.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.serialization/-references-aware-java-serializer/index.html">com.r3corda.core.serialization.ReferencesAwareJavaSerializer</a></td>
 <td>
 <p>Improvement to the builtin JavaSerializer by honouring the <a href="#">Kryo.getReferences</a> setting.</p>
@@ -2368,18 +2282,6 @@ again.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.demos.attachment/-role/index.html">com.r3corda.demos.attachment.Role</a></td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
-<a href="../com.r3corda.demos/-role/index.html">com.r3corda.demos.Role</a></td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.contracts/-schedulable-state/index.html">com.r3corda.core.contracts.SchedulableState</a></td>
 <td>
 </td>
@@ -2516,14 +2418,6 @@ type safety hack.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.node.internal/-server-r-p-c-ops/index.html">com.r3corda.node.internal.ServerRPCOps</a></td>
-<td>
-<p>Server side implementations of RPCs available to MQ based client tools. Execution takes place on the server
-thread (i.e. serially). Arguments are serialised and deserialised automatically.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.node/-service-entry/index.html">com.r3corda.core.node.ServiceEntry</a></td>
 <td>
 <p>Information for an advertised service including the service specific identity information.
@@ -2603,13 +2497,6 @@ SignedTransaction might be invalid or missing: the type does not imply validity.
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.simulation/-simulation/index.html">com.r3corda.simulation.Simulation</a></td>
-<td>
-<p>Base class for network simulations that are based on the unit test / mock environment.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.messaging/-single-message-recipient.html">com.r3corda.core.messaging.SingleMessageRecipient</a></td>
 <td>
 <p>A base class for the case of point-to-point messages</p>
@@ -2781,12 +2668,6 @@ our environment:</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts/kotlin.-string/index.html">kotlin.String</a> (extensions in package com.r3corda.contracts)</td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core/java.time.temporal.-temporal/index.html">java.time.temporal.Temporal</a> (extensions in package com.r3corda.core)</td>
 <td>
 </td>
@@ -2800,6 +2681,13 @@ our environment:</p>
 </tr>
 <tr>
 <td>
+<a href="../com.r3corda.node.utilities/-test-clock/index.html">com.r3corda.node.utilities.TestClock</a></td>
+<td>
+<p>A <a href="http://docs.oracle.com/javase/6/docs/api/java/time/Clock.html">Clock</a> that can have the date advanced for use in demos.</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="../com.r3corda.core/-thread-box/index.html">com.r3corda.core.ThreadBox</a></td>
 <td>
 <p>A threadbox is a simple utility that makes it harder to forget to take a lock before accessing some shared state.
@@ -2864,14 +2752,6 @@ between (after, before).</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.simulation/-trade-simulation/index.html">com.r3corda.simulation.TradeSimulation</a></td>
-<td>
-<p>Simulates a never ending series of trades that go pair-wise through the banks (e.g. A and B trade with each other,
-then B and C trade with each other, then C and A etc).</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.node.services.messaging/-transaction-build-result/index.html">com.r3corda.node.services.messaging.TransactionBuildResult</a></td>
 <td>
 </td>
@@ -3009,7 +2889,9 @@ and seller) and the following steps:</p>
 <td>
 <a href="../com.r3corda.core.contracts/-unique-identifier/index.html">com.r3corda.core.contracts.UniqueIdentifier</a></td>
 <td>
-<p>This class provides a truly unique identifier of a trade, state, or other business object.</p>
+<p>This class provides a truly unique identifier of a trade, state, or other business object, bound to any existing
+external ID. Equality and comparison are based on the unique ID only; if two states somehow have the same UUID but
+different external IDs, it would indicate a problem with handling of IDs.</p>
 </td>
 </tr>
 <tr>
@@ -3028,12 +2910,6 @@ if any of the inputs have already been used in another transaction.</p>
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.contracts/-unknown-type/index.html">com.r3corda.contracts.UnknownType</a></td>
-<td>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../com.r3corda.core.utilities/-untrustworthy-data/index.html">com.r3corda.core.utilities.UntrustworthyData</a></td>
 <td>
 <p>A small utility to approximate taint tracking: if a method gives you back one of these, it means the data came from
@@ -3043,9 +2919,8 @@ first. The wrapper helps you to avoid forgetting this vital step. Things you mig
 </tr>
 <tr>
 <td>
-<a href="../com.r3corda.demos.protocols/-update-business-day-protocol/index.html">com.r3corda.demos.protocols.UpdateBusinessDayProtocol</a></td>
+<a href="../com.r3corda.node.services/-user/index.html">com.r3corda.node.services.User</a></td>
 <td>
-<p>This is a less temporary, demo-oriented way of initiating processing of temporal events.</p>
 </td>
 </tr>
 <tr>

docs/build/html/api/com.r3corda.client.fxutils/-aggregated-list/index.html

@@ -173,14 +173,6 @@ val concatenatedNames2 = people.map(Person::name).fold("", String::plus)</p>
 </tr>
 <tr>
 <td>
-<a href="../../com.r3corda.core/kotlin.collections.-iterable/is-ordered-and-unique.html">isOrderedAndUnique</a></td>
-<td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">, </span><span class="identifier">I</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Comparable</span><span class="symbol">&lt;</span><span class="identifier">I</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">isOrderedAndUnique</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.core$isOrderedAndUnique(kotlin.collections.Iterable((com.r3corda.core.isOrderedAndUnique.T)), kotlin.Function1((com.r3corda.core.isOrderedAndUnique.T, com.r3corda.core.isOrderedAndUnique.I)))/extractId">extractId</span><span class="symbol">:</span>&nbsp;<span class="identifier">T</span><span class="symbol">.</span><span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">I</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Boolean</span></code><p>Determine if an iterable data types contents are ordered and unique, based on their <a href="#">Comparable</a>.compareTo
-function.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../javafx.collections.-observable-list/last.html">last</a></td>
 <td>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">last</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">?</span><span class="symbol">&gt;</span></code></td>

docs/build/html/api/com.r3corda.client.fxutils/-chosen-list/index.html

@@ -130,14 +130,6 @@ val concatenatedNames2 = people.map(Person::name).fold("", String::plus)</p>
 </tr>
 <tr>
 <td>
-<a href="../../com.r3corda.core/kotlin.collections.-iterable/is-ordered-and-unique.html">isOrderedAndUnique</a></td>
-<td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">, </span><span class="identifier">I</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Comparable</span><span class="symbol">&lt;</span><span class="identifier">I</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">isOrderedAndUnique</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.core$isOrderedAndUnique(kotlin.collections.Iterable((com.r3corda.core.isOrderedAndUnique.T)), kotlin.Function1((com.r3corda.core.isOrderedAndUnique.T, com.r3corda.core.isOrderedAndUnique.I)))/extractId">extractId</span><span class="symbol">:</span>&nbsp;<span class="identifier">T</span><span class="symbol">.</span><span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">I</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Boolean</span></code><p>Determine if an iterable data types contents are ordered and unique, based on their <a href="#">Comparable</a>.compareTo
-function.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../javafx.collections.-observable-list/last.html">last</a></td>
 <td>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">last</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">?</span><span class="symbol">&gt;</span></code></td>

docs/build/html/api/com.r3corda.client.fxutils/-concatenated-list/index.html

@@ -132,14 +132,6 @@ val concatenatedNames2 = people.map(Person::name).fold("", String::plus)</p>
 </tr>
 <tr>
 <td>
-<a href="../../com.r3corda.core/kotlin.collections.-iterable/is-ordered-and-unique.html">isOrderedAndUnique</a></td>
-<td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">, </span><span class="identifier">I</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Comparable</span><span class="symbol">&lt;</span><span class="identifier">I</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">isOrderedAndUnique</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.core$isOrderedAndUnique(kotlin.collections.Iterable((com.r3corda.core.isOrderedAndUnique.T)), kotlin.Function1((com.r3corda.core.isOrderedAndUnique.T, com.r3corda.core.isOrderedAndUnique.I)))/extractId">extractId</span><span class="symbol">:</span>&nbsp;<span class="identifier">T</span><span class="symbol">.</span><span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">I</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Boolean</span></code><p>Determine if an iterable data types contents are ordered and unique, based on their <a href="#">Comparable</a>.compareTo
-function.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../javafx.collections.-observable-list/last.html">last</a></td>
 <td>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">last</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">?</span><span class="symbol">&gt;</span></code></td>

docs/build/html/api/com.r3corda.client.fxutils/-flattened-list/index.html

@@ -158,14 +158,6 @@ val concatenatedNames2 = people.map(Person::name).fold("", String::plus)</p>
 </tr>
 <tr>
 <td>
-<a href="../../com.r3corda.core/kotlin.collections.-iterable/is-ordered-and-unique.html">isOrderedAndUnique</a></td>
-<td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">, </span><span class="identifier">I</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Comparable</span><span class="symbol">&lt;</span><span class="identifier">I</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">isOrderedAndUnique</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.core$isOrderedAndUnique(kotlin.collections.Iterable((com.r3corda.core.isOrderedAndUnique.T)), kotlin.Function1((com.r3corda.core.isOrderedAndUnique.T, com.r3corda.core.isOrderedAndUnique.I)))/extractId">extractId</span><span class="symbol">:</span>&nbsp;<span class="identifier">T</span><span class="symbol">.</span><span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">I</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Boolean</span></code><p>Determine if an iterable data types contents are ordered and unique, based on their <a href="#">Comparable</a>.compareTo
-function.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../javafx.collections.-observable-list/last.html">last</a></td>
 <td>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">last</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">?</span><span class="symbol">&gt;</span></code></td>

docs/build/html/api/com.r3corda.client.fxutils/-map-values-list/index.html

@@ -108,14 +108,6 @@ val concatenatedNames2 = people.map(Person::name).fold("", String::plus)</p>
 </tr>
 <tr>
 <td>
-<a href="../../com.r3corda.core/kotlin.collections.-iterable/is-ordered-and-unique.html">isOrderedAndUnique</a></td>
-<td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">, </span><span class="identifier">I</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Comparable</span><span class="symbol">&lt;</span><span class="identifier">I</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">isOrderedAndUnique</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.core$isOrderedAndUnique(kotlin.collections.Iterable((com.r3corda.core.isOrderedAndUnique.T)), kotlin.Function1((com.r3corda.core.isOrderedAndUnique.T, com.r3corda.core.isOrderedAndUnique.I)))/extractId">extractId</span><span class="symbol">:</span>&nbsp;<span class="identifier">T</span><span class="symbol">.</span><span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">I</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Boolean</span></code><p>Determine if an iterable data types contents are ordered and unique, based on their <a href="#">Comparable</a>.compareTo
-function.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../javafx.collections.-observable-list/last.html">last</a></td>
 <td>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">last</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">?</span><span class="symbol">&gt;</span></code></td>

docs/build/html/api/com.r3corda.client.fxutils/-mapped-list/index.html

@@ -140,14 +140,6 @@ val concatenatedNames2 = people.map(Person::name).fold("", String::plus)</p>
 </tr>
 <tr>
 <td>
-<a href="../../com.r3corda.core/kotlin.collections.-iterable/is-ordered-and-unique.html">isOrderedAndUnique</a></td>
-<td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">, </span><span class="identifier">I</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Comparable</span><span class="symbol">&lt;</span><span class="identifier">I</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">isOrderedAndUnique</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.core$isOrderedAndUnique(kotlin.collections.Iterable((com.r3corda.core.isOrderedAndUnique.T)), kotlin.Function1((com.r3corda.core.isOrderedAndUnique.T, com.r3corda.core.isOrderedAndUnique.I)))/extractId">extractId</span><span class="symbol">:</span>&nbsp;<span class="identifier">T</span><span class="symbol">.</span><span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">I</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Boolean</span></code><p>Determine if an iterable data types contents are ordered and unique, based on their <a href="#">Comparable</a>.compareTo
-function.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../javafx.collections.-observable-list/last.html">last</a></td>
 <td>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">last</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">?</span><span class="symbol">&gt;</span></code></td>

docs/build/html/api/com.r3corda.client.fxutils/-replayed-list/index.html

@@ -138,14 +138,6 @@ val concatenatedNames2 = people.map(Person::name).fold("", String::plus)</p>
 </tr>
 <tr>
 <td>
-<a href="../../com.r3corda.core/kotlin.collections.-iterable/is-ordered-and-unique.html">isOrderedAndUnique</a></td>
-<td>
-<code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">, </span><span class="identifier">I</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Comparable</span><span class="symbol">&lt;</span><span class="identifier">I</span><span class="symbol">&gt;</span><span class="symbol">&gt;</span> <span class="identifier">Iterable</span><span class="symbol">&lt;</span><span class="identifier">T</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">isOrderedAndUnique</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.core$isOrderedAndUnique(kotlin.collections.Iterable((com.r3corda.core.isOrderedAndUnique.T)), kotlin.Function1((com.r3corda.core.isOrderedAndUnique.T, com.r3corda.core.isOrderedAndUnique.I)))/extractId">extractId</span><span class="symbol">:</span>&nbsp;<span class="identifier">T</span><span class="symbol">.</span><span class="symbol">(</span><span class="symbol">)</span>&nbsp;<span class="symbol">-&gt;</span>&nbsp;<span class="identifier">I</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Boolean</span></code><p>Determine if an iterable data types contents are ordered and unique, based on their <a href="#">Comparable</a>.compareTo
-function.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="../javafx.collections.-observable-list/last.html">last</a></td>
 <td>
 <code><span class="keyword">fun </span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span> <span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">&gt;</span><span class="symbol">.</span><span class="identifier">last</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><span class="identifier">A</span><span class="symbol">?</span><span class="symbol">&gt;</span></code></td>

docs/build/html/api/com.r3corda.client.model/-gathered-transaction-data-model/collected-transactions.html

@@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>GatheredTransactionDataModel.collectedTransactions - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">GatheredTransactionDataModel</a>&nbsp;/&nbsp;<a href=".">collectedTransactions</a><br/>
-<br/>
-<h1>collectedTransactions</h1>
-<a name="com.r3corda.client.model.GatheredTransactionDataModel$collectedTransactions"></a>
-<code><span class="keyword">val </span><span class="identifier">collectedTransactions</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.client.model/-gathered-transaction-data-model/gathered-transaction-data-list.html

@@ -8,7 +8,7 @@
 <br/>
 <h1>gatheredTransactionDataList</h1>
 <a name="com.r3corda.client.model.GatheredTransactionDataModel$gatheredTransactionDataList"></a>
-<code><span class="keyword">val </span><span class="identifier">gatheredTransactionDataList</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="keyword">out</span>&nbsp;<a href="../-gathered-transaction-data/index.html"><span class="identifier">GatheredTransactionData</span></a><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">val </span><span class="identifier">gatheredTransactionDataList</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
 <p>We JOIN the transaction list with state machines</p>
 <br/>
 <br/>

docs/build/html/api/com.r3corda.client.model/-gathered-transaction-data-model/index.html

@@ -28,59 +28,11 @@
 <tbody>
 <tr>
 <td>
-<a href="collected-transactions.html">collectedTransactions</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">collectedTransactions</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code></td>
-</tr>
-<tr>
-<td>
 <a href="gathered-transaction-data-list.html">gatheredTransactionDataList</a></td>
 <td>
-<code><span class="keyword">val </span><span class="identifier">gatheredTransactionDataList</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><span class="keyword">out</span>&nbsp;<a href="../-gathered-transaction-data/index.html"><span class="identifier">GatheredTransactionData</span></a><span class="symbol">&gt;</span></code><p>We JOIN the transaction list with state machines</p>
+<code><span class="keyword">val </span><span class="identifier">gatheredTransactionDataList</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><p>We JOIN the transaction list with state machines</p>
 </td>
 </tr>
-<tr>
-<td>
-<a href="partially-resolved-transactions.html">partiallyResolvedTransactions</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">partiallyResolvedTransactions</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code></td>
-</tr>
-<tr>
-<td>
-<a href="progress-events.html">progressEvents</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">progressEvents</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code></td>
-</tr>
-<tr>
-<td>
-<a href="sm-tx-mapping-list.html">smTxMappingList</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">smTxMappingList</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code></td>
-</tr>
-<tr>
-<td>
-<a href="state-machine-data-list.html">stateMachineDataList</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">stateMachineDataList</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><a href="../-state-machine-data/index.html"><span class="identifier">StateMachineData</span></a><span class="symbol">&gt;</span></code></td>
-</tr>
-<tr>
-<td>
-<a href="state-machine-data-map.html">stateMachineDataMap</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">stateMachineDataMap</span><span class="symbol">: </span><span class="identifier">ObservableMap</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.protocols/-state-machine-run-id/index.html"><span class="identifier">StateMachineRunId</span></a><span class="symbol">,</span>&nbsp;<a href="../-state-machine-data/index.html"><span class="identifier">StateMachineData</span></a><span class="symbol">&gt;</span></code></td>
-</tr>
-<tr>
-<td>
-<a href="state-machine-status.html">stateMachineStatus</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">stateMachineStatus</span><span class="symbol">: </span><span class="identifier">ObservableMap</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.protocols/-state-machine-run-id/index.html"><span class="identifier">StateMachineRunId</span></a><span class="symbol">,</span>&nbsp;<span class="keyword">out</span>&nbsp;<span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><a href="../-state-machine-status/index.html"><span class="identifier">StateMachineStatus</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code></td>
-</tr>
-<tr>
-<td>
-<a href="transaction-map.html">transactionMap</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">transactionMap</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code></td>
-</tr>
 </tbody>
 </table>
 </BODY>

docs/build/html/api/com.r3corda.client.model/-gathered-transaction-data-model/partially-resolved-transactions.html

@@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>GatheredTransactionDataModel.partiallyResolvedTransactions - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">GatheredTransactionDataModel</a>&nbsp;/&nbsp;<a href=".">partiallyResolvedTransactions</a><br/>
-<br/>
-<h1>partiallyResolvedTransactions</h1>
-<a name="com.r3corda.client.model.GatheredTransactionDataModel$partiallyResolvedTransactions"></a>
-<code><span class="keyword">val </span><span class="identifier">partiallyResolvedTransactions</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.client.model/-gathered-transaction-data-model/progress-events.html

@@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>GatheredTransactionDataModel.progressEvents - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">GatheredTransactionDataModel</a>&nbsp;/&nbsp;<a href=".">progressEvents</a><br/>
-<br/>
-<h1>progressEvents</h1>
-<a name="com.r3corda.client.model.GatheredTransactionDataModel$progressEvents"></a>
-<code><span class="keyword">val </span><span class="identifier">progressEvents</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.client.model/-gathered-transaction-data-model/sm-tx-mapping-list.html

@@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>GatheredTransactionDataModel.smTxMappingList - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">GatheredTransactionDataModel</a>&nbsp;/&nbsp;<a href=".">smTxMappingList</a><br/>
-<br/>
-<h1>smTxMappingList</h1>
-<a name="com.r3corda.client.model.GatheredTransactionDataModel$smTxMappingList"></a>
-<code><span class="keyword">val </span><span class="identifier">smTxMappingList</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.client.model/-gathered-transaction-data-model/state-machine-data-list.html

@@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>GatheredTransactionDataModel.stateMachineDataList - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">GatheredTransactionDataModel</a>&nbsp;/&nbsp;<a href=".">stateMachineDataList</a><br/>
-<br/>
-<h1>stateMachineDataList</h1>
-<a name="com.r3corda.client.model.GatheredTransactionDataModel$stateMachineDataList"></a>
-<code><span class="keyword">val </span><span class="identifier">stateMachineDataList</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><a href="../-state-machine-data/index.html"><span class="identifier">StateMachineData</span></a><span class="symbol">&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.client.model/-gathered-transaction-data-model/state-machine-data-map.html

@@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>GatheredTransactionDataModel.stateMachineDataMap - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">GatheredTransactionDataModel</a>&nbsp;/&nbsp;<a href=".">stateMachineDataMap</a><br/>
-<br/>
-<h1>stateMachineDataMap</h1>
-<a name="com.r3corda.client.model.GatheredTransactionDataModel$stateMachineDataMap"></a>
-<code><span class="keyword">val </span><span class="identifier">stateMachineDataMap</span><span class="symbol">: </span><span class="identifier">ObservableMap</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.protocols/-state-machine-run-id/index.html"><span class="identifier">StateMachineRunId</span></a><span class="symbol">,</span>&nbsp;<a href="../-state-machine-data/index.html"><span class="identifier">StateMachineData</span></a><span class="symbol">&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.client.model/-gathered-transaction-data-model/state-machine-status.html

@@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>GatheredTransactionDataModel.stateMachineStatus - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">GatheredTransactionDataModel</a>&nbsp;/&nbsp;<a href=".">stateMachineStatus</a><br/>
-<br/>
-<h1>stateMachineStatus</h1>
-<a name="com.r3corda.client.model.GatheredTransactionDataModel$stateMachineStatus"></a>
-<code><span class="keyword">val </span><span class="identifier">stateMachineStatus</span><span class="symbol">: </span><span class="identifier">ObservableMap</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.protocols/-state-machine-run-id/index.html"><span class="identifier">StateMachineRunId</span></a><span class="symbol">,</span>&nbsp;<span class="keyword">out</span>&nbsp;<span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><a href="../-state-machine-status/index.html"><span class="identifier">StateMachineStatus</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.client.model/-gathered-transaction-data-model/transaction-map.html

@@ -1,15 +0,0 @@
-<HTML>
-<HEAD>
-<title>GatheredTransactionDataModel.transactionMap - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">GatheredTransactionDataModel</a>&nbsp;/&nbsp;<a href=".">transactionMap</a><br/>
-<br/>
-<h1>transactionMap</h1>
-<a name="com.r3corda.client.model.GatheredTransactionDataModel$transactionMap"></a>
-<code><span class="keyword">val </span><span class="identifier">transactionMap</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.client.model/-network-identity-model/-init-.html

@@ -0,0 +1,14 @@
+<HTML>
+<HEAD>
+<title>NetworkIdentityModel.<init> - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">NetworkIdentityModel</a>&nbsp;/&nbsp;<a href=".">&lt;init&gt;</a><br/>
+<br/>
+<h1>&lt;init&gt;</h1>
+<code><span class="identifier">NetworkIdentityModel</span><span class="symbol">(</span><span class="symbol">)</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>

docs/build/html/api/com.r3corda.client.model/-network-identity-model/index.html

@@ -0,0 +1,59 @@
+<HTML>
+<HEAD>
+<title>NetworkIdentityModel - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href=".">NetworkIdentityModel</a><br/>
+<br/>
+<h1>NetworkIdentityModel</h1>
+<code><span class="keyword">class </span><span class="identifier">NetworkIdentityModel</span></code><br/>
+<br/>
+<br/>
+<h3>Constructors</h3>
+<table>
+<tbody>
+<tr>
+<td>
+<a href="-init-.html">&lt;init&gt;</a></td>
+<td>
+<code><span class="identifier">NetworkIdentityModel</span><span class="symbol">(</span><span class="symbol">)</span></code></td>
+</tr>
+</tbody>
+</table>
+<h3>Properties</h3>
+<table>
+<tbody>
+<tr>
+<td>
+<a href="my-identity.html">myIdentity</a></td>
+<td>
+<code><span class="keyword">val </span><span class="identifier">myIdentity</span><span class="symbol">: </span><span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">?</span><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
+<a href="notaries.html">notaries</a></td>
+<td>
+<code><span class="keyword">val </span><span class="identifier">notaries</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
+<a href="parties.html">parties</a></td>
+<td>
+<code><span class="keyword">val </span><span class="identifier">parties</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">&gt;</span></code></td>
+</tr>
+</tbody>
+</table>
+<h3>Functions</h3>
+<table>
+<tbody>
+<tr>
+<td>
+<a href="lookup.html">lookup</a></td>
+<td>
+<code><span class="keyword">fun </span><span class="identifier">lookup</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.model.NetworkIdentityModel$lookup(java.security.PublicKey)/publicKey">publicKey</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../com.r3corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">?</span></code></td>
+</tr>
+</tbody>
+</table>
+</BODY>
+</HTML>

docs/build/html/api/com.r3corda.client.model/-network-identity-model/lookup.html

@@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>NetworkIdentityModel.lookup - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">NetworkIdentityModel</a>&nbsp;/&nbsp;<a href=".">lookup</a><br/>
+<br/>
+<h1>lookup</h1>
+<a name="com.r3corda.client.model.NetworkIdentityModel$lookup(java.security.PublicKey)"></a>
+<code><span class="keyword">fun </span><span class="identifier">lookup</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.model.NetworkIdentityModel$lookup(java.security.PublicKey)/publicKey">publicKey</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../com.r3corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">?</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>

docs/build/html/api/com.r3corda.client.model/-network-identity-model/my-identity.html

@@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>NetworkIdentityModel.myIdentity - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">NetworkIdentityModel</a>&nbsp;/&nbsp;<a href=".">myIdentity</a><br/>
+<br/>
+<h1>myIdentity</h1>
+<a name="com.r3corda.client.model.NetworkIdentityModel$myIdentity"></a>
+<code><span class="keyword">val </span><span class="identifier">myIdentity</span><span class="symbol">: </span><span class="identifier">ObservableValue</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">?</span><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>

docs/build/html/api/com.r3corda.client.model/-network-identity-model/notaries.html

@@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>NetworkIdentityModel.notaries - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">NetworkIdentityModel</a>&nbsp;/&nbsp;<a href=".">notaries</a><br/>
+<br/>
+<h1>notaries</h1>
+<a name="com.r3corda.client.model.NetworkIdentityModel$notaries"></a>
+<code><span class="keyword">val </span><span class="identifier">notaries</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>

docs/build/html/api/com.r3corda.client.model/-network-identity-model/parties.html

@@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>NetworkIdentityModel.parties - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">NetworkIdentityModel</a>&nbsp;/&nbsp;<a href=".">parties</a><br/>
+<br/>
+<h1>parties</h1>
+<a name="com.r3corda.client.model.NetworkIdentityModel$parties"></a>
+<code><span class="keyword">val </span><span class="identifier">parties</span><span class="symbol">: </span><span class="identifier">ObservableList</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>

docs/build/html/api/com.r3corda.client.model/-node-monitor-model/index.html

@@ -34,12 +34,24 @@
 </tr>
 <tr>
 <td>
+<a href="network-map.html">networkMap</a></td>
+<td>
+<code><span class="keyword">val </span><span class="identifier">networkMap</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.node.services/-network-map-cache/-map-change/index.html"><span class="identifier">MapChange</span></a><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
 <a href="progress-tracking.html">progressTracking</a></td>
 <td>
 <code><span class="keyword">val </span><span class="identifier">progressTracking</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../-progress-tracking-event/index.html"><span class="identifier">ProgressTrackingEvent</span></a><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>
+<a href="proxy-observable.html">proxyObservable</a></td>
+<td>
+<code><span class="keyword">val </span><span class="identifier">proxyObservable</span><span class="symbol">: </span><span class="identifier">SimpleObjectProperty</span><span class="symbol">&lt;</span><a href="../../com.r3corda.node.services.messaging/-corda-r-p-c-ops/index.html"><span class="identifier">CordaRPCOps</span></a><span class="symbol">?</span><span class="symbol">&gt;</span></code></td>
+</tr>
+<tr>
+<td>
 <a href="state-machine-transaction-mapping.html">stateMachineTransactionMapping</a></td>
 <td>
 <code><span class="keyword">val </span><span class="identifier">stateMachineTransactionMapping</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.node.services/-state-machine-transaction-mapping/index.html"><span class="identifier">StateMachineTransactionMapping</span></a><span class="symbol">&gt;</span></code></td>
@@ -71,7 +83,8 @@
 <td>
 <a href="register.html">register</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">register</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(com.r3corda.core.node.NodeInfo, java.nio.file.Path)/vaultMonitorNodeInfo">vaultMonitorNodeInfo</span><span class="symbol">:</span>&nbsp;<a href="../../com.r3corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(com.r3corda.core.node.NodeInfo, java.nio.file.Path)/certificatesPath">certificatesPath</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/nio/file/Path.html"><span class="identifier">Path</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Register for updates to/from a given vault.</p>
+<code><span class="keyword">fun </span><span class="identifier">register</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(, com.r3corda.node.services.config.NodeSSLConfiguration, kotlin.String, kotlin.String)/nodeHostAndPort">nodeHostAndPort</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(, com.r3corda.node.services.config.NodeSSLConfiguration, kotlin.String, kotlin.String)/sslConfig">sslConfig</span><span class="symbol">:</span>&nbsp;<a href="../../com.r3corda.node.services.config/-node-s-s-l-configuration/index.html"><span class="identifier">NodeSSLConfiguration</span></a><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(, com.r3corda.node.services.config.NodeSSLConfiguration, kotlin.String, kotlin.String)/username">username</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(, com.r3corda.node.services.config.NodeSSLConfiguration, kotlin.String, kotlin.String)/password">password</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Register for updates to/from a given vault.
+TODO provide an unsubscribe mechanism</p>
 </td>
 </tr>
 </tbody>

docs/build/html/api/com.r3corda.client.model/-node-monitor-model/network-map.html

@@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>NodeMonitorModel.networkMap - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">NodeMonitorModel</a>&nbsp;/&nbsp;<a href=".">networkMap</a><br/>
+<br/>
+<h1>networkMap</h1>
+<a name="com.r3corda.client.model.NodeMonitorModel$networkMap"></a>
+<code><span class="keyword">val </span><span class="identifier">networkMap</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">&lt;</span><a href="../../com.r3corda.core.node.services/-network-map-cache/-map-change/index.html"><span class="identifier">MapChange</span></a><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>

docs/build/html/api/com.r3corda.client.model/-node-monitor-model/proxy-observable.html

@@ -0,0 +1,15 @@
+<HTML>
+<HEAD>
+<title>NodeMonitorModel.proxyObservable - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">NodeMonitorModel</a>&nbsp;/&nbsp;<a href=".">proxyObservable</a><br/>
+<br/>
+<h1>proxyObservable</h1>
+<a name="com.r3corda.client.model.NodeMonitorModel$proxyObservable"></a>
+<code><span class="keyword">val </span><span class="identifier">proxyObservable</span><span class="symbol">: </span><span class="identifier">SimpleObjectProperty</span><span class="symbol">&lt;</span><a href="../../com.r3corda.node.services.messaging/-corda-r-p-c-ops/index.html"><span class="identifier">CordaRPCOps</span></a><span class="symbol">?</span><span class="symbol">&gt;</span></code><br/>
+<br/>
+<br/>
+</BODY>
+</HTML>

docs/build/html/api/com.r3corda.client.model/-node-monitor-model/register.html

@@ -7,16 +7,10 @@
 <a href="../index.html">com.r3corda.client.model</a>&nbsp;/&nbsp;<a href="index.html">NodeMonitorModel</a>&nbsp;/&nbsp;<a href=".">register</a><br/>
 <br/>
 <h1>register</h1>
-<a name="com.r3corda.client.model.NodeMonitorModel$register(com.r3corda.core.node.NodeInfo, java.nio.file.Path)"></a>
-<code><span class="keyword">fun </span><span class="identifier">register</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(com.r3corda.core.node.NodeInfo, java.nio.file.Path)/vaultMonitorNodeInfo">vaultMonitorNodeInfo</span><span class="symbol">:</span>&nbsp;<a href="../../com.r3corda.core.node/-node-info/index.html"><span class="identifier">NodeInfo</span></a><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(com.r3corda.core.node.NodeInfo, java.nio.file.Path)/certificatesPath">certificatesPath</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/nio/file/Path.html"><span class="identifier">Path</span></a><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
-<p>Register for updates to/from a given vault.</p>
-<h3>Parameters</h3>
-<a name="messagingService"></a>
-<code>messagingService</code> - The messaging to use for communication.<br/>
-<br/>
-<a name="monitorNodeInfo"></a>
-<code>monitorNodeInfo</code> - the <a href="#">Node</a> to connect to.
-TODO provide an unsubscribe mechanism<br/>
+<a name="com.r3corda.client.model.NodeMonitorModel$register(, com.r3corda.node.services.config.NodeSSLConfiguration, kotlin.String, kotlin.String)"></a>
+<code><span class="keyword">fun </span><span class="identifier">register</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(, com.r3corda.node.services.config.NodeSSLConfiguration, kotlin.String, kotlin.String)/nodeHostAndPort">nodeHostAndPort</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(, com.r3corda.node.services.config.NodeSSLConfiguration, kotlin.String, kotlin.String)/sslConfig">sslConfig</span><span class="symbol">:</span>&nbsp;<a href="../../com.r3corda.node.services.config/-node-s-s-l-configuration/index.html"><span class="identifier">NodeSSLConfiguration</span></a><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(, com.r3corda.node.services.config.NodeSSLConfiguration, kotlin.String, kotlin.String)/username">username</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.model.NodeMonitorModel$register(, com.r3corda.node.services.config.NodeSSLConfiguration, kotlin.String, kotlin.String)/password">password</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
+<p>Register for updates to/from a given vault.
+TODO provide an unsubscribe mechanism</p>
 <br/>
 <br/>
 </BODY>

docs/build/html/api/com.r3corda.client.model/index.html

@@ -58,6 +58,12 @@ TODO hook up an actual oracle</p>
 </tr>
 <tr>
 <td>
+<a href="-network-identity-model/index.html">NetworkIdentityModel</a></td>
+<td>
+<code><span class="keyword">class </span><span class="identifier">NetworkIdentityModel</span></code></td>
+</tr>
+<tr>
+<td>
 <a href="-node-monitor-model/index.html">NodeMonitorModel</a></td>
 <td>
 <code><span class="keyword">class </span><span class="identifier">NodeMonitorModel</span></code><p>This model exposes raw event streams to and from the node.</p>

docs/build/html/api/com.r3corda.client/-corda-r-p-c-client/-init-.html

@@ -7,7 +7,7 @@
 <a href="../index.html">com.r3corda.client</a>&nbsp;/&nbsp;<a href="index.html">CordaRPCClient</a>&nbsp;/&nbsp;<a href=".">&lt;init&gt;</a><br/>
 <br/>
 <h1>&lt;init&gt;</h1>
-<code><span class="identifier">CordaRPCClient</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.CordaRPCClient$<init>(, java.nio.file.Path)/host">host</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.CordaRPCClient$<init>(, java.nio.file.Path)/certificatesPath">certificatesPath</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/nio/file/Path.html"><span class="identifier">Path</span></a><span class="symbol">)</span></code><br/>
+<code><span class="identifier">CordaRPCClient</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.CordaRPCClient$<init>(, com.r3corda.node.services.config.NodeSSLConfiguration)/host">host</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.CordaRPCClient$<init>(, com.r3corda.node.services.config.NodeSSLConfiguration)/config">config</span><span class="symbol">:</span>&nbsp;<a href="../../com.r3corda.node.services.config/-node-s-s-l-configuration/index.html"><span class="identifier">NodeSSLConfiguration</span></a><span class="symbol">)</span></code><br/>
 <p>An RPC client connects to the specified server and allows you to make calls to the server that perform various
 useful tasks. See the documentation for <a href="proxy.html">proxy</a> or review the docsite to learn more about how this API works.</p>
 <br/>

docs/build/html/api/com.r3corda.client/-corda-r-p-c-client/config.html

@@ -0,0 +1,17 @@
+<HTML>
+<HEAD>
+<title>CordaRPCClient.config - </title>
+<link rel="stylesheet" href="../../style.css">
+</HEAD>
+<BODY>
+<a href="../index.html">com.r3corda.client</a>&nbsp;/&nbsp;<a href="index.html">CordaRPCClient</a>&nbsp;/&nbsp;<a href=".">config</a><br/>
+<br/>
+<h1>config</h1>
+<a name="com.r3corda.client.CordaRPCClient$config"></a>
+<code><span class="keyword">val </span><span class="identifier">config</span><span class="symbol">: </span><a href="../../com.r3corda.node.services.config/-node-s-s-l-configuration/index.html"><span class="identifier">NodeSSLConfiguration</span></a></code><br/>
+Overrides <a href="../../com.r3corda.node.services.messaging/-artemis-messaging-component/config.html">ArtemisMessagingComponent.config</a><br/>
+<p>The config object is used to pass in the passwords for the certificate KeyStore and TrustStore</p>
+<br/>
+<br/>
+</BODY>
+</HTML>

docs/build/html/api/com.r3corda.client/-corda-r-p-c-client/index.html

@@ -19,7 +19,7 @@ useful tasks. See the documentation for <a href="proxy.html">proxy</a> or review
 <td>
 <a href="-init-.html">&lt;init&gt;</a></td>
 <td>
-<code><span class="identifier">CordaRPCClient</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.CordaRPCClient$<init>(, java.nio.file.Path)/host">host</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.CordaRPCClient$<init>(, java.nio.file.Path)/certificatesPath">certificatesPath</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/nio/file/Path.html"><span class="identifier">Path</span></a><span class="symbol">)</span></code><p>An RPC client connects to the specified server and allows you to make calls to the server that perform various
+<code><span class="identifier">CordaRPCClient</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.CordaRPCClient$<init>(, com.r3corda.node.services.config.NodeSSLConfiguration)/host">host</span><span class="symbol">:</span>&nbsp;<span class="identifier">&lt;ERROR CLASS&gt;</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.CordaRPCClient$<init>(, com.r3corda.node.services.config.NodeSSLConfiguration)/config">config</span><span class="symbol">:</span>&nbsp;<a href="../../com.r3corda.node.services.config/-node-s-s-l-configuration/index.html"><span class="identifier">NodeSSLConfiguration</span></a><span class="symbol">)</span></code><p>An RPC client connects to the specified server and allows you to make calls to the server that perform various
 useful tasks. See the documentation for <a href="proxy.html">proxy</a> or review the docsite to learn more about how this API works.</p>
 </td>
 </tr>
@@ -30,30 +30,17 @@ useful tasks. See the documentation for <a href="proxy.html">proxy</a> or review
 <tbody>
 <tr>
 <td>
+<a href="config.html">config</a></td>
+<td>
+<code><span class="keyword">val </span><span class="identifier">config</span><span class="symbol">: </span><a href="../../com.r3corda.node.services.config/-node-s-s-l-configuration/index.html"><span class="identifier">NodeSSLConfiguration</span></a></code><p>The config object is used to pass in the passwords for the certificate KeyStore and TrustStore</p>
+</td>
+</tr>
+<tr>
+<td>
 <a href="host.html">host</a></td>
 <td>
 <code><span class="keyword">val </span><span class="identifier">host</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code></td>
 </tr>
-<tr>
-<td>
-<a href="my-i-d.html">myID</a></td>
-<td>
-<code><span class="keyword">var </span><span class="identifier">myID</span><span class="symbol">: </span><span class="identifier">Int</span></code><p>An ID that we used to identify this connection on the server side: kind of like a local port number but
-it persists for the lifetime of this process and survives short TCP connection interruptions. Is -1
-until <a href="start.html">start</a> is called.</p>
-</td>
-</tr>
-</tbody>
-</table>
-<h3>Inherited Properties</h3>
-<table>
-<tbody>
-<tr>
-<td>
-<a href="../../com.r3corda.node.services.messaging/-artemis-messaging-component/config.html">config</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">config</span><span class="symbol">: </span><a href="../../com.r3corda.node.services.config/-node-s-s-l-configuration/index.html"><span class="identifier">NodeSSLConfiguration</span></a></code></td>
-</tr>
 </tbody>
 </table>
 <h3>Functions</h3>
@@ -80,7 +67,7 @@ proxies.</p>
 <td>
 <a href="start.html">start</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">start</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Opens the connection to the server and registers a JVM shutdown hook to cleanly disconnect.</p>
+<code><span class="keyword">fun </span><span class="identifier">start</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.CordaRPCClient$start(kotlin.String, kotlin.String)/username">username</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.CordaRPCClient$start(kotlin.String, kotlin.String)/password">password</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><p>Opens the connection to the server and registers a JVM shutdown hook to cleanly disconnect.</p>
 </td>
 </tr>
 </tbody>
@@ -104,6 +91,12 @@ unfortunately Artemis tends to bury the exception when the password is wrong.</p
 </tr>
 <tr>
 <td>
+<a href="../../com.r3corda.node.services.messaging/-artemis-messaging-component/expected-on-default-file-system.html">expectedOnDefaultFileSystem</a></td>
+<td>
+<code><span class="keyword">fun </span><a href="http://docs.oracle.com/javase/6/docs/api/java/nio/file/Path.html"><span class="identifier">Path</span></a><span class="symbol">.</span><span class="identifier">expectedOnDefaultFileSystem</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code></td>
+</tr>
+<tr>
+<td>
 <a href="../../com.r3corda.node.services.messaging/-artemis-messaging-component/parse-key-from-queue-name.html">parseKeyFromQueueName</a></td>
 <td>
 <code><span class="keyword">fun </span><span class="identifier">parseKeyFromQueueName</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.node.services.messaging.ArtemisMessagingComponent$parseKeyFromQueueName(kotlin.String)/name">name</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code></td>

docs/build/html/api/com.r3corda.client/-corda-r-p-c-client/my-i-d.html

@@ -1,18 +0,0 @@
-<HTML>
-<HEAD>
-<title>CordaRPCClient.myID - </title>
-<link rel="stylesheet" href="../../style.css">
-</HEAD>
-<BODY>
-<a href="../index.html">com.r3corda.client</a>&nbsp;/&nbsp;<a href="index.html">CordaRPCClient</a>&nbsp;/&nbsp;<a href=".">myID</a><br/>
-<br/>
-<h1>myID</h1>
-<a name="com.r3corda.client.CordaRPCClient$myID"></a>
-<code><span class="keyword">var </span><span class="identifier">myID</span><span class="symbol">: </span><span class="identifier">Int</span></code><br/>
-<p>An ID that we used to identify this connection on the server side: kind of like a local port number but
-it persists for the lifetime of this process and survives short TCP connection interruptions. Is -1
-until <a href="start.html">start</a> is called.</p>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.client/-corda-r-p-c-client/start.html

@@ -7,8 +7,8 @@
 <a href="../index.html">com.r3corda.client</a>&nbsp;/&nbsp;<a href="index.html">CordaRPCClient</a>&nbsp;/&nbsp;<a href=".">start</a><br/>
 <br/>
 <h1>start</h1>
-<a name="com.r3corda.client.CordaRPCClient$start()"></a>
-<code><span class="keyword">fun </span><span class="identifier">start</span><span class="symbol">(</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
+<a name="com.r3corda.client.CordaRPCClient$start(kotlin.String, kotlin.String)"></a>
+<code><span class="keyword">fun </span><span class="identifier">start</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.client.CordaRPCClient$start(kotlin.String, kotlin.String)/username">username</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.client.CordaRPCClient$start(kotlin.String, kotlin.String)/password">password</span><span class="symbol">:</span>&nbsp;<span class="identifier">String</span><span class="symbol">)</span><span class="symbol">: </span><span class="identifier">Unit</span></code><br/>
 <p>Opens the connection to the server and registers a JVM shutdown hook to cleanly disconnect.</p>
 <br/>
 <br/>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-commands/-exit/amount.html

@@ -9,7 +9,7 @@
 <h1>amount</h1>
 <a name="com.r3corda.contracts.asset.Cash.Commands.Exit$amount"></a>
 <code><span class="keyword">val </span><span class="identifier">amount</span><span class="symbol">: </span><a href="../../../../com.r3corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../../com.r3corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
-Overrides <a href="../../../-fungible-asset/-commands/-exit/amount.html">Exit.amount</a><br/>
+Overrides <a href="../../../../com.r3corda.core.contracts/-fungible-asset/-commands/-exit/amount.html">Exit.amount</a><br/>
 <br/>
 <br/>
 </BODY>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-commands/-exit/index.html

@@ -7,7 +7,7 @@
 <a href="../../../index.html">com.r3corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../../index.html">Cash</a>&nbsp;/&nbsp;<a href="../index.html">Commands</a>&nbsp;/&nbsp;<a href=".">Exit</a><br/>
 <br/>
 <h1>Exit</h1>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Exit</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../index.html"><span class="identifier">Commands</span></a><span class="symbol">, </span><a href="../../../-fungible-asset/-commands/-exit/index.html"><span class="identifier">Exit</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Exit</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../index.html"><span class="identifier">Commands</span></a><span class="symbol">, </span><a href="../../../../com.r3corda.core.contracts/-fungible-asset/-commands/-exit/index.html"><span class="identifier">Exit</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><br/>
 <p>A command stating that money has been withdrawn from the shared ledger and is now accounted for
 in some other way.</p>
 <br/>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-commands/-issue/index.html

@@ -7,7 +7,7 @@
 <a href="../../../index.html">com.r3corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../../index.html">Cash</a>&nbsp;/&nbsp;<a href="../index.html">Commands</a>&nbsp;/&nbsp;<a href=".">Issue</a><br/>
 <br/>
 <h1>Issue</h1>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Issue</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../../-fungible-asset/-commands/-issue.html"><span class="identifier">Issue</span></a><span class="symbol">, </span><a href="../index.html"><span class="identifier">Commands</span></a></code><br/>
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Issue</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../../../com.r3corda.core.contracts/-fungible-asset/-commands/-issue.html"><span class="identifier">Issue</span></a><span class="symbol">, </span><a href="../index.html"><span class="identifier">Commands</span></a></code><br/>
 <p>Allows new cash states to be issued into existence: the nonce ("number used once") ensures the transaction
 has a unique ID even when there are no inputs.</p>
 <br/>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-commands/-move/index.html

@@ -7,7 +7,7 @@
 <a href="../../../index.html">com.r3corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../../index.html">Cash</a>&nbsp;/&nbsp;<a href="../index.html">Commands</a>&nbsp;/&nbsp;<a href=".">Move</a><br/>
 <br/>
 <h1>Move</h1>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Move</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../../-fungible-asset/-commands/-move.html"><span class="identifier">Move</span></a><span class="symbol">, </span><a href="../index.html"><span class="identifier">Commands</span></a></code><br/>
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Move</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../../../com.r3corda.core.contracts/-fungible-asset/-commands/-move.html"><span class="identifier">Move</span></a><span class="symbol">, </span><a href="../index.html"><span class="identifier">Commands</span></a></code><br/>
 <p>A command stating that money has been moved, optionally to fulfil another contract.</p>
 <h3>Parameters</h3>
 <a name="contractHash"></a>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-commands/index.html

@@ -7,7 +7,7 @@
 <a href="../../index.html">com.r3corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">Cash</a>&nbsp;/&nbsp;<a href=".">Commands</a><br/>
 <br/>
 <h1>Commands</h1>
-<code><span class="keyword">interface </span><span class="identifier">Commands</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../-fungible-asset/-commands/index.html"><span class="identifier">Commands</span></a></code><br/>
+<code><span class="keyword">interface </span><span class="identifier">Commands</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../../com.r3corda.core.contracts/-fungible-asset/-commands/index.html"><span class="identifier">Commands</span></a></code><br/>
 <br/>
 <br/>
 <h3>Types</h3>
@@ -17,7 +17,7 @@
 <td>
 <a href="-exit/index.html">Exit</a></td>
 <td>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Exit</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Commands</span><span class="symbol">, </span><a href="../../-fungible-asset/-commands/-exit/index.html"><span class="identifier">Exit</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><p>A command stating that money has been withdrawn from the shared ledger and is now accounted for
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Exit</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Commands</span><span class="symbol">, </span><a href="../../../com.r3corda.core.contracts/-fungible-asset/-commands/-exit/index.html"><span class="identifier">Exit</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><p>A command stating that money has been withdrawn from the shared ledger and is now accounted for
 in some other way.</p>
 </td>
 </tr>
@@ -25,7 +25,7 @@ in some other way.</p>
 <td>
 <a href="-issue/index.html">Issue</a></td>
 <td>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Issue</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../-fungible-asset/-commands/-issue.html"><span class="identifier">Issue</span></a><span class="symbol">, </span><span class="identifier">Commands</span></code><p>Allows new cash states to be issued into existence: the nonce ("number used once") ensures the transaction
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Issue</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../../com.r3corda.core.contracts/-fungible-asset/-commands/-issue.html"><span class="identifier">Issue</span></a><span class="symbol">, </span><span class="identifier">Commands</span></code><p>Allows new cash states to be issued into existence: the nonce ("number used once") ensures the transaction
 has a unique ID even when there are no inputs.</p>
 </td>
 </tr>
@@ -33,7 +33,7 @@ has a unique ID even when there are no inputs.</p>
 <td>
 <a href="-move/index.html">Move</a></td>
 <td>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Move</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../-fungible-asset/-commands/-move.html"><span class="identifier">Move</span></a><span class="symbol">, </span><span class="identifier">Commands</span></code><p>A command stating that money has been moved, optionally to fulfil another contract.</p>
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Move</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../../com.r3corda.core.contracts/-fungible-asset/-commands/-move.html"><span class="identifier">Move</span></a><span class="symbol">, </span><span class="identifier">Commands</span></code><p>A command stating that money has been moved, optionally to fulfil another contract.</p>
 </td>
 </tr>
 </tbody>
@@ -45,7 +45,7 @@ has a unique ID even when there are no inputs.</p>
 <td>
 <a href="-exit/index.html">Exit</a></td>
 <td>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Exit</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Commands</span><span class="symbol">, </span><a href="../../-fungible-asset/-commands/-exit/index.html"><span class="identifier">Exit</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><p>A command stating that money has been withdrawn from the shared ledger and is now accounted for
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Exit</span>&nbsp;<span class="symbol">:</span>&nbsp;<span class="identifier">Commands</span><span class="symbol">, </span><a href="../../../com.r3corda.core.contracts/-fungible-asset/-commands/-exit/index.html"><span class="identifier">Exit</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><p>A command stating that money has been withdrawn from the shared ledger and is now accounted for
 in some other way.</p>
 </td>
 </tr>
@@ -53,7 +53,7 @@ in some other way.</p>
 <td>
 <a href="-issue/index.html">Issue</a></td>
 <td>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Issue</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../-fungible-asset/-commands/-issue.html"><span class="identifier">Issue</span></a><span class="symbol">, </span><span class="identifier">Commands</span></code><p>Allows new cash states to be issued into existence: the nonce ("number used once") ensures the transaction
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Issue</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../../com.r3corda.core.contracts/-fungible-asset/-commands/-issue.html"><span class="identifier">Issue</span></a><span class="symbol">, </span><span class="identifier">Commands</span></code><p>Allows new cash states to be issued into existence: the nonce ("number used once") ensures the transaction
 has a unique ID even when there are no inputs.</p>
 </td>
 </tr>
@@ -61,7 +61,7 @@ has a unique ID even when there are no inputs.</p>
 <td>
 <a href="-move/index.html">Move</a></td>
 <td>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Move</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../-fungible-asset/-commands/-move.html"><span class="identifier">Move</span></a><span class="symbol">, </span><span class="identifier">Commands</span></code><p>A command stating that money has been moved, optionally to fulfil another contract.</p>
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">Move</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../../com.r3corda.core.contracts/-fungible-asset/-commands/-move.html"><span class="identifier">Move</span></a><span class="symbol">, </span><span class="identifier">Commands</span></code><p>A command stating that money has been moved, optionally to fulfil another contract.</p>
 </td>
 </tr>
 </tbody>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-state/amount.html

@@ -9,7 +9,7 @@
 <h1>amount</h1>
 <a name="com.r3corda.contracts.asset.Cash.State$amount"></a>
 <code><span class="keyword">val </span><span class="identifier">amount</span><span class="symbol">: </span><a href="../../../com.r3corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../com.r3corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span></code><br/>
-Overrides <a href="../../-fungible-asset/amount.html">FungibleAsset.amount</a><br/>
+Overrides <a href="../../../com.r3corda.core.contracts/-fungible-asset/amount.html">FungibleAsset.amount</a><br/>
 <br/>
 <br/>
 </BODY>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-state/deposit.html

@@ -1,18 +0,0 @@
-<HTML>
-<HEAD>
-<title>Cash.State.deposit - </title>
-<link rel="stylesheet" href="../../../style.css">
-</HEAD>
-<BODY>
-<a href="../../index.html">com.r3corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">Cash</a>&nbsp;/&nbsp;<a href="index.html">State</a>&nbsp;/&nbsp;<a href=".">deposit</a><br/>
-<br/>
-<h1>deposit</h1>
-<a name="com.r3corda.contracts.asset.Cash.State$deposit"></a>
-<code><span class="keyword">val </span><span class="identifier">deposit</span><span class="symbol">: </span><a href="../../../com.r3corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a></code><br/>
-Overrides <a href="../../-fungible-asset/deposit.html">FungibleAsset.deposit</a><br/>
-<p>Where the underlying asset backing this ledger entry can be found. The reference
-is only intended for use by the issuer, and is not intended to be meaningful to others.</p>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-state/exit-keys.html

@@ -9,7 +9,7 @@
 <h1>exitKeys</h1>
 <a name="com.r3corda.contracts.asset.Cash.State$exitKeys"></a>
 <code><span class="keyword">val </span><span class="identifier">exitKeys</span><span class="symbol">: </span><span class="identifier">&lt;ERROR CLASS&gt;</span></code><br/>
-Overrides <a href="../../-fungible-asset/exit-keys.html">FungibleAsset.exitKeys</a><br/>
+Overrides <a href="../../../com.r3corda.core.contracts/-fungible-asset/exit-keys.html">FungibleAsset.exitKeys</a><br/>
 <p>There must be an ExitCommand signed by these keys to destroy the amount. While all states require their
 owner to sign, some (i.e. cash) also require the issuer.</p>
 <br/>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-state/index.html

@@ -7,7 +7,7 @@
 <a href="../../index.html">com.r3corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">Cash</a>&nbsp;/&nbsp;<a href=".">State</a><br/>
 <br/>
 <h1>State</h1>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">State</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><a href="../../../com.r3corda.core.schemas/-queryable-state/index.html"><span class="identifier">QueryableState</span></a></code><br/>
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">State</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../../com.r3corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><a href="../../../com.r3corda.core.schemas/-queryable-state/index.html"><span class="identifier">QueryableState</span></a></code><br/>
 <p>A state representing a cash claim against some party.</p>
 <br/>
 <br/>
@@ -41,14 +41,6 @@
 </tr>
 <tr>
 <td>
-<a href="deposit.html">deposit</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">deposit</span><span class="symbol">: </span><a href="../../../com.r3corda.core.contracts/-party-and-reference/index.html"><span class="identifier">PartyAndReference</span></a></code><p>Where the underlying asset backing this ledger entry can be found. The reference
-is only intended for use by the issuer, and is not intended to be meaningful to others.</p>
-</td>
-</tr>
-<tr>
-<td>
 <a href="encumbrance.html">encumbrance</a></td>
 <td>
 <code><span class="keyword">val </span><span class="identifier">encumbrance</span><span class="symbol">: </span><span class="identifier">Int</span><span class="symbol">?</span></code><p>All contract states may be <emph>encumbered</emph> by up to one other state.</p>
@@ -64,12 +56,6 @@ owner to sign, some (i.e. cash) also require the issuer.</p>
 </tr>
 <tr>
 <td>
-<a href="issuance-def.html">issuanceDef</a></td>
-<td>
-<code><span class="keyword">val </span><span class="identifier">issuanceDef</span><span class="symbol">: </span><a href="../../../com.r3corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code></td>
-</tr>
-<tr>
-<td>
 <a href="owner.html">owner</a></td>
 <td>
 <code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code><p>There must be a MoveCommand signed by this key to claim the amount.</p>
@@ -98,7 +84,7 @@ owner to sign, some (i.e. cash) also require the issuer.</p>
 <td>
 <a href="move.html">move</a></td>
 <td>
-<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.contracts.asset.Cash.State$move(com.r3corda.core.contracts.Amount((com.r3corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../com.r3corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../com.r3corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.contracts.asset.Cash.State$move(com.r3corda.core.contracts.Amount((com.r3corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code></td>
+<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.contracts.asset.Cash.State$move(com.r3corda.core.contracts.Amount((com.r3corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../com.r3corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../com.r3corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.contracts.asset.Cash.State$move(com.r3corda.core.contracts.Amount((com.r3corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../com.r3corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code></td>
 </tr>
 <tr>
 <td>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-state/issuance-def.html

@@ -1,16 +0,0 @@
-<HTML>
-<HEAD>
-<title>Cash.State.issuanceDef - </title>
-<link rel="stylesheet" href="../../../style.css">
-</HEAD>
-<BODY>
-<a href="../../index.html">com.r3corda.contracts.asset</a>&nbsp;/&nbsp;<a href="../index.html">Cash</a>&nbsp;/&nbsp;<a href="index.html">State</a>&nbsp;/&nbsp;<a href=".">issuanceDef</a><br/>
-<br/>
-<h1>issuanceDef</h1>
-<a name="com.r3corda.contracts.asset.Cash.State$issuanceDef"></a>
-<code><span class="keyword">val </span><span class="identifier">issuanceDef</span><span class="symbol">: </span><a href="../../../com.r3corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><br/>
-Overrides <a href="../../-fungible-asset/issuance-def.html">FungibleAsset.issuanceDef</a><br/>
-<br/>
-<br/>
-</BODY>
-</HTML>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-state/move.html

@@ -8,7 +8,7 @@
 <br/>
 <h1>move</h1>
 <a name="com.r3corda.contracts.asset.Cash.State$move(com.r3corda.core.contracts.Amount((com.r3corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)"></a>
-<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.contracts.asset.Cash.State$move(com.r3corda.core.contracts.Amount((com.r3corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../com.r3corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../com.r3corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.contracts.asset.Cash.State$move(com.r3corda.core.contracts.Amount((com.r3corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><br/>
+<code><span class="keyword">fun </span><span class="identifier">move</span><span class="symbol">(</span><span class="identifier" id="com.r3corda.contracts.asset.Cash.State$move(com.r3corda.core.contracts.Amount((com.r3corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newAmount">newAmount</span><span class="symbol">:</span>&nbsp;<a href="../../../com.r3corda.core.contracts/-amount/index.html"><span class="identifier">Amount</span></a><span class="symbol">&lt;</span><a href="../../../com.r3corda.core.contracts/-issued/index.html"><span class="identifier">Issued</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">&gt;</span><span class="symbol">, </span><span class="identifier" id="com.r3corda.contracts.asset.Cash.State$move(com.r3corda.core.contracts.Amount((com.r3corda.core.contracts.Issued((java.util.Currency)))), java.security.PublicKey)/newOwner">newOwner</span><span class="symbol">:</span>&nbsp;<a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a><span class="symbol">)</span><span class="symbol">: </span><a href="../../../com.r3corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span></code><br/>
 <br/>
 <br/>
 </BODY>

docs/build/html/api/com.r3corda.contracts.asset/-cash/-state/owner.html

@@ -9,7 +9,7 @@
 <h1>owner</h1>
 <a name="com.r3corda.contracts.asset.Cash.State$owner"></a>
 <code><span class="keyword">val </span><span class="identifier">owner</span><span class="symbol">: </span><a href="http://docs.oracle.com/javase/6/docs/api/java/security/PublicKey.html"><span class="identifier">PublicKey</span></a></code><br/>
-Overrides <a href="../../-fungible-asset/owner.html">FungibleAsset.owner</a><br/>
+Overrides <a href="../../../com.r3corda.core.contracts/-fungible-asset/owner.html">FungibleAsset.owner</a><br/>
 <p>There must be a MoveCommand signed by this key to claim the amount.</p>
 <br/>
 <br/>

docs/build/html/api/com.r3corda.contracts.asset/-cash/index.html

@@ -34,13 +34,13 @@ vaults can ignore the issuer/depositRefs and just examine the amount fields.</p>
 <td>
 <a href="-commands/index.html">Commands</a></td>
 <td>
-<code><span class="keyword">interface </span><span class="identifier">Commands</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../-fungible-asset/-commands/index.html"><span class="identifier">Commands</span></a></code></td>
+<code><span class="keyword">interface </span><span class="identifier">Commands</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../com.r3corda.core.contracts/-fungible-asset/-commands/index.html"><span class="identifier">Commands</span></a></code></td>
 </tr>
 <tr>
 <td>
 <a href="-state/index.html">State</a></td>
 <td>
-<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">State</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><a href="../../com.r3corda.core.schemas/-queryable-state/index.html"><span class="identifier">QueryableState</span></a></code><p>A state representing a cash claim against some party.</p>
+<code><span class="keyword">data</span> <span class="keyword">class </span><span class="identifier">State</span>&nbsp;<span class="symbol">:</span>&nbsp;<a href="../../com.r3corda.core.contracts/-fungible-asset/index.html"><span class="identifier">FungibleAsset</span></a><span class="symbol">&lt;</span><a href="http://docs.oracle.com/javase/6/docs/api/java/util/Currency.html"><span class="identifier">Currency</span></a><span class="symbol">&gt;</span><span class="symbol">, </span><a href="../../com.r3corda.core.schemas/-queryable-state/index.html"><span class="identifier">QueryableState</span></a></code><p>A state representing a cash claim against some party.</p>
 </td>
 </tr>
 </tbody>