diff --git a/docs/build/html/_sources/creating-a-cordapp.txt b/docs/build/html/_sources/creating-a-cordapp.txt
index 8f67960851..f610ccdf81 100644
--- a/docs/build/html/_sources/creating-a-cordapp.txt
+++ b/docs/build/html/_sources/creating-a-cordapp.txt
@@ -106,10 +106,58 @@ root directory of Corda
This will publish corda-$version.jar, contracts-$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.
-In Gradle you can depend on these by adding/modifying your build.gradle file to contain the following:
+Gradle Plugins for Cordapps
+===========================
+
+There are several Gradle plugins that reduce your build.gradle boilerplate and make development of Cordapps easier.
+The available plugins are in the gradle-plugins directory of the Corda repository.
+
+Building Gradle Plugins
+-----------------------
+
+To install to your local Maven repository the plugins that Cordapp gradle files require, run the following from the
+root of the Corda project:
+
+.. code-block:: text
+
+ ./gradlew publishToMavenLocal
+
+The plugins will now be installed to your local Maven repository in ~/.m2 on Unix and %HOMEPATH%\.m2 on Windows.
+
+Using Gradle Plugins
+--------------------
+
+To use the plugins, if you are not already using the Cordapp template project, you must modify your build.gradle. Add
+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:
.. code-block:: groovy
+ buildscript {
+ ext.corda_version = ''
+ ... your buildscript ...
+
+ repositories {
+ ... other repositories ...
+ mavenLocal()
+ }
+
+ dependencies {
+ ... your dependencies ...
+ classpath "com.r3corda.plugins:cordformation:$corda_version"
+ classpath "com.r3corda.plugins:quasar-utils:$corda_version"
+ classpath "com.r3corda.plugins:publish-utils:$corda_version"
+ }
+ }
+
+ apply plugin: 'com.r3corda.plugins.cordformation'
+ apply plugin: 'com.r3corda.plugins.quasar-utils'
+ apply plugin: 'com.r3corda.plugins.publish-utils'
+
repositories {
mavenLocal()
... other repositories here ...
@@ -122,3 +170,78 @@ In Gradle you can depend on these by adding/modifying your build.gradle file to
compile "com.r3corda:corda:$corda_version"
... other dependencies here ...
}
+
+ ... your tasks ...
+
+ // Sets the classes for Quasar to scan. Loaded by the the quasar-utils plugin.
+ quasarScan.dependsOn('classes', ... your dependent subprojects...)
+
+ // Standard way to publish Cordapps to maven local with the maven-publish and publish-utils plugin.
+ publishing {
+ publications {
+ jarAndSources(MavenPublication) {
+ from components.java
+ // The two lines below are the tasks added by this plugin.
+ artifact sourceJar
+ artifact javadocJar
+ }
+ }
+ }
+
+
+
+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
+deployment.
+
+To use this gradle plugin you must add a new task that is of the type `com.r3corda.plugins.Cordform` to your
+build.gradle and then configure the nodes you wish to deploy with the Node and nodes configuration DSL.
+This DSL is specified in the `JavaDoc `_. An example of this is in the template-cordapp and below
+is a three node example;
+
+.. code-block:: text
+
+ task deployNodes(type: com.r3corda.plugins.Cordform, dependsOn: ['build']) {
+ directory "./build/nodes" // The output directory
+ networkMap "Controller" // The artemis address of the node named here will be used as the networkMapAddress on all other nodes.
+ node {
+ name "Controller"
+ dirName "controller"
+ nearestCity "London"
+ notary true // Sets this node to be a notary
+ advertisedServices []
+ artemisPort 12345
+ webPort 12346
+ cordapps []
+ }
+ node {
+ name "NodeA"
+ dirName "nodea"
+ nearestCity "London"
+ advertisedServices []
+ artemisPort 31337
+ webPort 31339
+ cordapps []
+ }
+ node {
+ name "NodeB"
+ dirName "nodeb"
+ nearestCity "New York"
+ advertisedServices []
+ artemisPort 31338
+ webPort 31340
+ cordapps []
+ }
+ }
+
+You can create more configurations with new tasks that extend Cordform.
+
+New nodes can be added by simply adding another node block and giving it a different name, directory and ports. When you
+run this task it will install the nodes to the directory specified and a script will be generated (for UNIX users only
+at present) to run the nodes with one command.
+
+Other cordapps can also be specified if they are already specified as classpath or compile dependencies in your
+build.gradle.
\ No newline at end of file
diff --git a/docs/build/html/_sources/protocol-state-machines.txt b/docs/build/html/_sources/protocol-state-machines.txt
index 1da9d0f7cc..16ed30c951 100644
--- a/docs/build/html/_sources/protocol-state-machines.txt
+++ b/docs/build/html/_sources/protocol-state-machines.txt
@@ -242,17 +242,20 @@ Let's implement the ``Seller.call`` method. This will be run when the protocol i
@Suspendable
override fun call(): SignedTransaction {
val partialTX: SignedTransaction = receiveAndCheckProposedTransaction()
- val ourSignature: DigitalSignature.WithKey = signWithOurKey(partialTX)
- val notarySignature = getNotarySignature(partialTX)
- val result: SignedTransaction = sendSignatures(partialTX, ourSignature, notarySignature)
+ val ourSignature: DigitalSignature.WithKey = computeOurSignature(partialTX)
+ val allPartySignedTx = partialTX + ourSignature
+ val notarySignature = getNotarySignature(allPartySignedTx)
+ val result: SignedTransaction = sendSignatures(allPartySignedTx, ourSignature, notarySignature)
return result
}
Here we see the outline of the procedure. We receive a proposed trade transaction from the buyer and check that it's
-valid. Then we sign with our own key and request a notary to assert with another signature that the
+valid. The buyer has already attached their signature before sending it. Then we calculate and attach our own signature so that the transaction is
+now signed by both the buyer and the seller. We then send this request to a notary to assert with another signature that the
timestamp in the transaction (if any) is valid and there are no double spends, and send back both
-our signature and the notaries signature. Finally, we hand back to the code that invoked the protocol the
-finished transaction.
+our signature and the notaries signature. Note we should not send to the notary until all other required signatures have been appended
+as the notary may validate the signatures as well as verifying for itself the transactional integrity.
+Finally, we hand back to the code that invoked the protocol the finished transaction.
Let's fill out the ``receiveAndCheckProposedTransaction()`` method.
@@ -369,12 +372,12 @@ Here's the rest of the code:
.. sourcecode:: kotlin
- open fun signWithOurKey(partialTX: SignedTransaction) = myKeyPair.signWithECDSA(partialTX.txBits)
+ open fun computeOurSignature(partialTX: SignedTransaction) = myKeyPair.signWithECDSA(partialTX.txBits)
@Suspendable
- private fun sendSignatures(partialTX: SignedTransaction, ourSignature: DigitalSignature.WithKey,
+ private fun sendSignatures(allPartySignedTX: SignedTransaction, ourSignature: DigitalSignature.WithKey,
notarySignature: DigitalSignature.LegallyIdentifiable): SignedTransaction {
- val fullySigned = partialTX + ourSignature + notarySignature
+ val fullySigned = allPartySignedTX + notarySignature
logger.trace { "Built finished transaction, sending back to secondary!" }
send(otherSide, SignaturesFromSeller(ourSignature, notarySignature))
return fullySigned
diff --git a/docs/build/html/api/alltypes/index.html b/docs/build/html/api/alltypes/index.html
index c664978d66..fcbde57f35 100644
--- a/docs/build/html/api/alltypes/index.html
+++ b/docs/build/html/api/alltypes/index.html
@@ -664,6 +664,12 @@ client apps and are implemented by the node in the ServerRPCOps
class PerFileTransactionStorage:TransactionStorage
File-based transaction storage, storing transactions per file.
diff --git a/docs/build/html/api/com.r3corda.demos.protocols/-auto-offer-protocol/-requester/index.html b/docs/build/html/api/com.r3corda.demos.protocols/-auto-offer-protocol/-requester/index.html
index 629488c56d..b386a713ce 100644
--- a/docs/build/html/api/com.r3corda.demos.protocols/-auto-offer-protocol/-requester/index.html
+++ b/docs/build/html/api/com.r3corda.demos.protocols/-auto-offer-protocol/-requester/index.html
@@ -128,8 +128,8 @@ will do as long as the other side registers with it.
diff --git a/docs/build/html/api/com.r3corda.demos.protocols/-exit-server-protocol/-broadcast/index.html b/docs/build/html/api/com.r3corda.demos.protocols/-exit-server-protocol/-broadcast/index.html
index b041d85261..2b5974fc94 100644
--- a/docs/build/html/api/com.r3corda.demos.protocols/-exit-server-protocol/-broadcast/index.html
+++ b/docs/build/html/api/com.r3corda.demos.protocols/-exit-server-protocol/-broadcast/index.html
@@ -102,8 +102,8 @@ will do as long as the other side registers with it.
diff --git a/docs/build/html/api/com.r3corda.demos.protocols/-update-business-day-protocol/-broadcast/index.html b/docs/build/html/api/com.r3corda.demos.protocols/-update-business-day-protocol/-broadcast/index.html
index 130deb7391..acd210dceb 100644
--- a/docs/build/html/api/com.r3corda.demos.protocols/-update-business-day-protocol/-broadcast/index.html
+++ b/docs/build/html/api/com.r3corda.demos.protocols/-update-business-day-protocol/-broadcast/index.html
@@ -109,8 +109,8 @@ will do as long as the other side registers with it.
A first pass of a simple SchedulerService that works with MutableClocks for testing, demonstrations and simulations
that also encompasses the Vault observer for processing transactions.
This will observe transactions as they are stored and schedule and unschedule activities based on the States consumed
diff --git a/docs/build/html/api/com.r3corda.node.services.events/-node-scheduler-service/index.html b/docs/build/html/api/com.r3corda.node.services.events/-node-scheduler-service/index.html
index 273964a83e..21cb39b552 100644
--- a/docs/build/html/api/com.r3corda.node.services.events/-node-scheduler-service/index.html
+++ b/docs/build/html/api/com.r3corda.node.services.events/-node-scheduler-service/index.html
@@ -38,7 +38,7 @@ activity. Only replace this for unit testing purposes. This is not the executo
A first pass of a simple SchedulerService that works with MutableClocks for testing, demonstrations and simulations
+NodeSchedulerService(database:<ERROR CLASS>, services:ServiceHubInternal, protocolLogicRefFactory:ProtocolLogicRefFactory= ProtocolLogicRefFactory(), schedulerTimerExecutor:Executor= Executors.newSingleThreadExecutor())
A first pass of a simple SchedulerService that works with MutableClocks for testing, demonstrations and simulations
that also encompasses the Vault observer for processing transactions.